From 0fa58e1d82588cbd0e24bb318bf328a05c6c680b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 11 May 2023 11:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=A0=E6=AC=BE=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arrearsbilling/arrearsbillingAdd.vue           | 14 ++++++++++++--
 .../qiankuankaipiaoFlow/arrearsbillingEdit.vue     | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
index 5d2122be8b..85bb32c643 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
@@ -108,7 +108,7 @@
             </el-table-column>
             <el-table-column label="开票名称" align="center">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" clearable>
+                <el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" filterable>
                   <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </template>
@@ -301,7 +301,7 @@ export default {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.formobj.useOrgSid = res.data
-          selectAllDisList({ orgSid: res.data }).then((resp) => {
+          selectAllDisList({ orgSid: res.data, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
             if (resp.success) {
               this.openTick_list = resp.data
             }
@@ -495,6 +495,16 @@ export default {
             this.$message({ showClose: true, type: 'error', message: '请选择车辆' })
             return
           }
+          for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+            if (this.formobj.finBillVehicles[i].openTickName === '') {
+              this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+              return
+            }
+            if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
+              this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
+              return
+            }
+          }
           this.submitdisabled = true
           submit(this.formobj).then((res) => {
             if (res.success) {
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
index 76bd60dc93..6558a1c263 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
@@ -107,7 +107,7 @@
             </el-table-column>
             <el-table-column label="开票名称" align="center">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" clearable>
+                <el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" filterable>
                   <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </template>
@@ -338,7 +338,7 @@ export default {
               this.moneyEdit = res.data.isEdit
             }
           })
-          selectAllDisList({ orgSid: this.formobj.useOrgSid }).then((resp) => {
+          selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid }).then((resp) => {
             if (resp.success) {
               this.openTick_list = resp.data
             }
@@ -469,6 +469,16 @@ export default {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()
+          for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+            if (this.formobj.finBillVehicles[i].openTickName === '') {
+              this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
+              return
+            }
+            if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
+              this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
+              return
+            }
+          }
           this.submitdisabled = true
           submit(this.formobj).then((res) => {
             if (res.success) {