配送计划详情增加订单搜索功能

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -197,7 +197,7 @@
             :columnList="ordoptioncolumn"
             :tableData="orddata"
             :loading="loading"
-            @inputTxt="inputsc"
+            @inputTxt="inputscOrder"
             @timeCheck="timesc"
             @btnCheck="btnsc"
             @selectCheck="selectsc"
@@ -691,6 +691,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'waybillNo',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'mallName',
           label: '商场名称',
@@ -1093,8 +1104,8 @@ export default {
       ],
       ordoptioncolumn: [
         {
-          prop: 'orderCode',
-          label: '订单自编号',
+          prop: 'waybillNumber',
+          label: '运单号',
           type: 2,
           values: '',
           width: '150',
@@ -1104,8 +1115,8 @@ export default {
           head: false,
         },
         {
-          prop: 'descriptionGoods',
-          label: '货物名称',
+          prop: 'serviceNumber',
+          label: '服务号',
           type: 2,
           values: '',
           width: '150',
@@ -1114,6 +1125,28 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        // {
+        //   prop: 'descriptionGoods',
+        //   label: '货物名称',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
           prop: 'materialName',
           label: '物料名称',
@@ -1128,7 +1161,7 @@ export default {
         {
           prop: 'totalNumber',
           label: '包件总数',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -1138,7 +1171,7 @@ export default {
         {
           prop: 'handQuantity',
           label: '在库数量',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -1148,7 +1181,7 @@ export default {
         {
           prop: 'deliveryNumber',
           label: '计划数量',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -1158,7 +1191,7 @@ export default {
         {
           prop: 'stockupNumber',
           label: '已备数量',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -1168,7 +1201,7 @@ export default {
         {
           prop: 'loadingNumber',
           label: '装车数量',
-          type: 3,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -1211,7 +1244,7 @@ export default {
         {
           prop: 'consigneeUnit',
           label: '收货单位',
-          type: 1,
+          type: 2,
           values: '',
           width: '180',
           checkarr: [],
@@ -1221,7 +1254,7 @@ export default {
         {
           prop: 'consigneePerson',
           label: '运单收货人',
-          type: 1,
+          type: 2,
           values: '',
           width: '180',
           checkarr: [],
@@ -1231,7 +1264,7 @@ export default {
         {
           prop: 'consigneeAddress',
           label: '运单收货地址',
-          type: 1,
+          type: 2,
           values: '',
           width: '180',
           checkarr: [],
@@ -1241,7 +1274,7 @@ export default {
         {
           prop: 'consigneeMobile',
           label: '运单收货电话',
-          type: 1,
+          type: 2,
           values: '',
           width: '180',
           checkarr: [],
@@ -1251,7 +1284,7 @@ export default {
         {
           prop: 'customerName',
           label: '终端收货人',
-          type: 1,
+          type: 2,
           values: '',
           width: '180',
           checkarr: [],
@@ -1261,7 +1294,7 @@ export default {
         {
           prop: 'customerAddress',
           label: '终端收货地址',
-          type: 1,
+          type: 2,
           values: '',
           width: '150',
           checkarr: [],
@@ -1271,7 +1304,7 @@ export default {
         {
           prop: 'customerTelephone',
           label: '终端收货电话',
-          type: 1,
+          type: 2,
           values: '',
           width: '150',
           checkarr: [],
@@ -1921,6 +1954,7 @@ export default {
       dialogFormCustomer: false,
       // 查询信息
       query: {},
+      orderQuery: {},
       formCustomer: {},
       formCustomerRolus: {
         consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
@@ -2852,15 +2886,23 @@ export default {
       let tabName = tab.paneName;
       switch (tabName) {
         case 'tab1':
+          //客户列表
+          this.handleClient(this.page);
           console.log('ssss');
           break;
         case 'tab2':
+          //订单列表
+          this.handleOrder(this.page);
           console.log('ssss');
           break;
         case 'tab3':
+          //包件列表
+                this.handlePackage(this.page);
           console.log('ssss');
           break;
         case 'tab4':
+          //库存品列表
+                this.handleInventory(this.page);
           console.log('ssss');
           break;
       }
@@ -2878,6 +2920,14 @@ export default {
     },
 
     inputsc() {},
+    inputscOrder(index, row) {
+      console.log('index',index);
+      console.log('row',row);
+      this.orderQuery[row.prop] = index;
+      if (!index) delete this.orderQuery[row.prop];
+      this.handleOrder(this.page);
+
+    },
     timesc() {},
     btnsc() {},
     selectsc() {},
@@ -3154,12 +3204,23 @@ export default {
       this.ord = false;
       this.inventory = false;
     },
+    //客户列表
+    handleClient(page) {
+      let params = {};
+      console.log();
+      params.deliveryId = this.deliverydata.id;
+      getDetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log('查看>>>>>订单>>', res.data.data);
+        const data = res.data.data;
+        this.orddata = data.records;
+        this.ordpage.total = data.total;
+      });
+    },
     //订单列表
     handleOrder(page) {
       let params = {};
       params.deliveryId = this.deliverydata.id;
-
-      getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.orderQuery)).then(res => {
         console.log('查看>>>>>订单>>', res.data.data);
         const data = res.data.data;
         this.orddata = data.records;