功能优化调整

src/utils/index.js

@@ -324,6 +324,9 @@ export function pickProperties(to, source) {
 }
 
 export function downloadExcel(data, filename) {
+	if(filename.indexOf(".xls") === -1){
+		filename = filename + ".xls"
+	}
 	var blob = new Blob([data], {
 		type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
 	}); // application/vnd.openxmlformats-officedocument.spreadsheetml.sheet这里表示xlsx类型

src/utils/validateXG.js

@@ -36,7 +36,7 @@ export function isPhoneOrMobile (str) {
  */
 export function isBankNumber (str) {
   // const bankNumber = /^([1-9]{1})(\d{15}|\d{18})$/
-  const bankNumber = /^[1-9]\d{0,19}$/
+  const bankNumber = /^[1-9]\d{0,25}$/
   return bankNumber.test(str)
 }
 

src/views/cw/invoice/InvoiceForm.vue

@@ -48,6 +48,11 @@
 						  <el-input :readonly="true" :disabled="method==='view'" placeholder="请填写项目编号" v-model="scope.row.programNo"/>
 					  </template>
 				  </vxe-table-column>
+				  <vxe-table-column field="reportNo" title="报告号" :edit-render="{}">
+					  <template v-slot:edit="scope">
+						  <el-input :readonly="true" :disabled="method==='view'" v-model="scope.row.reportNo" placeholder="请填写报告号"/>
+					  </template>
+				  </vxe-table-column>
 				  <vxe-table-column   field="account" align="center" title="发票金额(元)" :edit-render="{}">
 					  <template v-slot:edit="scope">
 						  <el-input
@@ -70,11 +75,6 @@
 				  <!--                <el-input :readonly="true" placeholder="请填写委托方" v-model="scope.row.clientName"/>-->
 				  <!--              </template>-->
 				  <!--            </vxe-table-column>-->
-				              <vxe-table-column field="reportNo" title="报告号" :edit-render="{}">
-				                <template v-slot:edit="scope">
-				                  <el-input :readonly="true" :disabled="method==='view'" v-model="scope.row.reportNo" placeholder="请填写报告号"/>
-				                </template>
-				              </vxe-table-column>
 				  <vxe-table-column title="操作" width="100">
 					  <template v-slot="scope">
 						  <el-button type="danger" :disabled="method==='view'" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
@@ -268,7 +268,7 @@
             </el-form-item>
           </el-col>
 			<el-col :span="12">
-				<el-form-item label="发票金额(元)" prop="accountTotal"
+				<el-form-item label="发票金额(元)" prop="account"
 							  :rules="[
                         {required: true, message:'发票金额不能为空', trigger:'blur'}
                ]">
@@ -276,7 +276,7 @@
 						@input="fixedAccount"
 						placeholder="请填写发票金额"
 						maxlength="15"
-						v-model="inputForm.accountTotal"
+						v-model="inputForm.account"
 						:disabled="true"
 					>
 

src/views/cw/invoice/InvoiceList.vue

@@ -191,7 +191,7 @@
 			  ></vxe-button>
 		  </template>
       </vxe-toolbar>
-      <div style="height: calc(100% - 80px)">
+      <div style="height: calc(100% - 90px)">
         <vxe-table
           border="inner"
           auto-resize

src/views/cw/invoice/InvoiceUpdateForm.vue

@@ -966,8 +966,8 @@
         await financeInvoiceService.queryById(this.inputForm.id).then((data) => {
           if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
             this.loading = false
-            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
-            throw new Error()
+            /*this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error()*/
           } else {
             this.doSubmit('agree', callback)
           }

src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -113,13 +113,13 @@
                       @getValue="(value) => {inputForm.officeId=value}"/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <!--<el-col :span="12">
                   <el-form-item label="业务类型" prop="businessTypeName"
 								:rules="[
                                 {required: true, message:'业务类型不能为空', trigger:'blur'}]">
                     <el-input :readonly="true" @focus="openBusinessTypeForm" v-model="inputForm.businessTypeName" placeholder="请填写业务类型" clearable></el-input>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
                 <el-col :span="12">
                   <el-form-item label="风险等级" prop="riskLevel"
                                 :rules="[
@@ -170,6 +170,7 @@
                 <el-col :span="12">
                   <el-form-item label="审计期间" prop="auditYear"
                                 :rules="[
+                                	{required: true, message:'项目规模不能为空', trigger:'blur'}
                    ]">
                     <el-date-picker
                       v-model="inputForm.auditYear"
@@ -617,7 +618,7 @@
               this.inputForm.projectLeaderId = this.$store.state.user.id
             }
             if (this.commonJS.isEmpty(this.inputForm.projectMoney)) {
-              this.inputForm.projectMoney = 0
+              this.inputForm.projectMoney = ''
             }
             this.loading = false
           })

src/views/cw/projectRecords/ProjectRecordsForm.vue

@@ -139,6 +139,7 @@
                 <el-col :span="12">
                   <el-form-item label="项目规模(元)" prop="projectMoney"
                                 :rules="[
+                                	{required: true, message:'项目规模不能为空', trigger:'blur'}
                    ]">
                     <el-input-number
                       v-model="inputForm.projectMoney"

src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -92,7 +92,7 @@
                     filename: `项目数据${moment(new Date()).format('YYYY-MM-DD')}`,
                     sheetName: `项目数据${moment(new Date()).format('YYYY-MM-DD')}`,
                     exportMethod: exportMethod,
-                    types: ['xlsx'],
+                    types: ['xls'],
                     modes: ['current', 'selected', 'all']
                   }"
           :data="dataList"
@@ -454,7 +454,7 @@
         }
         return projectRecordsService.exportFile(params).then((res) => {
           // 将二进制流文件写入excel表，以下为重要步骤
-          this.$utils.downloadExcel(res, options.filename)
+          this.$utils.downloadExcel(res, options.filename + '.xls')
         }).catch(function (err) {
           if (err.response) {
             console.log(err.response)

src/views/flowable/task/NoticePageList.vue

@@ -153,7 +153,7 @@
             this.inputForm.noticeId = row.noticeName
             noticeService.update(this.inputForm)
             this.$router.push({
-              path: '/flowable/task/TaskForm',
+              path: '/flowable/task/TaskFormDetail',
               query: {
                 isShow: false,
                 formReadOnly: true,

src/views/program/registered/ProjectArchiveFormDialog.vue

@@ -754,8 +754,8 @@
       async agreeForm (callback) {
         await this.programProjectListInfoService.findByIdArchive(this.inputForm.id).then((data) => {
           if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
-            this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
-            throw new Error()
+            /*this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
+            throw new Error()*/
           } else {
             this.doSubmit('agree', callback)
           }