build

src/views/sellOut/sellOutOrder/sendOutOrder.vue

@@ -200,7 +200,7 @@ export default {
         if (!is_codeok) {
           this.$notify.warning({
             title: "部分物流单号不符合规则!",
-            message: code_msg,
+            message: this.code_msg,
           });
           this.loading = false;
           return;

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

@@ -27,10 +27,10 @@ const editColumns = [
 ]
 
 const ShowDataTableColumns = [
-  {
-    prop: "in_company",
-    label: "业务企业",
-  },
+  // {
+  //   prop: "in_company",
+  //   label: "业务企业",
+  // },
   {
     prop: "in_khname",
     label: "客户企业",
@@ -40,13 +40,14 @@ const ShowDataTableColumns = [
   {
     prop: "good_name",
     label: "商品名称",
+    _slot_: "good_name",
   },
 
-  {
-    prop: "specinfo",
-    label: "规格",
-    _slot_: "specinfo",
-  },
+  // {
+  //   prop: "specinfo",
+  //   label: "规格",
+  //   _slot_: "specinfo",
+  // },
 
    {
     prop: "origin_addr",
@@ -61,12 +62,7 @@ const ShowDataTableColumns = [
     prop: "is_noble",
     label: "贵金属信息",
     _slot_: "is_noble",
-    span:24
-  },
-  {
-    prop: "in_platform_name",
-    label: "所属平台",
-    span: 8,
+    span:16
   },
   {
     prop: "in_arrival_time",
@@ -74,21 +70,26 @@ const ShowDataTableColumns = [
     span: 8,
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    span: 8,
+    prop: "in_platform_name",
+    label: "所属平台",
+    span: 7,
   },
+
   {
-    prop: "tax",
-    label: "税点",
-    append: '%',
-    span: 4,
+    prop: "brand_name",
+    label: "品牌",
+    span: 7,
   },
   {
     prop: "weight",
     label: "商品总克重",
     append: 'g',
-    span: 8,
+    span: 6,
+  },
+  {
+    prop: "creater",
+    label: "采购人员",
+    span:4
   },
 
   {
@@ -103,20 +104,22 @@ const ShowDataTableColumns = [
     _slot_: "in_num",
     span: 6,
   },
+  {
+    prop: "tax",
+    label: "税点",
+    append: '%',
+    span: 4,
+  },
+
   {
     prop: "work_day",
     label: "工期",
-    span:8
+    span:4
   },
    {
     prop: "delivery_day",
     label: "物流",
-    span:8
-  },
-   {
-    prop: "creater",
-    label: "采购人员",
-    span:8
+    span:4
   },
 ]
 

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

@@ -25,7 +25,8 @@
             border
             :columns="ShowDataTableColumns"
           >
-            <template slot="specinfo">
+            <template slot="good_name">
+              <span>{{ sitem.good_name }}</span>
               <span v-for="(si, sii) in sitem.specinfo" :key="si.specid + sii">
                 <span v-if="sii !== 0">--</span
                 ><span>{{ si.spec_name }}[{{ si.spec_value_name }}]</span></span
@@ -126,7 +127,16 @@
                   >保 存
                 </el-button>
               </el-col>
-              <el-col :span="24">
+              <el-col :span="11">
+                <el-form-item label="订单备注" prop="remark" label-width="85px">
+                  <el-input
+                    v-model="ruleForm.remark"
+                    maxlength="500"
+                    placeholder="订单备注"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="13">
                 <el-form-item label="订单备注" prop="remark" label-width="85px">
                   <el-input
                     v-model="ruleForm.remark"