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

工艺提醒ok

parent 88aeab98
...@@ -1436,9 +1436,10 @@ export default { ...@@ -1436,9 +1436,10 @@ export default {
filePaths: "", //多个文件路径 filePaths: "", //多个文件路径
dispatchId: '工单id', dispatchId: '工单id',
routingDetailId: '工序id', routingDetailId: '工序id',
routingDetail:'工序',
routingHeaderId: '工艺规程id', routingHeaderId: '工艺规程id',
type: '类型(1工艺案例,2工艺提醒)', type: '类型(1工艺案例,2工艺提醒)',
status:'状态' status:'状态',
}, },
product_info: { product_info: {
......
...@@ -2,8 +2,19 @@ ...@@ -2,8 +2,19 @@
<div> <div>
<Form ref="form" :model="entity" :rules="rules" :label-width="110"> <Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row> <Row>
<Col :span="12">
<FormItem :label="l('routingDetail')" prop="routingDetailId">
<Select v-model="entity.routingDetailId">
<Option
v-for="(item,index) in routingDetailList"
:value="item.value"
:key="index"
>{{ item.label }}</Option>
</Select>
</FormItem>
</Col>
<Col span="12"> <Col span="12">
<FormItem :label="l('title')" prop="title "> <FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"></Input> <Input v-model="entity.title"></Input>
</FormItem> </FormItem>
</Col> </Col>
...@@ -21,7 +32,7 @@ ...@@ -21,7 +32,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
<FormItem :label="l('content')" prop="content "> <FormItem :label="l('content')" prop="content">
<Input v-model="entity.content" type="textarea" :rows="5"></Input> <Input v-model="entity.content" type="textarea" :rows="5"></Input>
</FormItem> </FormItem>
</Col> </Col>
...@@ -40,7 +51,7 @@ ...@@ -40,7 +51,7 @@
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import ApiDetail from "../api";
export default { export default {
name: "Add", name: "Add",
...@@ -58,8 +69,18 @@ export default { ...@@ -58,8 +69,18 @@ export default {
filePaths: "", //多个文件路径 filePaths: "", //多个文件路径
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], title: [{ required: true, message: "必填", trigger: "blur" }],
content: [{ required: true, message: "必填", trigger: "blur" }],
routingDetailId: [
{
required: true,
message: "请选择工序",
type: "number",
trigger: "change",
},
],
}, },
routingDetailList: [],
parms: { parms: {
app: "technology", app: "technology",
eid: null, eid: null,
...@@ -68,14 +89,30 @@ export default { ...@@ -68,14 +89,30 @@ export default {
}, },
}; };
}, },
props: { props: ["eid"],
eid: String,
},
mounted() { mounted() {
this.loadDetails();
this.parms.eid = this.$u.guid(); this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles(); this.$refs.refFile.intFiles();
}, },
methods: { methods: {
loadDetails() {
//获取工序列表
let parms = {
headerID: this.eid,
};
ApiDetail.pagedDetails(parms).then((r) => {
let tempDetails = r.result;
let tempD = [];
tempDetails.forEach((data) => {
let tempObj = {};
tempObj.value = data.id;
tempObj.label = data.taskSeq + " " + data.name;
tempD.push(tempObj);
});
this.routingDetailList = tempD;
});
},
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
if (v) { if (v) {
......
...@@ -38,6 +38,18 @@ export default { ...@@ -38,6 +38,18 @@ export default {
detail: null, detail: null,
curId: 0, curId: 0,
columns: [ columns: [
{
type: "index",
width: 60,
align: "center",
},
{
key: "routingDetail",
title: this.l("routingDetail"),
align: "left",
high: true,
tooltip: true,
},
{ {
key: "title", key: "title",
title: this.l("title"), title: this.l("title"),
...@@ -117,6 +129,8 @@ export default { ...@@ -117,6 +129,8 @@ export default {
props: ["headerid"], props: ["headerid"],
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