Skip to content

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

页面修改

parent abfe3498
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 73 deletions
pages/produce/execute/taskTime/add.vue
View file @ f94d8ae5
......@@ -5,16 +5,6 @@
<Row>
<Col span="8">
<FormItem label="所属车间">
<!-- <Select v-model="entity.che" style="width: 200px">
<Option
v-for="item in workShopList"
:value="item.value"
:key="item.value"
>
{{ item.label }}
</Option>
</Select> -->
<departmentSelect
:type="3"
@on-change="departChange"
......@@ -23,15 +13,10 @@
</Col>
<Col span="8">
<FormItem label="所属班组">
<!-- <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>
<departmentSelect
:type="1"
@on-change="departChange"
></departmentSelect>
</FormItem>
</Col>
<Col span="8">
......@@ -41,7 +26,7 @@
enter-button
v-model="searchStr"
placeholder="请输入编号/姓名"
@click="searchUsers"
@on-search="searchUsers"
/>
</FormItem>
</Col>
......@@ -50,7 +35,6 @@
<div class="gd_userB">
<a
class="user_item"
v-model="entity.oldUserse"
@click="checkItem(index)"
v-for="(item, index) in listMan"
:key="index"
......@@ -80,12 +64,8 @@
</Col>
<Col span="24" v-show="showSelect">
<FormItem label="添加人员" style="width: 90%">
<UserSelect
ref="userSelected"
v-model="entity.userse"
@on-change="changeUser"
/>
<!-- :roleTitle="roleTitle" :datas="userlist" :multiple="true" -->
<UserSelect ref="userSelected" v-model="entity.userse" />
<!-- :roleTitle="roleTitle" :datas="userlist" :multiple="true" @on-change="changeUser"-->
</FormItem>
</Col>
<Col span="24">
......@@ -107,7 +87,7 @@
<Row>
<Col span="24" style="text-align: right; height: 60px; line-height: 60px">
<Button @click="handleClose" class="mr20">取消</Button>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button type="primary" @click="handleSubmit" v-noClick>确认</Button>
</Col>
</Row>
</div>
......@@ -137,13 +117,14 @@ export default {
},
maxHour: 10,
listMan: [
{
checked: false,
userName: "",
cardNo: "",
id: 0,
},
// {
// checked: false,
// userName: "张珊珊1",
// cardNo: "08965481",
// id: 1
// },{
// checked: false,
// userName: "张珊珊2",
// cardNo: "08965482",
// id: 2
......@@ -166,10 +147,10 @@ export default {
this.listMan = result;
});
},
searchUsers() {
searchUsers(value) {
let parm = {
partmentId: 0,
search: this.searchStr,
search: value,
};
Api.getusers(parm).then((res) => {
let result = res.result;
......@@ -228,18 +209,18 @@ export default {
}
});
if (oolist.length == 0) {
this.showSelect = true;
this.showSelect = true;
}
},
// 选择新增人员
changeUser(data) {
this.$nextTick(() => {
let alloterInfo = this.$refs.userSelected.getSelectItems();
this.entity.cardNo = alloterInfo[0].cardNo;
this.entity.userName = alloterInfo[0].userName;
this.entity.userId = alloterInfo[0].id;
});
},
// changeUser(data) {
// this.$nextTick(() => {
// let alloterInfo = this.$refs.userSelected.getSelectItems();
// this.entity.cardNo = alloterInfo[0].cardNo;
// this.entity.userName = alloterInfo[0].userName;
// this.entity.userId = alloterInfo[0].id;
// });
// },
testChange() {
// 该方法在input内容改变是就会触发进行检测
this.numberChange(this.entity.workHour); // 调用函数
......
pages/produce/execute/taskTime/index.vue
View file @ f94d8ae5
......@@ -66,12 +66,27 @@
<Icon type="ios-add" />
</a>
</div>
<!-- <div>
<Button class="mr20">取消</Button>
<Button type="primary" v-noClick>提交</Button>
</Col>
</Row>
</div> -->
<div
style="
text-align: center;
height: 50px;
width: 100%;
position: absolute;
bottom: 25px;
"
>
<Button type="primary" v-noClick style="height: 50px; width: 100px">
提交
</Button>
&nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;
<Button
class="mr20"
style="background: #d0d2d9; height: 50px; width: 100px"
>
取消
</Button>
</div>
<!-- 新增弹框 -->
<Modal
v-model="addmodal"
......@@ -105,15 +120,7 @@ export default {
// workHour: 0,
// },
],
topInfoShow: {
productName: this.$route.query.productName,
taskSeq: "", //工序号
taskName: "", //工序名
dispatchingNumber: "", //派工数量
qualifiedData: "", //合格数据
performanceQuasiKnot: "", //绩效单件
performanceSingleton: "", //绩效准结
},
topInfoShow: {},
};
},
created() {
......@@ -158,13 +165,14 @@ export default {
// 获取既定users
Api.getentryusers({ Id: id }).then((res) => {
let result = res.result;
// 默认工时分配
this.defaultWorkTime(result);
this.waitHours = 0;
});
}
// 工时分配列表
this.getWorkTimelist();
}
// 工时分配列表
this.getWorkTimelist();
} else {
console.log("获取失败。");
}
......@@ -197,17 +205,16 @@ export default {
var averageHour = this.allHours / length;
//最后一个人的工时
var lastHour = this.allHours - averageHour * (length - 1);
let parme = [];
for (var i = 0; i < length; i++) {
var model = {
userId: result[i].userId,
userTitle: result[i].userTitle,
userCardNo: result[i].userCardNo,
groupId: result[i].groupId,
groupTitle: result[i].groupTitle,
workShopId: result[i].workShopId,
workShopTitle: result[i].workShopTitle,
userId: result[i].id,
userTitle: result[i].userName,
userCardNo: result[i].cardNo,
// groupId: result[i].groupId,
// groupTitle: result[i].groupTitle,
// workShopId: result[i].workShopId,
// workShopTitle: result[i].workShopTitle,
workHour: i == length - 1 ? lastHour : averageHour,
dispatchId: this.$route.query.id,
routingDetailId: this.$route.query.routid,
......@@ -215,7 +222,6 @@ export default {
};
parme.push(model);
}
this.cardMan = parme;
// 默认工时创建
Api.subcreatemodelhours(parme).then((res) => {
if (res.success) {
......@@ -287,8 +293,8 @@ export default {
// this.$refs.addview.listMan = result;
// });
let parm = {
partmentId:0,
search:""
partmentId: 0,
search: "",
};
Api.getusers(parm).then((res) => {
let result = res.result;
......
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