Merge branch 'dev' into sit

src/assets/js/statusList.js

@@ -10,14 +10,22 @@ const cg_order_type_options = [
 const xs_order_type_options = [
   { id: "1", label: "库存品" },
   { id: "2", label: "非库存品" },
-  { id: "3", label: "采反" },
+  { id: "3", label: "采购反馈" },
+]
+const cg_order_source_options = [
+  { id: "0", label: "备库单" },
+  // { id: "1", label: "直接下单" },
+  { id: "2", label: "咨询转单" },
+  { id: "3", label: "项目转单" },
+  { id: "4", label: "平台导入" },
+  // { id: "5", label: "有赞平台" },
 ]
-
-const yw_order_source = [
+const xs_order_source_options = [
+  // { id: "0", label: "备库单" },
   { id: "1", label: "直接下单" },
   { id: "2", label: "咨询转单" },
   { id: "3", label: "项目转单" },
   { id: "4", label: "平台导入" },
-  { id: "5", label: "有赞平台" },
+  // { id: "5", label: "有赞平台" },
 ]
-export { statusList, cg_order_type_options, xs_order_type_options,yw_order_source };
+export { statusList, cg_order_type_options, xs_order_type_options, cg_order_source_options, xs_order_source_options };

src/views/sellOut/project/components/buyGoodModal.vue

@@ -588,6 +588,8 @@ export default {
         let list1 = this.project_list[index].order_good;
         this.order_good =
           list1.length > 0 ? JSON.parse(JSON.stringify(list1)) : [];
+
+          this.order_good[0].good_img = this.order_good[0].good_img.split(",")
         let list2 = this.project_list[index].order_addr;
         this.addrForm.order_addr =
           list2.length > 0 ? JSON.parse(JSON.stringify(list2)) : [];
@@ -666,6 +668,7 @@ export default {
       };
       this.project_list.forEach((e) => {
         const { order_good, order_addr } = e;
+
         const { id, sendtype } = JSON.parse(JSON.stringify(order_good[0]));
         let modelA = {
           feedback_id: id || "",

src/views/sellOut/project/components/setPlan.vue

@@ -531,6 +531,7 @@ export default {
     place_order() {
       const { company, khName, platform_name, arrtime, project_name } =
         this.sitem;
+        // console.log("aaaaaaaaaaaaaaa",this.sitem)
       this.bayGoodItem = JSON.parse(
         JSON.stringify(this.allPlanList[this.index])
       );

src/views/sellOut/salesOrder/columns.js

@@ -47,11 +47,18 @@ export default [
     _slot_: "status",
     width: "120px",
   },
+  
+  {
+    prop: "order_source",
+    label: "订单来源",
+    _slot_: "order_source",
+    width: "90px",
+  },
   {
     prop: "order_type",
-    label: "订单类型",
+    label: "商品来源",
     _slot_: "order_type",
-    width: "130px",
+    width: "90px",
   },
   {
     prop: "useage",

src/views/sellOut/salesOrder/components/ShowDataTableColumns.js

@@ -92,15 +92,21 @@ const showColumns = [
     _slot_: "status",
     span: 6,
   },
+  {
+    prop: "order_source",
+    label: "订单来源",
+    _slot_: "order_source",
+    span: 4,
+  },
   {
     prop: "order_type",
-    label: "订单类型",
+    label: "商品来源",
     _slot_: "order_type",
-    span: 6,
+    span: 4,
   }, {
     prop: "apply_name",
     label: "创建人",
-    span: 6,
+    span: 4,
   },
 
   {

src/views/sellOut/salesOrder/detail.vue

@@ -59,6 +59,20 @@
                     "
                   ></el-tag>
                 </template>
+                <template slot="order_source">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        xs_order_source_options.find(
+                          (item) => item.id == sitem.order_source
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+
+                
 
                 <template slot="supplierName">
                   <span>{{ sitem.supplierName }}</span>
@@ -206,7 +220,7 @@ import orderOutTable from "./components/order-out-table";
 
 import { showColumns } from "./components/ShowDataTableColumns";
 import setPartial from "./setPartial";
-import { xs_order_type_options } from "@/assets/js/statusList";
+import {  xs_order_source_options,xs_order_type_options } from "@/assets/js/statusList";
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
@@ -250,6 +264,7 @@ export default {
         },
       ],
       xs_order_type_options,
+       xs_order_source_options,
       statusOptions: [
         { value: "0", label: "待发货" },
         { value: "1", label: "待发货完成" },

src/views/sellOut/salesOrder/index.vue

@@ -98,7 +98,7 @@
                   :value="customerCode"
                   :size="searchSize"
                   :names="parmValue.supplierName"
-                    :is-detail="true"
+                  :is-detail="true"
                   :placeholder="'客户公司名称'"
                   @searchChange="customerChange"
                 />
@@ -110,7 +110,7 @@
                   v-model="parmValue.order_type"
                   filterable
                   clearable
-                  placeholder="订单类型"
+                  placeholder="商品来源"
                   style="width: 100%"
                   @change="
                     pageInfo.curr = 1;
@@ -158,7 +158,10 @@
                     ></el-option> -->
                     <el-option label="商品名称" value="good_name"></el-option>
                     <el-option label="创建人" value="apply_name"></el-option>
-                    <el-option label="创建人部门" value="company_name"></el-option>
+                    <el-option
+                      label="创建人部门"
+                      value="company_name"
+                    ></el-option>
                   </el-select>
                 </el-input>
               </el-col>
@@ -217,18 +220,31 @@
             :size="tablebtnSize"
             v-text="
               (
-                xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
-                {}
+                xs_order_type_options.find(
+                  (item) => item.id == scope.row.order_type
+                ) || {}
               ).label || '--'
             "
           ></el-tag>
         </template>
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
         <template #operation="{ scope }">
           <el-tooltip effect="dark" content="详情" placement="top">
             <i
               class="el-icon-view tb-icon"
-              
-               @click="getRouter('salesOrderDetail', scope.row.id )"
+              @click="getRouter('salesOrderDetail', scope.row.id)"
             ></i>
           </el-tooltip>
         </template>
@@ -263,7 +279,10 @@ import columns from "./columns"; //表格列参数
 import addEdit from "./components/addEdit";
 import userAddEdit from "./userAddEdit";
 import { mapGetters } from "vuex";
-import { xs_order_type_options } from "@/assets/js/statusList";
+import {
+  xs_order_type_options,
+  xs_order_source_options,
+} from "@/assets/js/statusList";
 export default {
   name: "salesOrder",
   mixins: [mixinPage, resToken],
@@ -272,7 +291,7 @@ export default {
     userAddEdit,
   },
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size",]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       let tran =
         this.$store.getters.btnList.find(
@@ -300,6 +319,7 @@ export default {
         { id: "3", label: "订单已取消" },
       ],
       xs_order_type_options,
+      xs_order_source_options,
       loading: false,
       showModel: false,
       isDetail: false,
@@ -317,8 +337,7 @@ export default {
         customer_code: "", //客户编号
         start: "", //新建起始时间
         end: "", // 新建结束时间
-        company_name:"", //创建人部门
-
+        company_name: "", //创建人部门
       },
       // 表格 - 数据
       tableData: [],
@@ -341,53 +360,52 @@ export default {
     };
   },
   mounted() {
-     const { back } = this.$route.query;
+    const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      console.log(this.parmValue)
-      const {page,size}=this.parmValue;
+      console.log(this.parmValue);
+      const { page, size } = this.parmValue;
       // this.parmValue.start = start || last_start;
       // this.parmValue.end = end || last_end;
-      if(this.parmValue.customer_code.length>0){
-          this.customerCode = [this.parmValue.customer_code] ;
+      if (this.parmValue.customer_code.length > 0) {
+        this.customerCode = [this.parmValue.customer_code];
       }
-      
-       this.pageInfo= {
+
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
       //多选条件
-    this.select = this.parmValue.select;
-    // this.sselect = this.parmValue.sselect;
-    this.input = this.parmValue.input
-
-    }else{
-       this.select = "orderCode";
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.input = this.parmValue.input;
+    } else {
+      this.select = "orderCode";
       //  this.sselect = "创建时间"
     }
     this.searchList();
   },
 
   methods: {
-    getRouter(toRouter, queryId){
+    getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
           id: queryId,
-          type: 'view',
+          type: "view",
         };
 
         //有多选框的条件
-        this.parmValue.select = this.select ;
+        this.parmValue.select = this.select;
         // this.parmValue.sselect = this.sselect ;
-        this.parmValue.input= this.input;
+        this.parmValue.input = this.input;
         //
-         let routerModel = {
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程！");
@@ -398,7 +416,7 @@ export default {
       this.input = "";
       this.customerCode = [];
       this.parmValue = {
-        order_type: "", 
+        order_type: "",
         orderCode: "", //销售订单code
         apply_name: "", // 申请人
         good_name: "", // 产品名称
@@ -410,7 +428,7 @@ export default {
         customer_code: "", //客户编号
         start: "", //新建起始时间
         end: "", // 新建结束时间
-        company_name:"", //部门
+        company_name: "", //部门
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -461,7 +479,7 @@ export default {
         this.parmValue.customer_code = e.code;
       } else {
         this.customerCode = [];
-        this.parmValue.supplierName = '';
+        this.parmValue.supplierName = "";
         this.parmValue.customer_code = "";
       }
       this.parmValue.page = 1;
@@ -493,7 +511,8 @@ export default {
       this.parmValue.apply_name =
         this.select === "apply_name" ? this.input : "";
 
-      this.parmValue.company_name = this.select === "company_name" ? this.input : "";
+      this.parmValue.company_name =
+        this.select === "company_name" ? this.input : "";
 
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {

src/views/sellOut/sellOutOrder/columns.js

@@ -143,7 +143,7 @@ const showColumns = [
   },
   {
     prop: "order_type",
-    label: "订单类别",
+    label: "商品来源",
     _slot_: "order_type",
     span: 6
   },

src/views/sellOut/sellOutOrder/detail.vue

@@ -62,9 +62,16 @@
                   ></el-tag>
                 </template>
                 <template slot="order_type">
-                  <el-tag :size="'mini'" :type="''">{{
-                    sitem.status === "1" ? "发货申请单" : "竞价发货申请单"
-                  }}</el-tag>
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        xs_order_type_options.find(
+                          (item) => item.id == sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
                 </template>
                 <template slot="sale_price">
                   <span>{{
@@ -317,6 +324,7 @@ import { showColumns } from "./columns";
 import { sellshowColumns } from "@/views/sellOut/sellAfterApply/columns";
 import returnExpress from "./components/returnExpress";
 import wantDeliver from "./components/want-deliver.vue";
+import { xs_order_type_options } from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
 export default {
   name: "sellOutOrderDetail",
@@ -343,6 +351,7 @@ export default {
   },
   data() {
     return {
+      xs_order_type_options,
       returnCode: "",
       returnCode_type: "",
       activeTabs: "1",

src/views/sellOut/sellOutOrder/index.vue

@@ -179,18 +179,7 @@
             "
           ></el-tag>
         </template>
-        <template #order_type="{ scope }">
-          <el-tag
-            :size="'mini'"
-            v-text="
-              (
-                xs_order_type_options.find(
-                  (item) => item.id == scope.row.order_type
-                ) || {}
-              ).label || '--'
-            "
-          ></el-tag>
-        </template>
+      
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((item) => item == '007')"
@@ -227,7 +216,7 @@ import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
 import addEdit from "./components/addEdit.vue";
 import { columns } from "./columns";
-import { xs_order_type_options } from "@/assets/js/statusList";
+
 export default {
   name: "sellOutOrder",
   mixins: [mixinPage, resToken],
@@ -255,7 +244,7 @@ export default {
       customerCode: [], //客户公司code
       fileUrl: urlConfig.baseURL,
       changeList: [],
-      xs_order_type_options,
+     
       // post_ownOptions: [
       //   { id: "1", label: "客户承担" },
       //   { id: "2", label: "公司承担" },

src/views/standingBook/columns.js

@@ -20,80 +20,80 @@ const schTahead = [
   // },
   {
     prop: "standBookNo",
-    label: "台账记录编码",
+    label: "台账记录",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "projectNo",
-    label: "项目编号",
+    label: "项目",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "infoNo",
-    label: "咨询单编号",
+    label: "竞价单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "bargainNo",
-    label: "议价单编号",
+    label: "议价单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "bk_code",
-    label: "备货单编号",
+    label: "备货单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "orderCode",
-    label: "销售订单编号",
+    label: "销售订单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "outCode",
-    label: "发货申请单编号",
+    label: "发货申请单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "returnCode",
-    label: "售后申请单编号",
+    label: "售后申请单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "thNo",
-    label: "售后退货单编号",
+    label: "售后退货单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "returnGoodCode",
-    label: "退货单编号",
+    label: "退货单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "cgdNo",
-    label: "采购单编号",
+    label: "采购单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
 
   {
     prop: "wsm_in_code",
-    label: "采购入库单编号",
+    label: "采购入库单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "cgdReturnCode",
-    label: "采购退货单编号",
+    label: "采购退货单",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
@@ -109,28 +109,28 @@ const schTahead = [
     t1:"方便统一修改、留存",
     minWidth:155,
   },
-  {
-    prop: "order_type",
-    label: "来源",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+  // {
+  //   prop: "order_type",
+  //   label: "来源",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
   
   {
     prop: "supplierNo",
-    label: "供应商编号",
+    label: "供应商",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "companyNo",
-    label: "业务公司编号",
+    label: "业务公司",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
   {
     prop: "customer_code",
-    label: "企业客户编号",
+    label: "企业客户",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
@@ -154,7 +154,7 @@ const columns = [
   },
   {
     prop: "infoNo",
-    label: "咨询单编号",
+    label: "竞价单编号",
     t1:"方便统一修改、留存",
     minWidth:155,
   },
@@ -244,12 +244,12 @@ const columns = [
     t1:"方便统一修改、留存",
     minWidth:155,
   },
-  {
-    prop: "order_type",
-    label: "来源",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+  // {
+  //   prop: "order_type",
+  //   label: "来源",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
   
   {
     prop: "supplierNo",
@@ -276,12 +276,12 @@ const columns = [
     t1:"方便统一修改、留存",
     minWidth:155,
   },
-  {
-    prop: "updatetime",
-    label: "更新时间",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+  // {
+  //   prop: "updatetime",
+  //   label: "更新时间",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
   {
     prop:"",
     label: "操作",

src/views/standingBook/components/detail2/main.vue

@@ -243,7 +243,7 @@ export default {
       const res = await asyncRequest.detail({ cgdNo: this.queryId });
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
-        console.log("11111111111111111", this.sitem);
+        // console.log("11111111111111111", this.sitem);
         this.goldPrice();
         const { status, can, cgdNo } = this.sitem;
         this.status = status;

src/views/standingBook/detail.vue

@@ -21,7 +21,7 @@
 
           <div id="detail2"  v-if="tableData.cgdNo">
             <el-collapse-item
-              title="采购——采购单"
+              title="采购--采购单"
               name="2"
               v-if="newTime !== ''"
             >
@@ -31,7 +31,7 @@
 
           <div id="detail3" v-if="tableData.wsm_in_code">
             <el-collapse-item
-              title="采购——入库单"
+              title="采购--入库单"
               name="3"
               v-if="newTime !== ''"
             >
@@ -41,7 +41,7 @@
 
           <div id="detail4" v-if="tableData.cgdReturnCode">
             <el-collapse-item
-              title="采购——退货单"
+              title="采购--退货单"
               name="4"
               v-if="newTime !== ''"
             >
@@ -49,10 +49,10 @@
             </el-collapse-item>
           </div>
 
-          <!-- 编号id -->
+  
           <div id="detail5" v-if="tableData.cgd_diff_id">
             <el-collapse-item
-              title="采购——工差单"
+              title="采购--工差单"
               name="5"
               v-if="newTime !== ''"
             >
@@ -61,13 +61,13 @@
           </div>
 
           <div id="detail6" v-if="tableData.projectNo">
-            <el-collapse-item title="销售——项目" name="6" v-if="newTime !== ''">
+            <el-collapse-item title="销售--项目" name="6" v-if="newTime !== ''">
               <detail6 :queryId="tableData.projectNo"> </detail6>
             </el-collapse-item>
           </div>
           <div id="detail7" v-if="tableData.infoNo">
             <el-collapse-item
-              title="销售——竞价单"
+              title="销售--竞价单"
               name="7"
               v-if="newTime !== ''"
             >
@@ -77,7 +77,7 @@
 
           <div id="detail8"  v-if="tableData.bargainNo">
             <el-collapse-item
-              title="销售——议价单"
+              title="销售--议价单"
               name="8"
               v-if="newTime !== ''"
             >
@@ -85,20 +85,21 @@
             </el-collapse-item>
           </div>
 
-          <!-- 编号id -->
+      
           <div id="detail9" v-if="tableData.purchease_id">
             <el-collapse-item
-              title="销售——备货申请单"
+              title="销售--备货申请单"
               name="9"
               v-if="newTime !== ''"
             >
               <detail9 :queryId="tableData.purchease_id"> </detail9>
             </el-collapse-item>
           </div>
-          <!-- 编号id -->
+    
+
           <div id="detail10"  v-if="tableData.sale_id">
             <el-collapse-item
-              title="销售——销售订单"
+              title="销售--销售订单"
               name="10"
               v-if="newTime !== ''"
             >
@@ -108,7 +109,7 @@
 
           <div id="detail11"  v-if="tableData.outCode">
             <el-collapse-item
-              title="销售——发货申请单"
+              title="销售--发货申请单"
               name="11"
               v-if="newTime !== ''"
             >
@@ -117,7 +118,7 @@
           </div>
           <div id="detail12" v-if="tableData.returnCode">
             <el-collapse-item
-              title="销售——售后申请单"
+              title="销售--售后申请单"
               name="12"
               v-if="newTime !== ''"
             >
@@ -126,7 +127,7 @@
           </div>
           <div id="detail13" v-if="tableData.thNo">
             <el-collapse-item
-              title="销售——售后退货单"
+              title="销售--售后退货单"
               name="13"
               v-if="newTime !== ''"
             >
@@ -135,7 +136,7 @@
           </div>
           <div id="detail14"  v-if="tableData.returnGoodCode">
             <el-collapse-item
-              title="销售——退货单"
+              title="销售--退货单"
               name="14"
               v-if="newTime !== ''"
             >
@@ -143,10 +144,10 @@
             </el-collapse-item>
           </div>
 
-          <!-- 编号id -->
+    
           <div id="detail15" v-if="tableData.sale_diff_id">
             <el-collapse-item
-              title="销售——工差单"
+              title="销售--工差单"
               name="15"
               v-if="newTime !== ''"
             >
@@ -268,20 +269,20 @@ export default {
       tableData: {},
       anchorArray: [
         // { tar: "#detail1", title: "商品信息" },
-        // { tar: "#detail2", title: "采购——采购单" },
-        // { tar: "#detail3", title: "采购——入库单" },
-        // { tar: "#detail4", title: "采购——退货单" },
-        // { tar: "#detail5", title: "采购——工差单" },
-        // { tar: "#detail6", title: "销售——项目" },
-        // { tar: "#detail7", title: "销售——竞价单" },
-        // { tar: "#detail8", title: "销售——议价单" },
-        // { tar: "#detail9", title: "销售——备货申请单" },
-        // { tar: "#detail10", title: "销售——销售订单" },
-        // { tar: "#detail11", title: "销售——发货申请单" },
-        // { tar: "#detail12", title: "销售——售后申请单" },
-        // { tar: "#detail13", title: "销售——售后退货单" },
-        // { tar: "#detail14", title: "销售——退货单" },
-        // { tar: "#detail15", title: "销售——工差单" },
+        // { tar: "#detail2", title: "采购--采购单" },
+        // { tar: "#detail3", title: "采购--入库单" },
+        // { tar: "#detail4", title: "采购--退货单" },
+        // { tar: "#detail5", title: "采购--工差单" },
+        // { tar: "#detail6", title: "销售--项目" },
+        // { tar: "#detail7", title: "销售--竞价单" },
+        // { tar: "#detail8", title: "销售--议价单" },
+        // { tar: "#detail9", title: "销售--备货申请单" },
+        // { tar: "#detail10", title: "销售--销售订单" },
+        // { tar: "#detail11", title: "销售--发货申请单" },
+        // { tar: "#detail12", title: "销售--售后申请单" },
+        // { tar: "#detail13", title: "销售--售后退货单" },
+        // { tar: "#detail14", title: "销售--退货单" },
+        // { tar: "#detail15", title: "销售--工差单" },
         // { tar: "#detail16", title: "供应商详情" },
         // { tar: "#detail17", title: "业务公司详情" },
         // { tar: "#detail18", title: "企业客户详情" },
@@ -350,46 +351,46 @@ export default {
         ? arr.push({ tar: "#detail1", title: "商品信息" })
         : (flag = false);
       (cgdNo ?? "") != ""
-        ? arr.push({ tar: "#detail2", title: "采购——采购单" })
+        ? arr.push({ tar: "#detail2", title: "采购--采购单" })
         : (flag = false);
       (wsm_in_code ?? "") != ""
-        ? arr.push({ tar: "#detail3", title: "采购——入库单" })
+        ? arr.push({ tar: "#detail3", title: "采购--入库单" })
         : (flag = false);
       (cgdReturnCode ?? "") != ""
-        ? arr.push({ tar: "#detail4", title: "采购——退货单" })
+        ? arr.push({ tar: "#detail4", title: "采购--退货单" })
         : (flag = false);
       (cgd_diff_id ?? "") != ""
-        ? arr.push({ tar: "#detail5", title: "采购——工差单" })
+        ? arr.push({ tar: "#detail5", title: "采购--工差单" })
         : (flag = false);
       (projectNo ?? "") != ""
-        ? arr.push({ tar: "#detail6", title: "销售——项目" })
+        ? arr.push({ tar: "#detail6", title: "销售--项目" })
         : (flag = false);
       (infoNo ?? "") != ""
-        ? arr.push({ tar: "#detail7", title: "销售——竞价单" })
+        ? arr.push({ tar: "#detail7", title: "销售--竞价单" })
         : (flag = false);
       (bargainNo ?? "") != ""
-        ? arr.push({ tar: "#detail8", title: "销售——议价单" })
+        ? arr.push({ tar: "#detail8", title: "销售--议价单" })
         : (flag = false);
       (purchease_id ?? "") != ""
-        ? arr.push({ tar: "#detail9", title: "销售——备货申请单" })
+        ? arr.push({ tar: "#detail9", title: "销售--备货申请单" })
         : (flag = false);
       (sale_id ?? "") != ""
-        ? arr.push({ tar: "#detail10", title: "销售——销售订单" })
+        ? arr.push({ tar: "#detail10", title: "销售--销售订单" })
         : (flag = false);
       (outCode ?? "") != ""
-        ? arr.push({ tar: "#detail11", title: "销售——发货申请单" })
+        ? arr.push({ tar: "#detail11", title: "销售--发货申请单" })
         : (flag = false);
       (returnCode ?? "") != ""
-        ? arr.push({ tar: "#detail12", title: "销售——售后申请单" })
+        ? arr.push({ tar: "#detail12", title: "销售--售后申请单" })
         : (flag = false);
       (thNo ?? "") != ""
-        ? arr.push({ tar: "#detail13", title: "销售——售后退货单" })
+        ? arr.push({ tar: "#detail13", title: "销售--售后退货单" })
         : (flag = false);
       (returnGoodCode ?? "") != ""
-        ? arr.push({ tar: "#detail14", title: "销售——退货单" })
+        ? arr.push({ tar: "#detail14", title: "销售--退货单" })
         : (flag = false);
       (sale_diff_id ?? "") != ""
-        ? arr.push({ tar: "#detail15", title: "销售——工差单" })
+        ? arr.push({ tar: "#detail15", title: "销售--工差单" })
         : (flag = false);
       (supplierNo ?? "") != ""
         ? arr.push({ tar: "#detail16", title: "供应商详情" })

src/views/standingBook/index.vue

@@ -76,11 +76,11 @@
     <el-dialog
       title="筛选条件汇总"
       :visible.sync="dialogFormVisible"
-      width="1040px"
+      width="1140px"
     >
       <div>
         <el-col
-          style="padding: 20px"
+          style="padding: 0 20px 30px"
           v-for="(item, index) in schTahead"
           :span="8"
           :key="item.prop + index"
@@ -91,9 +91,9 @@
             :content="parmValue[item.prop]"
             placement="top"
           ></el-tooltip> -->
-            <el-input v-model="parmValue[item.prop]" :placeholder="item.label">
+            <el-input v-model="parmValue[item.prop]" :placeholder="item.label+'编号'">
               <template slot="prepend">
-                <div style="width: 100px">{{ item.label }}</div>
+                <div style="width: 90px">{{ item.label }}</div>
               </template>
             </el-input>
           
@@ -334,7 +334,10 @@ export default {
 }
 
 /deep/ .el-dialog {
-  padding-bottom: 40px;
+  padding-bottom: 10px;
+}
+/deep/ .el-dialog__body{
+  padding: 0;
 }
 </style>