Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue

@@ -68,7 +68,7 @@
             <el-col :span="6">
               <div class="span-sty">开票类型默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" class="addinputInfo">
                   <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -76,7 +76,7 @@
             <el-col :span="8">
               <div class="span-sty">开票名称默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo" style="width: 60%">
+                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable class="addinputInfo" style="width: 60%">
                   <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -348,14 +348,21 @@ export default {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         this.formobj.openTickTypeKey = choose[0].dictKey
+        this.formobj.openTickName = ''
+        this.formobj.openTickSid = ''
         if (this.formobj.finBillVehicles.length > 0) {
           for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
             this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
             this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
           }
         }
-      } else {
+        if (this.formobj.finBillVehicles.length > 0) {
-        this.formobj.openTickTypeKey = ''
+          for (var k = 0; k < this.formobj.finBillVehicles.length; k++) {
+            this.formobj.finBillVehicles[k].openTickName = ''
+            this.formobj.finBillVehicles[k].openTickSid = ''
+            this.formobj.finBillVehicles[k].openTickRemarks = ''
+          }
+        }
       }
     },
     changeOpenTick(val) {
@@ -379,16 +386,15 @@ export default {
             }
           }
         }
-      } else {
-        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         row.billTypeKey = choose[0].dictKey
-      } else {
+        row.openTickName = ''
-        row.billTypeKey = ''
+        row.openTickSid = ''
+        row.openTickRemarks = ''
       }
     },
     changeOpenTickName(val, row) {
@@ -407,9 +413,6 @@ export default {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks
         }
-      } else {
-        row.openTickSid = ''
-        row.openTickRemarks = ''
       }
     },
     handleLookByDingDan() {

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue

@@ -174,7 +174,7 @@
 
 <script>
 import { listPageByOrgPathSid, sendFinCustomer } from '@/api/jichuxinxi/crmcustomer'
-import { typeValues, getOrgSidByPath, fetchDetailsByUseOrgSid } from '@/api/dictcommons/dictcommons'
+import { typeValues, getOrgSidByPath, fetchDetailsByUseOrgSid, getButtonPermissions } from '@/api/dictcommons/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -251,7 +251,18 @@ export default {
     }
   },
   mounted() {
-    this.$refs['btnbar'].setButtonList(this.btnList)
+    getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
+      if (res.success) {
+        for (var i = 0; i < res.data.length; i++) {
+          for (var k = 0; k < this.btnList.length; k++) {
+            if (res.data[i].buttonId === this.btnList[k].btnKey) {
+              this.btnList.splice(k, 1)
+            }
+          }
+        }
+        this.$refs['btnbar'].setButtonList(this.btnList)
+      }
+    })
   },
   created() {
     // 初始化变量

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue

@@ -68,7 +68,7 @@
             <el-col :span="6">
               <div class="span-sty">开票类型默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" class="addinputInfo">
                   <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -76,7 +76,7 @@
             <el-col :span="8">
               <div class="span-sty">开票名称默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo" style="width: 60%">
+                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable class="addinputInfo" style="width: 60%">
                   <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -348,14 +348,21 @@ export default {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         this.formobj.openTickTypeKey = choose[0].dictKey
+        this.formobj.openTickName = ''
+        this.formobj.openTickSid = ''
         if (this.formobj.finBillVehicles.length > 0) {
           for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
             this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
             this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
           }
         }
-      } else {
+        if (this.formobj.finBillVehicles.length > 0) {
-        this.formobj.openTickTypeKey = ''
+          for (var k = 0; k < this.formobj.finBillVehicles.length; k++) {
+            this.formobj.finBillVehicles[k].openTickName = ''
+            this.formobj.finBillVehicles[k].openTickSid = ''
+            this.formobj.finBillVehicles[k].openTickRemarks = ''
+          }
+        }
       }
     },
     changeOpenTick(val) {
@@ -379,16 +386,15 @@ export default {
             }
           }
         }
