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

src/styles/media.scss

@@ -66,7 +66,7 @@
   padding: 0;
   // padding-bottom: 20px;
   width: calc(100% - 200px);
-  height: calc(100% - 50px);
+  // height: calc(100% - 50px);
   box-sizing: border-box;
   overflow: hidden;
   .el-tabs__item {

src/views/houseSelfCollect/inspectionManagement.vue

@@ -81,7 +81,7 @@
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
       <el-table-column prop="qualityInspector" label="质检员"></el-table-column>
-      <el-table-column prop="qualityDate" label="质检时间"></el-table-column>
+      <el-table-column prop="updateDate" label="质检时间"></el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column width="400" label="操作">
         <template slot-scope="scope">

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -152,7 +152,7 @@
         </el-table-column>
         <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <template v-if="scope.row.receivingStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementShipping.vue

@@ -146,7 +146,7 @@
         </el-table-column>
         <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div class="record" @click="handleLook(scope.row)">查看</div>
             <div class="adjustment" @click="shipping(scope.row)">船次</div>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -147,7 +147,7 @@
         </el-table-column>
         <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <template v-if="scope.row.feedbackStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -146,7 +146,7 @@
         </el-table-column>
         <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div
               class="record"

src/views/tranManagement/tranManagementVehicle.vue

@@ -146,7 +146,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="createDate" label="接单时间"> </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div class="record" @click="nocomplete(scope.row)">查看</div>
             <div class="adjustment" @click="warehousing(scope.row)">派车</div>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -619,51 +619,59 @@ export default {
     },
     //提交按钮
     submit() {
-      for (var i = this.index; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        if (!this.deptBudgetList.tranCarInfoList[i].driver) {
-          this.$message({
-            message: '姓名不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-        for(var j = 0 ; j < this.carList.length ; j++){   
-           if (this.carList[j].driverName == this.deptBudgetList.tranCarInfoList[i].driver && this.carList[j].disableStatusFlag == 1) { 
+      if(!this.deptBudgetList.tranPrice){
+        this.$message({
+          message: '请设置运输单价！',
+          type: 'warning',
+        })
+      }
+      else{
+        for (var i = this.index; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          if (!this.deptBudgetList.tranCarInfoList[i].driver) {
             this.$message({
-              message: this.deptBudgetList.tranCarInfoList[i].driver+'该司机已被禁用！',
+              message: '姓名不能为空！',
               type: 'warning',
             })
             return
           }
-        }  
-      }
-      this.$confirm(`提交成功后，任务将下发给司机，是否确定提交？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
-            if (valid) {
-              var tranCarInfo = {}
-              tranCarInfo.id = this.deptBudgetList.id
-              tranCarInfo.infoId = this.deptBudgetList.infoId
-              tranCarInfo.tranCarInfoList = this.deptBudgetList.tranCarInfoList
-              dispatchCat(tranCarInfo)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('提交成功')
-                  this.$router.go(-1)
-                })
-            } else {
-              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
+          for(var j = 0 ; j < this.carList.length ; j++){   
+            if (this.carList[j].driverName == this.deptBudgetList.tranCarInfoList[i].driver && this.carList[j].disableStatusFlag == 1) { 
+              this.$message({
+                message: this.deptBudgetList.tranCarInfoList[i].driver+'该司机已被禁用！',
+                type: 'warning',
+              })
+              return
             }
-          })
-        })
-        .catch(() => {
-          return false
+          }  
+        }
+        this.$confirm(`提交成功后，任务将下发给司机，是否确定提交？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
         })
+          .then(() => {
+            this.$refs.deptBudgetList.validate((valid) => {
+              if (valid) {
+                var tranCarInfo = {}
+                tranCarInfo.id = this.deptBudgetList.id
+                tranCarInfo.infoId = this.deptBudgetList.infoId
+                tranCarInfo.tranCarInfoList = this.deptBudgetList.tranCarInfoList
+                dispatchCat(tranCarInfo)
+                  .toPromise()
+                  .then((response) => {
+                    this.$message.success('提交成功')
+                    this.$router.go(-1)
+                  })
+              } else {
+                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                return false
+              }
+            })
+          })
+          .catch(() => {
+            return false
+          })
+        }
     },
 
     handleClose() {

src/views/warehouse/warehouseManagementAdd.vue

@@ -633,6 +633,7 @@ export default {
                 this.deptBudgetList.warehousePositionInfoList =
                   this.freightspace
                 this.deptBudgetList.totalStorage = this.totalStorage
+                this.deptBudgetList.otherPersonPhone=this.deptBudgetList.otherPersonPhone.toString()
                 if (this.radio == 2) {
                   this.deptBudgetList.warehousetype == 2
                 }