gjy пре 2 година
родитељ
комит
82e0bd629e

+ 65 - 72
src/views/tranManagement/tranManagementDriverAdd.vue

@@ -210,7 +210,7 @@
         </div>
         </div>
       </div>
       </div>
     </ws-form>
     </ws-form>
-    <ws-form
+    <!-- <ws-form
       ref="deptBudgetList"
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :rules="mainReportAdd"
       :model="deptBudgetList"
       :model="deptBudgetList"
@@ -242,7 +242,6 @@
             />
             />
           </div>
           </div>
           <ws-info-table class="el-table">
           <ws-info-table class="el-table">
-            <!--账户类型-->
             <ws-form-item
             <ws-form-item
               label="账户类型"
               label="账户类型"
               span="1"
               span="1"
@@ -256,7 +255,6 @@
                 >企业账户</el-radio
                 >企业账户</el-radio
               >
               >
             </ws-form-item>
             </ws-form-item>
-            <!--账号-->
             <ws-form-item label="账号" span="1" prop="bankCard" class="el-car">
             <ws-form-item label="账号" span="1" prop="bankCard" class="el-car">
               <ws-input
               <ws-input
                 v-model="item.bankCard"
                 v-model="item.bankCard"
@@ -287,7 +285,6 @@
                 />
                 />
               </el-upload>
               </el-upload>
             </ws-form-item>
             </ws-form-item>
-            <!--开户行-->
             <ws-form-item
             <ws-form-item
               label="开户行"
               label="开户行"
               span="1"
               span="1"
@@ -301,7 +298,6 @@
                 size="small"
                 size="small"
               />
               />
             </ws-form-item>
             </ws-form-item>
-            <!--姓名-->
             <ws-form-item
             <ws-form-item
               label="姓名"
               label="姓名"
               v-if="item.accountTypeFlag == 1"
               v-if="item.accountTypeFlag == 1"
@@ -317,7 +313,6 @@
                 size="small"
                 size="small"
               />
               />
             </ws-form-item>
             </ws-form-item>
-            <!--企业名称-->
             <ws-form-item
             <ws-form-item
               label="企业名称"
               label="企业名称"
               v-else
               v-else
@@ -333,8 +328,6 @@
                 size="small"
                 size="small"
               />
               />
             </ws-form-item>
             </ws-form-item>
-
-            <!--身份证号-->
             <ws-form-item
             <ws-form-item
               label="身份证号"
               label="身份证号"
               v-if="item.accountTypeFlag == 1"
               v-if="item.accountTypeFlag == 1"
@@ -400,8 +393,8 @@
           </ws-info-table>
           </ws-info-table>
         </div>
         </div>
       </div>
       </div>
-    </ws-form>
-    <ws-form
+    </ws-form> -->
+    <!-- <ws-form
       ref="deptBudgetList"
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :rules="mainReportAdd"
       :model="deptBudgetList"
       :model="deptBudgetList"
@@ -522,7 +515,7 @@
           />
           />
         </div>
         </div>
       </div>
       </div>
-    </ws-form>
+    </ws-form> -->
     <!-- 提交 -->
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
       <el-button
@@ -866,67 +859,67 @@ export default {
         //   return
         //   return
         // }
         // }
       }
       }
