Skip to content

M
mes-ui
Commit 462e4fa6 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents 1ea98a1e 39863f1d
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 70 deletions
pages/materiel/classification/edit.vue
View file @ 462e4fa6
...@@ -192,11 +192,11 @@ export default { ...@@ -192,11 +192,11 @@ export default {
fieldName: "categoryId", fieldName: "categoryId",
fieldValue: this.nodeInfo.id, fieldValue: this.nodeInfo.id,
}, },
{ // {
conditionalType: "Equal", // conditionalType: "Equal",
fieldName: "codeRuleId", // fieldName: "codeRuleId",
fieldValue: this.nodeInfo.codeRuleId, // fieldValue: this.nodeInfo.codeRuleId,
}, // },
]; ];
Api.listTable({ Api.listTable({
conditions: conditions, conditions: conditions,
......
pages/materiel/masterData/add.vue
View file @ 462e4fa6
...@@ -137,7 +137,7 @@ export default { ...@@ -137,7 +137,7 @@ export default {
if (u.dataType == 1 || u.dataType == 2) { if (u.dataType == 1 || u.dataType == 2) {
v = 0; v = 0;
} }
// this.$set(this.entity.customProperties,u.filed,v) this.entity[u.field] = "";
this.$set(this.entity, u.filed, v); this.$set(this.entity, u.filed, v);
}); });
} }
...@@ -157,7 +157,6 @@ export default { ...@@ -157,7 +157,6 @@ export default {
setRow(row, index) { setRow(row, index) {
this.$set(this.checkList, index, row); this.$set(this.checkList, index, row);
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
......
pages/materiel/masterData/edit.vue
View file @ 462e4fa6
...@@ -138,6 +138,7 @@ export default { ...@@ -138,6 +138,7 @@ export default {
v = 0; v = 0;
} }
// this.$set(this.entity.customProperties,u.filed,v) // this.$set(this.entity.customProperties,u.filed,v)
this.entity[u.field] = "";
this.$set(this.entity, u.filed, v); this.$set(this.entity, u.filed, v);
}); });
} }
......
pages/store/edit.vue
View file @ 462e4fa6
...@@ -102,7 +102,6 @@ export default { ...@@ -102,7 +102,6 @@ export default {
} }
} }
} }
alert(type)
this.entity.materialTypeName = code.join(","); this.entity.materialTypeName = code.join(",");
this.entity.codeRuleType = type.join(","); this.entity.codeRuleType = type.join(",");
}, },
......
pages/technology/details/setup/add.vue
View file @ 462e4fa6
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<FormItem :label="l('count')" prop="quantity"> <FormItem :label="l('count')" prop="quantity">
<InputNumber v-model="entity.quantity" style="width:280px"></InputNumber> <InputNumber v-model="entity.quantity"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Divider orientation="left">资源属性</Divider> <Divider orientation="left">资源属性</Divider>
<Row>
<Col :span="12" v-if="entity.materialId"> <Col :span="12" v-if="entity.materialId">
<FormItem label="名称："> <FormItem label="名称：">
<span>{{entity.nameMaterial}}</span> <span>{{entity.nameMaterial}}</span>
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
<span>{{entity.materialNumber}}</span> <span>{{entity.materialNumber}}</span>
</FormItem> </FormItem>
</Col> </Col>
<Row>
<Col v-for="li in fileds" :key="li.field" :span="li.span"> <Col v-for="li in fileds" :key="li.field" :span="li.span">
<FormItem :label="li.title+'：'" :prop="li.name" v-if="li.field!='name'&&li.field!='code'"> <FormItem :label="li.title+'：'" :prop="li.name" v-if="li.field!='name'&&li.field!='code'">
<div>{{li.newConten}}</div> <div>{{li.newConten}}</div>
...@@ -77,15 +76,27 @@ export default { ...@@ -77,15 +76,27 @@ export default {
creator: this.$store.state.userInfo.userName, creator: this.$store.state.userInfo.userName,
routingHeaderId: this.eid, //工艺规程id routingHeaderId: this.eid, //工艺规程id
nameMaterial: "", nameMaterial: "",
name: "",
materialNumber: "", materialNumber: "",
materialId: null, materialId: null,
quantity: 0, quantity: 0,
json: {}, json: {},
}, },
rules: { rules: {
title: [{ required: true, message: "必填", trigger: "blur" }], materialId: [
content: [{ required: true, message: "必填", trigger: "blur" }], {
required: true,
message: "请选择工序",
trigger: "change",
},
],
quantity: [
{
required: true,
type: "number",
message: "请选择工序",
trigger: "blur",
},
],
routingDetailId: [ routingDetailId: [
{ {
required: true, required: true,
...@@ -105,7 +116,7 @@ export default { ...@@ -105,7 +116,7 @@ export default {
methods: { methods: {
change(e, v) { change(e, v) {
// console.log(e) // console.log(e)
console.log(v); // console.log(v);
this.entity.nameMaterial = e.name; this.entity.nameMaterial = e.name;
this.entity.materialId = e.materialId; this.entity.materialId = e.materialId;
this.entity.materialNumber = e.mmcode; this.entity.materialNumber = e.mmcode;
...@@ -166,9 +177,7 @@ export default { ...@@ -166,9 +177,7 @@ export default {
tempObj.value = data.id; tempObj.value = data.id;
tempObj.label = data.taskSeq + " " + data.name; tempObj.label = data.taskSeq + " " + data.name;
tempD.push(tempObj); tempD.push(tempObj);
this.entity.name = data.name;
}); });
this.routingDetailList = tempD; this.routingDetailList = tempD;
}); });
}, },
......
pages/technology/details/setup/detail.vue
View file @ 462e4fa6
<template> <template>
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="8" :name="l('routingDetail')">{{entity.routingDetailId}}</Filed> <Filed :span="8" :name="l('routingDetail')">{{entity.routingDetailName}}</Filed>
<Filed :span="8" :name="l('nameOfResource')">{{entity.nameMaterial}}</Filed> <Filed :span="8" :name="l('nameOfResource')">{{entity.nameMaterial}}</Filed>
<Filed :span="8" :name="l('resourceId')">{{entity.materialNumber}}</Filed> <Filed :span="8" :name="l('resourceId')">{{entity.materialNumber}}</Filed>
<Filed :span="8" :name="l('count')">{{entity.quantity}}</Filed> <Filed :span="8" :name="l('count')">{{entity.quantity}}</Filed>
...@@ -78,19 +78,13 @@ export default { ...@@ -78,19 +78,13 @@ export default {
if (u.dataType == 1 || u.dataType == 2) { if (u.dataType == 1 || u.dataType == 2) {
a = 0; a = 0;
} }
// console.log(u);
// this.$set(this.entity.customProperties,u.filed,v)
for (let key of Object.keys(forItem)) { for (let key of Object.keys(forItem)) {
// console.log(key);
// console.log(forItem[key]);
if (key == u.field) { if (key == u.field) {
this.entity[key] = forItem[key]; this.entity[key] = forItem[key];
return (u.newConten = forItem[key]); return (u.newConten = forItem[key]);
} }
} }
this.$set(this.entity, u.filed, a); this.$set(this.entity, u.filed, a);
// console.log(this.entity)
}); });
} }
}); });
......
pages/technology/details/setup/edit.vue
View file @ 462e4fa6
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<FormItem :label="l('count')" prop="quantity"> <FormItem :label="l('count')" prop="quantity">
<InputNumber v-model="entity.quantity" style="width:280px"></InputNumber> <InputNumber v-model="entity.quantity"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<Divider orientation="left">资源属性</Divider> <Divider orientation="left">资源属性</Divider>
<Row>
<Col :span="12" v-if="entity.materialId"> <Col :span="12" v-if="entity.materialId">
<FormItem label="名称："> <FormItem label="名称：">
<span>{{entity.nameMaterial}}</span> <span>{{entity.nameMaterial}}</span>
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
<span>{{entity.materialNumber}}</span> <span>{{entity.materialNumber}}</span>
</FormItem> </FormItem>
</Col> </Col>
<Row>
<Col v-for="li in fileds" :key="li.field" :span="li.span"> <Col v-for="li in fileds" :key="li.field" :span="li.span">
<FormItem :label="li.title+'：'" :prop="li.name" v-if="li.field!='name'&&li.field!='code'"> <FormItem :label="li.title+'：'" :prop="li.name" v-if="li.field!='name'&&li.field!='code'">
<div>{{li.newConten}}</div> <div>{{li.newConten}}</div>
...@@ -81,18 +80,32 @@ export default { ...@@ -81,18 +80,32 @@ export default {
materialNumber: "", materialNumber: "",
materialId: null, materialId: null,
quantity: 0, quantity: 0,
name: "",
json: {}, json: {},
}, },
rules: { rules: {
// routingDetailId: [ routingDetailId: [
// { {
// required: true, required: true,
// message: "请选择工序", message: "请选择工序",
// type: "number", type: "number",
// trigger: "change", trigger: "change",
// }, },
// ], ],
materialId: [
{
required: true,
message: "请选择工序",
trigger: "change",
},
],
quantity: [
{
required: true,
type: "number",
message: "请选择工序",
trigger: "blur",
},
],
}, },
routingDetailList: [], routingDetailList: [],
}; };
...@@ -107,21 +120,42 @@ export default { ...@@ -107,21 +120,42 @@ export default {
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({ id: v }).then((r) => {
this.entity.id = r.result.id; this.entity = r.result;
this.entity.routingDetailId = r.result.routingDetailId; var materialId = r.result.materialId;
this.entity.quantity = r.result.quantity; let conditions = [];
conditions = [
{
fieldName: "codeRuleType",
fieldValue: "3",
conditionalType: "In",
},
];
Api.materiallist({ type: 0, conditions: conditions }).then((r) => {
let data = [];
var Item = {};
data = r.result.filter((u) => u.status == 3);
data.forEach((e) => {
if (materialId == e.id) {
Item = e;
}
});
this.getCustom(materialId, Item);
});
}); });
}, },
change(e, v) { change(e, v) {
// console.log(e) //console.log(e);
// console.log(v); // console.log(v);
this.entity.nameMaterial = e.name; this.entity.nameMaterial = e.name;
this.entity.materialId = e.materialId; this.entity.materialId = e.materialId;
this.entity.materialNumber = e.mmcode; this.entity.materialNumber = e.mmcode;
this.entity.json.nameMaterial = e.name; this.getCustom(e.materialId, v);
this.entity.json.materialNumber = e.mmcode; },
getCustom(materialId, v) {
// console.log(v)
//获取自定义属性
var forItem = v; var forItem = v;
Api.getmaterialdefinitionproperty({ materialId: e.materialId }).then( Api.getmaterialdefinitionproperty({ materialId: materialId }).then(
(r) => { (r) => {
if (r.result) { if (r.result) {
this.fileds = r.result.filter(function (item) { this.fileds = r.result.filter(function (item) {
...@@ -133,19 +167,15 @@ export default { ...@@ -133,19 +167,15 @@ export default {
// return item.fieldType != 1; // return item.fieldType != 1;
return item.fieldType; return item.fieldType;
}); });
this.fileds.map((u) => { this.fileds.map((u) => {
let v = ""; let v = "";
if (u.dataType == 1 || u.dataType == 2) { if (u.dataType == 1 || u.dataType == 2) {
v = 0; v = 0;
} }
// console.log(u);
// this.$set(this.entity.customProperties,u.filed,v)
for (let key of Object.keys(forItem)) { for (let key of Object.keys(forItem)) {
// console.log(key);
// console.log(forItem[key]);
if (key == u.field) { if (key == u.field) {
this.entity.json[key] = forItem[key]; u.newConten = forItem[key];
return (u.newConten = forItem[key]);
} }
} }
this.$set(this.entity, u.filed, v); this.$set(this.entity, u.filed, v);
...@@ -174,7 +204,6 @@ export default { ...@@ -174,7 +204,6 @@ export default {
tempObj.value = data.id; tempObj.value = data.id;
tempObj.label = data.taskSeq + " " + data.name; tempObj.label = data.taskSeq + " " + data.name;
tempD.push(tempObj); tempD.push(tempObj);
this.entity.name = data.name;
}); });
this.routingDetailList = tempD; this.routingDetailList = tempD;
}); });
......
pages/technology/details/setup/index.vue
View file @ 462e4fa6
...@@ -43,6 +43,7 @@ export default { ...@@ -43,6 +43,7 @@ export default {
title: "新增", title: "新增",
detail: null, detail: null,
curId: 0, curId: 0,
materialId: "",
columns: [ columns: [
// { // {
// type: "index", // type: "index",
...@@ -174,8 +175,6 @@ export default { ...@@ -174,8 +175,6 @@ export default {
mounted() { mounted() {
// console.log(this); // console.log(this);
this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles();
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
......
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