瀏覽代碼

修改毛重时修改运输方式没反应

achao 3 年之前
父節點
當前提交
db654ec959

+ 1 - 0
src/views/warehouse/warehouseManagementGross.vue

@@ -1890,6 +1890,7 @@
             }
           }
         }
+        if(!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (
             this.outContractNo[i].contractNo == this.deptBudgetList.contractNo

+ 12 - 9
src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -107,7 +107,7 @@
                   value-format="yyyy-MM-dd">
                 </el-date-picker>
               </ws-form-item>
-             <!-- 经办人  -->
+              <!-- 经办人  -->
               <ws-form-item label="经办人" span="1" prop="agent">
                 <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable clearable @change="selectstaff">
                   <el-option v-for="item in options" :key="item.value" :label="item.staffName"
@@ -216,7 +216,7 @@
                   <el-option v-for="item in options2" :key="item.constKey"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
-                 <span style='padding-left:10px;'>发货重量(吨):{{dataList.loadNetWeight}}</span>  
+                <span style='padding-left:10px;'>发货重量(吨):{{dataList.loadNetWeight}}</span>
               </ws-form-item>
               <!--船名  -->
               <ws-form-item label="船名" span="1" prop="carNo" v-if="deptBudgetList.outType == '散船'">
@@ -541,7 +541,7 @@
             value: '3',
           },
         ],
-        tare:"",
+        tare: "",
       }
     },
     mounted() {},
@@ -587,7 +587,7 @@
       this.dataList.cost = this.$route.query.cost
       this.dataList.freight = this.$route.query.freight
       this.dataList.type = this.$route.query.type
-      this.dataList.outType = this.$route.query.outType//运输方式
+      this.dataList.outType = this.$route.query.outType //运输方式
       this.dataList.buckleWeightRatio = this.$route.query.buckleWeightRatio
       this.dataList.tidalGrainWater = this.$route.query.tidalGrainWater
       this.dataList.solidGrainWater = this.$route.query.solidGrainWater
@@ -614,7 +614,7 @@
           this.dataList.grossWeight = data
         } else {
           this.tare = data
-           this.dataList.tare = data
+          this.dataList.tare = data
         }
       },
       openPort() {
@@ -661,11 +661,11 @@
             this.dataList.carId = this.tranCarInfoList[i].id
             this.dataList.freight = this.tranCarInfoList[i].tranPrice
           }
-          if(this.dataList.inOutType=='移库入库'){
-            if(!this.dataList.cost){
-              this.dataList.cost=this.tranCarInfoList[i].cost
+          if (this.dataList.inOutType == '移库入库') {
+            if (!this.dataList.cost) {
+              this.dataList.cost = this.tranCarInfoList[i].cost
             }
-            this.dataList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
+            this.dataList.loadNetWeight = this.tranCarInfoList[i].loadNetWeight
           }
         }
       },
@@ -681,6 +681,7 @@
             }
           }
         }
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '采购入库') {
@@ -1770,6 +1771,7 @@
     height: 2000px;
     margin: 0 auto;
   }
+
   .inspector {
     width: 50%;
   }
@@ -1787,6 +1789,7 @@
   /deep/.el-form-item {
     width: 50%;
   }
+
   /deep/.ws-info-table .el-form-item .el-form-item__label {
     text-align: center;
   }

+ 37 - 31
src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -41,7 +41,7 @@
               <!--任务编号-->
               <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
                 <el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
-                  @change="contractNoChange" >
+                  @change="contractNoChange">
                   <el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
                     :value="item.inOutTaskNo" />
                 </el-select>
@@ -184,15 +184,19 @@
               dataList.outType == '汽运' ||
               dataList.outType == '集装箱船'
             ">
