Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -638,6 +638,7 @@ export default {
     },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
+        if(this.freightspace[i].status== '已装车'){
           if (!this.freightspace[i].unloadNetWeight) {
             this.$message({
               message: '卸车净重不能为空！',
@@ -652,6 +653,7 @@ export default {
             })
             return
           }
+        }
       }
       this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交卸车信息？`, {
         confirmButtonText: '确定',
@@ -1136,7 +1138,7 @@ export default {
 }
 //卸车详情
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 15%;
+  width: 16%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -607,7 +607,7 @@ export default {
             })
             return
         }
-      }
+    }
       this.$confirm(
         `所有车辆完成卸车任务后，请及时修改任务状态，确定提交卸车信息？`,
         {

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -547,8 +547,8 @@
             setUpTranPrice(tranProcessInfo)
               .toPromise()
               .then((response) => {
-                this.$message.success('提交成功')
-                this.getList()
+               this.$message.success('提交成功')
+                this.loaddata()
               })
           })
           .catch(() => {

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -701,7 +701,7 @@ export default {
     },
     submit() {
       for(let i = 0 ; i < this.freightspace.length ; i++){
-        if(this.freightspace[i].shipType == '集装箱'){
+        if(this.freightspace[i].status== '已装车'){
             if (!this.freightspace[i].unloadNetWeight) {
                 this.$message({
                   message: '卸船净重不能为空！',

src/views/warehouse/warehouseManagementAdd.vue

@@ -58,6 +58,10 @@
         <ws-form-item label="总储量（吨）" span="1" prop="settlementMethod" v-show="radio == 1">
           <ws-input class="totalStorage" :readonly="true" v-model="totalStorage" maxlength="100" size="small" />
         </ws-form-item>
+        <ws-form-item label="是否自动获取重量" span="1" prop="automaticWeightAcquisition" class="readonly" style="180px">
+          <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="0">否</el-radio>
+          <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="1">是</el-radio>
+        </ws-form-item>
         <div style="width: 100%" class="flex position" v-for="(item, index) in freightspace" v-show="radio == 1"
           :key="index">
           <ws-form-item label="仓位编号" span="1" prop="contractNo" class="readonly">
@@ -138,6 +142,7 @@
         deptBudgetList: {
           totalStorage: 0,
           addressUrl: '',
+          automaticWeightAcquisition:'0'
         },
         options_: regionData,
         otherPersonPhone: '',
@@ -793,7 +798,7 @@
   }
 
   /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 115px;
+    width: 130px;
     text-align: center;
     background: #fff;
     // border: 1px solid #cdd2dc;

src/views/warehouse/warehouseManagementEdit.vue

@@ -59,6 +59,10 @@
           <ws-form-item v-if="warehouseType == 1" label="总储量（吨)" span="1" prop="totalStorage">
             {{ totalStorage }}
           </ws-form-item>
+          <ws-form-item label="是否自动获取重量" span="1" prop="automaticWeightAcquisition" class="readonly" style="180px">
+          <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="0">否</el-radio>
+          <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="1">是</el-radio>
+        </ws-form-item>
         </ws-info-table>
         <div v-for="(item, index) in deptBudgetList.warehousePositionInfoList">
           <ws-info-table>
@@ -752,7 +756,7 @@
   }
 
   /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 100px;
+    width: 130px;
     text-align: center;
     background: #fff;
     // border: 1px solid #cdd2dc;