From bb6c5edc477b7e22da4262e196ca11c088718eda Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 23 Nov 2023 16:14:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93=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

---
 .../chukuguanli/chukubanli/chukushenqingAdd.vue     |  9 +++++++--
 .../chukuguanli/chukubanli/daichukucheliang.vue     | 13 ++++++++++---
 .../chukuguanliFlow/chukuguanli/chukuEdit.vue       |  9 +++++++--
 .../chukuguanliFlow/chukuguanli/daichuku.vue        | 13 ++++++++++---
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
index fbab0fc39e..d98b4d9b69 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
@@ -201,7 +201,7 @@
               <div class="span-sty">是否开票</div>
               <el-form-item>
                 <div style="display: flex;flex-direction: row;justify-content: space-around;align-items: center">
-                  <el-radio-group class="addinputInfo" v-model="formobj.hasInvoice" style="font-size: 1px" @change="hasInvoiceChange">
+                  <el-radio-group class="addinputInfo" :disabled="formobj.paymentMethodKey == '2'" v-model="formobj.hasInvoice" style="font-size: 1px" @change="hasInvoiceChange">
                     <el-radio label="是">是</el-radio>
                     <el-radio label="否">否</el-radio>
                   </el-radio-group>
@@ -363,7 +363,7 @@ export default {
     // 选择待出库车辆
     handleChoose() {
       this.viewState = 2
-      this.$refs['divSelect'].showData(this.formobj.carList, this.formobj.contractId)
+      this.$refs['divSelect'].showData(this.formobj.carList, this.formobj.contractId, this.formobj.loanSid)
     },
     // 删除车辆信息
     handleDel(index) {
@@ -394,6 +394,11 @@ export default {
         getRetrievalApplyInfo(this.arguments).then((resp) => {
           if (resp.success) {
             this.formobj = resp.data
+            // 出库开票为贷款业务时，是否开票默认为否且不能修改
+            if (this.formobj.paymentMethodKey === '2') {
+              this.formobj.hasInvoice = '否'
+              this.formobj.hasInvoiceKey = '0'
+            }
             this.formobj.userSid = window.sessionStorage.getItem('userSid')
             selectCustomerList({ staffSid: this.formobj.pcStaffSid, userSid: '', orgPath: '' }).then((resp) => {
               if (resp.success) {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/daichukucheliang.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/daichukucheliang.vue
index c8cb87571c..1889db1afb 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/daichukucheliang.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/daichukucheliang.vue
@@ -45,6 +45,11 @@
               <span>{{ scope.row.contractNo }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="贷款人" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.loanName }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="客户名称" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.name }}</span>
@@ -114,6 +119,7 @@ export default {
         total: 0,
         params: {
           contractNo: '', // 合同编号
+          loanSid: '',
           name: '', // 客户名称
           vinNo: '', // 车架号
           userSid: '',
@@ -140,13 +146,14 @@ export default {
           break
       }
     },
-    showData(value, contractNo) {
+    showData(value, contractNo, loanSid) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
           aa.push(value[i].vinSid)
         }
         this.listQuery.params.contractNo = contractNo
+        this.listQuery.params.loanSid = loanSid
         this.listQuery.params.vinSid = aa
       } else {
         this.listQuery.params.vinSid = []
@@ -222,10 +229,10 @@ export default {
         this.FormLoading = true
         for (var i = 0; i < this.multipleSelection.length; i++) {
           for (var j = i + 1; j < this.multipleSelection.length; j++) {
-            if (this.multipleSelection[i].contractNo !== this.multipleSelection[j].contractNo) {
+            if (this.multipleSelection[i].contractNo !== this.multipleSelection[j].contractNo && this.multipleSelection[i].loanSid !== this.multipleSelection[j].loanSid) {
               this.$message({
                 showClose: true,
-                message: '请选择同一合同编号的车辆！',
+                message: '请选择同一合同编号且同一贷款人的车辆！',
                 type: 'error'
               })
               return
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
index c60b41750f..433e5d35e2 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
@@ -200,7 +200,7 @@
               <div class="span-sty">是否开票</div>
               <el-form-item>
                 <div style="display: flex;flex-direction: row;justify-content: space-around;align-items: center">
-                  <el-radio-group class="addinputInfo" v-model="formobj.hasInvoice" style="font-size: 1px" @change="hasInvoiceChange">
+                  <el-radio-group class="addinputInfo" :disabled="formobj.paymentMethodKey == '2'" v-model="formobj.hasInvoice" style="font-size: 1px" @change="hasInvoiceChange">
                     <el-radio label="是">是</el-radio>
                     <el-radio label="否">否</el-radio>
                   </el-radio-group>
@@ -365,7 +365,7 @@ export default {
     // 选择待出库车辆
     handleChoose() {
       this.viewState = 2
-      this.$refs['divSelect'].showData(this.formobj.carList, this.formobj.contractId)
+      this.$refs['divSelect'].showData(this.formobj.carList, this.formobj.contractId, this.formobj.loanSid)
     },
     // 删除车辆信息
     handleDel(index) {
@@ -397,6 +397,11 @@ export default {
           if (resp.success) {
             this.formobj = resp.data
             this.formobj.userSid = window.sessionStorage.getItem('userSid')
+            // 出库开票为贷款业务时，是否开票默认为否且不能修改
+            if (this.formobj.paymentMethodKey === '2') {
+              this.formobj.hasInvoice = '否'
+              this.formobj.hasInvoiceKey = '0'
+            }
             selectCustomerList({ staffSid: this.formobj.pcStaffSid, userSid: '', orgPath: '' }).then((resp) => {
               if (resp.success) {
                 this.customer_list = resp.data
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue
index 3b4aee189b..dcea333a5e 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/daichuku.vue
@@ -45,6 +45,11 @@
               <span>{{ scope.row.contractNo }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="贷款人" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.loanName }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="客户名称" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.name }}</span>
@@ -114,6 +119,7 @@ export default {
         total: 0,
         params: {
           contractNo: '', // 合同编号
+          loanSid: '',
           name: '', // 客户名称
           vinNo: '', // 车架号
           userSid: '',
@@ -140,13 +146,14 @@ export default {
           break
       }
     },
-    showData(value, contractNo) {
+    showData(value, contractNo, loanSid) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
           aa.push(value[i].vinSid)
         }
         this.listQuery.params.contractNo = contractNo
+        this.listQuery.params.loanSid = loanSid
         this.listQuery.params.vinSid = aa
       } else {
         this.listQuery.params.vinSid = []
@@ -222,10 +229,10 @@ export default {
         this.FormLoading = true
         for (var i = 0; i < this.multipleSelection.length; i++) {
           for (var j = i + 1; j < this.multipleSelection.length; j++) {
-            if (this.multipleSelection[i].contractNo !== this.multipleSelection[j].contractNo) {
+            if (this.multipleSelection[i].contractNo !== this.multipleSelection[j].contractNo && this.multipleSelection[i].loanSid !== this.multipleSelection[j].loanSid) {
               this.$message({
                 showClose: true,
-                message: '请选择同一合同编号的车辆！',
+                message: '请选择同一合同编号且同一贷款人的车辆！',
                 type: 'error'
               })
               return