-      } else {
-        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         row.billTypeKey = choose[0].dictKey
-      } else {
+        row.openTickName = ''
-        row.billTypeKey = ''
+        row.openTickSid = ''
+        row.openTickRemarks = ''
       }
     },
     changeOpenTickName(val, row) {
@@ -407,9 +413,6 @@ export default {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks
         }
-      } else {
-        row.openTickSid = ''
-        row.openTickRemarks = ''
       }
     },
     handleLookByDingDan() {

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearscollection.js

@@ -35,7 +35,7 @@ export function fetchDetailsBySid(data) {
 // 开票申请--保存
 export function saveOrUpdate(data) {
   return request({
-    url: 'fin/v1/finbillapplication/saveQKLP',
+    url: '/fin/v1/finbillapplication/saveQKLP',
     data: data,
     method: 'post',
     headers: {

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

@@ -72,7 +72,7 @@
             <el-col :span="6">
               <div class="span-sty">开票类型默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" class="addinputInfo">
                   <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -80,7 +80,7 @@
             <el-col :span="8">
               <div class="span-sty">开票名称默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable class="addinputInfo">
                   <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -485,14 +485,21 @@ export default {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         this.formobj.openTickTypeKey = choose[0].dictKey
+        this.formobj.openTickName = ''
+        this.formobj.openTickSid = ''
         if (this.formobj.finBillVehicles.length > 0) {
           for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
             this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
             this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
           }
         }
-      } else {
+        if (this.formobj.finBillVehicles.length > 0) {
-        this.formobj.openTickTypeKey = ''
+          for (var k = 0; k < this.formobj.finBillVehicles.length; k++) {
+            this.formobj.finBillVehicles[k].openTickName = ''
+            this.formobj.finBillVehicles[k].openTickSid = ''
+            this.formobj.finBillVehicles[k].openTickRemarks = ''
+          }
+        }
       }
     },
     changeOpenTick(val) {
@@ -516,16 +523,15 @@ export default {
             }
           }
         }
-      } else {
-        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         row.billTypeKey = choose[0].dictKey
-      } else {
+        row.openTickName = ''
-        row.billTypeKey = ''
+        row.openTickSid = ''
+        row.openTickRemarks = ''
       }
     },
     changeOpenTickName(val, row) {
@@ -544,9 +550,6 @@ export default {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks
         }
-      } else {
-        row.openTickSid = ''
-        row.openTickRemarks = ''
       }
     },
     changeArrearsOpenYY(val) {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue

@@ -539,6 +539,9 @@ export default {
       this.submitdisabled = false
       this.$refs['form_obj'].resetFields()
       this.image_list1 = []
+      this.image_list2 = []
+      this.image_list3 = []
+      this.image_list4 = []
       this.$emit('doback')
     }
   }

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

@@ -71,7 +71,7 @@
             <el-col :span="6">
               <div class="span-sty">开票类型默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" class="addinputInfo">
                   <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -79,7 +79,7 @@
             <el-col :span="8">
               <div class="span-sty">开票名称默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo" style="width: 60%">
+                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable class="addinputInfo" style="width: 60%">
                   <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -445,14 +445,21 @@ export default {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         this.formobj.openTickTypeKey = choose[0].dictKey
+        this.formobj.openTickName = ''
+        this.formobj.openTickSid = ''
         if (this.formobj.finBillVehicles.length > 0) {
           for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
             this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
             this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
           }
         }
-      } else {
+        if (this.formobj.finBillVehicles.length > 0) {
-        this.formobj.openTickTypeKey = ''
+          for (var k = 0; k < this.formobj.finBillVehicles.length; k++) {
+            this.formobj.finBillVehicles[k].openTickName = ''
+            this.formobj.finBillVehicles[k].openTickSid = ''
+            this.formobj.finBillVehicles[k].openTickRemarks = ''
+          }
+        }
       }
     },
     changeOpenTick(val) {
@@ -476,16 +483,15 @@ export default {
             }
           }
         }
-      } else {
-        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         row.billTypeKey = choose[0].dictKey
-      } else {
+        row.openTickName = ''
-        row.billTypeKey = ''
+        row.openTickSid = ''
+        row.openTickRemarks = ''
       }
     },
     changeOpenTickName(val, row) {
@@ -504,9 +510,6 @@ export default {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks
         }
-      } else {
-        row.openTickSid = ''
-        row.openTickRemarks = ''
       }
     },
     handleLookByDingDan() {

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

@@ -70,7 +70,7 @@
             <el-col :span="6">
               <div class="span-sty">开票类型默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" class="addinputInfo">
                   <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -78,7 +78,7 @@
             <el-col :span="8">
               <div class="span-sty">开票名称默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable class="addinputInfo">
                   <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -108,7 +108,7 @@
             </el-table-column>
             <el-table-column label="开票类型" align="center" width="250">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.billTypeValue" placeholder="请选择" @change="changeBillType($event, scope.row)" clearable>
+                <el-select v-model="scope.row.billTypeValue" placeholder="请选择" @change="changeBillType($event, scope.row)">
                   <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </template>
@@ -466,14 +466,21 @@ export default {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         this.formobj.openTickTypeKey = choose[0].dictKey
+        this.formobj.openTickName = ''
+        this.formobj.openTickSid = ''
         if (this.formobj.finBillVehicles.length > 0) {
           for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
             this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
             this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
           }
         }
-      } else {
+        if (this.formobj.finBillVehicles.length > 0) {
-        this.formobj.openTickTypeKey = ''
+          for (var k = 0; k < this.formobj.finBillVehicles.length; k++) {
+            this.formobj.finBillVehicles[k].openTickName = ''
+            this.formobj.finBillVehicles[k].openTickSid = ''
+            this.formobj.finBillVehicles[k].openTickRemarks = ''
+          }
+        }
       }
     },
     changeOpenTick(val) {
@@ -497,16 +504,15 @@ export default {
             }
           }
         }
