Explorar el Código

用户修改调整

wangqiang hace 1 año
padre
commit
0d2706ed0a

+ 1 - 0
src/components/userSelect/UserSelectDialog.vue

@@ -255,6 +255,7 @@ export default {
 		//获取用户
 		async getUser() {
 			this.showUserloading = true;
+			this.searchForm.certType = '1'
 			userService
 				.list({
 					current: this.currentPage,

+ 2 - 0
src/views/flowable/task/TaskForm.vue

@@ -512,6 +512,8 @@ export default {
 						if (!this.commonJS.isEmpty(inputForm.assignee)) {
 							assignee = inputForm.assignee
 						}
+						console.log('inputForm.assignee', inputForm.assignee)
+						console.log('assignee', assignee)
 						taskService
 							.start({
 								procDefId: this.procDefId,

+ 23 - 2
src/views/sys/user/UserForm.vue

@@ -215,7 +215,7 @@
 						></el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :span="12">
+				<el-col :span="12" v-if="method === 'add'">
 					<el-form-item label="证件类型" prop="otherInfoDto.certificatesType"
 								  :rules="[{required: true, message: '证件类型不能为空', trigger: 'blur'}
                  ]">
@@ -229,7 +229,21 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :span="12">
+				<el-col :span="12" v-else>
+					<el-form-item label="证件类型" prop="otherInfoDto.certificatesType"
+								  :rules="[{required: true, message: '证件类型不能为空', trigger: 'blur'}
+                 ]">
+						<el-select v-model="inputForm.otherInfoDto.certificatesType" :disabled="true" placeholder="请选择证件类型" style="width:100%;">
+							<el-option
+								v-for="item in $dictUtils.getDictList('certificates_type')"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value">
+							</el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" v-if="method === 'add'">
 					<el-form-item label="证件号" prop="otherInfoDto.idCard" :rules="[
                     {required: true, message: '证件号不能为空', trigger: 'blur'},
                     {validator: checkIdCardRule, trigger: 'blur'}
@@ -237,6 +251,13 @@
 						<el-input v-model="inputForm.otherInfoDto.idCard" placeholder="请填写证件号"  clearable></el-input>
 					</el-form-item>
 				</el-col>
+				<el-col :span="12" v-else>
+					<el-form-item label="证件号" prop="otherInfoDto.idCard" :rules="[
+                    {required: true, message: '证件号不能为空', trigger: 'blur'},
+                  ]">
+						<el-input v-model="inputForm.otherInfoDto.idCard" :disabled="true" placeholder="请填写证件号"  clearable></el-input>
+					</el-form-item>
+				</el-col>
 				<el-col :span="12">
 					<el-form-item label="证件照正面" prop="otherInfoDto.certificatesFront" :rules="[]">
 						<el-upload