snow 2 years ago
parent
commit
91f4c4ceb1

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 17 - 42
src/views/sellOut/sellAfterApply/columns.js

@@ -197,12 +197,7 @@ const sellshowColumns = [
     prop: 'is_receive',
     label: '期望结果',
     _slot_: 'is_receive',
-    span: 6
-  },
-  {
-    prop: 'addtime',
-    label: '创建时间',
-    span: 6
+    span: 12
   },
   {
     prop: 'companyName',
@@ -223,38 +218,41 @@ const sellshowColumns = [
     span: 12
   },
   {
-    prop: 'total_num',
-    label: '发货总数量',
-    span: 4
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    span: 6
   },
   {
     prop: 'error_num',
     label: '异常数量',
     span: 4
   },
-
   {
-    prop: 'apply_name',
-    label: '申请人',
+    prop: 'total_num',
+    label: '发货总数量',
     span: 4
   },
-
-  {
-    prop: 'error_msg',
-    label: '异常原因',
-    span: 6
-  },
   {
     prop: 'except_code',
     label: '期望',
     _slot_: 'except_code',
     span: 6
   },
+  {
+    prop: 'error_msg',
+    label: '异常原因',
+    span: 10
+  },
   {
     prop: 'loop_total',
     _slot_: 'loop_total',
     label: '更改次数',
-    span: 12
+    span: 24
   },
   {
     prop: 'error_img',
@@ -267,28 +265,5 @@ const sellshowColumns = [
     label: '备注',
     span: 24
   }
-  // {
-  //   prop: "sale_price",
-  //   label: "销售单价",
-  // },
-  // {
-  //   prop: "origin_price",
-  //   label: "采购单价",
-  // },
-
-  // {
-  //   prop: "sale_price",
-  //   label: "商品单价",
-  // },
-  // {
-  //   prop: "total_price",
-  //   label: "发货单总价",
-  // },
-
-  // {
-  //   prop: "updatetime",
-  //   label: "更新时间",
-  // },
-
 ]
 export { columns, sellshowColumns }

+ 4 - 8
src/views/sellOut/zixunOrder/components/buyGoodModal.vue

@@ -986,13 +986,6 @@ export default {
           this.loading = true
           const model = JSON.parse(JSON.stringify(this.ruleForm))
 
-          // 去除上送字段空格&换行
-          Object.keys(model).forEach(key => {
-            if (typeof model[key] === 'string') {
-              model[key] = replaceTextWrapAndSpace(model[key])
-            }
-          })
-
           model.order_addr = []
           const { sendtype, good_num } = model
           const { order_addr } = JSON.parse(JSON.stringify(this.addrForm))
@@ -1031,8 +1024,11 @@ export default {
             }
           }
 
+          // 去除上送字段空格&换行
           Object.keys(model).forEach(key => {
-            if (typeof model[key] === 'string') { model[key] = replaceTextWrapAndSpace(model[key]) }
+            if (typeof model[key] === 'string' && key !== 'arrtime') {
+              model[key] = replaceTextWrapAndSpace(model[key])
+            }
           })
 
           const res = await asyncRequest.consultorder(model)

+ 1 - 1
src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -432,7 +432,7 @@ export default {
     },
     // 时间选择事件
     async handleTime(e) {
-      const { startTime, endTime } = e;
+      const { startTime, endTime } = e; 
       this.parmValue.start = startTime || "";
       this.parmValue.end = endTime || "";
 

Some files were not shown because too many files changed in this diff