bug修复

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/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>