bug调整

src/views/modules/cw/invoice/InvoiceFormTask.vue

@@ -898,6 +898,15 @@
             throw new Error()
           }
         }
+        if (this.commonJS.isNotEmpty(this.inputForm.financeInvoiceBaseDTOList)) {
+          let i = this.inputForm.financeInvoiceBaseDTOList.length
+          for (let j = 0; j < i; j++) {
+            if (this.commonJS.isEmpty(this.inputForm.financeInvoiceBaseDTOList[j].programName)) {
+              this.$message.error('第' + (j + 1) + '行的基本信息不能为空')
+              throw new Error()
+            }
+          }
+        }
         if (this.inputForm.status === '5') {
           let acc = 0
           this.inputForm.financeInvoiceDetailDTOList.forEach((item, index) => {

src/views/modules/cw/projectRecords/ProjectRecordsList.vue

@@ -83,6 +83,7 @@
               <span v-else style="color: red">暂无合同</span>
             </template>
           </vxe-column>
+          <vxe-column min-width="160" align="center" title="客户名称" field="clientContactsName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理1" field="projectMasterName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理2" field="realHeaderName"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建人" field="createBy.name"></vxe-column>

src/views/modules/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -119,9 +119,9 @@
 
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('cw:cwProjectReport:filed')&&scope.row.createById === $store.state.user.id&&scope.row.status==='5'&& (scope.row.applyFileType === undefined || scope.row.applyFileType === '0')" type="text"  size="small" @click="archived(scope.row.id)">归档</el-button>
+              <el-button v-if="hasPermission('cw:cwProjectReport:filed')&&scope.row.createById === $store.state.user.id&&scope.row.status==='5'&& (scope.row.applyFileType === undefined || scope.row.applyFileType === '0')" type="text"  size="small" @click="archived(scope.row)">归档</el-button>
               <!--归档暂存修改-->
-              <el-button v-if="hasPermission('cw:cwProjectReport:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && scope.row.applyFileType === '1'" type="text" size="small" @click="archived(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('cw:cwProjectReport:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && scope.row.applyFileType === '1'" type="text" size="small" @click="archived(scope.row)">修改</el-button>
               <el-button v-else-if="hasPermission('cw:cwProjectReport:edit')&&isAdmin&&(scope.row.applyFileType==='1'||scope.row.applyFileType==='3'||scope.row.applyFileType==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
               <!--纸质归档撤回驳回修改-->
               <el-button v-if="hasPermission('cw:cwProjectReport:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && (scope.row.applyFileType === '3' )" type="text" size="small" @click="paperFiledAndClose(scope.row.id)">修改</el-button>
@@ -456,15 +456,15 @@
         })
       } */
       // 报告作废归档
-      archived (id) {
+      archived (row) {
         this.processService.getByName('会计-报告作废归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             // console.log('data', data)
             // 读取流程表单
-            let tabTitle = `发起流程【会计-报告作废归档】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报告作废归档]`
+            let tabTitle = ' ' + row.reportNo + ' - ' + row.projectName
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ` + tabTitle + '[会计-报告作废归档]'
             this.taskService.getTaskDef({ procDefId: data.id,
-              businessId: id,
+              businessId: row.id,
               businessTable: 'cw_project_report_cancell_apply_archived',
               status: 'startAndHoldFiled'}).then((reture) => {
                 this.$router.push({
@@ -479,7 +479,7 @@
                     formUrl: reture.data.formUrl,
                     formTitle: processTitle,
                     businessTable: 'cw_project_report_cancell_apply_archived',
-                    businessId: id,
+                    businessId: row.id,
                     isShow: false,
                     routePath: '/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList'
                   }

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -124,6 +124,7 @@
           </vxe-column>
           <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目名称" field="projectName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="客户名称" field="servedUnitName"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告文号" field="reportNo"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理" field="projectMasterName"></vxe-column>
@@ -566,8 +567,8 @@
       pushF (row) {
         // console.log('row', row)
         // 读取流程表单
-        let title = `发起流程【会计-报告复核】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[会计-报告复核]`
+        let title = ' ' + row.documentNo + ' - ' + row.projectName
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了` + title + '[会计-报告复核]'
         let status = 'startAndClose'
         if (row.reviewStatus === '3') {
           status = 'startAndClose'

src/views/modules/cw/reportManagement/ReportServiceUnitForm.vue

@@ -11,6 +11,20 @@
       @keyup.enter.native="getWorkClient"
       :visible.sync="visibleChoose">
       <div style="height: calc(100%);">
+        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
+          <!-- 搜索框-->
+          <el-form-item label="客户名称" prop="name">
+            <el-input size="small" v-model="searchForm.name" placeholder="请输入客户名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="客户编号" prop="no">
+            <el-input size="small" v-model="searchForm.no" placeholder="请输入客户编号" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
 
         <vxe-table
           border="inner"
@@ -141,11 +155,11 @@
         this.list()
       },
       resetSearch () {
-        // this.$refs.searchForm.resetFields()
+        this.$refs.searchForm.resetFields()
         this.list()
       },
       close () {
-        // this.$refs.searchForm.resetFields()
+        this.$refs.searchForm.resetFields()
         this.visibleChoose = false
       }
     }

src/views/modules/cw/workContract/ContractRegistration.vue

@@ -129,6 +129,7 @@
             </template>
           </vxe-column>
           <vxe-column min-width="150" align="center" title="合同编号" field="contractNo"></vxe-column>
+          <vxe-column min-width="150" align="center" title="客户名称" field="clientContactsName"></vxe-column>
           <vxe-column min-width="150" align="center" title="案卷号" field="filedNo"></vxe-column>
           <vxe-column min-width="150" align="center" title="签约日期" field="signingDate"></vxe-column>
           <vxe-column min-width="150" align="center" title="合同金额(元)" field="contractAmount"></vxe-column>
@@ -175,15 +176,15 @@
               <!--归档撤回-->
 <!--              <el-button v-if="hasPermission('cw:workContract:back') && scope.row.status === '5' && scope.row.filedType === '2'" type="text"  size="small" @click="rebackFiled(scope.row)">撤回</el-button>-->
               <!--合同借用-->
-              <el-button v-if="hasPermission('cw:workContract:borrow') && scope.row.status === '5' && scope.row.filedPaperType === '5' && (scope.row.borrowType === undefined || scope.row.borrowType === '0' || scope.row.borrowType === '1')" type="text" size="small" @click="borrow(scope.row.id)">借用</el-button>
+              <el-button v-if="hasPermission('cw:workContract:borrow') && scope.row.status === '5' && scope.row.filedPaperType === '5' && (scope.row.borrowType === undefined || scope.row.borrowType === '0' || scope.row.borrowType === '1')" type="text" size="small" @click="borrow(scope.row)">借用</el-button>
               <!--借用撤回-->
               <el-button v-if="hasPermission('cw:workContract:back') && scope.row.status === '5' && scope.row.filedPaperType === '5' && scope.row.borrowType === '2'" type="text" size="small" @click="rebackBorrow(scope.row)">撤回借用申请</el-button>
               <!--借用归还-->
               <el-button v-if="hasPermission('cw:workContract:reture') && scope.row.status === '5' && scope.row.filedPaperType === '5'  && scope.row.borrowType === '5'" type="text" size="small" @click="retureBorrow(scope.row)">归还合同</el-button>
 
-              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && (scope.row.filedPaperType === '0' || scope.row.filedPaperType === undefined)" type="text" size="small" @click="paperFiled(scope.row.id)">纸质归档</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && (scope.row.filedPaperType === '0' || scope.row.filedPaperType === undefined)" type="text" size="small" @click="paperFiled(scope.row)">纸质归档</el-button>
               <!--纸质归档暂存修改-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && scope.row.filedPaperType === '1'" type="text" size="small" @click="paperFiled(scope.row.id)">纸质归档</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && scope.row.filedPaperType === '1'" type="text" size="small" @click="paperFiled(scope.row)">纸质归档</el-button>
               <!--纸质归档撤回驳回修改-->
               <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5'  && scope.row.createId === $store.state.user.id && (scope.row.filedPaperType === '3')" type="text" size="small" @click="paperFiledAndClose(scope.row.id)">纸质归档</el-button>
               <!--纸质归档撤回-->
@@ -683,15 +684,15 @@
         }
       }, */
       // 借用
