Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@@ -497,33 +497,66 @@ export default {
     },
     changeOpenTickType(val) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
-      this.formobj.openTickTypeKey = choose[0].dictKey
+      if (choose !== null && choose.length > 0) {
-      if (this.formobj.finBillVehicles.length > 0) {
+        this.formobj.openTickTypeKey = choose[0].dictKey
-        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles.length > 0) {
-          this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+          for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
-          this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+            this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+            this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+          }
         }
+      } else {
+        this.formobj.openTickTypeKey = ''
       }
     },
     changeOpenTick(val) {
+      if (this.formobj.openTickTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
+        return
+      }
       const choose = this.openTick_list.filter((item) => item.name === val)
-      this.formobj.openTickSid = choose[0].sid
+      if (choose !== null && choose.length > 0) {
-      if (this.formobj.finBillVehicles.length > 0) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
-        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+          this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
-          this.formobj.finBillVehicles[i].openTickName = choose[0].name
+        } else {
-          this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+          this.formobj.openTickSid = choose[0].sid
-          this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+          if (this.formobj.finBillVehicles.length > 0) {
+            for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+              this.formobj.finBillVehicles[i].openTickName = choose[0].name
+              this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+              this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+            }
+          }
         }
+      } else {
+        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
-      row.billTypeKey = choose[0].dictKey
+      if (choose !== null && choose.length > 0) {
+        row.billTypeKey = choose[0].dictKey
+      } else {
+        row.billTypeKey = ''
+      }
     },
     changeOpenTickName(val, row) {
+      if (row.billTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
+        return
+      }
       const choose = this.openTick_list.filter((item) => item.name === val)
-      row.openTickSid = choose[0].sid
+      if (choose !== null && choose.length > 0) {
-      row.openTickRemarks = choose[0].openTickRemarks
+        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+          this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+        } else {
+          row.openTickSid = choose[0].sid
+          row.openTickRemarks = choose[0].openTickRemarks
+        }
+      } else {
+        row.openTickSid = ''
+        row.openTickRemarks = ''
+      }
     },
     changeArrearsOpenYY(val) {
       const choose = this.arrearsOpenYY_list.filter((item) => item.dictValue === val)

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue

@@ -50,7 +50,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票单位</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
             </el-col>
@@ -443,33 +443,66 @@ export default {
     },
     changeOpenTickType(val) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
-      this.formobj.openTickTypeKey = choose[0].dictKey
+      if (choose !== null && choose.length > 0) {
-      if (this.formobj.finBillVehicles.length > 0) {
+        this.formobj.openTickTypeKey = choose[0].dictKey
-        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles.length > 0) {
-          this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+          for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
-          this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+            this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+            this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+          }
         }
+      } else {
+        this.formobj.openTickTypeKey = ''
       }
     },
     changeOpenTick(val) {
+      if (this.formobj.openTickTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
+        return
+      }
       const choose = this.openTick_list.filter((item) => item.name === val)
-      this.formobj.openTickSid = choose[0].sid
+      if (choose !== null && choose.length > 0) {
-      if (this.formobj.finBillVehicles.length > 0) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
-        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+          this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
-          this.formobj.finBillVehicles[i].openTickName = choose[0].name
+        } else {
-          this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+          this.formobj.openTickSid = choose[0].sid
-          this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+          if (this.formobj.finBillVehicles.length > 0) {
+            for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+              this.formobj.finBillVehicles[i].openTickName = choose[0].name
+              this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+              this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+            }
+          }
         }
