Skip to content

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

dictionary/plan

parent 2e5366c1
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 36 deletions
pages/order/monitoring/speed.vue
View file @ 3c69319e
...@@ -6,23 +6,65 @@ ...@@ -6,23 +6,65 @@
<div v-show="!load"> <div v-show="!load">
<DataGrid :columns="columns" :data="result" border :tool="false" :height="820" :page="false"></DataGrid> <DataGrid :columns="columns" :data="result" border :tool="false" :height="820" :page="false"></DataGrid>
</div> </div>
<Modal v-model="modalSplit" title="订单分卡" width="800"> <Modal v-model="modalSplit" title="订单分卡" width="650" footer-hide>
<Form model="entity" label-width="100"> <div slot="close">
<Row > <Icon type="ios-close" size="31" color="gray" @click="handleClose" />
<Col span="24"> </div>
<FormItem label="选择序列号"></FormItem> <Form :model="entity" ref="form" :label-width="110" :rules="rules">
</Col> <Row>
<Col span="24"> <Col span="24">
<FormItem label="选择分卡原因"></FormItem> <FormItem label="选择序列号" prop="num">
</Col> <Select v-model="entity.num" multiple>
<Col span="24"> <Option
<FormItem label="备注说明"></FormItem> v-for="(item,index) in numList"
</Col> :value="item.value"
<Col span="24"> :key="index"
<FormItem label="选择序列号"></FormItem> >{{ item.label }}</Option>
</Col> </Select>
</Row> </FormItem>
</Form> </Col>
<Col span="24">
<FormItem label="选择分卡原因" prop="reason">
<Select v-model="entity.reason" style="width:260px">
<Option
v-for="(item,index) in reasonList"
:value="item.value"
:key="index"
>{{ item.label }}</Option>
</Select>
</FormItem>
</Col>
<Col span="24">
<FormItem label="备注说明">
<Input v-model="entity.remark" placeholder type="textarea" :rows="3" />
</FormItem>
</Col>
<Col span="14">
<FormItem label prop="action">
<RadioGroup v-model="entity.action" @on-change="onchangeAction">
<Radio :label="1">暂停</Radio>
<Radio :label="2">继续</Radio>
<Radio :label="3">移入排产</Radio>
</RadioGroup>
</FormItem>
</Col>
<Col span="10" v-if="entity.action===3">
<FormItem label prop="scheduleType">
<Dictionary
code="aps.plan.scheduleType"
v-model="entity.scheduleType"
class="scheduleTypeSelect"
></Dictionary>
</FormItem>
</Col>
</Row>
</Form>
<Row>
<Col span="24" style="text-align:right;height:60px;line-height:60px">
<Button type="primary" @click="splitOk">确定</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</Col>
</Row>
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -34,8 +76,14 @@ export default { ...@@ -34,8 +76,14 @@ export default {
data() { data() {
return { return {
modalSplit:false, modalSplit: false,
entity:{}, entity: {
num: [], //序列号组合
reason: null, //分卡原因
remark: "", //备注信息
action: null, //操作
scheduleType: null //排产类型
},
columns: [ columns: [
{ {
key: "detailId", key: "detailId",
...@@ -154,27 +202,35 @@ export default { ...@@ -154,27 +202,35 @@ export default {
h( h(
"op", "op",
{ {
props: { oprate: "delete",title:"操作信息",msg:"确定暂停工序："+params.row.detailName+"？" }, props: {
oprate: "delete",
title: "暂停",
msg: "确定暂停工序：" + params.row.detailName + "？"
},
style: params.row.status == 14 ? "" : "display:none", style: params.row.status == 14 ? "" : "display:none",
on: { click: () => this.pause(params.row) }, on: { click: () => this.pause(params.row) }
}, },
"暂停" "暂停"
), ),
h( h(
"op", "op",
{ {
attrs: { oprate: "edit" }, props: { oprate: "edit", title: "分卡" },
style: params.row.status == 12 ? "" : "display:none", style: params.row.status == 12 ? "" : "display:none",
on: { click: () => this.split(params.row) }, on: { click: () => this.split(params.row) }
}, },
"分卡" "分卡"
), ),
h( h(
"op", "op",
{ {
props: { oprate: "delete",msg:"确定继续执行工序："+params.row.detailName+"？" }, props: {
style: params.row.status == 5 ? "" : "display:none", oprate: "delete",
on: { click: () => this.continue(params.row) }, title: "继续",
msg: "确定继续执行工序：" + params.row.detailName + "？"
},
style: params.row.status == 5 ? "" : "display:none",
on: { click: () => this.continue(params.row) }
}, },
"继续" "继续"
) )
...@@ -183,26 +239,139 @@ export default { ...@@ -183,26 +239,139 @@ export default {
} }
], ],
listTask: [], listTask: [],
numList: [
{
value: 1,
label: "SKJC-001"
},
{
value: 2,
label: "SKJC-002"
},
{
value: 3,
label: "SKJC-003"
},
{
value: 4,
label: "SKJC-004"
},
{
value: 5,
label: "SKJC-005"
},
{
value: 6,
label: "SKJC-006"
}
],
reasonList: [
{
value: 1,
label: "分卡原因1"
},
{
value: 2,
label: "分卡原因2"
},
{
value: 3,
label: "分卡原因3"
}
],
rules: {
num: [
{
required: true,
message: "请选择分卡原因",
trigger: "change",
type: "array"
}
],
reason: [
{
required: true,
message: "请选择分卡原因",
trigger: "change",
type: "number"
}
],
action: [
{
required: true,
message: "请选择操作",
trigger: "change",
type: "number"
}
],
scheduleType: [
{
required: true,
message: "请选择排产类型",
trigger: "change",
type: "number"
}
]
}
}; };
}, },
props: { props: {
result: Array, result: Array,
load:Boolean, load: Boolean
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
created() {}, created() {},
methods: { methods: {
split(row){//工单分卡 split(row) {
alert(JSON.stringify(row)) //工单分卡
this.modalSplit=true this.modalSplit = true;
}, },
pause(row){//暂停工单 onchangeAction(val) {
alert(JSON.stringify(row)) if (val != 3) {
this.entity.scheduleType = null;
}
},
splitOk() {
//确定分卡
this.$refs.form.validate(valid => {
if (valid) {
let params = {
num: this.entity.num,
reason: this.entity.reason,
remark: this.entity.remark,
action: this.entity.action,
scheduleType: this.entity.scheduleType
};
alert(JSON.stringify(params));
this.handleClose();
} else {
this.modalSplit = true;
}
});
}, },
continue(row){//继续工单 handleClose() {
alert(JSON.stringify(row)) //取消分卡
this.entityReset();
this.modalSplit = false;
},
entityReset() {
this.entity = {
num: [],
reason: null,
remark: "",
action: null,
scheduleType: null
};
},
pause(row) {
//暂停工单
alert(JSON.stringify(row));
},
continue(row) {
//继续工单
alert(JSON.stringify(row));
}, },
//截取字符串 //截取字符串
sliceStr(str, lenS, lenE) { sliceStr(str, lenS, lenE) {
...@@ -234,5 +403,13 @@ export default { ...@@ -234,5 +403,13 @@ export default {
} }
}; };
</script> </script>
<style lang='less'> <style lang='less' scope>
.scheduleTypeSelect {
display: inline;
width: 180px;
margin-left: -110px;
.ivu-select {
width: 180px;
}
}
</style> </style>
\ No newline at end of file
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