|
@@ -27,31 +27,30 @@
|
|
|
placeholder="请输入"
|
|
placeholder="请输入"
|
|
|
/>
|
|
/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- <el-form-item label="类型用途:" prop="type" :key="data && data.id + 1">
|
|
|
|
|
- <DictSelection dictName="类型用途" clearable v-model="formData.type">
|
|
|
|
|
- </DictSelection>
|
|
|
|
|
- <!-- <el-select
|
|
|
|
|
|
|
+ <el-form-item label="分类组:" prop="type" >
|
|
|
|
|
+ <el-select
|
|
|
clearable
|
|
clearable
|
|
|
|
|
+ multiple
|
|
|
class="w100"
|
|
class="w100"
|
|
|
:maxlength="20"
|
|
:maxlength="20"
|
|
|
- v-model="formData.type"
|
|
|
|
|
|
|
+ v-model="type"
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
>
|
|
>
|
|
|
<el-option
|
|
<el-option
|
|
|
v-for="item in typeList"
|
|
v-for="item in typeList"
|
|
|
- :key="item.code"
|
|
|
|
|
|
|
+ :key="item.value"
|
|
|
:label="item.label"
|
|
:label="item.label"
|
|
|
- :value="item.code"
|
|
|
|
|
|
|
+ :value="item.value"
|
|
|
>
|
|
>
|
|
|
</el-option>
|
|
</el-option>
|
|
|
- </el-select> -->
|
|
|
|
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="编码规则:" prop="ruleCode">
|
|
<el-form-item label="编码规则:" prop="ruleCode">
|
|
|
<el-input
|
|
<el-input
|
|
|
clearable
|
|
clearable
|
|
|
v-model="formData.ruleCode"
|
|
v-model="formData.ruleCode"
|
|
|
- placeholder="请输入编码规则"
|
|
|
|
|
|
|
+ placeholder="请输入"
|
|
|
/>
|
|
/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
@@ -138,7 +137,6 @@
|
|
|
ruleCode: '',
|
|
ruleCode: '',
|
|
|
separate: '',
|
|
separate: '',
|
|
|
sort: '',
|
|
sort: '',
|
|
|
- type: '',
|
|
|
|
|
remark: '',
|
|
remark: '',
|
|
|
parentId: 0
|
|
parentId: 0
|
|
|
};
|
|
};
|
|
@@ -147,6 +145,22 @@
|
|
|
defaultForm,
|
|
defaultForm,
|
|
|
// 表单数据
|
|
// 表单数据
|
|
|
formData: { ...defaultForm },
|
|
formData: { ...defaultForm },
|
|
|
|
|
+ type: null,
|
|
|
|
|
+ typeList: [
|
|
|
|
|
+ {
|
|
|
|
|
+ value: '1',
|
|
|
|
|
+ label: '产品组'
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ value: '2',
|
|
|
|
|
+ label: '设备组',
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ value: '3',
|
|
|
|
|
+ label: '物料组'
|
|
|
|
|
+ }
|
|
|
|
|
+ ],
|
|
|
|
|
+
|
|
|
// 表单验证规则
|
|
// 表单验证规则
|
|
|
rules: {
|
|
rules: {
|
|
|
name: [
|
|
name: [
|
|
@@ -163,13 +177,7 @@
|
|
|
trigger: 'blur'
|
|
trigger: 'blur'
|
|
|
}
|
|
}
|
|
|
],
|
|
],
|
|
|
- type: [
|
|
|
|
|
- {
|
|
|
|
|
- required: true,
|
|
|
|
|
- message: '请选择类型用途',
|
|
|
|
|
- trigger: 'change'
|
|
|
|
|
- }
|
|
|
|
|
- ]
|
|
|
|
|
|
|
+
|
|
|
},
|
|
},
|
|
|
// 提交状态
|
|
// 提交状态
|
|
|
loading: false,
|
|
loading: false,
|
|
@@ -223,6 +231,9 @@
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
if(!this.rootId || ( this.data && this.data.id == this.rootId)) {
|
|
if(!this.rootId || ( this.data && this.data.id == this.rootId)) {
|
|
|
|
|
+ if(this.type) {
|
|
|
|
|
+ params.type = this.type.join(',')
|
|
|
|
|
+ }
|
|
|
params.parentId = 0
|
|
params.parentId = 0
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -249,6 +260,8 @@
|
|
|
if (visible) {
|
|
if (visible) {
|
|
|
if (this.data) {
|
|
if (this.data) {
|
|
|
this.$util.assignObject(this.formData, this.data);
|
|
this.$util.assignObject(this.formData, this.data);
|
|
|
|
|
+ console.log(this.data)
|
|
|
|
|
+ this.type = this.data.type.split(',')
|
|
|
this.isUpdate = true;
|
|
this.isUpdate = true;
|
|
|
} else {
|
|
} else {
|
|
|
this.isUpdate = false;
|
|
this.isUpdate = false;
|