Skip to content

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

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

parents 29e43eaa c1291ef6
Hide whitespace changes
Inline Side-by-side
Showing with 288 additions and 234 deletions
components/page/dataGrid.vue
View file @ add30ba4
...@@ -150,6 +150,10 @@ export default { ...@@ -150,6 +150,10 @@ export default {
type: Function, type: Function,
default: null default: null
}, },
initsearch: {
type: Function,
default: null
},
lazy: { lazy: {
//懒加载设置，设置为真时候，默认不加载数据。 //懒加载设置，设置为真时候，默认不加载数据。
type: Boolean, type: Boolean,
...@@ -291,6 +295,10 @@ export default { ...@@ -291,6 +295,10 @@ export default {
this.tableHeight = window.innerHeight - this.firstY - 60; this.tableHeight = window.innerHeight - this.firstY - 60;
} }
if (this.action) { if (this.action) {
//条件初始化处理。
if(this.initsearch){
this.initsearch(this.search)
}
this.$api.post(this.action, this.search).then(r => { this.$api.post(this.action, this.search).then(r => {
if (this.format) { if (this.format) {
this.list = this.format(r.result.items); this.list = this.format(r.result.items);
......
pages/materiel/classification/add.vue
View file @ add30ba4
...@@ -201,7 +201,7 @@ export default { ...@@ -201,7 +201,7 @@ export default {
this.checkList.splice(index, 1); this.checkList.splice(index, 1);
} }
}, },
setRow(row,index) { setRow(row, index) {
this.$set(this.checkList, index, row); this.$set(this.checkList, index, row);
}, },
addNew() { addNew() {
...@@ -229,12 +229,12 @@ export default { ...@@ -229,12 +229,12 @@ export default {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
} }
}) })
.catch(err => { .catch(err => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
}); });
} }
}); });
......
pages/materiel/classification/edit.vue
View file @ add30ba4
...@@ -69,8 +69,9 @@ ...@@ -69,8 +69,9 @@
<template <template
slot-scope="{ row, index }" slot-scope="{ row, index }"
slot="action" slot="action"
v-if="row.fieldType==2||row.fieldType==3" v-if="row.fieldType==2||row.fieldType==3||!row.notEditDelete"
> >
<!-- notEditDelete=true,删除不显示 -->
<a @click="remove(index,row)" style="color:#FF7A8B">删除</a> <a @click="remove(index,row)" style="color:#FF7A8B">删除</a>
</template> </template>
</Table> </Table>
...@@ -197,7 +198,7 @@ export default { ...@@ -197,7 +198,7 @@ export default {
this.checkList.splice(index, 1); this.checkList.splice(index, 1);
} }
}, },
setRow(row,index) { setRow(row, index) {
this.$set(this.checkList, index, row); this.$set(this.checkList, index, row);
}, },
addNew() { addNew() {
...@@ -227,12 +228,12 @@ export default { ...@@ -227,12 +228,12 @@ export default {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
} }
}) })
.catch(err => { .catch(err => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
}); });
} }
}); });
......
pages/materiel/classification/sonAdd.vue
View file @ add30ba4
...@@ -74,12 +74,12 @@ export default { ...@@ -74,12 +74,12 @@ export default {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
} }
}) })
.catch(err => { .catch(err => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
}); });
} }
}); });
......
pages/materiel/classification/sonEdit.vue
View file @ add30ba4
...@@ -83,12 +83,12 @@ export default { ...@@ -83,12 +83,12 @@ export default {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok",this.entity); this.$emit("on-ok",this.entity);
} else { } else {
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
} }
}) })
.catch(err => { .catch(err => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
}); });
} }
}); });
......
pages/materiel/masterData/add.vue
View file @ add30ba4
<template> <template>
<div> <div>
{{nodeInfo}}
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"> <Col :span="12">
...@@ -25,8 +24,8 @@ ...@@ -25,8 +24,8 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label="版本" prop="banben"> <FormItem label="版本" prop="version">
<Input v-model="entity.banben" placeholder="请输入"></Input> <Input v-model="entity.version" placeholder="请输入"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="24"> <Col :span="24">
...@@ -121,12 +120,12 @@ export default { ...@@ -121,12 +120,12 @@ export default {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
} }
}) })
.catch(err => { .catch(err => {
this.disabled = false; this.disabled = false;
this.$Message.error("保存失败"); this.$Message.error(r.error.message);
}); });
} }
}); });
......
pages/materiel/masterData/index.vue
View file @ add30ba4
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
}, },
handleSelect(root, data) { handleSelect(root, data) {
// console.log(root); // console.log(root);
// console.log(data);
let pid = null; //定义最顶级id let pid = null; //定义最顶级id
let upId = data.upId; let upId = data.upId;
let roots = root; let roots = root;
...@@ -124,11 +124,13 @@ export default { ...@@ -124,11 +124,13 @@ export default {
}); });
} }
addId(roots, upId); addId(roots, upId);
console.log(pid);
this.nodeInfo.categoryId = data.id; this.nodeInfo.categoryId = data.id;
this.nodeInfo.rootCategoryId = pid; if (pid == null) {
// this.$refs.dataTable.$refs.grid.reload(this.nodeInfo); this.nodeInfo.rootCategoryId = data.id;
} else {
this.nodeInfo.rootCategoryId = pid;
}
}, },
loadTree() { loadTree() {
let conditions = []; let conditions = [];
...@@ -149,35 +151,7 @@ export default { ...@@ -149,35 +151,7 @@ export default {
toggle() { toggle() {
this.expand = !this.expand; this.expand = !this.expand;
}, },
change(v, b) { change(v, b) {},
// console.log(v);
// console.log(b);
// }
// var parentList = [];
// buildParentList(v);
// findParent(b.id);
// function buildParentList(arr) {
// arr.forEach(g => {
// console.log(g);
// if (g.upId != undefined) {
// let pid = g["upId"];
// let oid = g["id"];
// parentList[oid] = pid;
// }
// if (g.children != undefined) buildParentList(g["children"]);
// });
// }
// function findParent(idx) {
// alert(idx);
// alert(parentList[idx]);
// if (parentList[idx] != undefined) {
// let pid = parentList[idx];
// console.log(pid);
// findParent(pid);
// } else {
// }
// }
},
hide() { hide() {
this.showMenu = false; this.showMenu = false;
} }
......
pages/materiel/masterData/masterData.vue
View file @ add30ba4
<template> <template>
<div class="master-data"> <div class="master-data">
{{nodeInfo}} {{nodeInfo}}
<DataGrid :columns="columns" ref="grid" :action="action"> <DataGrid :columns="columns" ref="grid" :action="action" :initsearch="sets" :high="false">
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input <Input
placeholder="请输入工艺名称/工艺编号" placeholder="请输入编码/名称/状态"
v-width="200" v-width="200"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
clearable clearable
...@@ -47,21 +47,25 @@ export default { ...@@ -47,21 +47,25 @@ export default {
props: ["nodeInfo"], props: ["nodeInfo"],
data() { data() {
return { return {
action: "", action: Api.index,
modal: false, modal: false,
title: "新增", title: "新增",
curId: 0, curId: 0,
detail: null, detail: null,
sets: v => {
v.categoryId = this.nodeInfo.categoryId;
v.rootCategoryId = this.nodeInfo.rootCategoryId;
},
easySearch: { easySearch: {
keys: { op: "categoryId,rootCategoryId", value: null }, keys: { op: "Code,Name", value: null },
categoryId: { // categoryId: {
op: "In", // op: "In",
value: this.nodeInfo.categoryId // value: this.nodeInfo.categoryId
}, // },
rootCategoryId: { // rootCategoryId: {
op: "In", // op: "In",
value: this.nodeInfo.rootCategoryId // value: this.nodeInfo.rootCategoryId
} // }
}, },
columns: [ columns: [
// { // {
...@@ -71,17 +75,17 @@ export default { ...@@ -71,17 +75,17 @@ export default {
// width: 60 // width: 60
// }, // },
{ {
key: "code", key: "Code",
title: "编码", title: "编码",
align: "left" align: "left"
}, },
{ {
key: "name", key: "Name",
title: "名称", title: "名称",
align: "left" align: "left"
}, },
{ {
key: "status", key: "Status",
title: "状态", title: "状态",
align: "left", align: "left",
render: (h, params) => { render: (h, params) => {
...@@ -89,17 +93,21 @@ export default { ...@@ -89,17 +93,21 @@ export default {
props: { props: {
code: "materail.category.status", code: "materail.category.status",
type: "text", type: "text",
value: params.row.status + "" value: params.row.Status + ""
} }
}); });
} }
}, },
{ {
key: "description", key: "Version",
title: "版本",
align: "left"
},
{
key: "Description",
title: "描述", title: "描述",
align: "left" align: "left"
}, },
{ {
title: "操作", title: "操作",
key: "action", key: "action",
...@@ -132,12 +140,7 @@ export default { ...@@ -132,12 +140,7 @@ export default {
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
created() { created() {},
Api.paged().then(r => {
if (r.success) {
}
});
},
methods: { methods: {
search() { search() {
this.$refs.grid.reload(this.easySearch); this.$refs.grid.reload(this.easySearch);
...@@ -167,7 +170,7 @@ export default { ...@@ -167,7 +170,7 @@ export default {
}); });
}, },
ok() { ok() {
// this.loadTree(); this.$refs.grid.reload(this.easySearch);
this.modal = false; this.modal = false;
this.curId = 0; this.curId = 0;
}, },
...@@ -175,6 +178,13 @@ export default { ...@@ -175,6 +178,13 @@ export default {
this.curId = 0; this.curId = 0;
this.modal = false; this.modal = false;
} }
},
watch: {
"nodeInfo.categoryId"(v) {
if (v) {
this.$refs.grid.reload(this.easySearch);
}
}
} }
}; };
</script> </script>
......
pages/produce/execute/api.js
View file @ add30ba4
...@@ -46,5 +46,8 @@ export default { ...@@ -46,5 +46,8 @@ export default {
getentryusers(params) { getentryusers(params) {
return Api.get(`${PlanUrl}/orderexecutenew/entryusers`, params); return Api.get(`${PlanUrl}/orderexecutenew/entryusers`, params);
}, },
//工时分配--总工时待分配
getallhours(params) {
return Api.post(`${technologyUrl}workhours/allhours`, params);
},
} }
\ No newline at end of file
pages/produce/execute/components/orderlist.vue
View file @ add30ba4
...@@ -81,6 +81,7 @@ export default { ...@@ -81,6 +81,7 @@ export default {
executeId: item.executeId, executeId: item.executeId,
headid: item.routingHeaderId, headid: item.routingHeaderId,
routid: item.routingDetailId,//工序ID routid: item.routingDetailId,//工序ID
quantity: item.quantity, //派工数量
dispatchStatus: item.status dispatchStatus: item.status
} }
}); });
......
pages/produce/execute/taskTime/add.vue
View file @ add30ba4
<template> <template>
<div class="add_user"> <div class="add_user">
<Form ref="form" :model="entity" :rules="rules" :label-width="100"> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row> <Row>
<!-- <Col span="8"> <!-- <Col span="8">
<FormItem label="所属车间"> <FormItem label="所属车间">
<Select v-model="entity.che" style="width:200px"> <Select v-model="entity.che" style="width:200px">
<Option v-for="item in cityList" :value="item.value" :key="item.value"> <Option v-for="item in cityList" :value="item.value" :key="item.value">
...@@ -23,157 +23,176 @@ ...@@ -23,157 +23,176 @@
<FormItem label=""> <FormItem label="">
<Input search enter-button placeholder="请输入编号" /> <Input search enter-button placeholder="请输入编号" />
</FormItem> </FormItem>
</Col> --> </Col>-->
<Col span="24" class="mb20"> <Col span="24" class="mb20">
<FormItem label="既定人员" > <FormItem label="既定人员">
<div class="gd_userB"> <div class="gd_userB">
<a class="user_item" @click="checkItem(index)" v-for="(item,index) in listMan" :key="index"> <a
<div :class="{user_bg:item.checked}" > class="user_item"
<Icon type="md-contact" /> v-model="entity.oldUserse"
<div class="gd_user"> @click="checkItem(index)"
<span class="user_name">{{item.userName}}</span> v-for="(item,index) in listMan"
<span class="user_number">{{item.userCode}}</span> :key="index"
</div> >
</div> <div :class="{user_bg:item.checked}">
</a> <Icon type="md-contact" />
</div> <div class="gd_user">
</FormItem> <p class="user_name">{{item.userName}}</p>
</Col> <p class="user_number">{{item.cardNo}}</p>
<Col span="24"> </div>
<FormItem label="添加人员" style="width:90%" > </div>
<UserSelect <!-- <RadioGroup class="man_body"> v-model="item.checked"
ref="userSelected" <Radio border :label="entity.oldUserse" class="checkUser">
v-model="entity.userse" <span class="svg_name" :title="item.userName">{{item.userName}}</span>
:multiple="true" </Radio >
/> </RadioGroup >-->
<!-- :roleTitle="roleTitle" --> <!-- <radioButton v-model="entity.oldUserse" @on-change="radioChange">
</FormItem> <RadioGroup class="man_body">
</Col> <Radio border :label="entity.oldUserse" class="checkUser">
<Col span="24"> <span class="svg_name" :title="item.userName">{{item.userName}}</span>
<FormItem label="分配工时" prop="setTime"> </Radio >
<!-- <InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; --> </RadioGroup >
<InputNumber :max="100" :min="1" v-model="value1"></InputNumber> 工时 &nbsp;&nbsp;&nbsp;&nbsp; </radioButton>-->
<!-- <InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟 &nbsp;&nbsp;&nbsp;&nbsp; --> </a>
</FormItem> </div>
</Col> </FormItem>
</Row> </Col>
</Form> <Col span="24" v-show="showSelect">
<Row> <FormItem label="添加人员" style="width:90%">
<Col span="24" style="text-align:right;height:60px;line-height:60px"> <UserSelect ref="userSelected" v-model="entity.userse" @on-change="changeUser"/>
<Button @click="handleClose" class="mr20">取消</Button> <!-- :roleTitle="roleTitle" :datas="userlist" :multiple="true" -->
<Button type="primary" @click="handleSubmit">确定</Button> </FormItem>
</Col> </Col>
</Row> <Col span="24">
</div> <FormItem label="分配工时" prop="setTime">
<!-- <InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; -->
<InputNumber :max="maxHour" :min="1" v-model="entity.workHour" @on-change="testChange"></InputNumber>工时 &nbsp;&nbsp;&nbsp;&nbsp;
<!-- <InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟 &nbsp;&nbsp;&nbsp;&nbsp; -->
</FormItem>
</Col>
</Row>
</Form>
<Row>
<Col span="24" style="text-align:right;height:60px;line-height:60px">
<Button @click="handleClose" class="mr20">取消</Button>
<Button type="primary" @click="handleSubmit">保存</Button>
</Col>
</Row>
</div>
</template> </template>
<script> <script>
export default { export default {
data(){ data() {
return{ return {
value1:1, entity: {
entity: { oldUserse: "",
}, userse: null,
rules: { workHour: 1
outSideTime: [ },
{ required: true, message: "必填", type: "number", trigger: "change" } // userlist:[],
] userflag:false,
}, showSelect: true,
// roleTitle: "操作工", rules: {
cityList:[ outSideTime: [
{ { required: true, message: "必填", type: "number", trigger: "change" }
value: '车间A1', ]
label: '车间A1' },
},{ maxHour: 10,
value: '车间A2', listMan: [
label: '车间A2' {
},{ checked: false,
value: '车间A3', userName: "张珊珊1",
label: '车间A3' cardNo: "08965481",
},{ id: 1
value: '车间A4',
label: '车间A4'
},{
value: '车间A5',
label: '车间A5'
},
],
listMan:[
{
checked:false,
userName:'张珊珊1',
userCode:'08965481',
id: 1
},{
checked:false,
userName:'张珊珊2',
userCode:'08965482',
id: 2
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
}
],
}
},
methods: {
handleSubmit(){
this.$emit("on-ok", this.entity);
},
handleClose(){
this.$emit("on-close");
}, },
checkItem(i){ {
this.listMan[i].checked = !this.listMan[i].checked; checked: false,
userName: "张珊珊2",
cardNo: "08965482",
id: 2
}, },
testChange () { // 该方法在input内容改变是就会触发进行检测 {
this.numberChange(this.myNumber ) // 调用函数 checked: false,
}, userName: "张珊珊3",
cardNo: "08965483",
// 封装控制小数点位数的函数 id: 3
numberChange (VauleNumber) { // VauleNumber你想要控制位数的数字 }
let newNumber= null ]
if (VauleNumber >= 0) { };
let reg = /.*\..*/ },
if (reg.test(VauleNumber)) { created(){},
newNumber= parseFloat(VauleNumber.toFixed(1)) methods: {
} else { handleSubmit() {
newNumber= VauleNumber console.log(this.entity);
this.$emit("on-ok", this.entity);
},
//单选框
radioChange(val) {
alert("选择项的值：" + val);
},
handleClose() {
this.$emit("on-close");
},
checkItem(i) {
if(this.userflag){
this.$Message.error("只能选择一人");
return
}
let oldlist = this.listMan
oldlist[i].checked = !oldlist[i].checked;
let oolist = [];
oldlist.map(u => {
if (u.checked) {
oolist.push(u);
this.showSelect = false
if (1 < oolist.length) {
this.$Message.error("只能选择一人");
this.listMan[i].checked = false;
} }
} }
return newNumber });
oolist.map(u => {
if (u.checked) {
this.entity.oldUserse = u.userName;
this.showSelect = false
}else{
this.entity.oldUserse = '';
}
});
if(oolist.length==0){
this.showSelect = true
}
},
// 选择新增人员
changeUser(data){
console.log(data)
if(data&&data!=undefined){
this.userflag = true
}
if(data==undefined){
this.userflag = false
} }
let alloterInfo = this.$refs.userSelected.getSelectItems();
console.log(alloterInfo)
}, },
} testChange() {
// 该方法在input内容改变是就会触发进行检测
this.numberChange(this.entity.workHour); // 调用函数
},
// 封装控制小数点位数的函数
numberChange(VauleNumber) {
// VauleNumber你想要控制位数的数字
let newNumber = null;
if (VauleNumber >= 0) {
let reg = /.*\..*/;
if (reg.test(VauleNumber)) {
newNumber = parseFloat(VauleNumber.toFixed(1));
} else {
newNumber = VauleNumber;
}
}
return newNumber;
}
}
};
</script> </script>
\ No newline at end of file
pages/produce/execute/taskTime/index.vue
View file @ add30ba4
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<!-- <Icon type="ios-time" /> --> <!-- <Icon type="ios-time" /> -->
<div class="gs_bo01"> <div class="gs_bo01">
<span class="shi">总工时</span> <span class="shi">总工时</span>
<span class="number">250</span> <span class="number">{{allHours}}</span>
</div> </div>
</div> </div>
<Divider type="vertical" class="line_slit"/> <Divider type="vertical" class="line_slit"/>
...@@ -16,20 +16,20 @@ ...@@ -16,20 +16,20 @@
<img src="@/assets/imgicon/execute/time02.png" alt=""/> <img src="@/assets/imgicon/execute/time02.png" alt=""/>
<div class="gs_bo01"> <div class="gs_bo01">
<span class="shi">待分配</span> <span class="shi">待分配</span>
<span class="number">200</span> <span class="number">{{waitHours}}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="gs_card_box"> <div class="gs_card_box">
<Card class="gs_card" v-for="i of 8" :key="i"> <Card class="gs_card" v-for="(item,index) in cardMan" :key="index">
<p slot="title" class="gs_title"> <p slot="title" class="gs_title">
张三 {{item.userName}}
<span class="fr">02816335{{i}}</span> <span class="fr">{{item.cardNo}}</span>
</p> </p>
<!-- <p class="gs_p">所属车间：车间A{{i}}</p> <!-- <p class="gs_p">所属车间：车间A{{i}}</p>
<p class="gs_p">所属班组：班组B{{i}}</p> --> <p class="gs_p">所属班组：班组B{{i}}</p> -->
<p class="gs_time"> <p class="gs_time">
<span class="b_size">100</span> 工时 <span class="b_size">{{item.workHour}}</span> 工时
</p> </p>
<!-- <p class="gs_p"> <!-- <p class="gs_p">
<span class="b_size">100</span> 分 <span class="b_size">100</span> 分
...@@ -70,10 +70,20 @@ export default { ...@@ -70,10 +70,20 @@ export default {
msg:'确认要删除吗？', msg:'确认要删除吗？',
title:'删除确认', title:'删除确认',
addmodal: false, addmodal: false,
allHours: 240,
waitHours: 200,
cardMan:[
// {
// userName:"张三",
// cardNo:123123,
// workHour:50,
// }
]
} }
}, },
created() { created() {
// this.treeHeight = window.innerHeight - 120; // this.treeHeight = window.innerHeight - 120;
this.laodHorse()
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
...@@ -87,11 +97,32 @@ export default { ...@@ -87,11 +97,32 @@ export default {
}; };
}, },
methods: { methods: {
laodHorse(){
let parme = {
dispatchId: this.$route.query.id,
routingDetailId: this.$route.query.routid,
count: this.$route.query.quantity
}
Api.getallhours(parme).then(res=>{
if(res.result){
this.allHours = res.result.allHours
this.waitHours = res.result.waitHours
this.$refs.addview.maxHour = this.waitHours
}else{
console.log("获取失败。")
}
})
},
addItem(){ addItem(){
this.addmodal = true this.addmodal = true
let id = this.$route.query.id let id = this.$route.query.id
console.log(id) Api.getentryusers({Id:id}).then(res=>{
// Api.getentryusers().then() let result = res.result
result.map(u=>{
u.checked = false
})
this.$refs.addview.listMan = result
})
}, },
editItem(){ editItem(){
this.$Message.success("编辑工时...") this.$Message.success("编辑工时...")
...@@ -108,7 +139,13 @@ export default { ...@@ -108,7 +139,13 @@ export default {
cancel(){ cancel(){
this.addmodal = false this.addmodal = false
}, },
addInfo(){ addInfo(formdata){
console.log(formdata)
this.cardMan.push(formdata)
// this.cardMan.userName = formdata.userse||formdata.oldUserse
// this.cardMan.cardNo = formdata.cardNo
// this.cardMan.workHour = formdata.workHour
console.log(this.cardMan)
this.addmodal = false this.addmodal = false
} }
}, },
......
pages/produce/orderlist.vue
View file @ add30ba4
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<template slot="card" slot-scope="{row}"> <template slot="card" slot-scope="{row}">
<div <div
class="body" class="body"
@click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.status)" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status)"
> >
<Row class="title-i"> <Row class="title-i">
<Col :span="10" class="order-code">{{row.productName}}</Col> <Col :span="10" class="order-code">{{row.productName}}</Col>
...@@ -186,6 +186,7 @@ export default { ...@@ -186,6 +186,7 @@ export default {
params.row.executeId, params.row.executeId,
params.row.routingHeaderId, params.row.routingHeaderId,
params.row.routingDetailId, params.row.routingDetailId,
params.row.quantity,
params.row.status params.row.status
) )
} }
...@@ -216,7 +217,7 @@ export default { ...@@ -216,7 +217,7 @@ export default {
search() { search() {
this.$refs.grid.reload(this.easySearch); this.$refs.grid.reload(this.easySearch);
}, },
toExecute(id, orderId, executeId, headid, routingDetailId, status) { toExecute(id, orderId, executeId, headid, routingDetailId,quantity, status) {
//跳转到对应操作页面 获取id:this.$route.query.id //跳转到对应操作页面 获取id:this.$route.query.id
this.$router.push({ this.$router.push({
path: "/produce/execute", path: "/produce/execute",
...@@ -226,6 +227,7 @@ export default { ...@@ -226,6 +227,7 @@ export default {
executeId: executeId, //订单执行表id executeId: executeId, //订单执行表id
headid: headid, //工艺规程id headid: headid, //工艺规程id
routid: routingDetailId, //工序ID routid: routingDetailId, //工序ID
quantity: quantity, //派工数量
dispatchStatus: status dispatchStatus: status
} }
}); });
......
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