|
@@ -96,7 +96,13 @@
|
|
|
min-width="140px"
|
|
min-width="140px"
|
|
|
>
|
|
>
|
|
|
<template v-slot="scope">
|
|
<template v-slot="scope">
|
|
|
- <div v-if="scope.row.type !== 60 && scope.row.options.length > 0">
|
|
|
|
|
|
|
+ <div
|
|
|
|
|
+ v-if="
|
|
|
|
|
+ scope.row.type !== 60 &&
|
|
|
|
|
+ scope.row.type !== 70 &&
|
|
|
|
|
+ scope.row.options.length > 0
|
|
|
|
|
+ "
|
|
|
|
|
+ >
|
|
|
<el-tag
|
|
<el-tag
|
|
|
size="medium"
|
|
size="medium"
|
|
|
:key="option"
|
|
:key="option"
|
|
@@ -106,7 +112,10 @@
|
|
|
</el-tag>
|
|
</el-tag>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
- <el-tag size="medium" v-if="scope.row.type === 60">
|
|
|
|
|
|
|
+ <el-tag
|
|
|
|
|
+ size="medium"
|
|
|
|
|
+ v-if="scope.row.type === 60 || scope.row.type === 70"
|
|
|
|
|
+ >
|
|
|
{{ getAssignRuleOptionName(scope.row) }}
|
|
{{ getAssignRuleOptionName(scope.row) }}
|
|
|
</el-tag>
|
|
</el-tag>
|
|
|
</template>
|
|
</template>
|
|
@@ -191,7 +200,7 @@
|
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
|
import { getByCode } from '@/api/system/dictionary-data';
|
|
import { getByCode } from '@/api/system/dictionary-data';
|
|
|
import { getProduceTreeByCode } from '@/api/saleManage/quotation';
|
|
import { getProduceTreeByCode } from '@/api/saleManage/quotation';
|
|
|
-
|
|
|
|
|
|
|
+ import { topLevel1, topLevel2 } from '@/enum/dict';
|
|
|
export default {
|
|
export default {
|
|
|
name: 'processSubmitDialog',
|
|
name: 'processSubmitDialog',
|
|
|
mixins: [dictMixins],
|
|
mixins: [dictMixins],
|
|
@@ -357,6 +366,7 @@
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
getAssignRuleOptionName(row, option) {
|
|
getAssignRuleOptionName(row, option) {
|
|
|
|
|
+ console.log(row, option);
|
|
|
if (row.type == 10) {
|
|
if (row.type == 10) {
|
|
|
for (const roleOption of this.roleOptions) {
|
|
for (const roleOption of this.roleOptions) {
|
|
|
if (roleOption.id === option) {
|
|
if (roleOption.id === option) {
|
|
@@ -392,6 +402,15 @@
|
|
|
);
|
|
);
|
|
|
} else if (row.type === 60) {
|
|
} else if (row.type === 60) {
|
|
|
return row.variableName;
|
|
return row.variableName;
|
|
|
|
|
+ } else if (row.type === 70) {
|
|
|
|
|
+ let data = JSON.parse(row.variableName);
|
|
|
|
|
+ if (data.direction == 1) {
|
|
|
|
|
+ return topLevel1.find((item) => item.value == data.topLevel)
|
|
|
|
|
+ ?.label;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return topLevel2.find((item) => item.value == data.topLevel)
|
|
|
|
|
+ ?.label;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
return '未知(' + option + ')';
|
|
return '未知(' + option + ')';
|
|
|
},
|
|
},
|