-                <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="dataList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
-                  <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
+                <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7"
+                  size="small" />
+                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="dataList.carNo"
+                  placeholder="请选择车牌号" class="typeselect" @change="carChange">
+                  <el-option v-for="item in options2" :key="item.constKey"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
-                 <!-- <span style='padding-left:10px;'>发货重量(吨):{{dataList.loadNetWeight}}</span> -->
-                  <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
+                <!-- <span style='padding-left:10px;'>发货重量(吨):{{dataList.loadNetWeight}}</span> -->
+                <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
               </ws-form-item>
               <ws-form-item label="发货重量(吨):" span="1" prop="loadNetWeight">
-                 <ws-input v-model="dataList.loadNetWeight" placeholder="暂无获取到发货重量" maxlength="10" disabled size="small" />
+                <ws-input v-model="dataList.loadNetWeight" placeholder="暂无获取到发货重量" maxlength="10" disabled
+                  size="small" />
               </ws-form-item>
 
               <ws-form-item label="车号" span="1" prop="carNo" v-if="dataList.outType == '火运'">
@@ -400,7 +404,7 @@
             value: '3',
           },
         ],
-        information:'毛重检斤',
+        information: '毛重检斤',
         readonly: true,
         typeList: ['干粮', '潮粮'],
         qualityInspectorList: [],
@@ -449,6 +453,7 @@
         },
         contractList: [],
         dataList: {
+          outType: '',
           id: '',
           grossWeight: '',
           contractNo: '',
@@ -460,7 +465,7 @@
           inOutDate: '',
           inOutType: '',
           goodsName: '',
-          selfLoading:"0",
+          selfLoading: "0",
           warehouseInOutDetail: {
             qualityInspector: '',
           },
@@ -486,9 +491,9 @@
         param: 9600,
         allowEdit: true,
         result1: '00',
-        grossWeight:"",//显示的毛重
-        carChange1:"手动填写",
-        carjudge:false
+        grossWeight: "", //显示的毛重
+        carChange1: "手动填写",
+        carjudge: false
       }
     },
     mounted() {},
@@ -502,7 +507,7 @@
       this.deptBudgetList1.binNumber = this.$route.query.binNumber
       this.dataList.id = this.$route.query.id
       this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
-      this.grossWeight =  this.dataList.grossWeight
+      this.grossWeight = this.dataList.grossWeight
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.baseId = this.$route.query.baseId
       this.dataList.positionId = this.$route.query.positionId
@@ -517,7 +522,7 @@
       this.dataList.grade = this.$route.query.grade
       this.dataList.agent = this.$route.query.agent
       this.dataList.carNo = this.$route.query.carNo
-      this.dataList.carId = this.$route.query.carId//派车id初始化默认一下(解决第一次进来无carid)
+      this.dataList.carId = this.$route.query.carId //派车id初始化默认一下(解决第一次进来无carid)
       this.dataList.inOutDate = this.$route.query.inOutDate
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.inOutType = this.$route.query.inOutType
@@ -529,8 +534,8 @@
       this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
       this.dataList.statusFlag = this.$route.statusFlag
       this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
-      this.dataList.outType = this.$route.query.outType//运输方式
-      this.dataList.selfLoading = this.$route.query.selfLoading//
+      this.dataList.outType = this.$route.query.outType //运输方式
+      this.dataList.selfLoading = this.$route.query.selfLoading //
       if (this.$route.query.automaticWeightAcquisition == '1') {
         this.isShowBalance = true
       }
