Ver código fonte

出运明细编辑页面面料是发货数量整数校验取消

jbb 2 anos atrás
pai
commit
7069dbe71e

+ 10 - 8
src/views/shipment-details/editShipDetDrawer.vue

@@ -244,6 +244,7 @@ export default {
          // orderType:[{required: true, message: '请输入订单类型!'}],
         },
         btnDisabled:true,//参照数据按钮禁止使用
+        readyFabric:'',
       // 表头
       columns: [
        {
@@ -272,9 +273,9 @@ export default {
           dataIndex: 'orderDate',
           width: 120,
           className: 'replacecolor',
-          customRender: text => {
-            return moment(text).format('YYYY-MM-DD')
-          }
+          // customRender: text => {
+          //   return moment(text).format('YYYY-MM-DD')
+          // }
         },
         
          {
@@ -656,11 +657,8 @@ export default {
            {key:'purOrSubOrder',value:'采购/委外订单号'},
            {key:'customsDeclarationUnitPrice',value:'报关单价'},
            {key:'shipmentQuantity',value:'发货数量'},
-            {key:'numberOfSets',value:'套装件数'},
-           {key:'isTc',value:'是否TC功能'},
-          //  {key:'materialComposition',value:'物料成分'},
-          //  {key:'salesTypeText',value:'销售类型'},
-              ]
+           {key:'numberOfSets',value:'套装件数'},
+           {key:'isTc',value:'是否TC功能'}, ]
              for(var j=0 ; j<required.length;j++){
                 if(tableRow[required[j].key] == null || tableRow[required[j].key] == "" || tableRow[required[j].key] == undefined){
                   this.$message.error('第'+(i+1)+'行'+required[j].value+'无值,无法保存');
@@ -692,6 +690,9 @@ export default {
                {key:'numberOfSets',value:'套装件数'},
                {key:'shipmentQuantity',value:'发货数量'},
              ]
+             if(this.readyFabric == '0'){
+             integer.splice(1, 1)
+            }
              for(var v=0 ; v<integer.length;v++){
                 if(!Number.isInteger(Number(tableRow[integer[v].key]))){
                   this.$message.error('第'+(i+1)+'行'+integer[v].value+'不为整数,无法保存');
@@ -818,6 +819,7 @@ export default {
       this.addShipDet = {};
       this.syShippingDetailsItemList = [];
       this.manualYarnDisabled = false
+      this.readyFabric =''
       this.$refs.form.resetFields();
     },
     // --------------------------------------

+ 1 - 0
src/views/shipment-details/shipmentList.vue

@@ -740,6 +740,7 @@ export default {
             }      
           })
           this.$refs.editShipDetDrawer.syShippingDetailsItemList = res.result.syShippingDetailsItemList
+          this.$refs.editShipDetDrawer.readyFabric = this.queryParam.flourOrGarment
         }
       })
     },