-      } else {
-        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         row.billTypeKey = choose[0].dictKey
-      } else {
+        row.openTickName = ''
-        row.billTypeKey = ''
+        row.openTickSid = ''
+        row.openTickRemarks = ''
       }
     },
     changeOpenTickName(val, row) {
@@ -525,9 +531,6 @@ export default {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks
         }
-      } else {
-        row.openTickSid = ''
-        row.openTickRemarks = ''
       }
     },
     handlePreserve() {

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

@@ -69,7 +69,7 @@
             <el-col :span="6">
               <div class="span-sty">开票类型默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" class="addinputInfo">
                   <el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -77,7 +77,7 @@
             <el-col :span="8">
               <div class="span-sty">开票名称默认</div>
               <el-form-item>
-                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
+                <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable class="addinputInfo">
                   <el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -458,14 +458,21 @@ export default {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         this.formobj.openTickTypeKey = choose[0].dictKey
+        this.formobj.openTickName = ''
+        this.formobj.openTickSid = ''
         if (this.formobj.finBillVehicles.length > 0) {
           for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
             this.formobj.finBillVehicles[i].billTypeValue = choose[0].dictValue
             this.formobj.finBillVehicles[i].billTypeKey = choose[0].dictKey
           }
         }
-      } else {
+        if (this.formobj.finBillVehicles.length > 0) {
-        this.formobj.openTickTypeKey = ''
+          for (var k = 0; k < this.formobj.finBillVehicles.length; k++) {
+            this.formobj.finBillVehicles[k].openTickName = ''
+            this.formobj.finBillVehicles[k].openTickSid = ''
+            this.formobj.finBillVehicles[k].openTickRemarks = ''
+          }
+        }
       }
     },
     changeOpenTick(val) {
@@ -489,16 +496,15 @@ export default {
             }
           }
         }
-      } else {
-        this.formobj.openTickSid = ''
       }
     },
     changeBillType(val, row) {
       const choose = this.openTickType_list.filter((item) => item.dictValue === val)
       if (choose !== null && choose.length > 0) {
         row.billTypeKey = choose[0].dictKey
-      } else {
+        row.openTickName = ''
-        row.billTypeKey = ''
+        row.openTickSid = ''
+        row.openTickRemarks = ''
       }
     },
     changeOpenTickName(val, row) {
@@ -517,9 +523,6 @@ export default {
           row.openTickSid = choose[0].sid
           row.openTickRemarks = choose[0].openTickRemarks
         }
-      } else {
-        row.openTickSid = ''
-        row.openTickRemarks = ''
       }
     },
     changeArrearsOpenYY(val) {

anrui-riskcenter-ui/src/views/delinquentcustomerfiling/delinquentcustomerfilingAdd.vue

@@ -188,9 +188,9 @@
             </el-col>
           </el-row>
         </div>
-        <div class="title titleOne">
+        <div class="title" :class="{titleOne:formobj.customerTypeKey === '2'}">
           <div>附件清单</div>
-          <el-button type="primary" class="btntopblueline" size="mini" @click="downLoad('/template/信息查询授权书.pdf')">信息查询授权书模板下载</el-button>
+          <el-button type="primary" v-show="formobj.customerTypeKey === '2'" class="btntopblueline" size="mini" @click="downLoad('/template/信息查询授权书.pdf')">信息查询授权书模板下载</el-button>
         </div>
         <el-row v-show="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '1')">
           <el-col :span="24">

anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingEdit.vue

@@ -187,9 +187,9 @@
             </el-col>
           </el-row>
         </div>
-        <div class="title titleOne">
+        <div class="title" :class="{titleOne:formobj.customerTypeKey === '2'}">
           <div>附件清单</div>
-          <el-button type="primary" class="btntopblueline" size="mini" @click="downLoad('/template/信息查询授权书.pdf')">信息查询授权书模板下载</el-button>
+          <el-button type="primary" v-show="formobj.customerTypeKey === '2'" class="btntopblueline" size="mini" @click="downLoad('/template/信息查询授权书.pdf')">信息查询授权书模板下载</el-button>
         </div>
         <el-row v-show="formobj.customerTypeKey === '2' || (formobj.customerTypeKey === '1' && formobj.isAnchored === '1')">
           <el-col :span="24">