Commit d1bb05fc authored by kangzhenfei's avatar kangzhenfei

质量判定

parent 118c9dad
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
<div class="gs_set"> <div class="gs_set">
<div class="gs_top"> <div class="gs_top">
<div class="gs_top_box total_time"> <div class="gs_top_box total_time">
<img src="@/assets/imgicon/execute/time01.png" alt=""/> <img src="@/assets/imgicon/execute/time01.png" alt />
<!-- <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">{{allHours}}</span> <span class="number">{{allHours}}</span>
</div> </div>
</div> </div>
<Divider type="vertical" class="line_slit"/> <Divider type="vertical" class="line_slit" />
<div class="gs_top_box allocated"> <div class="gs_top_box allocated">
<!-- <Icon type="md-pie" /> --> <!-- <Icon type="md-pie" /> -->
<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">{{waitHours}}</span> <span class="number">{{waitHours}}</span>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<!-- <span class="fr">{{item.cardNo}}</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">{{item.workHour}}</span> 工时 <span class="b_size">{{item.workHour}}</span> 工时
</p> </p>
...@@ -36,24 +36,22 @@ ...@@ -36,24 +36,22 @@
</p> </p>
<p class="gs_p"> <p class="gs_p">
<span class="b_size">100</span> <span class="b_size">100</span>
</p> --> </p>-->
<p class="gs_footer"> <p class="gs_footer">
<!-- <a class="gs_edit" @click="editItem"> <!-- <a class="gs_edit" @click="editItem">
<Icon type="md-create" /> <Icon type="md-create" />
编辑</a> --> 编辑</a>-->
<a class="gs_del" @click="delItem(item.id)"> <a class="gs_del" @click="delItem(item.id)">
<Icon type="ios-trash-outline" /> <Icon type="ios-trash-outline" />删除
删除</a> </a>
</p> </p>
</Card> </Card>
<a class="gs_card gs_add" @click="addItem"> <a class="gs_card gs_add" @click="addItem" v-show="this.allHours!=0">
<Icon type="ios-add" /> <Icon type="ios-add" />
</a> </a>
</div> </div>
<!-- 新增弹框 --> <!-- 新增弹框 -->
<Modal <Modal v-model="addmodal" width="1100" :mask-closable="false" title="添加人员" footer-hide>
v-model="addmodal" width='1100' :mask-closable="false"
title="添加人员" footer-hide >
<addview ref="addview" @on-close="cancel" @on-ok="addInfo"></addview> <addview ref="addview" @on-close="cancel" @on-ok="addInfo"></addview>
</Modal> </Modal>
</div> </div>
...@@ -62,28 +60,28 @@ ...@@ -62,28 +60,28 @@
import addview from "./add"; import addview from "./add";
import Api from "../api"; import Api from "../api";
export default { export default {
name:'starOrder', name: "starOrder",
components: {addview,}, components: { addview },
data(){ data() {
return{ return {
starmodal: false, starmodal: false,
msg:'确认要删除吗?', msg: "确认要删除吗?",
title:'删除确认', title: "删除确认",
addmodal: false, addmodal: false,
allHours: 240, allHours: 240,
waitHours: 200, waitHours: 200,
cardMan:[ cardMan: [
// { // {
// userName:"张三", // userName:"张三",
// cardNo:123123, // cardNo:123123,
// workHour:50, // workHour:50,
// } // }
] ]
} };
}, },
created() { created() {
// this.treeHeight = window.innerHeight - 120; // this.treeHeight = window.innerHeight - 120;
this.laodHorse() this.laodHorse();
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
...@@ -97,21 +95,21 @@ export default { ...@@ -97,21 +95,21 @@ export default {
}; };
}, },
methods: { methods: {
laodHorse(){ laodHorse() {
let parme = { let parme = {
dispatchId: this.$route.query.id, dispatchId: this.$route.query.id,
routingDetailId: this.$route.query.routid, routingDetailId: this.$route.query.routid,
count: this.$route.query.quantity 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("获取失败。");
} }
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("获取失败。")
}
})
let parm = { let parm = {
conditions: [ conditions: [
{ {
...@@ -119,56 +117,56 @@ export default { ...@@ -119,56 +117,56 @@ export default {
fieldValue: this.$route.query.id, fieldValue: this.$route.query.id,
conditionalType: "Equal" conditionalType: "Equal"
} }
], ]
} };
Api.getentrylist(parm).then(rest =>{ Api.getentrylist(parm).then(rest => {
if(rest.success){ if (rest.success) {
this.cardMan = rest.result this.cardMan = rest.result;
}else{ } else {
console.log("获取失败。") console.log("获取失败。");
} }
}) });
}, },
addItem(){ addItem() {
// let aa=this.$refs.addview.$refs.userSelected.getSelectItems() // let aa=this.$refs.addview.$refs.userSelected.getSelectItems()
// console.log("1",aa) // console.log("1",aa)
if(this.allHours==0){ // if(this.allHours==0){
this.$Message.info("无工时分配...") // this.$Message.info("无工时分配...")
return // return
} // }
this.addmodal = true this.addmodal = true;
let id = this.$route.query.id let id = this.$route.query.id;
Api.getentryusers({Id:id}).then(res=>{ Api.getentryusers({ Id: id }).then(res => {
let result = res.result let result = res.result;
result.map(u=>{ result.map(u => {
u.checked = false u.checked = false;
}) });
this.$refs.addview.listMan = result this.$refs.addview.listMan = result;
}) });
}, },
editItem(){ editItem() {
this.$Message.success("编辑工时...") this.$Message.success("编辑工时...");
}, },
delItem(itmid){ delItem(itmid) {
this.$Modal.confirm({ this.$Modal.confirm({
title: this.title, title: this.title,
content: "<p>" + this.msg + "</p>", content: "<p>" + this.msg + "</p>",
onOk: () => { onOk: () => {
Api.deletehours(itmid).then(res=>{ Api.deletehours(itmid).then(res => {
if(res.success){ if (res.success) {
this.laodHorse() this.laodHorse();
this.$Message.success("工时已删除") this.$Message.success("工时已删除");
}else{ } else {
this.$Message.error("删除失败...") this.$Message.error("删除失败...");
} }
}) });
} }
}); });
}, },
cancel(){ cancel() {
this.addmodal = false this.addmodal = false;
}, },
addInfo(formdata){ addInfo(formdata) {
let parme = { let parme = {
users: [ users: [
{ {
...@@ -180,12 +178,16 @@ export default { ...@@ -180,12 +178,16 @@ export default {
dispatchId: this.$route.query.id, dispatchId: this.$route.query.id,
routingDetailId: this.$route.query.routid, routingDetailId: this.$route.query.routid,
count: this.$route.query.quantity count: this.$route.query.quantity
} };
Api.subcreatehours(parme).then(res => { Api.subcreatehours(parme).then(res => {
if(res.success){ this.laodHorse() } if (res.success) {
}) this.laodHorse();
this.addmodal = false this.addmodal = false;
}else{
this.addmodal = true;
} }
}, });
} }
}
};
</script> </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