Merge remote-tracking branch 'origin/master'

src/views/cw/invoice/InvoiceList.vue

@@ -296,7 +296,7 @@
               <el-button v-if="hasPermission('cw_finance:invoice:edit:receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" text type="primary"  @click="view(true, scope.row.id)">收款</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:is_receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" text type="primary"  @click="isReceivables(scope.row)">确认收款</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:is_receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus === '1'" text type="primary" @click="recallReceivables(scope.row)">撤回收款</el-button>
-              <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '5'||scope.row.status === '7')" text type="primary"  @click="invoiceInvalidPush(scope.row)">作废</el-button>
+              <!--<el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '5'||scope.row.status === '7')" text type="primary"  @click="invoiceInvalidPush(scope.row)">作废</el-button>-->
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status === '6'" text type="primary" @click="invoiceInvalidReBack(scope.row)">作废撤回</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '1'||scope.row.status === '3')" text type="primary"  @click="del(scope.row.id)">删除</el-button>
 <!--              审核  发票申请-->

src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -1071,6 +1071,12 @@
 					this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
 					//根据签字注师1的人员id去查是否超过了100次
 					userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
+						if (data.name === '庞广新' && data.accountantUserCount >= 99) {
+							this.$message.error(`庞广新签字注师被选次数不可超过99次`)
+							this.loading = false
+							return
+						}
+
 						if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
 							if(data.name === '王真' && data.accountantUserCount <= 120){
 
@@ -1147,6 +1153,12 @@
 						}else{
 							//根据签字注师1的人员id去查是否超过了100次
 							userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
+
+								if (data.name === '庞广新' && data.accountantUserCount >= 99) {
+									this.$message.error(`庞广新签字注师被选次数不可超过99次`)
+									this.loading = false
+									return
+								}
 								if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
 									if(data.name === '王真' && data.accountantUserCount <= 120){
 

src/views/cw/reportManagement/ReportSignatureForm.vue

@@ -90,13 +90,13 @@
 										  {required: true, message: '请选择签字注师1', trigger: 'blur'}
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-<!--								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
-								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
-									<template #suffix>
-										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
-										</el-button>
-									</template>
-								</el-input>
+								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
+<!--								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">-->
+<!--									<template #suffix>-->
+<!--										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">-->
+<!--										</el-button>-->
+<!--									</template>-->
+<!--								</el-input>-->
 							</el-form-item>
 						</el-col>
 
@@ -106,13 +106,13 @@
 										   {required: true, message: '请选择签字注师2', trigger: 'blur'}
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-<!--								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
-								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
-									<template #suffix>
-										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
-										</el-button>
-									</template>
-								</el-input>
+								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
+<!--								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">-->
+<!--									<template #suffix>-->
+<!--										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">-->
+<!--										</el-button>-->
+<!--									</template>-->
+<!--								</el-input>-->
 							</el-form-item>
 						</el-col>
 
@@ -121,13 +121,13 @@
 										  :rules="[
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-<!--								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>-->
-								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
-									<template #suffix>
-										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">
-										</el-button>
-									</template>
-								</el-input>
+								<UserSelect style="width: 100%" ref="userSelect1" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator1" @update:modelValue='(value) => {changeSignatory1(value)}'></UserSelect>
+<!--								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">-->
+<!--									<template #suffix>-->
+<!--										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia1">-->
+<!--										</el-button>-->
+<!--									</template>-->
+<!--								</el-input>-->
 							</el-form-item>
 						</el-col>
 
@@ -136,13 +136,13 @@
 										  :rules="[
                    ]">
 								<!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-<!--								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>-->
-								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
-									<template #suffix>
-										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">
-										</el-button>
-									</template>
-								</el-input>
+								<UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @update:modelValue='(value) => {changeSignatory2(value)}'></UserSelect2>
+<!--								<el-input :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">-->
+<!--									<template #suffix>-->
+<!--										<el-button :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true"  style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia2">-->
+<!--										</el-button>-->
+<!--									</template>-->
+<!--								</el-input>-->
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
@@ -739,7 +739,7 @@
 	// import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
 	import SelectTree from '@/components/treeSelect/treeSelect.vue'
 	import UserSelect from '../workClientInfo/clientUserSelect/AccountantUserIndex'
-	// import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
+	import UserSelect2 from '../workClientInfo/clientUserSelect/AccountantUserIndex2'
 	import UserSelectAll from '@/components/userSelect'
 	import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
 	import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
@@ -748,7 +748,7 @@
 	import CommonApi from '@/api/cw/common/CommonApi'
 	import userService from "@/api/sys/userService";
 	import UserSelect1 from '@/views/utils/UserTreeSelect'
-	import UserSelect2 from '@/views/utils/UserTreeSelect'
+	//import UserSelect2 from '@/views/utils/UserTreeSelect'
 	import UserSelect3 from '@/views/utils/UserTreeSelect'
 	export default {
 		props: {
@@ -1143,6 +1143,13 @@
 					this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
 					//根据签字注师1的人员id去查是否超过了100次
 					userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
+
+						if (data.name === '庞广新' && data.accountantUserCount >= 99) {
+							this.$message.error(`庞广新签字注师被选次数不可超过99次`)
+							this.loading = false
+							return
+						}
+
 						if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
 							if(data.name === '王真' && data.accountantUserCount <= 120){
 
@@ -1207,6 +1214,13 @@
 						}
 						//根据签字注师1的人员id去查是否超过了100次
 						userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
+
+							if (data.name === '庞广新' && data.accountantUserCount >= 99) {
+								this.$message.error(`庞广新签字注师被选次数不可超过99次`)
+								this.loading = false
+								return
+							}
+
 							if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
 								if(data.name === '王真' && data.accountantUserCount <= 120){
 

src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue

@@ -1370,6 +1370,11 @@
 				  }else{
 					  //根据签字注师1的人员id去查是否超过了100次
 					  userService.getCount(this.inputForm.signatureAnnotator1).then((data) => {
+					  	  if (data.name === '庞广新' && data.accountantUserCount >= 99) {
+							  this.$message.error(`庞广新签字注师被选次数不可超过99次`)
+							  this.loading = false
+							  return
+						  }
 						  if (data.accountantUserCount >= 100 && data.accountantUserFlag === 1) {
 							  if(data.name === '王真' && data.accountantUserCount <= 120){
 
@@ -1385,7 +1390,7 @@
 								  }).catch(() => {
 									  this.loading = false
 								  })
-							  }else{
+							  } else{
 								  this.$message.error(`请选择被选次数小于100次的签字注师人员`)
 								  this.loading = false
 								  throw new Error()

src/views/cw/workClientInfo/clientUserSelect/AccountantUserSelectDialog.vue

@@ -458,9 +458,7 @@
 			}
         }
 
-		  if(this.dataListAllSelections[0].name === '庞广新' && this.dataListAllSelections[0].accountantUserCount < 99) {
-
-		  }else{
+		  if(this.dataListAllSelections[0].name === '庞广新' && this.dataListAllSelections[0].accountantUserCount >= 99) {
 			  this.$message.error(`庞广新签字注师被选次数不可超过99次`)
 			  return
 		  }

src/views/finance/invoice/InvoiceList.vue

@@ -282,7 +282,7 @@
               <el-button v-if="hasPermission('finance:invoice:edit:receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" text type="primary"   @click="view(true, scope.row.id)">收款</el-button>
               <el-button v-if="hasPermission('finance:invoice:edit:is_receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" text type="primary"   @click="isReceivables(scope.row)">确认收款</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:is_receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus === '1'" text type="primary"   @click="recallReceivables(scope.row)">撤回收款</el-button>
-              <el-button v-if="hasPermission('finance:invoice:edit:invalid')&&scope.row.status === '5'||scope.row.status === '7'" text type="primary"  @click="invoiceInvalidPush(scope.row)">作废</el-button>
+              <!--<el-button v-if="hasPermission('finance:invoice:edit:invalid')&&scope.row.status === '5'||scope.row.status === '7'" text type="primary"  @click="invoiceInvalidPush(scope.row)">作废</el-button>-->
               <el-button v-if="hasPermission('finance:invoice:edit:invalid')&&scope.row.status === '6'" text type="primary"  @click="invoiceInvalidReBack(scope.row)">作废撤回</el-button>
               <el-button v-if="scope.row.status==='6' && checkIsAuditInvalid(scope.row)" text type="primary"  @click="examineInvalid(scope.row)">作废审核</el-button>
               <el-button v-if="hasPermission('finance:invoice:edit:invalid')&&scope.row.status === '8'" text type="primary"  @click="adjustInvalid(scope.row)">驳回调整</el-button>