build

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

@@ -80,6 +80,7 @@ const addColumns = [
     span: 24
   }
 ]
+
 const showColumns = [
   {
     prop: 'orderCode',
@@ -96,17 +97,13 @@ const showColumns = [
     prop: 'order_source',
     label: '订单来源',
     _slot_: 'order_source',
-    span: 4
+    span: 6
   },
   {
     prop: 'order_type',
     label: '商品来源',
     _slot_: 'order_type',
-    span: 4
-  }, {
-    prop: 'apply_name',
-    label: '创建人',
-    span: 4
+    span: 6
   },
 
   {
@@ -125,9 +122,24 @@ const showColumns = [
   {
     prop: 'platform_name',
     label: '所属平台',
+    span: 12
+  },
+  {
+    prop: 'apply_name',
+    label: '创建人',
     span: 6
   },
-
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'is_active',
+    label: '活动类型',
+    _slot_: 'is_active',
+    span: 12
+  },
   {
     prop: 'arrive_time',
     label: '要求到货时间',
@@ -138,11 +150,7 @@ const showColumns = [
     label: '承诺付款时间',
     span: 6
   },
-  {
-    prop: 'addtime',
-    label: '创建时间',
-    span: 6
-  },
+
   {
     prop: 'good_num',
     label: '购买数量',
@@ -164,23 +172,27 @@ const showColumns = [
     span: 4
   },
 
-  {
-    prop: 'proof_id',
-    label: '凭证文件',
-    _slot_: 'proof_id',
-    span: 8
-  },
-
   {
     prop: 'sale_price',
     label: '售价',
     append: '元',
-    span: 6
+    span: 4
   },
   {
     prop: 'total_price',
     label: '总金额',
     append: '元',
+    span: 4
+  },
+  {
+    prop: 'returnCode',
+    label: '售后来源单号',
+    span: 6
+  },
+  {
+    prop: 'proof_id',
+    label: '凭证文件',
+    _slot_: 'proof_id',
     span: 6
   },
 
@@ -197,22 +209,10 @@ const showColumns = [
     span: 6
   },
 
-  {
-    prop: 'is_active',
-    label: '活动类型',
-    _slot_: 'is_active',
-    span: 8
-  },
-  {
-    prop: 'returnCode',
-    label: '售后来源单号',
-    span: 8
-  },
-
   {
     prop: 'useage',
     label: '订单用途',
-    span: 8
+    span: 24
   },
 
   {

src/views/sellOut/salesOrder/detail.vue

@@ -82,7 +82,7 @@
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
                       <li>
-                        <span>购买方公司编号：</span><span>{{ sitem.companyNo }}</span>
+                        <span>购买方公司编号：</span><span>{{ sitem.customer_code }}</span>
                       </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>

src/views/stock/survey/index.vue

@@ -36,7 +36,17 @@
               @searchChange="selectStock"
             />
           </el-col>
-          <el-col :span="12" style="width: 290px; margin: 0 10px">
+
+          <el-col :span="12" style="width:300px;margin:0px 10px;">
+            <el-input size="mini" placeholder="关键字" v-model="keyword" @blur="handleKeyWordInputBlur" @clear="handleKeyWordInputBlur" clearable >
+              <template slot="prepend">
+                <el-select size="mini" v-model="selectKey" style="width:130px" @change="handleKeyWordInputBlur">
+                  <el-option v-for="opt in selectOptions" :key="opt.value" :value="opt.value" :label="opt.label" />
+                </el-select>
+              </template>
+            </el-input>
+          </el-col>
+          <!-- <el-col :span="12" style="width: 290px; margin: 0 10px">
             <el-input
               v-model="parmValue.good_name"
               size="mini"
@@ -53,8 +63,8 @@
                 searchList();
               "
             />
-          </el-col>
-          <el-col :span="12" style="width: 290px; margin-right: 10px">
+          </el-col> -->
+          <!-- <el-col :span="12" style="width: 290px; margin-right: 10px">
             <el-input
               v-model="parmValue.spuCode"
               clearable
@@ -71,7 +81,7 @@
                 searchList();
               "
             />
-          </el-col>
+          </el-col> -->
           <el-col :span="12" style="width: 290px; margin-right: 10px">
             <el-select
               placeholder="是否库存品"
@@ -81,6 +91,7 @@
               @change="
                 pageInfo.curr = 1;
                 parmValue.page = 1;
+                stockList();
                 searchList();
               "
             >
@@ -194,6 +205,12 @@ export default {
           label: "减少",
         },
       ],
+      selectOptions:[
+        {value: 'good_name', label: '商品名称'},  
+        {value: 'spuCode', label: '商品成本编码'}  
+      ],
+      keyword: "",
+      selectKey: "",
       stock_code: "",
       supplier_code: "",
       parmValue: {
@@ -346,10 +363,18 @@ export default {
     };
   },
   mounted() {
+    this.selectKey = this.selectOptions[0].value;
+    console.log(this.selectKey)
     this.onCompanyChangeInner()
   },
 
   methods: {
+    handleKeyWordInputBlur(){
+      this.parmValue.page = 1;
+      this.pageInfo.curr = 1;
+      this.stockList()
+      this.searchList();
+    },
     //业务公司选择
     supplierChange(e) {
       const { code } = e;
@@ -393,10 +418,14 @@ export default {
 
     //获取表格上方的卡片数据
     async stockList() {
+      if(!this.currentCompany) return
+
       let model = {
         companyNo: this.parmValue.companyNo,
         supplier_code: this.supplier_code,
         wsm_code: this.stock_code,
+        [this.selectKey]: this.keyword,
+        is_stock:this.parmValue.is_stock
       };
       const res = await asyncRequest.getstockwsm(model);
 
@@ -448,12 +477,14 @@ export default {
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.supplier_code = this.supplier_code;
       model.wsm_code = Array.isArray(this.stock_code) ? this.stock_code[0] : this.stock_code;
+      model[this.selectKey] = this.keyword
       delete model['stock_code']
       
       const res = await asyncRequest.list({
         ...model,
         needRela: true
       });
+
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.tableData.forEach((v) => {