+      } else {
+        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
-      row.billTypeKey = choose[0].dictKey
+      if (choose !== null && choose.length > 0) {
+        row.billTypeKey = choose[0].dictKey
+      } else {
+        row.billTypeKey = ''
+      }
     },
     changeOpenTickName(val, row) {
+      if (row.billTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
+        return
+      }
       const choose = this.openTick_list.filter((item) => item.name === val)
-      row.openTickSid = choose[0].sid
+      if (choose !== null && choose.length > 0) {
-      row.openTickRemarks = choose[0].openTickRemarks
+        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+          this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+        } else {
+          row.openTickSid = choose[0].sid
+          row.openTickRemarks = choose[0].openTickRemarks
+        }
+      } else {
+        row.openTickSid = ''
+        row.openTickRemarks = ''
+      }
     },
     handleLookByDingDan() {
       this.viewState = 2
@@ -684,4 +717,17 @@ export default {
 .addinputw {
   margin-left: 90px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyInfo.vue

@@ -48,7 +48,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票单位</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
             </el-col>
@@ -70,7 +70,7 @@
               <div class="span-sty">开票类型默认</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickTypeValue }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票名称默认</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
@@ -298,4 +298,17 @@ export default {
 .addinputInfo {
   margin-left: 90px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue

@@ -50,7 +50,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票单位</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
             </el-col>
@@ -72,7 +72,7 @@
               <div class="span-sty">开票类型默认</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickTypeValue }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票名称默认</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
@@ -621,4 +621,17 @@ export default {
 .addinputInfo {
   margin-left: 90px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue

@@ -50,7 +50,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票单位</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
             </el-col>
@@ -72,7 +72,7 @@
               <div class="span-sty">开票类型默认</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickTypeValue }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票名称默认</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
@@ -543,4 +543,17 @@ export default {
 .addinputInfo {
   margin-left: 90px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue

@@ -49,7 +49,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票单位</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
             </el-col>
@@ -464,33 +464,66 @@ export default {
     },
     changeOpenTickType(val) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
-      this.formobj.openTickTypeKey = choose[0].dictKey
+      if (choose !== null && choose.length > 0) {
-      if (this.formobj.finBillVehicles.length > 0) {
+        this.formobj.openTickTypeKey = choose[0].dictKey
-        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles.length > 0) {
-          this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+          for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
-          this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+            this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+            this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+          }
         }
+      } else {
+        this.formobj.openTickTypeKey = ''
       }
     },
     changeOpenTick(val) {
+      if (this.formobj.openTickTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
+        return
+      }
       const choose = this.openTick_list.filter((item) => item.name === val)
-      this.formobj.openTickSid = choose[0].sid
+      if (choose !== null && choose.length > 0) {
-      if (this.formobj.finBillVehicles.length > 0) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
-        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+          this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
-          this.formobj.finBillVehicles[i].openTickName = choose[0].name
+        } else {
-          this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+          this.formobj.openTickSid = choose[0].sid
-          this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+          if (this.formobj.finBillVehicles.length > 0) {
+            for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+              this.formobj.finBillVehicles[i].openTickName = choose[0].name
+              this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+              this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+            }
+          }
         }
+      } else {
+        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
-      row.billTypeKey = choose[0].dictKey
+      if (choose !== null && choose.length > 0) {
+        row.billTypeKey = choose[0].dictKey
+      } else {
+        row.billTypeKey = ''
+      }
     },
     changeOpenTickName(val, row) {
+      if (row.billTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
+        return
+      }
       const choose = this.openTick_list.filter((item) => item.name === val)
-      row.openTickSid = choose[0].sid
+      if (choose !== null && choose.length > 0) {
-      row.openTickRemarks = choose[0].openTickRemarks
+        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+          this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+        } else {
+          row.openTickSid = choose[0].sid
+          row.openTickRemarks = choose[0].openTickRemarks
+        }
+      } else {
+        row.openTickSid = ''
+        row.openTickRemarks = ''
+      }
     },
     handlePreserve() {
       this.viewState = 3
@@ -646,4 +679,17 @@ export default {
 .addinputw {
   margin-left: 90px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue

@@ -48,7 +48,7 @@
               <div class="span-sty">合同编号</div>
               <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票单位</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
             </el-col>
@@ -70,7 +70,7 @@
               <div class="span-sty">开票类型默认</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickTypeValue }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" class="tlineheightb">
               <div class="span-sty">开票名称默认</div>
               <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
@@ -417,4 +417,17 @@ export default {
 .addinputInfo {
   margin-left: 90px !important;
 }
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@@ -469,33 +469,66 @@ export default {
     },
     changeOpenTickType(val) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
-      this.formobj.openTickTypeKey = choose[0].dictKey
+      if (choose !== null && choose.length > 0) {
-      if (this.formobj.finBillVehicles.length > 0) {
+        this.formobj.openTickTypeKey = choose[0].dictKey
-        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+        if (this.formobj.finBillVehicles.length > 0) {
-          this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+          for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
-          this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+            this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
+            this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
+          }
         }
+      } else {
+        this.formobj.openTickTypeKey = ''
       }
     },
     changeOpenTick(val) {
+      if (this.formobj.openTickTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
+        return
+      }
       const choose = this.openTick_list.filter((item) => item.name === val)
-      this.formobj.openTickSid = choose[0].sid
+      if (choose !== null && choose.length > 0) {
-      if (this.formobj.finBillVehicles.length > 0) {
+        if (choose[0].openTickTypeValue !== this.formobj.openTickTypeValue) {
-        for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+          this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
-          this.formobj.finBillVehicles[i].openTickName = choose[0].name
+        } else {
-          this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+          this.formobj.openTickSid = choose[0].sid
-          this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+          if (this.formobj.finBillVehicles.length > 0) {
+            for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
+              this.formobj.finBillVehicles[i].openTickName = choose[0].name
+              this.formobj.finBillVehicles[i].openTickSid = choose[0].sid
+              this.formobj.finBillVehicles[i].openTickRemarks = choose[0].openTickRemarks
+            }
+          }
         }
+      } else {
+        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
-      row.billTypeKey = choose[0].dictKey
+      if (choose !== null && choose.length > 0) {
+        row.billTypeKey = choose[0].dictKey
+      } else {
+        row.billTypeKey = ''
+      }
     },
     changeOpenTickName(val, row) {
+      if (row.billTypeValue === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择开票类型' })
+        return
+      }
       const choose = this.openTick_list.filter((item) => item.name === val)
-      row.openTickSid = choose[0].sid
+      if (choose !== null && choose.length > 0) {
-      row.openTickRemarks = choose[0].openTickRemarks
+        if (choose[0].openTickTypeValue !== row.billTypeValue) {
+          this.$message({ showClose: true, type: 'error', message: '因开票信息与所选开票类型不符，请维护开票信息' })
+        } else {
+          row.openTickSid = choose[0].sid
+          row.openTickRemarks = choose[0].openTickRemarks
+        }
+      } else {
+        row.openTickSid = ''
+        row.openTickRemarks = ''
+      }
     },
     changeArrearsOpenYY(val) {
       const choose = this.arrearsOpenYY_list.filter((item) => item.dictValue === val)