Commit 92432624 authored by 仇晓婷's avatar 仇晓婷

物料添加字典选项

parent 48a46201
......@@ -45,21 +45,41 @@
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
</template>
<template slot-scope="{ row, index }" slot="dataType">
<state
v-if="row.fieldType==1"
code="materail.category.dataType"
:value="row.dataType"
type="text"
></state>
<Dictionary
v-else
@on-change="setRow(row,index)"
v-model="row.dataType"
code="materail.category.dataType"
type="select"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
<Row>
<Col :span="12">
<state
v-if="row.fieldType==1"
code="materail.category.dataType"
:value="row.dataType"
type="text"
></state>
<Dictionary
v-else
@on-change="setRow(row,index)"
v-model="row.dataType"
code="materail.category.dataType"
type="select"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
</Col>
<Col :span="12" v-if="row.dataType==3">
<div v-if="row.fieldType==1">'/'+{{row.dictionaryCode}}</div>
<Select
v-model="row.dictionaryCode"
clearable
transfer
v-else
@on-change="setRow(row,index)"
>
<Option
v-for="item in codeList"
:value="item.code"
:key="item.code"
>{{ item.name }}</Option>
</Select>
</Col>
</Row>
</template>
<template slot-scope="{ row, index }" slot="unitName">
<state
......@@ -119,6 +139,7 @@ export default {
codeRuleId: this.nodeInfo.codeRuleId
},
disabled: false,
codeList: [],
columns: [
{
title: "序号",
......@@ -136,19 +157,22 @@ export default {
title: "备注",
key: "note",
align: "center",
slot: "note"
slot: "note",
width: "150"
},
{
title: "属性类型",
key: "dataType",
align: "center",
slot: "dataType"
slot: "dataType",
width: "200"
},
{
title: "单位",
key: "unitName",
align: "center",
slot: "unitName"
slot: "unitName",
width: "150"
},
{
title: "是否必填",
......@@ -165,7 +189,7 @@ export default {
{
title: "操作",
slot: "action",
width: 100,
align: "center"
}
],
......@@ -209,6 +233,11 @@ export default {
});
}
});
Api.getChildren({ id: 582 }).then(r => {
if (r.result) {
this.codeList = r.result;
}
});
},
remove(index, row) {
if (row.add == 0) {
......
......@@ -26,5 +26,7 @@ export default {
delete(id) {
return Api.delete(`${systemUrl}/category/delete`,{params:{id:id}});
},
getChildren(params){
return Api.get(`${systemUrl}/Dictionary/getChildren`,params); //字典
},
}
\ No newline at end of file
......@@ -43,21 +43,41 @@
<Input v-model="row.note" placeholder="请输入" @on-blur="setRow(row,index)" v-else />
</template>
<template slot-scope="{ row, index }" slot="dataType">
<state
v-if="row.fieldType==1"
code="materail.category.dataType"
:value="row.dataType"
type="text"
></state>
<Dictionary
v-else
@on-change="setRow(row,index)"
v-model="row.dataType"
code="materail.category.dataType"
type="select"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
<Row>
<Col :span="12">
<state
v-if="row.fieldType==1"
code="materail.category.dataType"
:value="row.dataType"
type="text"
></state>
<Dictionary
v-else
@on-change="setRow(row,index)"
v-model="row.dataType"
code="materail.category.dataType"
type="select"
:value="row.dataType"
:key="row.dataType"
></Dictionary>
</Col>
<Col :span="12" v-if="row.dataType==3">
<div v-if="row.fieldType==1">'/'+{{row.dictionaryCode}}</div>
<Select
v-model="row.dictionaryCode"
clearable
transfer
v-else
@on-change="setRow(row,index)"
>
<Option
v-for="item in codeList"
:value="item.code"
:key="item.code"
>{{ item.name }}</Option>
</Select>
</Col>
</Row>
</template>
<template slot-scope="{ row, index }" slot="unitName">
<state
......
......@@ -7,11 +7,11 @@
<Input v-model="upName" placeholder="请输入" disabled></Input>
</FormItem>
</Col>
<Col :span="12">
<!-- <Col :span="12">
<FormItem label="编码" prop="code">
<Input v-model="entity.code" placeholder="请输入" disabled></Input>
</FormItem>
</Col>
</Col> -->
<Col :span="12">
<FormItem label="名称" prop="name">
<Input v-model="entity.name" placeholder="请输入"></Input>
......
......@@ -2,27 +2,27 @@
<div>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12">
<!-- <Col :span="12">
<FormItem label="编码" prop="code">
<Input v-model="entity.code" placeholder="请输入" disabled></Input>
</FormItem>
</Col>
</Col> -->
<Col :span="12">
<FormItem label="名称" prop="name">
<Input v-model="entity.name" placeholder="请输入"></Input>
</FormItem>
</Col>
<Col :span="12">
<!-- <Col :span="12">
<FormItem label="状态" prop="status" placeholder="请选择">
<Dictionary
code="materail.category.status"
code="material.main.status"
v-model="entity.status"
type="select"
:value="entity.status"
:key="entity.status"
></Dictionary>
</FormItem>
</Col>
</Col> -->
<Col :span="12">
<FormItem label="版本" prop="version">
<Input v-model="entity.version" placeholder="请输入"></Input>
......
......@@ -13,9 +13,9 @@
</FormItem>
</Col>
<Col :span="12">
<FormItem label="状态" prop="status" placeholder="请选择">
<Dictionary
code="materail.category.status"
<FormItem label="状态" prop="status" placeholder="请选择" v-if="entity.status==3||entity.status==2">
<Dictionary
code="material.main.status"
v-model="entity.status"
type="select"
:value="entity.status"
......@@ -46,7 +46,7 @@
<script>
import Api from "./api";
export default {
props: ["nodeInfo",'eid'],
props: ["nodeInfo", "eid"],
data() {
return {
arr: [],
......@@ -79,7 +79,6 @@ export default {
},
remove(index, row) {
// if (row.add == 0) {
// //新增的删除,直接删
// this.checkList.splice(index, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment