Skip to content

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

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

parents 6bcd208b afce80ad
Hide whitespace changes
Inline Side-by-side
Showing with 240 additions and 168 deletions
components/page/userSelect.vue
View file @ ebc06c43
...@@ -216,7 +216,7 @@ export default { ...@@ -216,7 +216,7 @@ export default {
if (!this.multiple) { if (!this.multiple) {
//单选时返回信息 //单选时返回信息
if (this.datas && this.datas.length > 0) { if (this.datas && this.datas.length > 0) {
var item2 = this.datas.filter(u => u.value == this.value); var item2 = this.datas.filter(u => u.value == this.value);
if (item2 && item2[0]) { if (item2 && item2[0]) {
items.push(item2[0]); items.push(item2[0]);
} }
...@@ -228,12 +228,21 @@ export default { ...@@ -228,12 +228,21 @@ export default {
} }
} else { } else {
//复选时返回 //复选时返回
this.value.forEach(v => { if (this.datas && this.datas.length > 0) {
var item = this.dic.filter(u => u.value == v); this.value.forEach(v => {
if (item && item[0]) { var item3 = this.dic.filter(u => u.value == v);
items.push(item[0]); if (item3 && item3[0]) {
} items.push(item3[0]);
}); }
});
} else {
this.value.forEach(v => {
var item = this.dic.filter(u => u.value == v);
if (item && item[0]) {
items.push(item[0]);
}
});
}
} }
} }
......
pages/produce/execute/api.js
View file @ ebc06c43
...@@ -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 @ ebc06c43
...@@ -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 @ ebc06c43
<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 @ ebc06c43
...@@ -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 @ ebc06c43
...@@ -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
} }
}); });
......
static/config.js
View file @ ebc06c43
...@@ -21,7 +21,8 @@ window.resourceUrl = `http://${address}:10000/resource`; // 制造资源地址 ...@@ -21,7 +21,8 @@ window.resourceUrl = `http://${address}:10000/resource`; // 制造资源地址
window.workflowUrl = `http://${address}:10000/workflow`; // 工作流地址 window.workflowUrl = `http://${address}:10000/workflow`; // 工作流地址
window.certificateUrl = `http://${address}:10000/qms`; //质量 window.certificateUrl = `http://${address}:10000/qms`; //质量
window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管理 window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管理
window.apsUrl = `http://${address}:10000/aps`;//aps排产 // window.apsUrl = `http://${address}:10000/aps`;//aps排产
window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产
window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口 window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口
window.iconImg = `/imgicon/`; window.iconImg = `/imgicon/`;
......
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