Skip to content

M
mes-ui
Commit 57fd5ebb authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

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

parents a91d33f2 8cdd013c
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 93 deletions
i18n/locale/zh-CN.js
View file @ 57fd5ebb
......@@ -1468,7 +1468,7 @@ export default {
creator:'创建人',
content:'内容',
filePath:'文件路径',
filePaths:'多个文件路径',
filePaths:'文件图片',
dispatchId:'工单id',
routingDetailId:'工序id',
routingHeaderId:'工艺规程id',
......
pages/produce/execute/ProcessCase/add.vue
View file @ 57fd5ebb
......@@ -8,7 +8,8 @@
</Col>
<Col :span="24">
<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 :label="l('filePath')" prop="filePath">
<InputFile v-model="entity.filePath"></InputFile>
......@@ -47,10 +48,13 @@ export default {
type: 1
},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }]
title: [{ required: true, message: "请填写案例名称", trigger: "blur" }]
},
parms:{
app: 'technology', //服务
eid: this.$u.guid(), //记录id
name: '', //表名process_case
field: '' //字段名
},
};
},
......@@ -59,11 +63,12 @@ export default {
eid: Number
},
created(){
console.log(this.entity.creator)
// console.log(this.entity.creator)
},
mounted() {
if (this.eid > 0) {
this.load(this.eid);
this.$refs.refFile.intFiles()
}
},
methods: {
......@@ -71,6 +76,13 @@ export default {
this.$refs.form.validate(v => {
if (v) {
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)
.then(r => {
this.disabled = false;
......
pages/produce/execute/ProcessCase/detail.vue
View file @ 57fd5ebb
......@@ -4,13 +4,15 @@
<Filed :span="24" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
<Filed :span="24" :name="l('filePath')">{{entity.filePath}}</Filed>
<Filed :span="12" :name="l('filePaths')">
<files
ref="refFile"
:parms="parms"
fileFormat
:Photos="true"
:showList="false"
@clickItem="clickData"
/></Filed>
<!-- <Filed :span="12" :name="l('filePaths')">{{entity.filePaths}}</Filed> -->
</Row>
</div>
......@@ -25,6 +27,12 @@ export default {
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }]
},
parms: {
app: "technology",
eid: "",
name: "",
field: ""
}
};
},
......@@ -37,9 +45,15 @@ export default {
}
},
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");
});
},
......
pages/produce/execute/ProcessCase/index.vue
View file @ 57fd5ebb
......@@ -46,7 +46,9 @@
<Row :gutter="16">
<Col span="6">
<div class="file">
<Icon type="ios-paper" v-if="row.id%2==0" />
<!-- <img :src="fileUrlDown +row.filePaths" /> -->
<!-- <Icon type="ios-paper" v-if="row.id%2==0" /> -->
<Icon type="ios-paper" v-if="row.filePaths" />
<Icon type="md-film" v-else />
</div>
</Col>
......
pages/produce/execute/ProcessCheck/guidance/add.vue
View file @ 57fd5ebb
......@@ -8,7 +8,8 @@
</Col>
<Col :span="24">
<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 :label="l('filePath')" prop="filePath">
<InputFile v-model="entity.filePath"></InputFile>
......@@ -29,13 +30,7 @@ export default {
return {
disabled: false,
entity: {
// creationTime: null,
creatorUserId: this.$store.state.userInfo.userId,
// lastModificationTime: null,
// lastModifierUserId: null,
// isDeleted: null,
// deletionTime: null,
// deleterUserId: null,
title: "",
creator: this.$store.state.userInfo.userName,
content: "",
......@@ -47,10 +42,13 @@ export default {
type: 2
},
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 {
eid: Number
},
created(){
console.log(this.entity.creator)
// console.log(this.entity.creator)
},
mounted() {
if (this.eid > 0) {
this.load(this.eid);
this.$refs.refFile.intFiles()
}
},
methods: {
clickData(data, liUrl) {
this.entity.filePath = liUrl;
},
handleSubmit() {
this.$refs.form.validate(v => {
if (v) {
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)
.then(r => {
this.disabled = false;
......
pages/produce/execute/ProcessCheck/guidance/detail.vue
View file @ 57fd5ebb
<template>
<div class="detail">
<Row>
<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
<Filed :span="12" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="12" :name="l('creator')">{{entity.creator}}</Filed>
<Filed :span="12" :name="l('content')">{{entity.content}}</Filed>
<Filed :span="12" :name="l('filePath')">{{entity.filePath}}</Filed>
<Filed :span="12" :name="l('filePaths')">{{entity.filePaths}}</Filed>
<Filed :span="12" :name="l('dispatchId')">{{entity.dispatchId}}</Filed>
<Filed :span="12" :name="l('routingDetailId')">{{entity.routingDetailId}}</Filed>
<Filed :span="12" :name="l('routingHeaderId')">{{entity.routingHeaderId}}</Filed>
<Filed :span="12" :name="l('type')">{{entity.type}}</Filed>
</Row>
</div>
<div class="detail">
<Row>
<Filed :span="24" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed>
<Filed :span="24" :name="l('filePaths')">
<files
ref="refFile"
:parms="parms"
fileFormat
:Photos="true"
:showList="false"
@clickItem="clickData"
/>
</Filed>
</Row>
</div>
</template>
<script>
import Api from './api'
export default {
name: 'Add',
data() {
return {
entity: {},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
},
props: {
eid: Number
},
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)
import Api from "./api";
export default {
name: "Add",
data() {
return {
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
code: [{ required: true, message: "必填", trigger: "blur" }]
},
parms: {
app: "technology",
eid: "",
name: "",
field: ""
}
},
watch: {
eid(v) {
if (v > 0) {
this.load(v);
}
}
}
};
},
props: {
eid: Number
},
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>
\ No newline at end of file
pages/produce/execute/ProcessCheck/guidance/index.vue
View file @ 57fd5ebb
......@@ -43,7 +43,7 @@
<Row :gutter="16">
<Col span="6">
<div class="file">
<Icon type="ios-paper" v-if="row.id%2==0" />
<Icon type="ios-paper" v-if="row.filePaths" />
<Icon type="md-film" v-else />
</div>
</Col>
......@@ -73,7 +73,7 @@
</div> -->
</template>
</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" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false">
......
pages/produce/execute/execute.less
View file @ 57fd5ebb
......@@ -330,7 +330,8 @@
height: 59px;
line-height: 60px;
text-align: center;
width: calc(50% - 2px);
width: calc(100% - 0px);
// width: calc(50% - 2px);
}
.gs_del{
background: #2680EB;
......
pages/produce/execute/taskTime/index.vue
View file @ 57fd5ebb
......@@ -21,7 +21,7 @@
</div>
</div>
<div class="gs_card_box">
<Card class="gs_card" v-for="i of 5" :key="i">
<Card class="gs_card" v-for="i of 1" :key="i">
<p slot="title" class="gs_title">
张三
<span class="fr">02816335{{i}}</span>
......@@ -32,9 +32,9 @@
<span class="b_size">100</span> 工时
</p>
<p class="gs_footer">
<a class="gs_edit" @click="editItem">
<!-- <a class="gs_edit" @click="editItem">
<Icon type="md-create" />
编辑</a>
编辑</a> -->
<a class="gs_del" @click="delItem">
<Icon type="ios-trash-outline" />
删除</a>
......
pages/technology/productMix/product/add.vue
View file @ 57fd5ebb
......@@ -134,6 +134,7 @@ export default {
},
methods: {
clickData(data, liUrl) {
debugger
this.img = 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