bug调整

src/views/advance-packingList/addAdpackingDrawer.vue

@@ -265,16 +265,18 @@ export default {
           title: '起始箱号',
           key: 'startingBoxNumber',
           width: 120,
-          type: JVXETypes.input ,
-          validateRules:[{ required: true, message: '${title}不能为空' }],
+          type: JVXETypes.inputNumber ,
+          validateRules:[{ required: true, message: '${title}不能为空' },
+          {pattern: /^[1-9]\d*$/, message: '请输入零以上的正整数' }],
         },
 
         {
           title: '结束箱号',
           key: 'endCaseNumber',
           width: 140,
-          type: JVXETypes.input ,
-          validateRules:[{ required: true, message: '${title}不能为空' }],
+          type: JVXETypes.inputNumber ,
+          validateRules:[{ required: true, message: '${title}不能为空' },
+          {pattern: /^[1-9]\d*$/, message: '请输入零以上的正整数' }],
         },
 
         {
@@ -299,7 +301,7 @@ export default {
           title: '箱数',
           key: 'boxNumber',
           width: 140,
-          type: JVXETypes.inputNumber ,
+          type: JVXETypes.normal ,
           validateRules:[{ required: true, message: '${title}不能为空' },
             {pattern: /^[1-9]\d*$/, message: '请输入零以上的正整数' }],
         },
@@ -705,6 +707,10 @@ export default {
     },
     // 表格字段值变动时触发
     handleValueChange(event) {
+      if (event.row.startingBoxNumber != undefined && event.row.startingBoxNumber != "" &&
+      event.row.endCaseNumber != undefined && event.row.endCaseNumber != ""){
+        event.row.boxNumber = event.row.endCaseNumber*1-event.row.startingBoxNumber*1+1;
+      }
       var allSizeSum = this.getAllSizeSum(event.row);
       event.row.piecesBox = allSizeSum.toFixed(this.dotConfig.quantity);
       event.row.total = (event.row.piecesBox*event.row.boxNumber).toFixed(this.dotConfig.quantity);
@@ -722,6 +728,7 @@ export default {
       event.row.outerBoxHeight != "" && event.row.outerBoxHeight != undefined){
         event.row.totalVolume = (event.row.outerBoxLength * event.row.outerBoxWidth * event.row.outerBoxHeight * event.row.boxNumber).toFixed(this.dotConfig.volume);
       }
+      
       this.setHeadCalField();
       },
     // 获取不同尺码数量之和

src/views/shipment-details/addShipDetDrawer.vue

@@ -108,7 +108,7 @@
               :columns="columns"
               :data-source="syShippingDetailsItemList"
               :pagination="false"
-              :scroll="{ x: 1500, y: 400 }"
+              :scroll="{ x: 2800, y: 400 }"
               size="small"
             >
               <!-- 款号 输入框 :rules="rules.itemNumber" -->
@@ -329,12 +329,6 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
-        {
-          title: '订单主表ID',
-          dataIndex: 'syOrderDataId',
-          width: 100,
-          className: 'replacecolor'
-        },
         {
           title: '客户订单',
           dataIndex: 'customerOrder',
@@ -435,9 +429,10 @@ export default {
         {
           title: '客户名称',
           dataIndex: 'customerName',
-          width: 220,
+          width: 300,
           align: 'left',
-          className: 'replacecolor'
+          className: 'replacecolor',
+           customRender: t => ellipsis(t),
         },
         {
           title: '汇率',
@@ -468,7 +463,7 @@ export default {
         {
           title: '品牌方',
           dataIndex: 'brandSide',
-          width: 120,
+          width: 180,
           className: 'replacecolor'
         },
         {
@@ -544,12 +539,6 @@ export default {
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
-        {
-          title: '订单子表ID',
-          dataIndex: 'syOrderDataItemId',
-          width: 160,
-          className: 'replacecolor'
-        },
 
         {
           title: '处理方式',
@@ -561,7 +550,7 @@ export default {
         {
           title: '是否手册纱',
           dataIndex: 'manualYarnFlag',
-          width: 100,
+          width: 140,
           scopedSlots: { customRender: 'manualYarnFlag' },
           className: 'replacecolor'
         },
@@ -662,15 +651,13 @@ export default {
               return;
             }
           }
-          // 根据inventoryCode，colour，codingRules判断重复物料
+          // 根据syOrderDataItemId判断重复子表id
           for (var i=0; i<newObj.syShippingDetailsItemList.length; i++){
             var rowData = newObj.syShippingDetailsItemList[i];
             for (var j=i+1;j<newObj.syShippingDetailsItemList.length; j++){
               var nextData = newObj.syShippingDetailsItemList[j];
-              if (rowData.inventoryCode == nextData.inventoryCode &&
-              rowData.colour == nextData.colour &&
-              rowData.codingRules == nextData.codingRules){
-                this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行物料重复，无法保存');
+              if (rowData.syOrderDataItemId == nextData.syOrderDataItemId){
+                this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行物订单子表id重复，无法保存');
                 return;
               }
             }
@@ -775,6 +762,8 @@ export default {
       this.$refs.referOrderDataModal.queryParam.salesman="";
       this.$refs.referOrderDataModal.queryParam.customerName="";
       this.$refs.referOrderDataModal.queryParam.dateRange=[];
+      this.$refs.referOrderDataModal.queryParam.preDeliveryDate="";
+      this.$refs.referOrderDataModal.queryParam.flourOrGarment="";
     }
   }
 }

src/views/shipment-details/detailsShipDetDrawer.vue

@@ -55,7 +55,7 @@
               :data-source="syShippingDetailsItemList"
               :loading="loading"
               :pagination="ipagination"
-              :scroll="{ x: 1500 }"
+              :scroll="{ x: 2800,y:400 }"
               @change="handleTableChange"
             >
             </a-table>
@@ -118,6 +118,29 @@ export default {
           title: '订单日期',
           dataIndex: 'orderDate',
           width: 120,
+          className: 'replacecolor',
+          customRender: text => {
+            return moment(text).format('YYYY-MM-DD')
+          }
+        },
+         {
+          title: '预发货日期',
+          dataIndex: 'preDeliveryDate',
+          width: 100,
+          className: 'replacecolor',
+        
+        },
+         {
+          title: '预完工日期',
+          dataIndex: 'preCompletionDate',
+          width: 100,
+          className: 'replacecolor',
+         
+        },
+        {
+          title: '成衣工厂',
+          dataIndex: 'garmentFactory',
+          width: 100,
           className: 'replacecolor'
         },
         {
@@ -151,6 +174,25 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
+        {
+          title: '颜色',
+          dataIndex: 'colour',
+          width: 160,
+          customRender: t => ellipsis(t),
+          className: 'replacecolor'
+        },
+        {
+          title: '尺码',
+          dataIndex: 'size',
+          width: 100,
+          className: 'replacecolor'
+        },
+        {
+          title: '配码规格',
+          dataIndex: 'codingRules',
+          width: 180,
+          className: 'replacecolor'
+        },
         {
           title: '采购/委外订单号',
           dataIndex: 'purOrSubOrder',
@@ -226,14 +268,15 @@ export default {
         {
           title: '客户简称',
           dataIndex: 'customerAbbreviation',
-          width: 120,
+          width: 220,
           className: 'replacecolor'
         },
         {
           title: '客户名称',
           dataIndex: 'customerName',
-          width: 120,
-          className: 'replacecolor'
+          width: 300,
+          className: 'replacecolor',
+          customRender: t => ellipsis(t),
         },
         {
           title: '汇率',
@@ -269,13 +312,13 @@ export default {
         {
           title: '品牌方',
           dataIndex: 'brandSide',
-          width: 120,
+          width: 180,
           className: 'replacecolor'
         },
         {
           title: '第三方',
           dataIndex: 'thirdParty',
-          width: 120,
+          width: 220,
           className: 'replacecolor'
         },
         {
@@ -326,7 +369,7 @@ export default {
         {
           title: '订单备注',
           dataIndex: 'orderRemarks',
-          width: 160,
+          width: 200,
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },

src/views/shipment-details/editShipDetDrawer.vue

@@ -268,6 +268,26 @@ export default {
           width: 120,
           className: 'replacecolor'
         },
+        {
+          title: '预发货日期',
+          dataIndex: 'preDeliveryDate',
+          width: 100,
+          className: 'replacecolor',
+        
+        },
+         {
+          title: '预完工日期',
+          dataIndex: 'preCompletionDate',
+          width: 100,
+          className: 'replacecolor',
+         
+        },
+         {
+          title: '成衣工厂',
+          dataIndex: 'garmentFactory',
+          width: 100,
+          className: 'replacecolor'
+        },
         {
           title: '业务类型',
           dataIndex: 'businessTypeText',
@@ -369,7 +389,7 @@ export default {
         {
           title: '客户简称',
           dataIndex: 'customerAbbreviation',
-          width: 120,
+          width: 220,
           className: 'replacecolor'
         },
         {
@@ -421,7 +441,7 @@ export default {
         {
           title: '第三方',
           dataIndex: 'thirdParty',
-          width: 120,
+          width: 220,
           className: 'replacecolor'
         },
         {
@@ -499,12 +519,6 @@ export default {
           customRender: t => ellipsis(t),
           className: 'replacecolor'
         },
-        {
-          title: '订单子表ID',
-          dataIndex: 'syOrderDataItemId',
-          width: 160,
-          className: 'replacecolor'
-        },
 
         {
           title: '处理方式',
@@ -590,15 +604,13 @@ export default {
               return;
             }
           }
-          // 根据inventoryCode，colour，codingRules判断重复物料
-          for (var i=0; i<newObj.syShippingDetailsItemList.length; i++){
-            var rowData = newObj.syShippingDetailsItemList[i];
-            for (var j=i+1;j<newObj.syShippingDetailsItemList.length; j++){
-              var nextData = newObj.syShippingDetailsItemList[j];
-              if (rowData.inventoryCode == nextData.inventoryCode &&
-              rowData.colour == nextData.colour &&
-              rowData.codingRules == nextData.codingRules){
-                this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行物料重复，无法保存');
+          // 根据syOrderDataItemId判断重复子表id
+          for (var i=0; i<this.editShipDet.syShippingDetailsItemList.length; i++){
+            var rowData = this.editShipDet.syShippingDetailsItemList[i];
+            for (var j=i+1;j<this.editShipDet.syShippingDetailsItemList.length; j++){
+              var nextData = this.editShipDet.syShippingDetailsItemList[j];
+              if (rowData.syOrderDataItemId == nextData.syOrderDataItemId){
+                this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行物订单子表id重复，无法保存');
                 return;
               }
             }
@@ -705,6 +717,8 @@ export default {
       this.$refs.referOrderDataModal.queryParam.salesman="";
       this.$refs.referOrderDataModal.queryParam.customerName="";
       this.$refs.referOrderDataModal.queryParam.dateRange=[];
+      this.$refs.referOrderDataModal.queryParam.preDeliveryDate="";
+      this.$refs.referOrderDataModal.queryParam.flourOrGarment="";
     },
     // father
     aa() {}

src/views/shipment-details/referOrderDataModal.vue

@@ -56,6 +56,25 @@
                   />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="类型">
+                  <a-select v-model="queryParam.flourOrGarment">
+                    <a-select-option value="">请选择</a-select-option>
+                    <a-select-option value="1">成衣</a-select-option>
+                    <a-select-option value="0">面辅料</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="预发货日期">
+                  <a-date-picker
+                    placeholder="请选择预发货日期"
+                    format="YYYY-MM-DD"
+                    style="width:100%;"
+                    v-model="queryParam.preDeliveryDate"
+                  />
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="8">
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -403,7 +422,10 @@ export default {
       // 查询条件
       queryParam: {
         orderNumber: '', // 订单号
-        account: ''
+        account: '',
+        pageSize:100,
+        preDeliveryDate:'',
+        flourOrGarment:'',
         // pageNo: '', // 初始页
         // pageSize: '-1' // 每页显示条数
       },
@@ -425,6 +447,9 @@ export default {
     // 参照订单数据 查询
     getOrderList() {
       this.confirmLoading = true;
+      if (this.queryParam.preDeliveryDate != ""){
+        this.queryParam.preDeliveryDate = this.queryParam.preDeliveryDate.format('YYYY-MM-DD');
+      }
       this.$nextTick(() => {
         queryOrderData(this.queryParam).then(res => {
           this.confirmLoading = false;