Skip to content

M
mes-ui
Commit 24ca7014 authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents f25e07f5 6d1abacc
Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 57 deletions
pages/aps/aps/components/excute.vue
View file @ 24ca7014
...@@ -161,33 +161,38 @@ export default { ...@@ -161,33 +161,38 @@ export default {
key: "setup_time", key: "setup_time",
title: this.l("setup_time"), title: this.l("setup_time"),
align: "right", align: "right",
high: true high: true,
type: "outputTime",
}, },
{ {
key: "run_time", key: "run_time",
title: this.l("run_time"), title: this.l("run_time"),
align: "right", align: "right",
high: true high: true,
type: "outputTime",
}, },
{ {
key: "outside_time", key: "outside_time",
title: this.l("outside_time"), title: this.l("outside_time"),
align: "right", align: "right",
high: true high: true,
type: "outputTime",
}, },
{ {
key: "transport_time", key: "transport_time",
title: this.l("transport_time"), title: this.l("transport_time"),
align: "right", align: "right",
high: true, high: true,
hide: true hide: true,
type: "outputTime",
}, },
{ {
key: "check_time", key: "check_time",
title: this.l("check_time"), title: this.l("check_time"),
align: "right", align: "right",
high: true, high: true,
hide: true hide: true,
type: "outputTime",
}, },
{ {
key: "efficiency_value", key: "efficiency_value",
......
pages/aps/results/result.vue
View file @ 24ca7014
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
}, },
{ {
title: "零件图号", title: "零件图号",
key: "part_id", key: "part_number",
align: "center" align: "center"
}, },
{ {
......
pages/produce/execute/ProcessCheck/components/guidance.vue
View file @ 24ca7014
<template> <template>
<div class="p20"> <div class="p20">
<div class=""> <div class="case_box">
工艺提醒 <CheckboxGroup v-model="caseLise">
<Checkbox class="file_card" border
v-for="(item,index) in cardlist" :label="item.id" :key="index">
<div class="file">
<Icon type="ios-paper" v-if="item.id%3==0"/>
<!-- <Icon type="ios-film" v-else/> -->
<Icon type="md-film" v-else/>
</div>
<div class="list">
<ul>
<li>{{item.name}}</li>
<li>{{item.userName}}</li>
<li>{{item.time}}</li>
</ul>
</div>
</Checkbox>
</CheckboxGroup>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -12,7 +27,147 @@ export default { ...@@ -12,7 +27,147 @@ export default {
name:'starOrder', name:'starOrder',
data(){ data(){
return{ return{
starmodal: false, cardlist:[
{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:1,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:2,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:3,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:4,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:5,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:6,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:7,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:8,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:9,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:10,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:11,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:12,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:13,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:14,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:15,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:16,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:17,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:18,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:19,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:20,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:21,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:22,
checked:false
},{
name:'工艺文档名称',
userName:'张三',
time:'2020-02-06',
id:23,
checked:false
},
],
} }
}, },
created() { created() {
......
pages/technology/details/routinghcorder/add.vue
View file @ 24ca7014
...@@ -9,7 +9,12 @@ ...@@ -9,7 +9,12 @@
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('printData')" prop="printData"> <FormItem :label="l('printData')" prop="printData">
<DatePicker type="date" v-model="entity.printData" style="width:100%" format="yyyy/MM/dd"></DatePicker> <DatePicker
type="date"
v-model="entity.printData"
style="width:100%"
format="yyyy/MM/dd"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="8">
...@@ -69,7 +74,12 @@ ...@@ -69,7 +74,12 @@
</Col> </Col>
<Col span="8"> <Col span="8">
<FormItem :label="l('effectiveDate')" prop="effectiveDate"> <FormItem :label="l('effectiveDate')" prop="effectiveDate">
<DatePicker type="date" v-model="entity.effectiveDate" style="width:100%" format="yyyy/MM/dd"></DatePicker> <DatePicker
type="date"
v-model="entity.effectiveDate"
style="width:100%"
format="yyyy/MM/dd"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
...@@ -166,7 +176,7 @@ export default { ...@@ -166,7 +176,7 @@ export default {
props: { props: {
v: Object, v: Object,
eid: Number, eid: Number,
headid: Number, headid: Number
}, },
mounted() { mounted() {
// if (this.eid > 0) { // if (this.eid > 0) {
...@@ -175,7 +185,8 @@ export default { ...@@ -175,7 +185,8 @@ export default {
this.loadCode(); this.loadCode();
}, },
methods: { methods: {
loadCode() {//生成更改单编号 loadCode() {
//生成更改单编号
let parma = { let parma = {
code: "JSWJGGD" code: "JSWJGGD"
}; };
...@@ -191,8 +202,11 @@ export default { ...@@ -191,8 +202,11 @@ export default {
this.$refs.form.validate(v => { this.$refs.form.validate(v => {
if (v) { if (v) {
this.disabled = true; this.disabled = true;
this.entity.handlingOpinions=this.entity.handlingOpinionsId this.entity.handlingOpinions = this.entity.handlingOpinionsId;
this.entity.routingHeaderId=this.headid; this.entity.routingHeaderId = this.headid;
if (!this.checked) {
this.entity.status = 1;
}
Api.create(this.entity) Api.create(this.entity)
.then(r => { .then(r => {
this.disabled = false; this.disabled = false;
...@@ -209,9 +223,8 @@ export default { ...@@ -209,9 +223,8 @@ export default {
this.$refs.changeSendReview.info.changeInfo = this.$refs.changeSendReview.info.changeInfo =
res.result.items[0]; res.result.items[0];
this.$refs.changeSendReview.changeorder_code = this.entity.changeorderCode; this.$refs.changeSendReview.changeorder_code = this.entity.changeorderCode;
}); });
this.$refs.changeSendReview.modalInfo = true; this.$refs.changeSendReview.modalInfo = true;
} }
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
...@@ -236,50 +249,49 @@ export default { ...@@ -236,50 +249,49 @@ export default {
}, },
handleImg(e) { handleImg(e) {
console.warn(e); console.warn(e);
let file = null let file = null;
if ( if (
e.clipboardData && e.clipboardData &&
e.clipboardData.items[0] && e.clipboardData.items[0] &&
e.clipboardData.items[0].type && e.clipboardData.items[0].type &&
e.clipboardData.items[0].type.indexOf('image') > -1 e.clipboardData.items[0].type.indexOf("image") > -1
) { ) {
//这里就是判断是否有粘贴进来的文件且文件为图片格式 //这里就是判断是否有粘贴进来的文件且文件为图片格式
file = e.clipboardData.items[0].getAsFile() file = e.clipboardData.items[0].getAsFile();
let reader = new FileReader() let reader = new FileReader();
reader.readAsDataURL(file) reader.readAsDataURL(file);
setTimeout(() => { setTimeout(() => {
var img = '<img src="' + reader.result + '" alt=""/>' var img = '<img src="' + reader.result + '" alt=""/>';
this.entity.beforeChangeContent += img this.entity.beforeChangeContent += img;
}, 1000) }, 1000);
// new R // new R
} }
}, },
handleImg1(e) { handleImg1(e) {
console.warn(e); console.warn(e);
let file = null let file = null;
if ( if (
e.clipboardData && e.clipboardData &&
e.clipboardData.items[0] && e.clipboardData.items[0] &&
e.clipboardData.items[0].type && e.clipboardData.items[0].type &&
e.clipboardData.items[0].type.indexOf('image') > -1 e.clipboardData.items[0].type.indexOf("image") > -1
) { ) {
//这里就是判断是否有粘贴进来的文件且文件为图片格式 //这里就是判断是否有粘贴进来的文件且文件为图片格式
file = e.clipboardData.items[0].getAsFile() file = e.clipboardData.items[0].getAsFile();
let reader = new FileReader() let reader = new FileReader();
reader.readAsDataURL(file) reader.readAsDataURL(file);
setTimeout(() => { setTimeout(() => {
var img = '<img src="' + reader.result + '" alt=""/>' var img = '<img src="' + reader.result + '" alt=""/>';
this.entity.afterChangeContent += img this.entity.afterChangeContent += img;
}, 1000) }, 1000);
// new R // new R
} }
}, },
departChange(v,items) departChange(v, items) {
{ this.entity.departmentId = v;
this.entity.departmentId=v this.entity.departmentName = items.name;
this.entity.departmentName=items.name
}, },
l(key) { l(key) {
key = "routing_header_changeorder" + "." + key; key = "routing_header_changeorder" + "." + key;
......
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