|
@@ -94,43 +94,67 @@
|
|
|
</el-col>
|
|
|
|
|
|
<el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
|
|
|
- <el-form-item label="签字注师1" prop="signatureAnnotator1"
|
|
|
+ <el-form-item label="签字注师1" prop="signatureAnnotator1Name"
|
|
|
:rules="[
|
|
|
{required: true, message:'签字注师1不能为空', trigger:'change'}
|
|
|
]">
|
|
|
<!-- <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-form-item>
|
|
|
+<!-- <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 @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
|
|
|
+ <template #suffix>
|
|
|
+ <el-button 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>
|
|
|
|
|
|
<el-col v-if="inputForm.signatureType === '1' || inputForm.signatureType === '3' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
|
|
|
- <el-form-item label="签字注师2" prop="signatureAnnotator2"
|
|
|
+ <el-form-item label="签字注师2" prop="signatureAnnotator2Name"
|
|
|
:rules="[
|
|
|
// {required: true, message:'签字注师2不能为空', trigger:'change'}
|
|
|
]">
|
|
|
<!-- <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>
|
|
|
+<!-- <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 @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
|
|
|
+ <template #suffix>
|
|
|
+ <el-button 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 v-if="inputForm.signatureType === '2' " :span="12">
|
|
|
- <el-form-item label="签字注师1" prop="signatureAnnotator1"
|
|
|
+ <el-form-item label="签字注师1" prop="signatureAnnotator1Name"
|
|
|
:rules="[
|
|
|
{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-form-item>
|
|
|
+<!-- <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 @blur="changeSignatory1(inputForm.signatureAnnotator1)" @focus="openUserDia1" v-model="inputForm.signatureAnnotator1Name" placeholder="请选择签字注师1">
|
|
|
+ <template #suffix>
|
|
|
+ <el-button 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>
|
|
|
|
|
|
<el-col v-if="inputForm.signatureType === '2' " :span="12">
|
|
|
- <el-form-item label="签字注师2" prop="signatureAnnotator2"
|
|
|
+ <el-form-item label="签字注师2" prop="signatureAnnotator2Name"
|
|
|
:rules="[
|
|
|
// {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-form-item>
|
|
|
+<!-- <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 @blur="changeSignatory2(inputForm.signatureAnnotator2)" @focus="openUserDia2" v-model="inputForm.signatureAnnotator2Name" placeholder="请选择签字注师2">
|
|
|
+ <template #suffix>
|
|
|
+ <el-button 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">
|
|
|
<el-form-item label="审计意见类型" prop="opinionType"
|
|
@@ -162,8 +186,14 @@
|
|
|
{required: true, message:'报告实际制作人不能为空', trigger:'blur'},
|
|
|
{required: true, message:'报告实际制作人不能为空', trigger:'change'}
|
|
|
]">
|
|
|
- <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>
|
|
|
- </el-form-item>
|
|
|
+<!-- <UserSelectAll :readonly="true" :disabled="status === 'audit' || status === 'taskFormDetail'" :limit='1' :modelValue="inputForm.realCreate" @update:modelValue='(value) => {inputForm.realCreate = value}'></UserSelectAll>-->
|
|
|
+ <el-input @focus="openUserDia3" v-model="inputForm.realCreateName" placeholder="请选择报告实际制作人">
|
|
|
+ <template #suffix>
|
|
|
+ <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia3">
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="创建时间" prop="createDate"
|
|
@@ -528,7 +558,10 @@
|
|
|
</template>
|
|
|
<ProjectRecoredChooseCom ref="projectRecoredChooseCom" @getProject="getContract"></ProjectRecoredChooseCom>
|
|
|
<ReportServiceUnitForm ref="reportServiceUnitForm" @getWorkClientChoose="getWorkClientChoose"></ReportServiceUnitForm>
|
|
|
- </el-dialog>
|
|
|
+ <user-select1 ref="userSelect1" @doSubmit="selectUser1"></user-select1>
|
|
|
+ <user-select2 ref="userSelect2" @doSubmit="selectUser2"></user-select2>
|
|
|
+ <user-select3 ref="userSelect3" @doSubmit="selectUser3"></user-select3>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -538,12 +571,15 @@
|
|
|
import UpLoadComponent from '@/views/common/UpLoadComponent'
|
|
|
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 projectReportService from '@/api/cw/reportManagement/ProjectReportService'
|
|
|
import EnterpriseSearchService from '@/api/cw/common/EnterpriseSearchService'
|
|
|
import ReportServiceUnitForm from './ReportServiceUnitForm'
|
|
|
import ProjectRecoredChooseCom from '../projectRecords/ProjectRecordsChooseCom'
|
|
|
+ import UserSelect1 from '@/views/utils/UserTreeSelect'
|
|
|
+ import UserSelect2 from '@/views/utils/UserTreeSelect'
|
|
|
+ import UserSelect3 from '@/views/utils/UserTreeSelect'
|
|
|
export default {
|
|
|
props: {
|
|
|
businessId: {
|
|
@@ -598,7 +634,9 @@
|
|
|
projectNumber: '',
|
|
|
officeId: '',
|
|
|
signatureAnnotator1: '',
|
|
|
+ signatureAnnotator1Name: '',
|
|
|
signatureAnnotator2: '',
|
|
|
+ signatureAnnotator2Name: '',
|
|
|
signatureType: '',
|
|
|
projectMasterId1: '',
|
|
|
projectMasterId2: '',
|
|
@@ -609,6 +647,7 @@
|
|
|
servedUnitId: '',
|
|
|
status: '',
|
|
|
realCreate: '',
|
|
|
+ realCreateName: '',
|
|
|
realHeaderName: '',
|
|
|
industry: '',
|
|
|
businessObjects: ''
|
|
@@ -658,7 +697,9 @@
|
|
|
UserSelect2,
|
|
|
ReportServiceUnitForm,
|
|
|
ProjectRecoredChooseCom,
|
|
|
- UserSelectAll
|
|
|
+ UserSelectAll,
|
|
|
+ UserSelect1,
|
|
|
+ UserSelect3
|
|
|
},
|
|
|
methods: {
|
|
|
getKeyWatch (keyWatch) {
|
|
@@ -669,8 +710,9 @@
|
|
|
this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
|
|
|
this.$nextTick(() => {
|
|
|
this.inputForm.signatureAnnotator1 = ''
|
|
|
- this.$refs.userSelect1.changeNameValue('')
|
|
|
- this.$refs.userSelect1.clearSelectData()
|
|
|
+ this.inputForm.signatureAnnotator1Name = ''
|
|
|
+ // this.$refs.userSelect1.changeNameValue('')
|
|
|
+ // this.$refs.userSelect1.clearSelectData()
|
|
|
this.$forceUpdate()
|
|
|
})
|
|
|
} else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator2) &&
|
|
@@ -686,8 +728,9 @@
|
|
|
this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
|
|
|
this.$nextTick(() => {
|
|
|
this.inputForm.signatureAnnotator1 = ''
|
|
|
- this.$refs.userSelect1.changeNameValue('')
|
|
|
- this.$refs.userSelect1.clearSelectData()
|
|
|
+ this.inputForm.signatureAnnotator1Name = ''
|
|
|
+ // this.$refs.userSelect1.changeNameValue('')
|
|
|
+ // this.$refs.userSelect1.clearSelectData()
|
|
|
this.$forceUpdate()
|
|
|
})
|
|
|
} else {
|
|
@@ -699,8 +742,9 @@
|
|
|
this.$message.warning('首次发行签字注师1和首次发行签字注师2不可以相同')
|
|
|
this.$nextTick(() => {
|
|
|
this.inputForm.signatureAnnotator2 = ''
|
|
|
- this.$refs.userSelect2.changeNameValue('')
|
|
|
- this.$refs.userSelect2.clearSelectData()
|
|
|
+ this.inputForm.signatureAnnotator2Name = ''
|
|
|
+ // this.$refs.userSelect2.changeNameValue('')
|
|
|
+ // this.$refs.userSelect2.clearSelectData()
|
|
|
this.$forceUpdate()
|
|
|
})
|
|
|
} else if (this.commonJS.isNotEmpty(this.inputForm.signatureAnnotator1) &&
|
|
@@ -715,8 +759,9 @@
|
|
|
this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
|
|
|
this.$nextTick(() => {
|
|
|
this.inputForm.signatureAnnotator2 = ''
|
|
|
- this.$refs.userSelect2.changeNameValue('')
|
|
|
- this.$refs.userSelect2.clearSelectData()
|
|
|
+ this.inputForm.signatureAnnotator2Name = ''
|
|
|
+ // this.$refs.userSelect2.changeNameValue('')
|
|
|
+ // this.$refs.userSelect2.clearSelectData()
|
|
|
this.$forceUpdate()
|
|
|
})
|
|
|
} else {
|
|
@@ -767,14 +812,17 @@
|
|
|
projectName: '',
|
|
|
officeId: '',
|
|
|
projectNumber: '',
|
|
|
- signatureAnnotator1: '',
|
|
|
- signatureAnnotator2: '',
|
|
|
+ signatureAnnotator1: '',
|
|
|
+ signatureAnnotator1Name: '',
|
|
|
+ signatureAnnotator2: '',
|
|
|
+ signatureAnnotator2Name: '',
|
|
|
signatureType: '',
|
|
|
projectMasterName: '',
|
|
|
projectMasterId1: '',
|
|
|
projectMasterId2: '',
|
|
|
cwProjectInfoList: [],
|
|
|
realCreate: '',
|
|
|
+ realCreateName: '',
|
|
|
realHeaderName: '',
|
|
|
industry: '',
|
|
|
businessObjects: ''
|
|
@@ -1130,7 +1178,31 @@
|
|
|
changeBusinessType () {
|
|
|
// 切换业务类型的时候,审计业务类型清空
|
|
|
this.inputForm.auditBusinessType = ''
|
|
|
- }
|
|
|
+ },
|
|
|
+ openUserDia1(){
|
|
|
+ this.$refs.userSelect1.init()
|
|
|
+ },
|
|
|
+ selectUser1(user){
|
|
|
+ console.log(user[0].name)
|
|
|
+ this.inputForm.signatureAnnotator1Name=user[0].name
|
|
|
+ this.inputForm.signatureAnnotator1=user[0].id
|
|
|
+ },
|
|
|
+ openUserDia2(){
|
|
|
+ this.$refs.userSelect2.init()
|
|
|
+ },
|
|
|
+ selectUser2(user){
|
|
|
+ console.log(user[0].name)
|
|
|
+ this.inputForm.signatureAnnotator2Name=user[0].name
|
|
|
+ this.inputForm.signatureAnnotator2=user[0].id
|
|
|
+ },
|
|
|
+ openUserDia3(){
|
|
|
+ this.$refs.userSelect3.init()
|
|
|
+ },
|
|
|
+ selectUser3(user){
|
|
|
+ console.log(user[0].name)
|
|
|
+ this.inputForm.realCreateName=user[0].name
|
|
|
+ this.inputForm.realCreate=user[0].id
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|