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

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -227,6 +227,15 @@
                 value-format="yyyy-MM-dd"
               />
             </el-form-item>
+             <!--单价 -->
+            <ws-form-item label="单价（元/吨）:" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
+              <ws-input
+                v-model="item.contractPrice"
+                placeholder="请输入单价"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
             <!-- 提交 -->
             <span class="servicedout" v-show="item.status == '已送达'"
               >已卸车</span
@@ -629,36 +638,20 @@ export default {
     },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
-        if (this.freightspace[i].temporaryDriverFlag != 0) {
-          if (!this.freightspace[i].driver) {
-            this.$message({
-              message: '司机姓名不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].driverPhone) {
-            this.$message({
-              message: '司机电话不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.freightspace[i].carNo) {
+          if (!this.freightspace[i].unloadNetWeight) {
             this.$message({
-              message: '车牌号不能为空！',
+              message: '卸车净重不能为空！',
               type: 'warning',
             })
             return
           }
-          if (!this.freightspace[i].loadNetWeight) {
+          if (this.deptBudgetList.priceType!=null&&this.deptBudgetList.priceType=='随行就市'&&!this.freightspace[i].contractPrice) {
             this.$message({
-              message: '装载净重不能为空！',
+              message: '单价不能为空！',
               type: 'warning',
             })
             return
           }
-        }
       }
       this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交卸车信息？`, {
         confirmButtonText: '确定',

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -180,6 +180,10 @@
             <!--卸车日期-->
             <ws-form-item label="卸车日期:" span="1" prop="unloadingDate">
               <span>{{ item.unloadingDate }}</span>
+            </ws-form-item>
+              <!--单价 -->
+            <ws-form-item label="单价（元/吨）:" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
+               {{ item.contractPrice }}
             </ws-form-item>
             <!-- <div
             v-show="

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -307,6 +307,15 @@
               <ws-form-item label="封号:" span="1" prop="titleNo">
                 <span>{{ item.titleNo }}</span>
               </ws-form-item>
+              <!--单价 -->
+              <ws-form-item label="单价（元/吨）:" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
+                <ws-input
+                  v-model="item.contractPrice"
+                  placeholder="请输入单价"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
               <div
                 v-show="
                   item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'
@@ -586,11 +595,18 @@ export default {
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].unloadNetWeight == null) {
           this.$message({
-            message: '卸重不能为空！',
+            message: '卸车净重不能为空！',
             type: 'warning',
           })
           return
         }
+        if (this.deptBudgetList.priceType!=null&&this.deptBudgetList.priceType=='随行就市'&&!this.freightspace[i].contractPrice) {
+            this.$message({
+              message: '单价不能为空！',
+              type: 'warning',
+            })
+            return
+        }
       }
       this.$confirm(
         `所有车辆完成卸车任务后，请及时修改任务状态，确定提交卸车信息？`,

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -188,6 +188,10 @@
               <!--封号-->
             <ws-form-item label="封号:" span="1" prop="titleNo">
              <span>{{ item.titleNo }}</span>
+            </ws-form-item>
+              <!--单价 -->
+            <ws-form-item label="单价（元/吨）:" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
+               {{ item.contractPrice }}
             </ws-form-item>
             <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
               {{ item.signStatus }}

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -268,6 +268,15 @@
                 value-format="yyyy-MM-dd"
               />
             </el-form-item>
+             <!--单价 -->
+            <ws-form-item label="单价（元/吨）:" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
+              <ws-input
+                v-model="item.contractPrice"
+                placeholder="请输入单价"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
             <div v-show="item.signStatus == '未签合同'" class="signStatus">
               {{ item.signStatus }}
             </div>
@@ -694,38 +703,43 @@ export default {
       for(let i = 0 ; i < this.freightspace.length ; i++){
         if(this.freightspace[i].shipType == '集装箱'){
             if (!this.freightspace[i].unloadNetWeight) {
-        this.$message({
-          message: '卸船净重不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        (this.freightspace[i].unloadNetWeight &&
-          String(this.freightspace[i].unloadNetWeight).indexOf('.') != -1 &&
-          String(this.freightspace[i].unloadNetWeight).length -
-            (String(this.freightspace[i].unloadNetWeight).indexOf('.') + 1) >
-            2) ||
-        this.freightspace[i].unloadNetWeight > 10000 ||
-        this.freightspace[i].unloadNetWeight < 0
-      ) {
-        this.$message({
-          message: '卸船净重输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.freightspace[i].unloadingDate) {
-        this.$message({
-          message: '卸船日期不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-
+                this.$message({
+                  message: '卸船净重不能为空！',
+                  type: 'warning',
+                })
+                return
+            }
+        if (
+          (this.freightspace[i].unloadNetWeight &&
+            String(this.freightspace[i].unloadNetWeight).indexOf('.') != -1 &&
+            String(this.freightspace[i].unloadNetWeight).length -
+              (String(this.freightspace[i].unloadNetWeight).indexOf('.') + 1) >
+              2) ||
+          this.freightspace[i].unloadNetWeight > 10000 ||
+          this.freightspace[i].unloadNetWeight < 0
+        ) {
+          this.$message({
+            message: '卸船净重输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.freightspace[i].unloadingDate) {
+          this.$message({
+            message: '卸船日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.priceType!=null&&this.deptBudgetList.priceType=='随行就市'&&!this.freightspace[i].contractPrice) {
+          this.$message({
+              message: '单价不能为空！',
+              type: 'warning',
+            })
+            return
+          }
         }
       }
-      
       this.$confirm(`提交成功后装船信息不可修改，是否确定提交？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -181,12 +181,16 @@
             <ws-form-item label="卸船日期" span="1" prop="unloadingDate">
                 {{ item.unloadingDate }}
             </ws-form-item>
-               <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
-                  {{ item.signStatus }}
-                </div>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
-                  {{ item.signStatus }}
-                </div>
+             <!--单价 -->
+            <ws-form-item label="单价（元/吨）:" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
+               {{ item.contractPrice }}
+            </ws-form-item>
+            <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+              {{ item.signStatus }}
+            </div>
+            <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+              {{ item.signStatus }}
+            </div>
             <span
               v-show="item.temporaryDriverFlag != 0"
               width="22"