-      borrow (id) {
+      borrow (row) {
         this.processService.getByName('会计-合同借用').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             // console.log('data', data)
             // 读取流程表单
-            let tabTitle = `发起流程【会计-合同借用】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-合同借用]`
+            let tabTitle = ' ' + row.contractNo + ' - ' + row.contractName
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ` + tabTitle + '[会计-合同借用]'
             this.taskService.getTaskDef({ procDefId: data.id,
-              businessId: id,
+              businessId: row.id,
               businessTable: 'cw_work_contract_borrow',
               status: 'startAndCloseBorrow'}).then((reture) => {
                 this.$router.push({
@@ -705,7 +706,7 @@
                     formUrl: reture.data.formUrl,
                     formTitle: processTitle,
                     businessTable: 'cw_work_contract_borrow',
-                    businessId: id,
+                    businessId: row.id,
                     isShow: false,
                     routePath: '/cw/workContract/ContractRegistration'
                   }
@@ -756,15 +757,16 @@
         })
       },
       // 纸质归档
-      paperFiled (id) {
+      paperFiled (row) {
+        console.log('row', row)
         this.processService.getByName('会计-合同纸质归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             // console.log('data', data)
             // 读取流程表单
-            let tabTitle = `发起流程【会计-合同纸质归档】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-合同纸质归档]`
+            let tabTitle = ' ' + row.contractNo + ' - ' + row.contractName
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ` + tabTitle + '[会计-合同纸质归档]'
             this.taskService.getTaskDef({ procDefId: data.id,
-              businessId: id,
+              businessId: row.id,
               businessTable: 'cw_work_contract_file_paper',
               status: 'startAndHoldFiled'}).then((reture) => {
                 this.$router.push({
@@ -779,7 +781,7 @@
                     formUrl: reture.data.formUrl,
                     formTitle: processTitle,
                     businessTable: 'cw_work_contract_file_paper',
-                    businessId: id,
+                    businessId: row.id,
                     isShow: false,
                     routePath: '/cw/workContract/ContractRegistration'
                   }

src/views/modules/finance/invoice/InvoiceFormTask.vue

@@ -874,6 +874,15 @@
             throw new Error()
           }
         }
+        if (this.commonJS.isNotEmpty(this.inputForm.financeInvoiceBaseDTOList)) {
+          let i = this.inputForm.financeInvoiceBaseDTOList.length
+          for (let j = 0; j < i; j++) {
+            if (this.commonJS.isEmpty(this.inputForm.financeInvoiceBaseDTOList[j].programName)) {
+              this.$message.error('第' + (j + 1) + '行的基本信息不能为空')
+              throw new Error()
+            }
+          }
+        }
         if (this.inputForm.status === '5') {
           let acc = 0
           this.inputForm.financeInvoiceDetailDTOList.forEach((item, index) => {