Merge branch 'dev1.0.3' into dev1.1.0

src/components/Upload/index.vue

@@ -453,7 +453,7 @@ export default {
         const newName = `预览图片${fileType || type}`
         window.open(`#/perview?fileId=${idNum}&absolutePath=${absolutePath}&name=${newName}`)
       } else {
-        window.open(`${process.env.VUE_APP_BASE_API}/fileStorage/preview?fileId=${idNum}&resource=${fileType ? 0 : 1}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/fileStorage/preview?fileId=${idNum}&resource=${fileType ? 0 : 1}#toolbar=0&navpanes=0&scrollbar=0`)
       }
     },
     downloadClick(row) {

src/views/financingManage/components/ContractApprovalContent.vue

@@ -22,7 +22,7 @@
         <el-radio-group v-model="ruleForm.conclusion" :disabled="disabled">
           <el-radio label="pass">通过</el-radio>
           <el-radio label="back">退回</el-radio>
-          <el-radio label="vite">否决</el-radio>
+          <el-radio label="veto">否决</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item

src/views/financingManage/components/ContractConclusion.vue

@@ -6,7 +6,7 @@
         <el-radio-group v-model="ruleForm.conclusion" :disabled="disabled">
           <el-radio label="pass">通过</el-radio>
           <el-radio label="back">退回</el-radio>
-          <el-radio label="vite">否决</el-radio>
+          <el-radio label="veto">否决</el-radio>
         </el-radio-group>
       </el-form-item>
       <template v-if="ruleForm.conclusion === 'pass'">

src/views/financingManage/components/PaymentApproveContent.vue

@@ -6,6 +6,7 @@
         <el-radio-group v-model="ruleForm.approvalConclusion" :disabled="disabled">
           <el-radio label="pass">通过</el-radio>
           <el-radio label="back">退回</el-radio>
+          <el-radio label="veto">否决</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item
@@ -111,7 +112,7 @@
           />
         </el-form-item>
       </template>
-   
+
     </el-form>
   </div>
 </template>
@@ -206,14 +207,14 @@ export default {
           this.$refs.ruleFormFile.validate(valid => {
             if (valid) {
               const receivablesFileIds = this.$refs.receivablesFiles.getFileLists.map(item => item.id)
-             
+
               if (!receivablesFileIds.length) {
                 this.$message.warning('请上传应收账款登记附件')
                 return
               }
               let mortgageFileIds = []
               let ownershipFileIds = []
-              if(this.hasCollateralInfo) {
+              if (this.hasCollateralInfo) {
                 mortgageFileIds = this.$refs.mortgageFiles.getFileLists.map(item => item.id)
                 ownershipFileIds = this.$refs.ownershipFiles.getFileLists.map(item => item.id)
                 if (!mortgageFileIds.length) {
@@ -225,7 +226,7 @@ export default {
                   return
                 }
               }
-           
+
               const params = {
                 ...this.ruleFormFile,
                 receivablesFileIds,

src/views/financingManage/index.vue

@@ -39,6 +39,7 @@
         </div>
         <cy-comm-table
           ref="commTable"
+          :key="tableKey"
           v-loading="loading"
           :columns="columns"
           :data="tableData"
@@ -273,7 +274,8 @@ export default {
           },
           width: 135
         }
-      ]
+      ],
+      tableKey: 1
     }
   },
   computed: {
@@ -440,6 +442,7 @@ export default {
     handleTabClick(tab) {
       this.activeName = tab.name
       this.fetchData('search')
+      this.tableKey += 1
     }
   }
 }

src/views/invoicesManagement/indexTable.js

@@ -92,7 +92,7 @@ export default {
                 icon: 'iconfont icon-xiazai',
                 power: 'downloadAllInvoiceFile',
                 tabPower: ['pending', 'all'],
-                satausPower: ['已开票'],
+                satausPower: ['已开票', '已申请'],
                 category: 'downloadContract'
               }
             ]

src/views/settlementManagement/detail.vue

@@ -54,7 +54,7 @@ export default {
       request({
         url: '/businessProcessingTask/doBusinessHistoryView',
         method: 'get',
-        params: { businessKey: this.$route.query.infoId, businessType: 'BillBasicInformation' }
+        params: { businessKey: this.$route.query.infoId, businessType: 'Bill' }
       }).then(({ data }) => {
         data.forEach(item => {
           if(item.obj) {

src/views/settlementManagement/index.vue

@@ -78,7 +78,7 @@ export default {
       },
       timeAxisParams: {
         businessKey: '',
-        businessType: 'BillBasicInformation'
+        businessType: 'Bill'
       },
       btnPermission: JSON.parse(sessionStorage.getItem('buttons')) || []
     }
@@ -106,7 +106,7 @@ export default {
           status: this.search.status,
           businessNo: this.search.businessNo,
           fastSearch: this.search.fastSearch,
-          simpleClassName: 'BillBasicInformation'
+          simpleClassName: 'Bill'
         },
         data: {
           page: this.page || 1,
@@ -114,7 +114,7 @@ export default {
           status: this.search.status,
           businessNo: this.search.businessNo,
           fastSearch: this.search.fastSearch,
-          simpleClassName: 'BillBasicInformation'
+          simpleClassName: 'Bill'
         }
       }).then(({ records, rows }) => {
         this.tableData = rows || []