修改自提操作问题

src/api/distribution/distributionParcelList.js

@@ -54,6 +54,17 @@ export const getParcelListOwn = (current, size, params) => {
     }
   })
 }
+export const getParcelListOwnSelf = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionParcelList/parcelListOwnSelf',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
 
 export const getDetail = (id) => {
   return request({

src/api/distribution/distributionStockup.js

@@ -48,6 +48,17 @@ export const getDetailOrderOwn = (current, size, params) => {
     }
   })
 }
+export const getDetailOrderOwnSelf = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockup/detailOrderOwnSelf',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
 export const getDetailStockupOwn = (id) => {
   return request({
     url: '/api/logpm-distribution/distributionStockup/detailOwn',
@@ -69,6 +80,17 @@ export const getDetailInventoryOwn = (current, size, params) => {
     }
   })
 }
+export const getDetailInventoryOwnSelf = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockup/inventoryOwnSelf',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
 
 export const getDetailReservationOwn = (current, size, params) => {
   return request({

src/option/distribution/distributionStockup.js

@@ -5,6 +5,137 @@ export default {
   selection: true,
   columnReservation: [ // 备货订单
 
+    {
+      label: "主键",
+      prop: "id",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "租户号",
+      prop: "tenantId",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      display: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      display: false,
+      hide: true,
+    },
+    // {
+    //   label: "备货时间",
+    //   prop: "stockupDate",
+    //   format: "YYYY-MM-DD hh:mm:ss",
+    //   valueFormat: "YYYY-MM-DD hh:mm:ss",
+    // },
+    // {
+    //   label: "配送单号",
+    //   prop: "stockupUser",
+    // },
+    {
+      label: "收货人",
+      prop: "consignee",
+      search: true,
+    },
+    {
+      label: "收货电话",
+      prop: "deliveryPhone",
+      search: true,
+    },
+    {
+      label: "收货地址",
+      prop: "deliveryAddress",
+      search: true,
+    },
+    {
+      label: "收货单位",
+      prop: "mallName",
+    },
+    {
+      label: "订单自编号",
+      prop: "stockArticleId",
+      display: false,
+    },
+    // {
+    //   label: "配送单号",
+    //   prop: "reserve2",
+    //   display: false,
+    // },
+    {
+      label: "备货状态",
+      prop: "stockupStatusName",
+      display: false,
+    },
+    // {
+    //   label: "配送状态",
+    //   prop: "reserve4",
+    //   display: false,
+    // },
+    /*  {
+        label: "装车件数",
+        prop: "reserve5",
+        display: false,
+      },
+      {
+        label: "签收件数",
+        prop: "reserve3",
+        display: false,
+      },
+      {
+        label: "回库件数",
+        prop: "reserve4",
+        display: false,
+      },
+      {
+        label: "是否加急",
+        prop: "reserve5",
+        display: false,
+      },
+      {
+        label: "状态",
+        prop: "reserve5",
+        display: false,
+      },*/
+  ],
+  columnReservationSelf: [ // 备货订单
+
   {
     prop: 'pickupBatch',
     label: '提货批次',

src/option/distribution/distrilbutionBillLading.js

@@ -1027,6 +1027,12 @@ export default {
       width: '150',
       head: false,
     },
+    {
+      prop: 'orderPackageCode',
+      label: '包条码',
+      width: '150',
+
+    },
     {
       prop: 'orderCode',
       label: '订单自编号',

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -146,7 +146,7 @@
               type="primary"
               text
               icon="el-icon-view"
-              v-if="slotProps.scope.row.materialId == '' || slotProps.scope.row.materialId == '-1'"
+              v-if="!slotProps.scope.row.materialId"
               @click="handleMaterial(slotProps.scope.row)"
               >补充物料信息</el-button
             >

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -1289,10 +1289,10 @@ export default {
         }
       })
       //待打开
-      // if(ad){
-      //   this.$message.warning("请选择同一收货人！！");
-      //   return ;
-      // }
+      if(ad){
+        this.$message.warning("请选择同一收货人！！");
+        return ;
+      }
       if(st){
         return ;
       }

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -1052,18 +1052,16 @@ export default {
     },
     getTime(dat){
       let date = new Date(dat);
-      var y = date.getFullYear()
-      var m = date.getMonth() + 1
-      m = m < 10 ? '0' + m : m
-      var d = date.getDate()
-      d = d < 10 ? '0' + d : d
-      var h = date.getHours()
-      h = h < 10 ? '0' + h : h
-      var minute = date.getMinutes()
-      minute = minute < 10 ? '0' + minute : minute
-      var s = date.getSeconds()
-      s = s < 10 ? '0' + s : s
-      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s;
+      let formatter = new Intl.DateTimeFormat('en', {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+        second: '2-digit'
+      });
+      let formattedDate = formatter.format(date);
+      return formattedDate.replace(/\//g, '-');
     },
     onLoad (page, params = {}) {
       this.loading = true;
@@ -1075,9 +1073,11 @@ export default {
       }
       getListOwnNUm(params).then(res =>{
         console.log("查询数量!!!",res.data.data);
-        this.treatNum = !res.data.data.treatNum ? 0 : res.data.data.treatNum;
+        if(!!res.data.data){
+          this.treatNum = !res.data.data.treatNum ? 0 : parseInt(res.data.data.treatNum);
           this.stopNum = !res.data.data.stopNum ?  0 : res.data.data.stopNum;
           this.numBill = parseInt(this.treatNum) + parseInt(this.stopNum);
+        }
       });
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;

src/views/distribution/stockup/distributionStockupDetailsSelf.vue

@@ -92,7 +92,7 @@
                 :align="center"
               >
               </el-table-column>
-              <template v-for="(item, index) in option.columnReservation">
+              <template v-for="(item, index) in option.columnReservationSelf">
                 <!-- table字段 -->
                 <el-table-column
                   v-if="item.hide !== true"
@@ -350,12 +350,12 @@ import {
   getDetailReservationOwn,
   getDetailOrderOwn,
   getDetailInventoryOwn,
-  billStockList,
+  billStockList, getDetailOrderOwnSelf, getDetailInventoryOwnSelf
 } from '@/api/distribution/distributionStockup';
 import option from '@/option/distribution/distributionStockup';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
-import { getParcelListOwn } from '@/api/distribution/distributionParcelList';
+import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList';
 
 export default {
   data() {
@@ -713,7 +713,7 @@ export default {
     async billStockListPage(page) {
       let a = await billStockList(page.currentPage, page.pageSize, { id: this.$route.query.id });
       this.data3 = a.data.data.records;
-      console.log("》》》》》》",this.data3);
+      console.log("自提任务》》》》》》",this.data3);
 
       // if (!!this.data3 && this.data3.length > 0) {
       //   this.data3.forEach(i => {
@@ -731,7 +731,7 @@ export default {
 
     //查询包件列表
     async getStockUpParcelsList(page) {
-      let a = await getParcelListOwn(page.currentPage, page.pageSize, { id: this.$route.query.id });
+      let a = await getParcelListOwnSelf(page.currentPage, page.pageSize, { id: this.$route.query.id });
       console.log('包件...', a.data);
       const data = a.data.data;
       this.data1 = data.records;
@@ -747,7 +747,7 @@ export default {
     },
     //查询订单列表
     async getOrderList(page) {
-      let a = await getDetailOrderOwn(page.currentPage, page.pageSize, {
+      let a = await getDetailOrderOwnSelf(page.currentPage, page.pageSize, {
         id: this.$route.query.id,
       });
       // console.log("订单...",a.data);
@@ -765,7 +765,7 @@ export default {
     },
     //查询库存品列表
     async getInventoryList(page) {
-      let a = await getDetailInventoryOwn(page.currentPage, page.pageSize, {
+      let a = await getDetailInventoryOwnSelf(page.currentPage, page.pageSize, {
         id: this.$route.query.id,
       });
       // console.log("库存品...",a.data);

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -67,7 +67,7 @@
             <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
             <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>
             <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
-            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleEditPrint(slotProps.scope)">打印</el-button>
           </template>
         </tablecmt>
       </el-row>
@@ -127,7 +127,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="出库时间" prop="outboundDate" :label-width="formLabelWidth" v-if="this.num=='2'">
+          <el-form-item label="出库时间" prop="outboundDate" :label-width="formLabelWidth" v-if="this.num=='2' || this.numout">
             <el-date-picker v-model="form.outboundDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择出库时间" style="width: 26%"></el-date-picker>
           </el-form-item>
         </el-form>
@@ -274,7 +274,7 @@ export default {
           head: false,
         },
         {
-          prop: 'stockupDate',
+          prop: 'outboundDate',
           label: '出库时间',
           type: 4,
           values: '',
@@ -481,6 +481,7 @@ export default {
       distributionType: [],
       deptId: '',
       num: '',
+      numout: false,
       stockupStatus: [],
       stockAllocation: [],
       stockupDate: [],
@@ -752,7 +753,7 @@ export default {
      * 指派叉车查询的司机
      */
     handleForklift(){
-
+      this.numout = false;
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
@@ -763,6 +764,9 @@ export default {
           a = true;
           return;
         }
+        if(!i.outboundDate){
+          this.numout = true;
+        }
       })
       // = this.selectionList.findIndex(i => i.assignStatus == 2);
       if(!a){
@@ -787,6 +791,7 @@ export default {
           });
           this.onLoad(this.page);
           this.dialogFormCustomer = false;
+          this.form = {};
         })
       }else if(this.num == '2'){
         console.log(">>>>>>>",this.formOne);
@@ -798,8 +803,9 @@ export default {
             message: "操作成功!"
           });
           this.dialogFormCustomer = false;
+          this.formOne ={};
+          this.form ={};
         })
-
       }
 
     },
@@ -885,6 +891,9 @@ export default {
       this.form = {}
       this.box = true
     },
+    handleEditPrint(row){
+      this.$message.warning("打印中》》》等待数据模板！！")
+    },
     handleEdit (row) {
       // this.title = '编辑'
       // this.box = true