Commit 05a177e5 authored by 仇晓婷's avatar 仇晓婷

资源物料ok

parent c4b7b181
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
:multiple="multiple" :multiple="multiple"
:departmentId="departmentId" :departmentId="departmentId"
:disabled="disabled" :disabled="disabled"
clearable
filterable filterable
> >
<Option <Option
...@@ -143,6 +142,11 @@ export default { ...@@ -143,6 +142,11 @@ export default {
type: String, type: String,
default: "", default: "",
}, },
codeRuleType: {
// 库房类型
type: Number,
default: "",
},
}, },
methods: { methods: {
change(val) { change(val) {
...@@ -167,9 +171,14 @@ export default { ...@@ -167,9 +171,14 @@ export default {
conditions = [ conditions = [
{ {
conditionalType: "In", conditionalType: "In",
fieldName: "categoryId", fieldName: "rootCategoryId",
fieldValue: this.materialType, fieldValue: this.materialType,
}, },
{
fieldName: "codeRuleType",
fieldValue: this.codeRuleType + "",
conditionalType: "In",
},
]; ];
} else { } else {
conditions = []; conditions = [];
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('name')" prop="materialId"> <FormItem :label="l('name')" prop="materialId">
<Materiel v-model="entity.materialId" @on-change="change" :materialType="materialType"></Materiel> <Materiel v-model="entity.materialId" @on-change="change" :materialType="materialType" :codeRuleType='codeRuleType'></Materiel>
</FormItem> </FormItem>
</Col> </Col>
...@@ -123,13 +123,15 @@ export default { ...@@ -123,13 +123,15 @@ export default {
}, },
}; };
}, },
props: { props: ["eid", "rootName", "storeTitle", "materialType", "codeRuleType"],
// v: Object, // props: {
eid: Number,
rootName: String, // eid: Number,
storeTitle: String, // rootName: String,
materialType: String, // storeTitle: String,
}, // materialType: String,
// codeRuleType:String,
// },
mounted() {}, mounted() {},
methods: { methods: {
handleSubmit() { handleSubmit() {
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
:rootName="rootName" :rootName="rootName"
:storeTitle="storeTitle" :storeTitle="storeTitle"
:materialType="materialType" :materialType="materialType"
:codeRuleType="codeRuleType"
:storeId="storeId" :storeId="storeId"
:mcode="mCode" :mcode="mCode"
@on-close="cancel" @on-close="cancel"
...@@ -60,6 +61,7 @@ export default { ...@@ -60,6 +61,7 @@ export default {
easySearch: { easySearch: {
keys: { op: "name,storeTitle,materialCode", value: null }, keys: { op: "name,storeTitle,materialCode", value: null },
}, },
codeRuleType: null,
fscreeen: false, fscreeen: false,
modal: false, modal: false,
title: "新增", title: "新增",
...@@ -211,10 +213,14 @@ export default { ...@@ -211,10 +213,14 @@ export default {
}, },
add() { add() {
if (this.curId) { if (this.curId) {
this.title = "新增"; if (this.codeRuleType == 1) {
this.detail = () => import("./add"); this.title = "新增";
this.fscreeen = false; this.detail = () => import("./add");
this.modal = true; this.fscreeen = false;
this.modal = true;
} else {
this.$Message.error("请先选择正确的库房类型");
}
} else { } else {
this.$Message.error("请先选择库房库位"); this.$Message.error("请先选择库房库位");
} }
...@@ -262,7 +268,16 @@ export default { ...@@ -262,7 +268,16 @@ export default {
}, },
productSearch(item, ids, rootName) { productSearch(item, ids, rootName) {
console.log(item); console.log(item);
let type = [];
this.curId = item.id; this.curId = item.id;
type = item.codeRuleType.split(",");
if (type) {
type.forEach((e) => {
if (e == 1) {
this.codeRuleType = 1;
}
});
}
this.storeTitle = item.title; this.storeTitle = item.title;
this.rootName = rootName.join(" / "); this.rootName = rootName.join(" / ");
this.materialType = item.materialType; this.materialType = item.materialType;
......
...@@ -102,6 +102,7 @@ export default { ...@@ -102,6 +102,7 @@ export default {
}, },
methods: { methods: {
clickItem(val) { clickItem(val) {
console.log(val);
this.nodeInfo.codeRuleId = val; this.nodeInfo.codeRuleId = val;
this.model8 = val; this.model8 = val;
this.cityList.forEach((e) => { this.cityList.forEach((e) => {
......
...@@ -258,7 +258,7 @@ export default { ...@@ -258,7 +258,7 @@ export default {
this.addCol = items; this.addCol = items;
this.cols = this.$u.clone(this.columns); this.cols = this.$u.clone(this.columns);
let extra = items.map(u => { let extra = items.map(u => {
console.log(u); // console.log(u);
var col = { var col = {
key: u.field, key: u.field,
title: u.title title: u.title
......
...@@ -90,6 +90,7 @@ export default { ...@@ -90,6 +90,7 @@ export default {
return { return {
action: Api.index, action: Api.index,
rowId: "", rowId: "",
fileds:[],
entity: {}, entity: {},
metCodesStrTxt: "", metCodesStrTxt: "",
results: {}, results: {},
...@@ -313,9 +314,9 @@ export default { ...@@ -313,9 +314,9 @@ export default {
let codeList = []; let codeList = [];
let idList = []; let idList = [];
if (this.eid !== 0) { if (this.eid !== 0) {
if (this.entity.code) { if (this.entity.code!=0) {
codeList.push(this.entity.code); codeList.push(this.entity.code);
} else { } else {
codeList.push(this.eid); codeList.push(this.eid);
} }
idList.push(this.eid); idList.push(this.eid);
......
...@@ -12,7 +12,12 @@ ...@@ -12,7 +12,12 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('name')" prop="resourceId"> <FormItem :label="l('name')" prop="resourceId">
<Materiel v-model="entity.resourceId" @on-change="change" :materialType="materialType"></Materiel> <Materiel
v-model="entity.resourceId"
@on-change="change"
:materialType="materialType"
:codeRuleType="codeRuleType"
></Materiel>
</FormItem> </FormItem>
</Col> </Col>
...@@ -125,13 +130,14 @@ export default { ...@@ -125,13 +130,14 @@ export default {
}, },
}; };
}, },
props: { props: ["eid", "rootName", "storeTitle", "materialType", "codeRuleType"],
// v: Object, // props: {
eid: Number, // // v: Object,
rootName: String, // eid: Number,
storeTitle: String, // rootName: String,
materialType: String, // storeTitle: String,
}, // materialType: String,
// },
mounted() {}, mounted() {},
methods: { methods: {
handleSubmit() { handleSubmit() {
......
This diff is collapsed.
...@@ -68,6 +68,7 @@ export default { ...@@ -68,6 +68,7 @@ export default {
level: this.level, level: this.level,
userName: "", userName: "",
userIds: "", userIds: "",
codeRuleType: "",
}, },
rules: { rules: {
title: [{ required: true, message: "必填", trigger: "blur" }], title: [{ required: true, message: "必填", trigger: "blur" }],
...@@ -105,15 +106,19 @@ export default { ...@@ -105,15 +106,19 @@ export default {
}, },
changeVal(val) { changeVal(val) {
let code = []; let code = [];
let type = [];
for (let i = 0; i < this.list.length; i++) { for (let i = 0; i < this.list.length; i++) {
let obj = this.list[i]; let obj = this.list[i];
for (let j = 0; j < val.length; j++) { for (let j = 0; j < val.length; j++) {
if (obj.id == val[j]) { if (obj.id == val[j]) {
code.push(obj.code); code.push(obj.code);
type.push(obj.codeRuleType);
} }
} }
} }
this.entity.materialTypeName = code.join(","); this.entity.materialTypeName = code.join(",");
this.entity.codeRuleType = type.join(",");
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
...@@ -137,6 +142,7 @@ export default { ...@@ -137,6 +142,7 @@ export default {
userIds: userId, //库管员id userIds: userId, //库管员id
materialType: materialType, //物料类型 materialType: materialType, //物料类型
materialTypeName: this.entity.materialTypeName, //物料编码 materialTypeName: this.entity.materialTypeName, //物料编码
codeRuleType:this.entity.codeRuleType
}; };
Api.create(paramsdata) Api.create(paramsdata)
......
...@@ -51,6 +51,7 @@ export default { ...@@ -51,6 +51,7 @@ export default {
roleTitle: "库管", roleTitle: "库管",
entity: { entity: {
materialType: [], materialType: [],
codeRuleType: "",
}, },
materialType: [], materialType: [],
rules: { rules: {
...@@ -91,15 +92,19 @@ export default { ...@@ -91,15 +92,19 @@ export default {
}, },
changeVal(val) { changeVal(val) {
let code = []; let code = [];
let type = [];
for (let i = 0; i < this.list.length; i++) { for (let i = 0; i < this.list.length; i++) {
let obj = this.list[i]; let obj = this.list[i];
for (let j = 0; j < val.length; j++) { for (let j = 0; j < val.length; j++) {
if (obj.id == val[j]) { if (obj.id == val[j]) {
code.push(obj.code); code.push(obj.code);
type.push(obj.codeRuleType);
} }
} }
} }
alert(type)
this.entity.materialTypeName = code.join(","); this.entity.materialTypeName = code.join(",");
this.entity.codeRuleType = type.join(",");
}, },
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({ id: v }).then((r) => {
...@@ -138,6 +143,7 @@ export default { ...@@ -138,6 +143,7 @@ export default {
creatorUserId: this.entity.creatorUserId, creatorUserId: this.entity.creatorUserId,
materialType: materialType, //物料类型 materialType: materialType, //物料类型
materialTypeName: this.entity.materialTypeName, //物料编码 materialTypeName: this.entity.materialTypeName, //物料编码
codeRuleType: this.entity.codeRuleType,
}; };
Api.update(paramsdata) Api.update(paramsdata)
......
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