Skip to content

M
mes-ui
Commit b165d59f authored by zhanglongtao's avatar zhanglongtao
Browse files
Options

修改页面

parent 7fea4d16
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 33 deletions
pages/produce/execute/api.js
View file @ b165d59f
......@@ -71,6 +71,9 @@ export default {
subcreatemodelhours(params) {
return Api.post(`${technologyUrl}workhours/createmoremodel`, params);
},
subupdatehours(params) { // 编辑 提交修改的工时
return Api.post(`${technologyUrl}workhours/updatecount`, params);
},
//工时分配--删除一条
deletehours(params) {
return Api.delete(`${technologyUrl}workhours/delete?id=`+ params);
......
pages/produce/execute/taskTime/add.vue
View file @ b165d59f
......@@ -63,10 +63,10 @@
</FormItem>
</Col>
<Col span="24" v-show="showSelect">
<FormItem label="添加人员" style="width: 90%">
<!-- <FormItem label="添加人员" style="width: 90%">
<UserSelect ref="userSelected" v-model="entity.userse" />
<!-- :roleTitle="roleTitle" :datas="userlist" :multiple="true" @on-change="changeUser"-->
</FormItem>
<!-- </FormItem> -->
</Col>
<Col span="24">
<FormItem label="分配工时" prop="setTime">
......
pages/produce/execute/taskTime/index.vue
View file @ b165d59f
......@@ -44,22 +44,34 @@
   
<p>所属班组：{{ item.groupTitle }}</p>
<p class="gs_time">
<span class="b_size">{{ item.workHour }}</span> 工时
<span v-show="!item.showInputWorkHour" class="b_size">{{
item.workHour
}}</span>
<InputNumber
v-show="item.showInputWorkHour"
:max="maxHour"
:min="1"
:editable="false"
v-model="item.workHour"
@on-change="testChange(item.workHour)"
></InputNumber>
工时
</p>
<!-- <p class="gs_p">
<span class="b_size">100</span> 分
</p>
<p class="gs_p">
<span class="b_size">100</span> 秒
</p>-->
<p class="gs_footer" >
<a class="gs_edit" @click="editItem">
<p class="gs_footer">
<a class="gs_edit" @click="editItem(item, index)">
<Icon type="md-create" />
编辑</a
>
<a
class="gs_del"
style="position: absolute;right:0px; width: 50%;"
style="position: absolute; right: 0px; width: 50%"
@click="delItem(item.id)"
>
<Icon type="ios-trash-outline" />删除
......@@ -67,7 +79,7 @@
</p>
</Card>
<a class="gs_card gs_add" @click="addItem" v-show="this.waitHours != 0">
<Icon type="ios-add" style="vertical-align:middle"/>
<Icon type="ios-add" style="vertical-align: middle" />
</a>
</div>
<div
......@@ -79,13 +91,20 @@
bottom: 25px;
"
>
<Button type="primary" v-noClick style="height: 50px; width: 100px">
<Button
type="primary"
v-noClick
@click="submitWorkHour"
style="height: 50px; width: 100px"
>
提交
</Button>
&nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;
<Button
class="mr20"
style="background: #d0d2d9; height: 50px; width: 100px"
v-noClick
@click="editCancel"
>
取消
</Button>
......@@ -119,13 +138,15 @@ export default {
waitHours: 0,
cardMan: [
// {
// userName: "张三",
// cardNo: 123123,
// workHour: 0,
// showInputWorkHour: true,
// userName: "张三",
// cardNo: 123123,
// workHour: 0,
// },
],
cardManCopy:[],
cardManCopy: [],
topInfoShow: {},
maxHour: 10,
};
},
created() {
......@@ -165,7 +186,7 @@ export default {
this.$refs.addview.maxHour = this.waitHours;
// 如果工时还未分配，则默认人员平均分配
if (this.allHours == this.waitHours) {
if (res.result.allHours == res.result.waitHours) {
let id = this.$route.query.id;
// 获取既定users
Api.getentryusers({ Id: id }).then((res) => {
......@@ -251,15 +272,33 @@ export default {
Api.getentrylist(parm).then((rest) => {
if (rest.success) {
this.cardMan = rest.result;
this.cardManCopy = JSON.parse(JSON.stringify(this.cardMan));
} else {
console.log("获取失败。");
}
});
},
editItem() {
this.$Message.success("编辑工时...");
// 编辑工时
editItem(item, index) {
// 关闭其他编辑框
for (var i = 0; i < this.cardMan.length; i++) {
if (
this.cardMan[i] != item &&
this.cardMan[i].showInputWorkHour == true
) {
this.cardMan[i].showInputWorkHour = false;
this.$set(this.cardMan, i, this.cardMan[i]);
}
}
// 编辑或关闭当前编辑框
console.log(item.workHour)
this.maxHour = item.workHour + this.waitHours;
item.showInputWorkHour = !item.showInputWorkHour;
this.$set(this.cardMan, index, item);
},
// 删除工时
delItem(itmid) {
this.$Modal.confirm({
title: this.title,
......@@ -276,27 +315,39 @@ export default {
},
});
},
// 提交
submitWorkHour() {
if (this.cardMan.length == 0) {
return this.$Message.success("没有工时可提交");
}
Api.subupdatehours(this.cardMan).then((res) => {
if (res.success) {
this.$Message.success("已提交");
this.laodHorse();
} else {
this.$Message.error("提交失败...");
}
});
},
editCancel() {
// this.laodHorse()
this.cardMan = JSON.parse(JSON.stringify(this.cardManCopy));
},
cancel() {
this.addmodal = false;
},
// 打开添加分配人员页面
addItem() {
// let aa=this.$refs.addview.$refs.userSelected.getSelectItems()
// console.log("1",aa)
// if(this.allHours==0){
// this.$Message.info("无工时分配...")
// return
// }
// 添加分配人员时关闭所有编辑框
for (var i = 0; i < this.cardMan.length; i++) {
if (this.cardMan[i].showInputWorkHour == true) {
this.cardMan[i].showInputWorkHour = false;
this.$set(this.cardMan, i, this.cardMan[i]);
}
}
this.$refs.addview.maxHour = this.waitHours;
this.addmodal = true;
let id = this.$route.query.id;
// 既定users
// Api.getentryusers({ Id: id }).then((res) => {
// let result = res.result;
// result.map((u) => {
// u.checked = false;
// });
// this.$refs.addview.listMan = result;
// });
// 获取人员
let parm = {
partmentId: 0,
search: "",
......@@ -312,8 +363,9 @@ export default {
workHour: 1,
};
},
// 保存 添加分配人员
// 保存 添加分配人员
addInfo(formdata) {
this.addmodal = false;
let parme = [
{
userTitle: formdata.userName,
......@@ -328,12 +380,36 @@ export default {
Api.subcreatemodelhours(parme).then((res) => {
if (res.success) {
this.laodHorse();
this.addmodal = false;
} else {
this.addmodal = true;
}
});
},
// 检验编辑内容
testChange(workHour) {
// 该方法在input内容改变是就会触发进行检测
this.numberChange(workHour); // 调用函数
// 编辑框发生变化时，修改待分配工时
let editWorkHour = 0;
this.cardMan.forEach((item) => {
editWorkHour += item.workHour;
});
this.waitHours = this.allHours - editWorkHour;
},
// 封装控制小数点位数的函数
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>
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