diff --git a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue index d665ce6d..3416a170 100644 --- a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue +++ b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue @@ -59,9 +59,7 @@ - + v-if="e.fieldDataType!=5"/> {{ val.dictName }} @@ -151,7 +149,7 @@
{{ m.fieldName }} - :{{m.dictionaryCode ? dict.getLabel(m.dictionaryCode, m.fieldValue) : m.fieldValue }} + :{{ m.dictionaryCode ? dict.getLabel(m.dictionaryCode, m.fieldValue) : m.fieldValue }}
@@ -222,7 +220,7 @@ :prop="`fieldInfos.${i}.fieldValue`" :rules="{required:op.mustFill==1,message:`请输入${op.fieldName}`}"> + clearable v-if="op.fieldDataType=='0'" show-word-limit :maxlength="op.fieldLength"/> - - + @@ -27,7 +25,7 @@ import guidance from "./components/guidance"; export default { name: "AppMattersConfig", label: '事项配置(秀山)', - components: {addConfig,guidance}, + components: {addConfig, guidance}, props: { instance: Function, dict: Object, @@ -61,7 +59,7 @@ export default { this.$router.push({query: {processType: this.currentTab.value}}) }, - back () { + back() { this.$router.push({query: {}}) } }, diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue b/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue index d9c89df8..756ccac4 100644 --- a/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue +++ b/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue @@ -17,7 +17,7 @@ + style="width: 100%;" v-if="['0','1','6','10'].includes(e.fieldDataType)"/> @@ -30,8 +30,7 @@ :key="Math.random()">
- + { if (item.fieldType == 0) { - if(item.dictionaryCode && dictionaryCodeArr.indexOf(item.dictionaryCode)==-1){ + if (item.dictionaryCode && dictionaryCodeArr.indexOf(item.dictionaryCode) == -1) { dictionaryCodeArr.push(item.dictionaryCode) } let {groupIndex, groupName} = item @@ -121,11 +120,11 @@ export default { arr[groupIndex].value.push({...item}) } }) - if(dictionaryCodeArr.length){ - this.$dict.load(dictionaryCodeArr).then(()=>{ + if (dictionaryCodeArr.length) { + this.$dict.load(dictionaryCodeArr).then(() => { this.tablelist = arr.filter(e => e) }) - }else { + } else { this.tablelist = arr.filter(e => e) } } @@ -192,7 +191,8 @@ export default { margin-left: 24px !important; } } - ::v-deep .el-radio{ + + ::v-deep .el-radio { margin-bottom: 6px; } } diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue index 67912f7a..4ae50b42 100644 --- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue +++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue @@ -55,14 +55,14 @@ v-if="item.candidateApproverType==1"> 选择指定人员 --> - + + :chooseUserList="item.candidateList" + v-if="item.candidateApproverType==1" + :instance="instance" customRightText url="/user/page" + headerTitle="人员列表" dialogTitle="选择" :isMultiple="true" + @selectPerson="e => changeCharge(e, index)">