Skip to content

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

修改工时页面

parent 1d9c2ce6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 356 additions and 157 deletions
pages/produce/execute/api.js
View file @ abfe3498
...@@ -50,6 +50,12 @@ export default { ...@@ -50,6 +50,12 @@ export default {
getentryusers(params) { getentryusers(params) {
return Api.get(`${PlanUrl}/orderexecutenew/entryusers`, params); return Api.get(`${PlanUrl}/orderexecutenew/entryusers`, params);
}, },
getusers(params) {
return Api.get(`${PlanUrl}/orderexecutenew/getusers`,params);
},
gethourinfo(params) {
return Api.get(`${technologyUrl}workhours/gethourinfo`, params);
},
//工时分配--工时列表 //工时分配--工时列表
getentrylist(params) { getentrylist(params) {
return Api.post(`${technologyUrl}workhours/list`, params); return Api.post(`${technologyUrl}workhours/list`, params);
...@@ -62,6 +68,9 @@ export default { ...@@ -62,6 +68,9 @@ export default {
subcreatehours(params) { subcreatehours(params) {
return Api.post(`${technologyUrl}workhours/createmore`, params); return Api.post(`${technologyUrl}workhours/createmore`, params);
}, },
subcreatemodelhours(params) {
return Api.post(`${technologyUrl}workhours/createmoremodel`, params);
},
//工时分配--删除一条 //工时分配--删除一条
deletehours(params) { deletehours(params) {
return Api.delete(`${technologyUrl}workhours/delete?id=`+ params); return Api.delete(`${technologyUrl}workhours/delete?id=`+ params);
......
pages/produce/execute/taskTime/add.vue
View file @ abfe3498
...@@ -3,42 +3,63 @@ ...@@ -3,42 +3,63 @@
<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
{{ item.label }} v-for="item in workShopList"
</Option> :value="item.value"
</Select> :key="item.value"
</FormItem> >
</Col> {{ item.label }}
<Col span="8"> </Option>
<FormItem label="所属班组"> </Select> -->
<Select v-model="entity.productName" style="width:200px">
<Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option> <departmentSelect
</Select> :type="3"
</FormItem> @on-change="departChange"
</Col> ></departmentSelect>
<Col span="8"> </FormItem>
<FormItem label=""> </Col>
<Input search enter-button placeholder="请输入编号" /> <Col span="8">
</FormItem> <FormItem label="所属班组">
</Col>--> <!-- <Select v-model="entity.productName" style="width: 200px">
<Option
v-for="item in groupList"
:value="item.value"
:key="item.value"
>{{ item.label }}</Option
>
</Select> -->
<departmentSelect :type="1"></departmentSelect>
</FormItem>
</Col>
<Col span="8">
<FormItem label="">
<Input
search
enter-button
v-model="searchStr"
placeholder="请输入编号/姓名"
@click="searchUsers"
/>
</FormItem>
</Col>
<Col span="24" class="mb20"> <Col span="24" class="mb20">
<FormItem label="既定人员"> <FormItem label="选择人员">
<div class="gd_userB"> <div class="gd_userB">
<a <a
class="user_item" class="user_item"
v-model="entity.oldUserse" v-model="entity.oldUserse"
@click="checkItem(index)" @click="checkItem(index)"
v-for="(item,index) in listMan" v-for="(item, index) in listMan"
:key="index" :key="index"
> >
<div :class="{user_bg:item.checked}"> <div :class="{ user_bg: item.checked }">
<Icon type="md-contact" /> <Icon type="md-contact" />
<div class="gd_user"> <div class="gd_user">
<p class="user_name">{{item.userName}}</p> <p class="user_name">{{ item.userName }}</p>
<p class="user_number">{{item.cardNo}}</p> <p class="user_number">{{ item.cardNo }}</p>
</div> </div>
</div> </div>
<!-- <RadioGroup class="man_body"> v-model="item.checked" <!-- <RadioGroup class="man_body"> v-model="item.checked"
...@@ -58,22 +79,33 @@ ...@@ -58,22 +79,33 @@
</FormItem> </FormItem>
</Col> </Col>
<Col span="24" v-show="showSelect"> <Col span="24" v-show="showSelect">
<FormItem label="添加人员" style="width:90%"> <FormItem label="添加人员" style="width: 90%">
<UserSelect ref="userSelected" v-model="entity.userse" @on-change="changeUser"/> <UserSelect
ref="userSelected"
v-model="entity.userse"
@on-change="changeUser"
/>
<!-- :roleTitle="roleTitle" :datas="userlist" :multiple="true" --> <!-- :roleTitle="roleTitle" :datas="userlist" :multiple="true" -->
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
<FormItem label="分配工时" prop="setTime"> <FormItem label="分配工时" prop="setTime">
<!-- <InputNumber :max="30" :min="0" :step="1" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; --> <!-- <InputNumber :max="30" :min="0" :step="1" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; -->
<InputNumber :max="maxHour" :min="1" :editable="false" v-model="entity.workHour" @on-change="testChange"></InputNumber>&nbsp;&nbsp;&nbsp;&nbsp;工时 <InputNumber
:max="maxHour"
:min="1"
:editable="false"
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; --> <!-- <InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟 &nbsp;&nbsp;&nbsp;&nbsp; -->
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
</Form> </Form>
<Row> <Row>
<Col span="24" style="text-align:right;height:60px;line-height:60px"> <Col span="24" style="text-align: right; height: 60px; line-height: 60px">
<Button @click="handleClose" class="mr20">取消</Button> <Button @click="handleClose" class="mr20">取消</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
</Col> </Col>
...@@ -81,49 +113,78 @@ ...@@ -81,49 +113,78 @@
</div> </div>
</template> </template>
<script> <script>
import Api from "../api";
export default { export default {
data() { data() {
return { return {
entity: { entity: {
oldUserse: "", oldUserse: "",
userse: null, userse: null,
workHour: 1 workHour: 1,
}, },
// userlist:[], // userlist:[],
userflag:false, userflag: false,
showSelect: true, showSelect: true,
rules: { rules: {
outSideTime: [ outSideTime: [
{ required: true, message: "必填", type: "number", trigger: "change" } {
] required: true,
message: "必填",
type: "number",
trigger: "change",
},
],
}, },
maxHour: 10, maxHour: 10,
listMan: [ listMan: [
{ // {
checked: false, // checked: false,
userName: "张珊珊1", // userName: "张珊珊1",
cardNo: "08965481", // cardNo: "08965481",
id: 1 // id: 1
},{ // },{
checked: false, // checked: false,
userName: "张珊珊2", // userName: "张珊珊2",
cardNo: "08965482", // cardNo: "08965482",
id: 2 // id: 2
}, // },
] ],
workShopList: [],
groupList: [],
searchStr: "",
}; };
}, },
created(){}, created() {},
methods: { methods: {
departChange(v, item) {
let parm = {
partmentId: v,
search: "",
};
Api.getusers(parm).then((res) => {
let result = res.result;
this.listMan = result;
});
},
searchUsers() {
let parm = {
partmentId: 0,
search: this.searchStr,
};
Api.getusers(parm).then((res) => {
let result = res.result;
this.listMan = result;
});
},
handleSubmit() { handleSubmit() {
this.listMan.map(item=>{ this.listMan.map((item) => {
if(item.checked){ if (item.checked) {
this.entity.cardNo = item.cardNo this.entity.cardNo = item.cardNo;
} }
}) });
// console.log(this.entity); // console.log(this.entity);
this.$emit("on-ok", this.entity); this.$emit("on-ok", this.entity);
this.showSelect = true this.showSelect = true;
}, },
//单选框 //单选框
radioChange(val) { radioChange(val) {
...@@ -131,53 +192,53 @@ export default { ...@@ -131,53 +192,53 @@ export default {
}, },
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
this.entity={ this.entity = {
cardNo: "", cardNo: "",
oldUserse: null, oldUserse: null,
userse: null, userse: null,
workHour: 1, workHour: 1,
} };
}, },
checkItem(i) { checkItem(i) {
if(this.userflag){ if (this.userflag) {
this.$Message.error("只能选择一人"); this.$Message.error("只能选择一人");
return return;
} }
let oldlist = this.listMan let oldlist = this.listMan;
oldlist[i].checked = !oldlist[i].checked; oldlist[i].checked = !oldlist[i].checked;
let oolist = []; let oolist = [];
oldlist.map(u => { oldlist.map((u) => {
if (u.checked) { if (u.checked) {
oolist.push(u); oolist.push(u);
this.showSelect = false this.showSelect = false;
if (1 < oolist.length) { if (1 < oolist.length) {
this.$Message.error("只能选择一人"); this.$Message.error("只能选择一人");
this.listMan[i].checked = false; this.listMan[i].checked = false;
} }
} }
}); });
oolist.map(u => { oolist.map((u) => {
if (u.checked) { if (u.checked) {
this.entity.userName = u.userName; this.entity.userName = u.userName;
this.entity.userId = u.id this.entity.userId = u.id;
this.showSelect = false this.showSelect = false;
}else{ } else {
this.entity.userName = ''; this.entity.userName = "";
this.entity.userId = '' this.entity.userId = "";
} }
}); });
if(oolist.length==0){ if (oolist.length == 0) {
this.showSelect = true this.showSelect = true;
} }
}, },
// 选择新增人员 // 选择新增人员
changeUser(data){ changeUser(data) {
this.$nextTick(()=>{ this.$nextTick(() => {
let alloterInfo = this.$refs.userSelected.getSelectItems(); let alloterInfo = this.$refs.userSelected.getSelectItems();
this.entity.cardNo = alloterInfo[0].cardNo this.entity.cardNo = alloterInfo[0].cardNo;
this.entity.userName = alloterInfo[0].userName this.entity.userName = alloterInfo[0].userName;
this.entity.userId = alloterInfo[0].id this.entity.userId = alloterInfo[0].id;
}) });
}, },
testChange() { testChange() {
// 该方法在input内容改变是就会触发进行检测 // 该方法在input内容改变是就会触发进行检测
...@@ -196,7 +257,7 @@ export default { ...@@ -196,7 +257,7 @@ export default {
} }
} }
return newNumber; return newNumber;
} },
} },
}; };
</script> </script>
\ No newline at end of file
pages/produce/execute/taskTime/index.vue
View file @ abfe3498
This diff is collapsed.
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