Skip to content

M
mes-ui
Commit d00ed736 authored by renjintao's avatar renjintao
Browse files
Options

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

parents 0835f8a9 26eb1c60
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 52 deletions
pages/aps/complete/index.vue
View file @ d00ed736
......@@ -5,9 +5,9 @@
<Col :span="10" class="chan-chi">整机排产-排产池</Col>
<Col :span="14" class="l-ringht">
<!-- <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
<Radio label="0">未排产</Radio> -->
<!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> -->
<Radio label="0">未排产</Radio>-->
<!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> -->
<!-- </RadioGroup> -->
</Col>
</Row>
......@@ -58,19 +58,8 @@
<Radio label="1">班组</Radio>
</RadioGroup>
</FormItem>
<FormItem label="人员" v-if="formItem.radio==0">
<UserSelect
ref="userSelected"
v-model="formItem.userIds"
style="width:300px"
:multiple="true"
/>
<!-- <Dictionary
disabled
code="aps.scheduling.groupingForm"
v-model="formItem.resourcesType"
type="radio"
></Dictionary>-->
<FormItem v-if="formItem.radio==0">
<UserSelect v-model="user" :multiple="true" theme="list" />
</FormItem>
<FormItem label="班组" v-if="formItem.radio==1">
<Select v-model="formItem.shopId" placeholder="请选择" style="width:300px">
......@@ -122,14 +111,10 @@
</div>
</template>
<script>
import CheckboxList from "./checkboxList";
import Api from "./api";
export default {
name: "list",
components: {
CheckboxList
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
......@@ -202,8 +187,8 @@ export default {
if (r.success) {
r.result.map(e => {
e.checked = false;
e.demandFinishDate = e.demandFinishDate.substr(0,10)
e.demandStartDate = e.demandStartDate.substr(0,10)
e.demandFinishDate = e.demandFinishDate.substr(0, 10);
e.demandStartDate = e.demandStartDate.substr(0, 10);
});
this.list = r.result;
}
......@@ -243,7 +228,7 @@ export default {
// }
let params1 = {
orderIds: this.orderIds,
userIds: this.formItem.userIds,
userIds: this.user,
beginTime: this.formItem.beginTime,
endTime: this.formItem.endTime,
remark: this.formItem.remark
......@@ -254,7 +239,7 @@ export default {
this.$Message.success("下发成功");
this.orderlist(this.status);
this.orderIds = [];
this.showSet = false;
this.showSet = false;
} else {
this.$Message.success("下发失败");
this.formItem = {};
......
pages/aps/stream/index.vue
View file @ d00ed736
......@@ -5,9 +5,9 @@
<Col :span="9" class="chan-chi">流水排产-排产池</Col>
<Col :span="15" class="l-ringht">
<!-- <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
<Radio label="0">未排产</Radio> -->
<!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> -->
<Radio label="0">未排产</Radio>-->
<!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> -->
<!-- </RadioGroup> -->
</Col>
</Row>
......@@ -190,8 +190,8 @@ export default {
if (r.result) {
r.result.map(u => {
u.aps = 0;
u.demandFinishDate = u.demandFinishDate.substr(0,10)
u.demandStartDate = u.demandStartDate.substr(0,10)
u.demandFinishDate = u.demandFinishDate.substr(0, 10);
u.demandStartDate = u.demandStartDate.substr(0, 10);
});
this.list = r.result;
// if (r.result[0]) {
......@@ -268,7 +268,7 @@ export default {
this.indexId = index;
this.detailId = item.detailId;
this.active = index;
this.$refs.setObj.formItem={}
this.$refs.setObj.formItem = {};
// this.group.orderId = item.orderId;
// this.group.routingHeaderId = item.routingHeaderId;
// this.$refs.setObj.formItem = {};
......@@ -335,6 +335,7 @@ export default {
if (r.result) {
this.$Message.success("下发成功");
this.orderlist(this.status);
this.result = [];
} else {
this.$Message.info("下发失败");
}
......
pages/aps/stream/set.vue
View file @ d00ed736
......@@ -18,12 +18,13 @@
</RadioGroup>
</FormItem>-->
<FormItem label="人员" v-if="mode==1" prop="userIds">
<UserSelect
<!-- <UserSelect
ref="userSelected"
v-model="formItem.userIds"
style="width:300px"
:multiple="true"
/>
/>-->
<UserSelect v-model="formItem.userIds" :multiple="true" theme="list" />
</FormItem>
<FormItem label="班组" v-if="mode==2" prop="shopId">
<Select v-model="formItem.shopId" placeholder="请选择" style="width:300px">
......@@ -73,7 +74,8 @@ export default {
remark: "",
departmentTitle: "",
shopId: "",
shopName: ""
shopName: "",
userIds: []
},
workShop: [],
listClass: [],
......@@ -90,14 +92,14 @@ export default {
}
}
],
userIds: [
{
required: true,
message: "请选择人员",
type: "array",
trigger: "change"
}
],
// user: [
// {
// required: true,
// message: "请选择人员",
// type: "array",
// trigger: "change"
// }
// ],
shopId: [
{
required: true,
......@@ -115,14 +117,18 @@ export default {
methods: {
//确定
Determine() {
this.$refs["formItem"].validate(valid => {
if (valid) {
this.formItem.detailId = this.detailId;
this.$emit("on-DetermineOk", this.formItem, this.indexId);
} else {
this.$Message.error("Fail!");
}
});
if (this.formItem.userIds.length == 0) {
this.$Message.error("人员不能为空");
} else {
this.$refs["formItem"].validate(valid => {
if (valid) {
this.formItem.detailId = this.detailId;
this.$emit("on-DetermineOk", this.formItem, this.indexId);
} else {
this.$Message.error("请填写完整");
}
});
}
},
closeOk() {
this.$emit("closeOk");
......@@ -172,8 +178,7 @@ export default {
this.listClass.push(obj);
this.formItem.shopId = this.listClass[0].value;
this.formItem.shopName = this.listClass[0].label;
},
}
},
watch: {
"formItem.radio"(v) {
......
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