Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/distribution/distributionDeliveryList.js

@@ -51,7 +51,19 @@ export const getDetail = id => {
     url: '/api/logpm-distribution/deliveryList/detail',
     method: 'get',
     params: {
-      id,
+      id
+    },
+  });
+};
+
+export const getClientDetail = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/clientDetail',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
     },
   });
 };

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -508,17 +508,17 @@ export default {
           fixed: false,
           sortable: true,
         },
-        // {
+        {
-        //   prop: 'kind',
+          prop: 'clineName',
-        //   label: '配送种类',
+          label: '客户名称',
-        //   type: 3,
+          type: 2,
-        //   values: '',
+          values: '',
-        //   width: '180',
+          width: '180',
-        //   checkarr: [],
+          checkarr: [],
-        //   fixed: false,
+          fixed: false,
-        //   sortable: true,
+          sortable: true,
-        //   hide:true,
+          hide:true,
-        // },
+        },
         {
           prop: 'kindName',
           label: '配送种类',

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -134,7 +134,7 @@
             :columnList="columnList"
             :tableData="data"
             :loading="loading"
-            @inputTxt="inputsc"
+            @inputTxt="inputscClient"
             @timeCheck="timesc"
             @btnCheck="btnsc"
             @selectCheck="selectsc"
@@ -198,10 +198,6 @@
             :tableData="orddata"
             :loading="loading"
             @inputTxt="inputscOrder"
-            @timeCheck="timesc"
-            @btnCheck="btnsc"
-            @selectCheck="selectsc"
-            @selection="selectionChange"
           >
             <template #default="slotProps"> </template>
           </tablecmt>
@@ -212,7 +208,7 @@
             :columnList="wrapoptioncolumn"
             :tableData="packdata"
             :loading="loading"
-            @inputTxt="inputsc"
+            @inputTxt="inputscPackage"
             @timeCheck="timesc"
             @btnCheck="btnsc"
             @selectCheck="selectsc"
@@ -272,7 +268,7 @@
             :columnList="inventoryoptioncolumn"
             :tableData="inventorydata"
             :loading="loading"
-            @inputTxt="inputsc"
+            @inputTxt="inputscInventory"
             @timeCheck="timesc"
             @btnCheck="btnsc"
             @selectCheck="selectsc"
@@ -613,18 +609,18 @@
 </template>
 
 <script>
-import {
+  import {
-  getList,
+    getList,
-  getDetail,
+    getDetail,
-  add,
+    add,
-  update,
+    update,
-  remove,
+    remove,
-  getOneclick,
+    getOneclick,
-  getorddetail,
+    getorddetail,
-  getWrapdetail,
+    getWrapdetail,
-  getpackdetail,
+    getpackdetail,
-  getinventorydetail,
+    getinventorydetail, getClientDetail
-} from '@/api/distribution/distributionDeliveryList';
+  } from '@/api/distribution/distributionDeliveryList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
 import { update as updatesign, getOneclickq } from '@/api/distribution/distributionSignfor';
@@ -670,9 +666,9 @@ export default {
       windowHeight: null,
       columnList: [
         {
-          prop: 'reservationCode',
+          prop: 'trainNumber',
-          label: '预约单号',
+          label: '配送车次号',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -681,8 +677,8 @@ export default {
           head: false,
         },
         {
-          prop: 'trainNumber',
+          prop: 'reservationCode',
-          label: '配送车次号',
+          label: '预约单号',
           type: 2,
           values: '',
           width: '150',
@@ -736,7 +732,7 @@ export default {
         {
           prop: 'deliveryAddress',
           label: '收货地址',
-          type: 3,
+          type: 2,
           values: '',
           width: '150',
           checkarr: [],
@@ -778,7 +774,7 @@ export default {
         {
           prop: 'reservationStockListNum',
           label: '计划库存品数',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -1392,7 +1388,7 @@ export default {
         {
           prop: 'sendWarehouseName',
           label: '发站仓',
-          type: 3,
+          type: 2,
           values: '',
           width: '150',
           checkarr: [],
@@ -1410,32 +1406,31 @@ export default {
           sortable: true,
           head: false,
         },
+
         {
-          prop: 'fahuoTime',
+          prop: 'trainNumber',
-          label: '发货时间',
+          label: '入库车次',
           type: 2,
           values: '',
-          width: '150',
+          width: '180',
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: false,
         },
         {
-          prop: 'warehouseEntryTimeEnd',
+          prop: 'firsts',
-          label: '入库时间',
+          label: '一级品类',
           type: 2,
           values: '',
-          width: '150',
+          width: '180',
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: false,
         },
         {
-          prop: 'trainNumber',
+          prop: 'second',
-          label: '入库车次',
+          label: '二级品类',
-          type: 1,
+          type: 2,
           values: '',
           width: '180',
           checkarr: [],
@@ -1443,9 +1438,9 @@ export default {
           sortable: true,
         },
         {
-          prop: 'firsts',
+          prop: 'thirdProduct',
-          label: '一级品类',
+          label: '三级品类',
-          type: 1,
+          type: 2,
           values: '',
           width: '180',
           checkarr: [],
@@ -1453,24 +1448,26 @@ export default {
           sortable: true,
         },
         {
-          prop: 'second',
+          prop: 'fahuoTime',
-          label: '二级品类',
+          label: '发货时间',
           type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
+          head: false,
         },
         {
-          prop: 'thirdProduct',
+          prop: 'warehouseEntryTimeEnd',
-          label: '三级品类',
+          label: '入库时间',
           type: 1,
           values: '',
-          width: '180',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
+          head: false,
         },
         {
           prop: 'orderPackageStatusName',
@@ -1550,7 +1547,7 @@ export default {
         {
           prop: 'quantity',
           label: '包件数量',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -1561,7 +1558,7 @@ export default {
         {
           prop: 'reservationNum',
           label: '计划数量',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -1571,7 +1568,7 @@ export default {
         {
           prop: 'loadingNub',
           label: '装车数量',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -1581,7 +1578,7 @@ export default {
         {
           prop: 'signingNub',
           label: '签收数量',
-          type: 2,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -1666,17 +1663,17 @@ export default {
           sortable: true,
           head: false,
         },
-        {
+        // {
-          prop: 'serviceNumber',
+        //   prop: 'serviceNumber',
-          label: '服务号',
+        //   label: '服务号',
-          type: 2,
+        //   type: 2,
-          values: '',
+        //   values: '',
-          width: '150',
+        //   width: '150',
-          checkarr: [],
+        //   checkarr: [],
-          fixed: false,
+        //   fixed: false,
-          sortable: true,
+        //   sortable: true,
-          head: false,
+        //   head: false,
-        },
+        // },
         {
           prop: 'marketName',
           label: '商场名称',
@@ -1955,6 +1952,9 @@ export default {
       // 查询信息
       query: {},
       orderQuery: {},
+      clientQuery: {},
+      inventoryQuery: {},
+      packageQuery: {},
       formCustomer: {},
       formCustomerRolus: {
         consignee: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
@@ -2905,6 +2905,12 @@ export default {
                 this.handleInventory(this.page);
           console.log('ssss');
           break;
+          default:
+            this.clientQuery ={};
+            this.orderQuery ={};
+            this.packageQuery ={};
+            this.inventoryQuery ={};
+            break;
       }
     },
     searchHide() {
@@ -2926,7 +2932,29 @@ export default {
       this.orderQuery[row.prop] = index;
       if (!index) delete this.orderQuery[row.prop];
       this.handleOrder(this.page);
+    },
+    inputscPackage(index, row) {
+      console.log('index',index);
+      console.log('row',row);
+      this.packageQuery[row.prop] = index;
+      if (!index) delete this.packageQuery[row.prop];
+      this.handlePackage(this.page);
+    },
+
+    inputscClient(index, row) {
+      console.log('index',index);
+      console.log('row',row);
+      this.clientQuery[row.prop] = index;
+      if (!index) delete this.clientQuery[row.prop];
+      this.handleClient(this.page);
+    },
 
+    inputscInventory(index, row) {
+      console.log('index',index);
+      console.log('row',row);
+      this.inventoryQuery[row.prop] = index;
+      if (!index) delete this.inventoryQuery[row.prop];
+      this.handleInventory(this.page);
     },
     timesc() {},
     btnsc() {},
@@ -3209,10 +3237,10 @@ export default {
       let params = {};
       console.log();
       params.deliveryId = this.deliverydata.id;
-      getDetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getClientDetail(page.currentPage, page.pageSize, Object.assign(params, this.clientQuery)).then(res => {
         console.log('查看>>>>>订单>>', res.data.data);
         const data = res.data.data;
-        this.orddata = data.records;
+        this.data = data.records;
         this.ordpage.total = data.total;
       });
     },
@@ -3231,7 +3259,7 @@ export default {
     handlePackage(page) {
       let params = {};
       params.deliveryId = this.deliverydata.id;
-      getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+      getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.packageQuery)).then(
         res => {
           console.log('查看>>>>>包间>>', res.data.data);
           const data = res.data.data;
@@ -3244,7 +3272,7 @@ export default {
     handleInventory(page) {
       let params = {};
       params.deliveryId = this.deliverydata.id;
-      getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+      getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.inventoryQuery)).then(
         res => {
           console.log('查看>>>>>库存>>', res.data.data);
           const data = res.data.data;
@@ -3482,16 +3510,16 @@ export default {
         this.deliverydata.deliveryNumber = packNum;
         this.deliverydata.inventoryNub = invenNum;
         this.deliverydata.signingNumber = signNum;
-        console.log('---------------------------->a', a);
+        // console.log('---------------------------->a', a);
-        console.log('---------------------------->packNum', packNum);
+        // console.log('---------------------------->packNum', packNum);
-        console.log('---------------------------->invenNum', invenNum);
+        // console.log('---------------------------->invenNum', invenNum);
-        console.log('---------------------------->signNum', signNum);
+        // console.log('---------------------------->signNum', signNum);
-        this.handleOrder(this.packpage);
+        // this.handleOrder(this.packpage);
-        this.handlePackage(this.packpage);
+        // this.handlePackage(this.packpage);
-        console.log('--------->deliveryType', this.deliverydata);
+        // console.log('--------->deliveryType', this.deliverydata);
-        if (this.deliverydata.deliveryType !== '商配') {
+        // if (this.deliverydata.deliveryType !== '商配') {
-          this.handleInventory(this.packpage);
+        //   this.handleInventory(this.packpage);
-        }
+        // }
       });
 
       this.loading = false;

src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@@ -249,7 +249,6 @@
                 type="primary"
                 text
                 icon="el-icon-delete"
-                v-if="row.conditions == '1'"
                 @click="rowDelOwn(row)"
                 :disabled="typeView"
                 >删除</el-button