Browse Source

前端 pc 更新sdy

zhongtianhaoyuan 3 years ago
parent
commit
ed79eb10e8
2 changed files with 29 additions and 32 deletions
  1. 28 31
      src/views/tranManagement/tranManagementFireFeedback.vue
  2. 1 1
      vue.config.js

+ 28 - 31
src/views/tranManagement/tranManagementFireFeedback.vue

@@ -173,12 +173,12 @@
                 </el-upload>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg != null
+                    deptBudgetList.tranCarInfoList.length>0 && deptBudgetList.tranCarInfoList[0].loadPoundImg
                   "
                 >1</span>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                     deptBudgetList.tranCarInfoList.length>0 && !deptBudgetList.tranCarInfoList[0].loadPoundImg
                   "
                 >未上传</span>
               </template>
@@ -589,28 +589,27 @@ 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) {
-            this.$message({
-              message: '车牌号不能为空!',
-              type: 'warning'
-            })
-            return
-          }
+          // 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) {
+          //   this.$message({
+          //     message: '车牌号不能为空!',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.freightspace[i].loadNetWeight) {
             this.$message({
               message: '装车净重不能为空!',
@@ -635,7 +634,7 @@ export default {
             })
             return
           }
-        }
+        
       }
       if (sessionStorage.getItem('sh-msg')) {
         this.validateFunc()
@@ -665,14 +664,12 @@ export default {
         .then(response => {
           this.deptBudgetList = response
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          if(response.tranCarInfoList[0].driver){
+            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          }
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.$set(
-            this.deptBudgetList,
-            'sendDateStart',
-            response.tranCarInfoList[0].sendDateStart
-          )
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart)
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel

+ 1 - 1
vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.115:8090/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',