Skip to content

M
mes-ui
Commit e6c645db authored by kangzhenfei's avatar kangzhenfei
Browse files
Options

工艺案例工艺提醒

parent 5b8f7a69
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 87 deletions
i18n/locale/zh-CN.js
View file @ e6c645db
...@@ -1468,7 +1468,7 @@ export default { ...@@ -1468,7 +1468,7 @@ export default {
creator:'创建人', creator:'创建人',
content:'内容', content:'内容',
filePath:'文件路径', filePath:'文件路径',
filePaths:'多个文件路径', filePaths:'文件图片',
dispatchId:'工单id', dispatchId:'工单id',
routingDetailId:'工序id', routingDetailId:'工序id',
routingHeaderId:'工艺规程id', routingHeaderId:'工艺规程id',
......
pages/produce/execute/ProcessCase/add.vue
View file @ e6c645db
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem label> <FormItem label>
<files ref="refFile" :parms="parms" files /> <!-- <files ref="refFile" :parms="parms" files /> -->
<files ref="refFile" :parms="parms" fileFormat :Photos="true" @clickItem="clickData" />
</FormItem> </FormItem>
<!-- <FormItem :label="l('filePath')" prop="filePath"> <!-- <FormItem :label="l('filePath')" prop="filePath">
<InputFile v-model="entity.filePath"></InputFile> <InputFile v-model="entity.filePath"></InputFile>
...@@ -47,10 +48,13 @@ export default { ...@@ -47,10 +48,13 @@ export default {
type: 1 type: 1
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }] title: [{ required: true, message: "请填写案例名称", trigger: "blur" }]
}, },
parms:{ parms:{
app: 'technology', //服务
eid: this.$u.guid(), //记录id
name: '', //表名process_case
field: '' //字段名
}, },
}; };
}, },
...@@ -59,11 +63,12 @@ export default { ...@@ -59,11 +63,12 @@ export default {
eid: Number eid: Number
}, },
created(){ created(){
console.log(this.entity.creator) // console.log(this.entity.creator)
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid > 0) {
this.load(this.eid); this.load(this.eid);
this.$refs.refFile.intFiles()
} }
}, },
methods: { methods: {
...@@ -71,6 +76,13 @@ export default { ...@@ -71,6 +76,13 @@ export default {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
if (this.$refs.refFile.nameList.length > 0) {
// this.entity.filePath = this.$refs.refFile.nameList[0].filePath
this.entity.filePaths = this.parms.eid;
} else {
this.entity.filePath = "";
this.entity.filePaths = "";
}
Api.create(this.entity) Api.create(this.entity)
.then(r => { .then(r => {
this.disabled = false; this.disabled = false;
......
pages/produce/execute/ProcessCase/detail.vue
View file @ e6c645db
...@@ -4,13 +4,15 @@ ...@@ -4,13 +4,15 @@
<Filed :span="24" :name="l('title')">{{entity.title}}</Filed> <Filed :span="24" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed> <Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed> <Filed :span="12" :name="l('filePaths')">
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed> <files
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed> ref="refFile"
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed> :parms="parms"
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed> fileFormat
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed> :Photos="true"
<Filed :span="24" :name="l('filePath')">{{entity.filePath}}</Filed> :showList="false"
@clickItem="clickData"
/></Filed>
<!-- <Filed :span="12" :name="l('filePaths')">{{entity.filePaths}}</Filed> --> <!-- <Filed :span="12" :name="l('filePaths')">{{entity.filePaths}}</Filed> -->
</Row> </Row>
</div> </div>
...@@ -25,6 +27,12 @@ export default { ...@@ -25,6 +27,12 @@ export default {
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }] code: [{ required: true, message: "必填", trigger: "blur" }]
},
parms: {
app: "technology",
eid: "",
name: "",
field: ""
} }
}; };
}, },
...@@ -37,9 +45,15 @@ export default { ...@@ -37,9 +45,15 @@ export default {
} }
}, },
methods: { methods: {
clickData(data,liUrl) {
console.log(liUrl)
console.log(data)
window.open(data, "_blank");
},
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then(r => {
this.entity = r.result; this.entity = r.result;
this.parms.eid = r.result.filePaths;
this.$emit("on-load"); this.$emit("on-load");
}); });
}, },
......
pages/produce/execute/ProcessCheck/guidance/add.vue
View file @ e6c645db
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem label> <FormItem label>
<files ref="refFile" :parms="parms" files /> <!-- <files ref="refFile" :parms="parms" files @clickItem="clickData"/> -->
<files ref="refFile" :parms="parms" fileFormat :Photos="true" @clickItem="clickData" />
</FormItem> </FormItem>
<!-- <FormItem :label="l('filePath')" prop="filePath"> <!-- <FormItem :label="l('filePath')" prop="filePath">
<InputFile v-model="entity.filePath"></InputFile> <InputFile v-model="entity.filePath"></InputFile>
...@@ -29,13 +30,7 @@ export default { ...@@ -29,13 +30,7 @@ export default {
return { return {
disabled: false, disabled: false,
entity: { entity: {
// creationTime: null,
creatorUserId: this.$store.state.userInfo.userId, creatorUserId: this.$store.state.userInfo.userId,
// lastModificationTime: null,
// lastModifierUserId: null,
// isDeleted: null,
// deletionTime: null,
// deleterUserId: null,
title: "", title: "",
creator: this.$store.state.userInfo.userName, creator: this.$store.state.userInfo.userName,
content: "", content: "",
...@@ -47,10 +42,13 @@ export default { ...@@ -47,10 +42,13 @@ export default {
type: 2 type: 2
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }] title: [{ required: true, message: "请填写工艺名称", trigger: "blur" }]
}, },
parms:{ parms: {
app: 'technology', //服务
eid: this.$u.guid(), //记录id
name: '', //表名process_case
field: '' //字段名
}, },
}; };
}, },
...@@ -59,18 +57,29 @@ export default { ...@@ -59,18 +57,29 @@ export default {
eid: Number eid: Number
}, },
created(){ created(){
console.log(this.entity.creator) // console.log(this.entity.creator)
}, },
mounted() { mounted() {
if (this.eid > 0) { if (this.eid > 0) {
this.load(this.eid); this.load(this.eid);
this.$refs.refFile.intFiles()
} }
}, },
methods: { methods: {
clickData(data, liUrl) {
this.entity.filePath = liUrl;
},
handleSubmit() { handleSubmit() {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
if (this.$refs.refFile.nameList.length > 0) {
// this.entity.filePath = this.$refs.refFile.nameList[0].filePath
this.entity.filePaths = this.parms.eid;
} else {
this.entity.filePath = "";
this.entity.filePaths = "";
}
Api.create(this.entity) Api.create(this.entity)
.then(r => { .then(r => {
this.disabled = false; this.disabled = false;
......
pages/produce/execute/ProcessCheck/guidance/detail.vue
View file @ e6c645db
<template> <template>
<div class="detail"> <div class="detail">
<Row>
<Row> <Filed :span="24" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed> <Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed> <Filed :span="24" :name="l('filePaths')">
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed> <files
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed> ref="refFile"
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed> :parms="parms"
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed> fileFormat
<Filed :span="12" :name="l('title')">{{entity.title}}</Filed> :Photos="true"
<Filed :span="12" :name="l('creator')">{{entity.creator}}</Filed> :showList="false"
<Filed :span="12" :name="l('content')">{{entity.content}}</Filed> @clickItem="clickData"
<Filed :span="12" :name="l('filePath')">{{entity.filePath}}</Filed> />
<Filed :span="12" :name="l('filePaths')">{{entity.filePaths}}</Filed> </Filed>
<Filed :span="12" :name="l('dispatchId')">{{entity.dispatchId}}</Filed> </Row>
<Filed :span="12" :name="l('routingDetailId')">{{entity.routingDetailId}}</Filed> </div>
<Filed :span="12" :name="l('routingHeaderId')">{{entity.routingHeaderId}}</Filed>
<Filed :span="12" :name="l('type')">{{entity.type}}</Filed>
</Row>
</div>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Add', name: "Add",
data() { data() {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }], name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: '必填', trigger: 'blur' }] code: [{ required: true, message: "必填", trigger: "blur" }]
} },
} parms: {
}, app: "technology",
props: { eid: "",
eid: Number name: "",
}, field: ""
mounted() {
if (this.eid > 0) {
this.load(this.eid);
}
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.$emit('on-load')
})
},
handleClose() {
this.$emit('on-close')
},
l(key) {
key = "process_case" + "." + key;
return this.$t(key)
} }
}, };
watch: { },
eid(v) { props: {
if (v > 0) { eid: Number
this.load(v); },
} mounted() {
} if (this.eid > 0) {
} this.load(this.eid);
} }
},
methods: {
clickData(data,liUrl) {
console.log(liUrl)
console.log(data)
window.open(data, "_blank");
},
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.parms.eid = r.result.filePaths;
this.$emit("on-load");
});
},
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "process_case" + "." + key;
return this.$t(key);
}
},
watch: {
eid(v) {
if (v > 0) {
this.load(v);
}
}
}
};
</script> </script>
\ No newline at end of file
pages/produce/execute/ProcessCheck/guidance/index.vue
View file @ e6c645db
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</div> --> </div> -->
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide :mask-closable="false"> <Modal v-model="modal" :title="title" width="800" footer-hide :mask-closable="false">
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false">
......
pages/technology/productMix/product/add.vue
View file @ e6c645db
...@@ -134,6 +134,7 @@ export default { ...@@ -134,6 +134,7 @@ export default {
}, },
methods: { methods: {
clickData(data, liUrl) { clickData(data, liUrl) {
debugger
this.img = liUrl; this.img = liUrl;
this.entity.productUrl = liUrl; this.entity.productUrl = liUrl;
}, },
......
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