-      for (var i = 0; i < this.freightspace1.length; i++) {
-        if (!this.freightspace1[i].bankCard) {
-          EventBus.$emit('error', '银行卡账号不能为空')
-          return
-        }
-        if (!this.freightspace1[i].bankDeposit) {
-          EventBus.$emit('error', '开户行不能为空')
-          return
-        }
-        if (!this.freightspace1[i].bankDepositBranch) {
-          EventBus.$emit('error', '开户支行不能为空')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeName == ''
-        ) {
-          EventBus.$emit('error', '收款人姓名不能为空')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeNumberCard == ''
-        ) {
-          EventBus.$emit('error', '收款人身份证号码不能为空')
-          return
-        }
-        if (
-          (this.freightspace1[i].accountTypeFlag == 1 &&
-            this.freightspace1[i].payeeName.length < 2) ||
-          (this.freightspace1[i].accountTypeFlag == 1 &&
-            this.freightspace1[i].payeeName.length > 10)
-        ) {
-          EventBus.$emit('error', '收款人姓名输入错误')
-          return
-        }
-        console.log(this.freightspace1[i].payeeNumberCard != 18)
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeNumberCard.length != 18
-        ) {
-          EventBus.$emit('error', '收款人身份证号输入错误')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 2 &&
-          this.freightspace1[i].compName == ''
-        ) {
-          EventBus.$emit('error', '企业名称不能为空')
-          return
-        }
-        if (
-          (this.freightspace1[i].accountTypeFlag == 2 &&
-            this.freightspace1[i].compName.length < 2) ||
-          (this.freightspace1[i].accountTypeFlag == 2 &&
-            this.freightspace1[i].compName.length > 30)
-        ) {
-          EventBus.$emit('error', '企业名称输入有误')
-          return
-        }
-      }
+      // for (var i = 0; i < this.freightspace1.length; i++) {
+      //   if (!this.freightspace1[i].bankCard) {
+      //     EventBus.$emit('error', '银行卡账号不能为空')
+      //     return
+      //   }
+      //   if (!this.freightspace1[i].bankDeposit) {
+      //     EventBus.$emit('error', '开户行不能为空')
+      //     return
+      //   }
+      //   if (!this.freightspace1[i].bankDepositBranch) {
+      //     EventBus.$emit('error', '开户支行不能为空')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeName == ''
+      //   ) {
+      //     EventBus.$emit('error', '收款人姓名不能为空')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeNumberCard == ''
+      //   ) {
+      //     EventBus.$emit('error', '收款人身份证号码不能为空')
+      //     return
+      //   }
+      //   if (
+      //     (this.freightspace1[i].accountTypeFlag == 1 &&
+      //       this.freightspace1[i].payeeName.length < 2) ||
+      //     (this.freightspace1[i].accountTypeFlag == 1 &&
+      //       this.freightspace1[i].payeeName.length > 10)
+      //   ) {
+      //     EventBus.$emit('error', '收款人姓名输入错误')
+      //     return
+      //   }
+      //   console.log(this.freightspace1[i].payeeNumberCard != 18)
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeNumberCard.length != 18
+      //   ) {
+      //     EventBus.$emit('error', '收款人身份证号输入错误')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 2 &&
+      //     this.freightspace1[i].compName == ''
+      //   ) {
+      //     EventBus.$emit('error', '企业名称不能为空')
+      //     return
+      //   }
+      //   if (
+      //     (this.freightspace1[i].accountTypeFlag == 2 &&
+      //       this.freightspace1[i].compName.length < 2) ||
+      //     (this.freightspace1[i].accountTypeFlag == 2 &&
+      //       this.freightspace1[i].compName.length > 30)
+      //   ) {
+      //     EventBus.$emit('error', '企业名称输入有误')
+      //     return
+      //   }
+      // }
       // if (!this.addressUrls.travel) {
       // if (!this.addressUrls.travel) {
       //   EventBus.$emit('error', '行驶证不能为空')
       //   EventBus.$emit('error', '行驶证不能为空')
       //   return
       //   return

+ 1 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -860,7 +860,6 @@
               })
               })
               .toPromise()
               .toPromise()
               .then((response) => {
               .then((response) => {
-                console.log(this, response)
                 this.deptBudgetList.tranCarInfoList[index].carNo =
                 this.deptBudgetList.tranCarInfoList[index].carNo =
                   response.carNumber
                   response.carNumber
                 if (response.carLoad != null) {
                 if (response.carLoad != null) {
@@ -877,6 +876,7 @@
                   response.carLengthKey
                   response.carLengthKey
                 this.deptBudgetList.tranCarInfoList[index].carModelKey =
                 this.deptBudgetList.tranCarInfoList[index].carModelKey =
                   response.carModelKey
                   response.carModelKey
+                  this.$forceUpdate()
               })
               })
           }
           }
         }
         }