@@ -538,14 +543,14 @@
     },
     methods: {
       //切换车牌号输入状态
-      carNoTypeChange(){
-         this.carjudge = !this.carjudge
-        if(!this.carjudge){
-            this.dataList.selfLoading = "0"
-            this.carChange1="手动填写"
-        }else{
-            this.dataList.selfLoading = "1"
-            this.carChange1="识别下拉"
+      carNoTypeChange() {
+        this.carjudge = !this.carjudge
+        if (!this.carjudge) {
+          this.dataList.selfLoading = "0"
+          this.carChange1 = "手动填写"
+        } else {
+          this.dataList.selfLoading = "1"
+          this.carChange1 = "识别下拉"
         }
       },
       setVal(data) {
@@ -612,12 +617,12 @@
           if (this.tranCarInfoList[i].carNo == this.dataList.carNo) {
             this.dataList.tranCarNo = this.tranCarInfoList[i].tranCarNo
             this.dataList.carId = this.tranCarInfoList[i].id
-             if(this.dataList.inOutType=='移库入库'){
-            if(!this.dataList.cost){
-              this.dataList.cost=this.tranCarInfoList[i].cost
+            if (this.dataList.inOutType == '移库入库') {
+              if (!this.dataList.cost) {
+                this.dataList.cost = this.tranCarInfoList[i].cost
+              }
+              this.dataList.loadNetWeight = this.tranCarInfoList[i].loadNetWeight
             }
-            this.dataList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
-          }
           }
         }
       },
@@ -663,7 +668,7 @@
             }
           }
         }
-
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '销售出库') {
@@ -1144,7 +1149,7 @@
             return
           }
         }
-        if(!this.carstatus){//若自运的合同该字段置空
+        if (!this.carstatus) { //若自运的合同该字段置空
           this.deptBudgetList.selfLoading = ""
         }
         this.$confirm(`确定提交毛重检斤`, {
@@ -1610,6 +1615,7 @@
   .el-input__inner {
     width: 150px;
   }
+
   .balance-row {
     display: flex;
     margin: 20px 0;

File diff suppressed because it is too large
+ 1298 - 1664
src/views/warehouse/warehouseManagementPut.vue


+ 20 - 16
src/views/warehouse/warehouseManagementTare.vue

@@ -171,9 +171,12 @@
                 </el-select>
               </ws-form-item>
 
-              <ws-form-item label="车牌号" span="1" prop="carNo" v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
-                <ws-input v-if="!carstatus || carjudge" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
+              <ws-form-item label="车牌号" span="1" prop="carNo"
+                v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
+                <ws-input v-if="!carstatus || carjudge" v-model="deptBudgetList.carNo" placeholder="请输入车牌号"
+                  maxlength="7" size="small" />
+                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="deptBudgetList.carNo"
+                  placeholder="请选择车牌号" class="typeselect" @change="carChange">
                   <el-option v-for="item in options2" :key="item.constKey"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
@@ -396,7 +399,7 @@
           grossWeight: '',
           tare: '',
           inOutDate: '',
-          selfLoading:"0",
+          selfLoading: "0",
         },
         weightbills: {},
         historyList: [],
@@ -428,10 +431,10 @@
             value: '3',
           },
         ],
-        tare:"0",//显示的皮重
-        carChange1:"手动填写",
-        carjudge:false,
-        options2:[],
+        tare: "0", //显示的皮重
+        carChange1: "手动填写",
+        carjudge: false,
+        options2: [],
       }
     },
     mounted() {
@@ -468,14 +471,14 @@
     },
     methods: {
       //切换车牌号输入状态
-      carNoTypeChange(){
+      carNoTypeChange() {
         this.carjudge = !this.carjudge
-        if(!this.carjudge){
-            this.deptBudgetList.selfLoading = "0"
-            this.carChange1="手动填写"
-        }else{
-            this.deptBudgetList.selfLoading = "1"
-            this.carChange1="识别下拉"
+        if (!this.carjudge) {
+          this.deptBudgetList.selfLoading = "0"
+          this.carChange1 = "手动填写"
+        } else {
+          this.deptBudgetList.selfLoading = "1"
+          this.carChange1 = "识别下拉"
         }
       },
       setVal(data) {
@@ -524,6 +527,7 @@
             }
           }
         }
+        if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (
             this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
@@ -1427,7 +1431,7 @@
             return
           }
         }
-        if(!this.carstatus){//若自运的合同该字段置空
+        if (!this.carstatus) { //若自运的合同该字段置空
           this.deptBudgetList.selfLoading = ""
         }
         this.$confirm(`确定提交出库信息`, {

Some files were not shown because too many files changed in this diff