签字注师调整

src/api/sys/OSSService.js

@@ -60,8 +60,8 @@ export const client = new OSS({
   region: 'oss-cn-hangzhou', // oss地址
   accessKeyId: 'LTAI5tQDWoM9c1WyJNPs86rX', // 通过阿里云控制台创建的AccessKey ID。
   accessKeySecret: '84dDIx4edT1n78KUOqqSmDZ35pchJv', // 通过阿里云控制台创建的AccessKey Secret。
-  // bucket: 'xgxm-test', // 仓库名字
-  bucket: 'xg-pg', // 仓库名字
+  bucket: 'xgxm-test', // 仓库名字
+	// bucket: 'xg-pg', // 仓库名字
   useFetch: true, // 支持上传大于100KB的文件
   secure: false // 返回的url为https
 })

src/views/cw/invoice/ProgramPageForm.vue

@@ -12,7 +12,7 @@
       <div v-if="isShow">
         <el-radio v-model="checkType" label="1" style="margin-right: 20px">项目</el-radio>
         <el-radio v-model="checkType" label="2" style="margin-right: 20px">报告</el-radio>
-	    <el-radio v-model="checkType" label="3" style="margin-right: 20px">其他</el-radio>
+	    <el-radio v-model="checkType" v-if="hasPermission('cw_finance:invoice:add:report')" label="3" style="margin-right: 20px">其他</el-radio>
       </div>
 		<!--报告        -->
 		<div v-if="checkType === '2'">

src/views/cw/reportManagement/ReportManagementList.vue

@@ -438,7 +438,6 @@
           'orders': this.tablePage.orders,
           ...this.searchForm
         }).then((data) => {
-        	console.log('data',data.records)
           projectRecordsService.getHaveProjectIds().then((data) => {
             if (this.commonJS.isNotEmpty(data)) {
               this.haveProjectIds = data.map(i => {

src/views/cw/reportManagement/ReportSignatureForm.vue

@@ -467,6 +467,21 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
+
+					<el-divider content-position="left"><i class="el-icon-document"></i>修改原因</el-divider>
+					<el-form :class="method==='view'?'readonly':''">
+						<el-row :gutter="15">
+							<el-col style="margin-top: 15px">
+								<el-form-item label="修改原因" prop="sigReason"
+											  :rules="[
+							  {required: true, message:'修改原因不能为空', trigger:'blur'}
+                   ]">
+									<el-input type="textarea" :disabled="status === 'audit' || status === 'taskFormDetail'" v-model="inputForm.sigReason" placeholder="请填写修改签字注师原因" clearable></el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+
 					<el-divider content-position="left"><i class="el-icon-document"></i>一级复核</el-divider>
 					<el-row :gutter="15" >
 						<vxe-table

src/views/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -1113,27 +1113,42 @@
             this.inputForm.detailFor1010.forEach(item => { this.inputForm.details.push(item) })
             this.inputForm.detailFor1020.forEach(item => { this.inputForm.details.push(item) })
             this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
-			  //根据签字注师1的人员id去查是否超过了100次
-			  userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
-				  if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
-					  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+			  if (status === 'agree') {
+				  this.reportReviewService.save(this.inputForm).then((data) => {
+					  this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+					  console.log('this.inputForm', this.inputForm)
+					  projectReportService.saveForm(this.inputForm).then((da) => {
+						  callback(data.businessTable, data.businessId, this.inputForm)
+						  this.loading = false
+					  }).catch(() => {
+						  this.loading = false
+					  })
+				  }).catch(() => {
 					  this.loading = false
-					  throw new Error()
-				  } else {
-					  this.reportReviewService.save(this.inputForm).then((data) => {
-						  this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
-						  console.log('this.inputForm', this.inputForm)
-						  projectReportService.saveForm(this.inputForm).then((da) => {
-							  callback(data.businessTable, data.businessId, this.inputForm)
-							  this.loading = false
+				  })
+			  }else{
+				  //根据签字注师1的人员id去查是否超过了100次
+				  userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
+					  if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
+						  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
+						  this.loading = false
+						  throw new Error()
+					  } else {
+						  this.reportReviewService.save(this.inputForm).then((data) => {
+							  this.inputForm.cwFileInfoList2 = this.$refs.enclosure.getDataList()
+							  console.log('this.inputForm', this.inputForm)
+							  projectReportService.saveForm(this.inputForm).then((da) => {
+								  callback(data.businessTable, data.businessId, this.inputForm)
+								  this.loading = false
+							  }).catch(() => {
+								  this.loading = false
+							  })
 						  }).catch(() => {
 							  this.loading = false
 						  })
-					  }).catch(() => {
-						  this.loading = false
-					  })
-				  }
-			  });
+					  }
+				  });
+			  }
           } else {
             this.loading = false
           }