Skip to content

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

resourceSelectCode&&aps-edit

parent 498274b2
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 105 deletions
components/page/resourceSelectCode.vue 0 → 100644
View file @ d1306e7e
<template>
<Cascader :data="data" v-model="name" @on-change="change" trigger="hover"></Cascader>
</template>
<script>
export default {
name: "roleSelectCode",
model: {
prop: "value",
event: "on-change"
},
data() {
return {
name: this.value,
data: [],
resources: [],
types: []
};
},
mounted() {
//
this.types = this.$store.getters.dictionaryByKey(
"aps.resource.type"
);
let url = `${systemUrl}/planresource/list`;
this.$api
.post(url, {
pageSize: 2000
})
.then(r => {
this.resources = r.result;
this.init();
});
},
props: {
value: [Array]
},
methods: {
init(data) {
var data = [];
this.types.map(u => {
let item = {
label: u.name,
value: parseInt(u.code)
};
var children = this.resources.filter(r => {
return r.type == u.code;
});
if (children && children.length > 0) {
var ul = [];
children.map(u => {
ul.push({
label: u.title,
value: u.code,
id: u.id
});
});
item.children = ul;
} else {
item.disabled = true
}
data.push(item);
});
this.data = data;
},
change(value, selected) {
// console.log(event)
this.$emit("on-change", value, selected);
},
//获取所有的选中项
getSelectItems() {
var items = [];
this.value.forEach(v => {
var item = this.dic.filter(u => u.value == v);
if (item && item[0]) {
items.push(item[0]);
}
});
return items;
},
//获取所有选中项的名称
getSelectNames() {
var names = [];
this.getSelectItems().forEach(v => {
names.push(v.label);
});
return names;
}
},
computed: {
dic() {
let result = [];
this.data.forEach(u => {
result.push({
value: u.id,
label: u.name
});
});
return result;
}
},
watch: {
value: {
handler(v, o) {
this.name = v;
},
deep: true
}
}
};
</script>
pages/aps/aps/api.js
View file @ d1306e7e
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
}, },
//工时同步到原始工艺 //工时同步到原始工艺
apsupdate(params) { apsupdate(params) {
return Api.post(`${designUrl}/routingdetail/apsupdate `, params); return Api.post(`${technologyUrl}routingdetail/apsupdate `, params);
}, },
//排序模板相关start----- //排序模板相关start-----
//获取排序规则下拉列表 //获取排序规则下拉列表
......
pages/aps/aps/components/edit.vue
View file @ d1306e7e
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="100"> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('tASKSEQ')" prop="tASKSEQ">{{this.entity.task_seq}}</FormItem> <FormItem :label="l('tASKSEQ')" prop="tASKSEQ">{{this.entity.task_seq}}</FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('tASKNAME')" prop="tASKNAME">{{this.entity.task_name}}</FormItem> <FormItem :label="l('tASKNAME')" prop="tASKNAME">{{this.entity.task_name}}</FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12" v-if="false">
<FormItem label="生产设备"> <FormItem label="生产设备">
<EquipSelect v-model="entity.eQUIPID"></EquipSelect> <EquipSelect v-model="entity.eQUIPID"></EquipSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12">
<Col :span="12" v-model="entity.rUNTIME"> <FormItem label="首选资源" prop="resourceType">
<ResourceSelectCode v-model="entity.resource" @on-change="resourceChange"></ResourceSelectCode>
</FormItem>
</Col>
<Col :span="12" v-model="entity.rUNTIME">
<FormItem :label="l('rUNTIME')" prop="rUNTIME"> <FormItem :label="l('rUNTIME')" prop="rUNTIME">
<InputTime v-model="entity.run_time" ></InputTime> <InputTime v-model="entity.run_time"></InputTime>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label=" "> <FormItem label=" ">
<Checkbox v-model="single">是否同步到原始工艺</Checkbox> <Checkbox v-model="single">是否同步到原始工艺</Checkbox>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
<FormItem> <FormItem>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script> <script>
import Api from "../api"; import Api from "../api";
export default { export default {
name: "Edit", name: "Edit",
data() { data() {
return { return {
entity: {}, entity: {},
orderCatList: [], orderCatList: [],
rules: { resources: [],
name: [{ required: true, message: "必填", trigger: "blur" }] rules: {
}, name: [{
single: false required: true,
}; message: "必填",
}, trigger: "blur"
props: { }],
row: { resourceType: [{
type: Object, required: true,
default: () => { message: "请选择首选资源",
return null; trigger: "change",
} }, ],
} },
}, single: false
methods: { };
load(v) {
this.entity = v;
}, },
handleSubmit() { props: {
this.$refs.form.validate(v => { row: {
if (v) { type: Object,
default: () => {
let parmsUp = { return null;
run_time: this.entity.run_time, }
first_equip: this.entity.eQUIPID, }
id: this.entity.id },
}; methods: {
Api.updatesetuptimeandfirstequip(parmsUp) load(v) {
.then(res => { this.entity = v;
if (res.success) {
if (!this.single) { },
this.$Message.success("保存成功"); handleSubmit() {
this.$emit("on-option-ok"); this.$refs.form.validate(v => {
} else { if (v) {
let parms = {
id: this.entity.routing_detail_id, //工序ID let parmsUp = {
name: this.entity.task_name, //工序名 run_time: this.entity.run_time,
task_seq: this.entity.task_seq, //工序号 first_equip: this.entity.resourceCode,
resource_id: this.entity.eQUIPID, //设备id id: this.entity.id
runtime: this.entity.run_time, //单件工时 };
department_id: 0 //班组ID Api.updatesetuptimeandfirstequip(parmsUp)
}; .then(res => {
Api.apsupdate(parms) if (res.success) {
.then(r => { if (!this.single) {
this.$Message.success("保存成功");
if (r.success) { this.$emit("on-option-ok");
this.$Message.success("保存成功"); } else {
this.$emit("on-option-ok"); let parms = {
} else { id: this.entity.routing_detail_id, //工序ID
this.$Message.error("保存失败"); name: this.entity.task_name, //工序名
} task_seq: this.entity.task_seq, //工序号
}) resource_id: this.entity.resourceId, //设备id
.catch(err => { runtime: this.entity.run_time, //单件工时
department_id: 0 //班组ID
this.$Message.error("保存失败"); };
console.warn(err); Api.apsupdate(parms)
}); .then(r => {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-option-ok");
} else {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.$Message.error("保存失败");
console.warn(err);
});
}
} else {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.$Message.error("保存失败");
console.warn(err);
});
} }
} else {
this.$Message.error("保存失败");
}
})
.catch(err => {
this.$Message.error("保存失败");
console.warn(err);
}); });
},
handleClose() {
this.$emit("on-close");
},
resourceChange(v, items) {
//alert(v.length)
//alert(JSON.stringify(v))
//alert(JSON.stringify(items))
this.entity.resourceCode = v[1];
this.entity.resourceId = items[1].id;
if (v != null && v.length > 0) {
this.rules.resourceType[0].required = false;
} else {
this.rules.resourceType[0].required = true;
}
},
l(key) {
key = "mes_op_task_execute" + "." + key;
return this.$t(key);
} }
});
},
handleClose() {
this.$emit("on-close");
}, },
l(key) { watch: {
key = "mes_op_task_execute" + "." + key; row(v) {
return this.$t(key); if (v != {}) {
} let url = `${systemUrl}/planresource/list`;
}, this.$api
watch: { .post(url, {
row(v) { pageSize: 2000
if (v != {}) { })
//alert(JSON.stringify(v)) .then(r => {
this.entity = v; this.resources = this.$u.clone(r.result);
} this.entity = v;
let code = v.code;
//let code = 'PCZYBZBH_20200804_1'
if (code && code != '') {
this.resources.forEach(e => {
if (e.code == code) {
this.entity.resource = []
this.entity.resource.push(parseInt(e.type));
this.entity.resource.push(code)
}
})
}
});
}
}
} }
}
}; };
</script> </script>
plugins/iview.js
View file @ d1306e7e
...@@ -37,6 +37,7 @@ import WorkShop from '@/components/page/workShop.vue' ...@@ -37,6 +37,7 @@ import WorkShop from '@/components/page/workShop.vue'
import EquipSelect from '@/components/page/equipSelect.vue' import EquipSelect from '@/components/page/equipSelect.vue'
import EquipTypeSelect from '@/components/page/equipTypeSelect.vue' import EquipTypeSelect from '@/components/page/equipTypeSelect.vue'
import ResourceSelect from '@/components/page/resourceSelect.vue' import ResourceSelect from '@/components/page/resourceSelect.vue'
import ResourceSelectCode from '@/components/page/resourceSelectCode.vue'
import StoreTree from '@/components/page/storeTree.vue' import StoreTree from '@/components/page/storeTree.vue'
import StoreSelect from '@/components/page/storeSelect.vue' import StoreSelect from '@/components/page/storeSelect.vue'
import clipboard from 'clipboard'; import clipboard from 'clipboard';
...@@ -124,6 +125,7 @@ Vue.component("WorkShop", WorkShop) ...@@ -124,6 +125,7 @@ Vue.component("WorkShop", WorkShop)
Vue.component("EquipSelect", EquipSelect) Vue.component("EquipSelect", EquipSelect)
Vue.component("EquipTypeSelect", EquipTypeSelect) Vue.component("EquipTypeSelect", EquipTypeSelect)
Vue.component("ResourceSelect", ResourceSelect) Vue.component("ResourceSelect", ResourceSelect)
Vue.component("ResourceSelectCode", ResourceSelectCode)
Vue.component("User", User) Vue.component("User", User)
Vue.component("op", op) //DepartmentSelect Vue.component("op", op) //DepartmentSelect
Vue.component("DepartmentSelect", DepartmentSelect) Vue.component("DepartmentSelect", DepartmentSelect)
......
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