发运明细页面调整

src/views/shipment-details/referOrderDataModal.vue

@@ -491,17 +491,14 @@ export default {
     onSubmit() {
       this.dataSet( this.selectedRows)
       var vv = this.selectedRows[0]
-      if(this.fatherData.length !== 0){
-        this.fatherDataSet(this.fatherData,vv)
-      }
+      // if(this.fatherData.length !== 0){
+      //   this.fatherDataSet(this.fatherData,vv)
+      // }
       if (this.selectedRowKeys.length == 0) {
         this.$message.error('请勾选订单数据')
       } else if(this.selectedRows !== 1 && this.error !==''){
           this.$message.error(this.error+'至少一项不相同！');
           this.error = ''
-      }else if(this.fatherData.length !== 0 && this.errorFather !== ''){
-          this.$message.error(this.errorFather +'至少一项不相同！');
-           this.errorFather = ''
       }else{
         var garment = ''
         if(this.queryParam.flourOrGarment == 1){
@@ -564,28 +561,28 @@ export default {
     },
 
     //已有参考列表
-    fatherDataSet(fathers,sons){
-      var father = fathers[0]
-      if(father.orderNumber === sons.orderNumber && father.smallPo === sons.smallPo && father.preDeliveryDate === sons.preDeliveryDate &&
-      father.preCompletionDate === sons.preCompletionDate && father.itemNumber === sons.itemNumber && father.inventoryCode === sons.inventoryCode &&
-      father.inventoryName === sons.inventoryName && father.colour === sons.colour && father.size === sons.size) {
-        this.errorFather = '订单号,小po,预发货日期,预完工日期,款号,存货编码,存货名称,颜色,尺码'
-      }
-      // if(father.orderNumber !== sons.orderNumber){this.errorFather.push('订单号')}
-      // if(father.smallPo !== sons.smallPo){this.errorFather.push('小po')}
-      // if(father.preDeliveryDate !== sons.preDeliveryDate){this.errorFather.push('预发货日期')}
-      // if(father.preCompletionDate !== sons.preCompletionDate){this.errorFather.push('预完工日期')}
-      // if(father.itemNumber !== sons.itemNumber){this.errorFather.push('款号')}
-      // if(father.inventoryCode !== sons.inventoryCode){this.errorFather.push('存货编码')}
-      // if(father.inventoryName !== sons.inventoryName){this.errorFather.push('存货名称')}
-      // if(father.colour !== sons.colour){this.errorFather.push('颜色')}
-      // if(father.size !== sons.size){this.errorFather.push('尺码')}
-    },
+    // fatherDataSet(fathers,sons){
+    //   var father = fathers[0]
+    //   if(father.orderNumber === sons.orderNumber && father.smallPo === sons.smallPo && father.preDeliveryDate === sons.preDeliveryDate &&
+    //   father.preCompletionDate === sons.preCompletionDate && father.itemNumber === sons.itemNumber && father.inventoryCode === sons.inventoryCode &&
+    //   father.inventoryName === sons.inventoryName && father.colour === sons.colour && father.size === sons.size) {
+    //     this.errorFather = '订单号,小po,预发货日期,预完工日期,款号,存货编码,存货名称,颜色,尺码'
+    //   }
+    //   // if(father.orderNumber !== sons.orderNumber){this.errorFather.push('订单号')}
+    //   // if(father.smallPo !== sons.smallPo){this.errorFather.push('小po')}
+    //   // if(father.preDeliveryDate !== sons.preDeliveryDate){this.errorFather.push('预发货日期')}
+    //   // if(father.preCompletionDate !== sons.preCompletionDate){this.errorFather.push('预完工日期')}
+    //   // if(father.itemNumber !== sons.itemNumber){this.errorFather.push('款号')}
+    //   // if(father.inventoryCode !== sons.inventoryCode){this.errorFather.push('存货编码')}
+    //   // if(father.inventoryName !== sons.inventoryName){this.errorFather.push('存货名称')}
+    //   // if(father.colour !== sons.colour){this.errorFather.push('颜色')}
+    //   // if(father.size !== sons.size){this.errorFather.push('尺码')}
+    // },
 
-    handleTableChange(pagination, filters, sorter) {
-      this.queryParam.pageNo = pagination.current;
-      this.getOrderList();
-    },
+    // handleTableChange(pagination, filters, sorter) {
+    //   this.queryParam.pageNo = pagination.current;
+    //   this.getOrderList();
+    // },
 
     searchQuery() {
 

src/views/shipment-details/shipmentList.vue

@@ -98,7 +98,8 @@
     <!-- 操作按钮区域 -->
     <a-card :bordered="false" style=" marginTop:10px;">
       <div class="table-operator">
-        <a-button type="primary" @click.stop="addShipDet" icon="plus">新增</a-button>
+        <!-- <a-button type="primary" @click.stop="addShipDet" icon="plus">新增</a-button> -->
+        <a-button type="primary" @click.stop="referOrderDataOpen" icon="plus">参照订单数据</a-button>
         <a-button type="primary" icon="download" @click="handleExportXls('发运明细')">导出</a-button>
         <a-button type="primary" icon="download" @click="submit">批量提交</a-button>
         <a-button type="primary" icon="download" @click="cancelSubmit">批量取消提交</a-button>
@@ -227,7 +228,9 @@
 
     <!-- 抽屉  -->
     <div>
-      <addShipDet-drawer ref="addShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk" @close="closeAdd"></addShipDet-drawer>
+      <!-- <addShipDet-drawer ref="addShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk" @close="closeAdd"></addShipDet-drawer> -->
+       <!-- 参照订单数据 -->
+      <referOrderData-modal ref="referOrderDataModal" @close="getShipmentList" @default-reset="defaultReset"></referOrderData-modal>
 
       <editShipDet-drawer ref="editShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk"></editShipDet-drawer>
 
@@ -253,6 +256,7 @@ import addShipDetDrawer from '@views/shipment-details/addShipDetDrawer.vue'
 import detailsShipDetDrawer from '@views/shipment-details/detailsShipDetDrawer.vue'
 import editShipDetDrawer from '@views/shipment-details/editShipDetDrawer.vue'
 import declareElementsModal from '@views/shipment-details/declareElementsModal.vue'
+import ReferOrderDataModal from '@views/shipment-details/referOrderDataModal.vue'
 import itemNumEleModal from '@views/shipment-details/itemNumEleModal.vue'
 import { randomUUID } from '@/utils/util'
 
@@ -278,6 +282,7 @@ export default {
     detailsShipDetDrawer,
     editShipDetDrawer,
     declareElementsModal,
+    ReferOrderDataModal,
     cancelSubmitShipment,
     pushShipment,
     rePushShipment,
@@ -289,6 +294,7 @@ export default {
     return {
       loading: false, // 表格加载
       id: '',
+      monthStartDate:'',//本月1号
       shipmentListColumns: [
         {
           title: '账套',
@@ -547,6 +553,14 @@ export default {
     // this.getShipmentList() // 渲染 发运明细列表
   },
   methods: {
+    moment,
+    //默认预发货日期
+    defalutDate(){
+     var now = new Date(); //当前日期 
+      var nowMonth = now.getMonth(); //当前月 
+      var nowYear = now.getFullYear(); //当前年
+      this.monthStartDate = moment(new Date(nowYear, nowMonth, 1)).format('YYYY-MM-DD');  
+    },
     // 分页查询 发运明细
     async getShipmentList() {
       await  shipmentList(this.queryParam)
@@ -582,10 +596,27 @@ export default {
       cc.map(item => this.selectedRowKeys.push(item.itemIds))
     },
 
-    // 新增
-    addShipDet() {
-      this.$refs.addShipDetDrawer.syShippingDetailsItemList = [];
-      this.$refs.addShipDetDrawer.visible = true
+    // // 新增
+    // addShipDet() {
+    //   this.$refs.addShipDetDrawer.syShippingDetailsItemList = [];
+    //   this.$refs.addShipDetDrawer.visible = true
+    // },
+
+    //参照订单数据
+    referOrderDataOpen(){
+      this.$refs.referOrderDataModal.referOrderDataModVis = true
+      this.defalutDate() 
+      this.$refs.referOrderDataModal.range.push(this.monthStartDate)     
+      this.$refs.referOrderDataModal.queryParam.preDeliveryDateS = this.monthStartDate;
+      this.$refs.referOrderDataModal.queryParam.preDeliveryDateE  = '';
+    },
+
+     //参照数据重置，恢复默认值
+    defaultReset() {
+      this.defalutDate()
+      this.$refs.referOrderDataModal.range.push(this.monthStartDate)     
+      this.$refs.referOrderDataModal.queryParam.preDeliveryDateS = this.monthStartDate;
+      this.$refs.referOrderDataModal.queryParam.preDeliveryDateE  = '';
     },
 
     //  申报要素