Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
c6093379 by xukangle
Options

Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

2 parents f2b921df 3bc0c571
Inline Side-by-side
Showing 3 changed files with 18 additions and 7 deletions
src/components/Form/index.vue
...@@ -1119,12 +1119,11 @@ const panelChange = (scope, row) => { ...@@ -1119,12 +1119,11 @@ const panelChange = (scope, row) => {
1119 <el-radio v-for="(radio, index) in item.options" :label="radio.value"> 1119 <el-radio v-for="(radio, index) in item.options" :label="radio.value">
1120 <template #default> 1120 <template #default>
1121 <span :style="{ 'line-height': '32px' }">{{ radio.label }}</span> 1121 <span :style="{ 'line-height': '32px' }">{{ radio.label }}</span>
1122 <span 1122 <span :style="{ display: 'inline-flex', width: (index == (item.inputOptions?.index ?? (item.options.length - 1)) && item.inputOptions) ? (item.inputOptions.width ?? '230px') : '0px' }">
1123 :style="{ display: 'inline-flex', width: (index == (item.inputOptions?.index ?? (item.options.length - 1)) && item.inputOptions) ? (item.inputOptions.width ?? '230px') : '0px' }">
1124 <el-form-item 1123 <el-form-item
1125 v-if="index == (item.inputOptions?.index ?? (item.options.length - 1)) && (item.inputOptions?.visible ?? false)" 1124 v-if="index == (item.inputOptions?.index ?? (item.options.length - 1)) && (item.inputOptions?.visible ?? false)"
1126 :prop="item.inputOptions?.field" :class="[item.inputOptions?.col]"> 1125 :prop="item.inputOptions?.field" :class="[item.inputOptions?.col]">
1127 <el-select v-if="item.inputOptions.type == 'select'" v-model="formInline[item.inputOptions?.field]" 1126 <el-select v-if="item.inputOptions?.type == 'select'" v-model="formInline[item.inputOptions?.field]"
1128 :placeholder="item.inputOptions?.placeholder" :clearable="item.inputOptions?.clearable ?? false" 1127 :placeholder="item.inputOptions?.placeholder" :clearable="item.inputOptions?.clearable ?? false"
1129 :filterable="item.inputOptions?.filterable ?? false" 1128 :filterable="item.inputOptions?.filterable ?? false"
1130 :disabled="item.inputOptions?.disabled || readonly" 1129 :disabled="item.inputOptions?.disabled || readonly"
...@@ -1136,12 +1135,12 @@ const panelChange = (scope, row) => { ...@@ -1136,12 +1135,12 @@ const panelChange = (scope, row) => {
1136 :value="item.inputOptions?.props?.value ? opts[item.inputOptions.props.value] : opts.value" 1135 :value="item.inputOptions?.props?.value ? opts[item.inputOptions.props.value] : opts.value"
1137 :disabled="opts.disabled" /> 1136 :disabled="opts.disabled" />
1138 </el-select> 1137 </el-select>
1139 <el-date-picker v-else-if="item.ipnutOptions.type == 'date'" 1138 <el-date-picker v-else-if="item.ipnutOptions?.type == 'date'"
1140 :disabled="item.inputOptions?.disabled || readonly" v-model="formInline[item.inputOptions?.field]" 1139 :disabled="item.inputOptions?.disabled || readonly" v-model="formInline[item.inputOptions?.field]"
1141 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" 1140 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
1142 :placeholder="item.inputOptions?.placeholder" 1141 :placeholder="item.inputOptions?.placeholder"
1143 :disabled-date="item.inputOptions?.disabledDate ?? ((time) => { return false; })" /> 1142 :disabled-date="item.inputOptions?.disabledDate ?? ((time) => { return false; })" />
1144 <el-input v-else-if="item.inputOptions.type == 'input'" 1143 <el-input v-else-if="item.inputOptions?.type == 'input'"
1145 v-model.trim="formInline[item.inputOptions?.field]" :placeholder="item.inputOptions?.placeholder" 1144 v-model.trim="formInline[item.inputOptions?.field]" :placeholder="item.inputOptions?.placeholder"
1146 :disabled="item.inputOptions?.disabled || readonly" :clearable="item.inputOptions?.clearable" 1145 :disabled="item.inputOptions?.disabled || readonly" :clearable="item.inputOptions?.clearable"
1147 :maxlength="item.inputOptions?.maxlength ?? ''" /> 1146 :maxlength="item.inputOptions?.maxlength ?? ''" />
......
src/views/data_asset/registerManagemant.vue
...@@ -104,6 +104,7 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce ...@@ -104,6 +104,7 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce
104 return scope.row['ownIndustryName']?.join(',') 104 return scope.row['ownIndustryName']?.join(',')
105 } 105 }
106 }, 106 },
107 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" },
107 { 108 {
108 label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { 109 label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
109 const approveVO = scope.row.approveVO || {} 110 const approveVO = scope.row.approveVO || {}
......
src/views/data_asset/registerStart.vue
...@@ -1986,8 +1986,19 @@ onBeforeMount(() => { ...@@ -1986,8 +1986,19 @@ onBeforeMount(() => {
1986 const data = res.data || {} 1986 const data = res.data || {}
1987 let { approveVO } = data; 1987 let { approveVO } = data;
1988 draftDetailInfo.value = data; 1988 draftDetailInfo.value = data;
1989 deploymentId.value = approveVO?.camundaDeploymentId; 1989 if (approveVO) {
1990 processInstanceId.value = approveVO?.camundaInstanceId 1990 deploymentId.value = approveVO.camundaDeploymentId;
1991 processInstanceId.value = approveVO.camundaInstanceId;
1992 } else {
1993 getCamundaDeploymentId('10017', userData.tenantGuid, userData.staffGuid).then((res: any) => {
1994 if (res.code == proxy.$passCode) {
1995 deploymentId.value = res.data;
1996 } else {
1997 ElMessage.error(res.msg);
1998 }
1999 })
2000 }
2001
1991 let coverageArea = ''; 2002 let coverageArea = '';
1992 let coverageAreas = []; 2003 let coverageAreas = [];
1993 let damTypeItem = baseFormItems.value.find(item => item.field == 'damType'); 2004 let damTypeItem = baseFormItems.value.find(item => item.field == 'damType');
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!