Skip to content

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

on-selection-change

parent d97107be
Show whitespace changes
Inline Side-by-side
Showing with 726 additions and 744 deletions
pages/aps/aps/index.vue
View file @ 695863e3
<template> <template>
<div> <div>
<DataGrid <DataGrid :columns="columns" ref="grid" :draggable="true" :data="list" :high="false" @on-drag-drop="onDragDrop" :page="false" @on-selection-change="onSelect" :batch="true" :border="true" :easy="true">
:columns="columns"
ref="grid"
:draggable="true"
:data="list"
:high="false"
@on-drag-drop="onDragDrop"
:page="false"
@on-change="onSelect"
:batch="true"
:border="true"
:easy="true"
>
<template slot="easySearch"> <template slot="easySearch">
<div> <div>
<Select <Select placeholder="选择排序优先级" v-model="tempValue" style="width: 150px;" @on-change="tempValueChange" clearable>
placeholder="选择排序优先级" <Option v-for="(item,index) in listTemp" :key="index" :value="item.id" :label="item.name"></Option>
v-model="tempValue"
style="width: 150px;"
@on-change="tempValueChange"
clearable
>
<Option
v-for="(item,index) in listTemp"
:key="index"
:value="item.id"
:label="item.name"
></Option>
</Select> </Select>
<a style="font-weight: bold;" @click="openaddModalTemp"> <a style="font-weight: bold;" @click="openaddModalTemp">
<Icon type="md-color-palette" size="14" />&nbsp;自定义排序模板 <Icon type="md-color-palette" size="14" />&nbsp;自定义排序模板
...@@ -43,21 +20,11 @@ ...@@ -43,21 +20,11 @@
<Search /> <Search />
</template> </template>
<template slot="buttons"> <template slot="buttons">
<DatePicker <DatePicker type="date" placeholder="设置基准日期" style="width: 150px;" v-model="entity.setTime" @on-change="getTime"></DatePicker>
type="date"
placeholder="设置基准日期"
style="width: 150px;"
v-model="entity.setTime"
@on-change="getTime"
></DatePicker>
<a style="font-weight: bold;" @click="openAddModel(1)"> <a style="font-weight: bold;" @click="openAddModel(1)">
<Icon type="ios-options" size="14" />&nbsp;工序参数调整 <Icon type="ios-options" size="14" />&nbsp;工序参数调整
</a> </a>
<Button <Button type="primary" @click="goResults" style="background:#515A6E;border:solid 1px #515A6E">历史方案</Button>
type="primary"
@click="goResults"
style="background:#515A6E;border:solid 1px #515A6E"
>历史方案</Button>
<Button type="primary" @click="openApsModal">APS排产</Button> <Button type="primary" @click="openApsModal">APS排产</Button>
</template> </template>
<template slot="batch"> <template slot="batch">
...@@ -71,14 +38,7 @@ ...@@ -71,14 +38,7 @@
<Duration ref="durationRef"></Duration> <Duration ref="durationRef"></Duration>
</Modal> </Modal>
<Modal v-model="addModal" title="工序参数设置" footer-hide width="1000"> <Modal v-model="addModal" title="工序参数设置" footer-hide width="1000">
<Add <Add @on-close="cancel" @on-parameter-ok="addOk" :opTaskPk="setParams.opTaskPk" :partTaskPk="setParams.partTaskPk" :taskSeq="setParams.taskSeq" :count="setParams.count" />
@on-close="cancel"
@on-parameter-ok="addOk"
:opTaskPk="setParams.opTaskPk"
:partTaskPk="setParams.partTaskPk"
:taskSeq="setParams.taskSeq"
:count="setParams.count"
/>
</Modal> </Modal>
<Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel"> <Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel">
<p>确定进行APS排产？</p> <p>确定进行APS排产？</p>
...@@ -106,8 +66,9 @@ ...@@ -106,8 +66,9 @@
<Modal v-model="insertlModal1" :title="insertTItle1" @on-ok="insertOk1" @on-cancel="cancel"> <Modal v-model="insertlModal1" :title="insertTItle1" @on-ok="insertOk1" @on-cancel="cancel">
<p>确定进行 {{ insertTItle1 }} 操作？</p> <p>确定进行 {{ insertTItle1 }} 操作？</p>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
var myDate = new Date(); var myDate = new Date();
var nowDate = myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + myDate.getDate(); var nowDate = myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + myDate.getDate();
...@@ -130,7 +91,10 @@ export default { ...@@ -130,7 +91,10 @@ export default {
return { return {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "notes", value: null } keys: {
op: "notes",
value: null
}
}, },
result: { result: {
res: true, res: true,
...@@ -138,7 +102,7 @@ export default { ...@@ -138,7 +102,7 @@ export default {
}, },
resultModal: false, resultModal: false,
entity: { entity: {
setTime:this.getFormatDate(nowDate) setTime: this.getFormatDate(nowDate)
}, },
addModal: false, addModal: false,
editModal: false, editModal: false,
...@@ -154,8 +118,7 @@ export default { ...@@ -154,8 +118,7 @@ export default {
rowIndex1: null, rowIndex1: null,
list: [], list: [],
curId: 0, curId: 0,
columns: [ columns: [{
{
key: "move", key: "move",
title: " ", title: " ",
hide: false, hide: false,
...@@ -204,11 +167,9 @@ export default { ...@@ -204,11 +167,9 @@ export default {
high: true, high: true,
render: (h, params) => { render: (h, params) => {
return h( return h(
"Tooltip", "Tooltip", {
{
props: { props: {
content: content: params.row.insert_flag == 1 ? "取消插单" : "进行插单",
params.row.insert_flag == 1 ? "取消插单" : "进行插单",
placement: "top" placement: "top"
}, },
class: "ico" class: "ico"
...@@ -216,10 +177,9 @@ export default { ...@@ -216,10 +177,9 @@ export default {
[ [
h("Icon", { h("Icon", {
attrs: { attrs: {
type: type: params.row.insert_flag == 1 ?
params.row.insert_flag == 1 "ios-water" :
? "ios-water" "ios-water-outline",
: "ios-water-outline",
size: 20, size: 20,
color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa" color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
}, },
...@@ -354,7 +314,9 @@ export default { ...@@ -354,7 +314,9 @@ export default {
align: "center", align: "center",
// fixed:"right", // fixed:"right",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h("op", { h("op", {
attrs: { attrs: {
icon: "md-options", icon: "md-options",
...@@ -362,7 +324,9 @@ export default { ...@@ -362,7 +324,9 @@ export default {
title: "工序参数设置", title: "工序参数设置",
oprate: "edit" oprate: "edit"
}, },
on: { click: () => this.openAddModel(2, params.row) } on: {
click: () => this.openAddModel(2, params.row)
}
}), }),
h("op", { h("op", {
attrs: { attrs: {
...@@ -372,7 +336,9 @@ export default { ...@@ -372,7 +336,9 @@ export default {
oprate: "edit", oprate: "edit",
msg: "确认要恢复工序吗？" msg: "确认要恢复工序吗？"
}, },
on: { click: () => this.refresh(params.row.part_task_pk) } on: {
click: () => this.refresh(params.row.part_task_pk)
}
}), }),
h("op", { h("op", {
attrs: { attrs: {
...@@ -382,7 +348,9 @@ export default { ...@@ -382,7 +348,9 @@ export default {
oprate: "delete", oprate: "delete",
msg: "确认要移出排产吗？" msg: "确认要移出排产吗？"
}, },
on: { click: () => this.remove(params.row.part_task_pk) } on: {
click: () => this.remove(params.row.part_task_pk)
}
}) })
]); ]);
} }
...@@ -407,7 +375,10 @@ export default { ...@@ -407,7 +375,10 @@ export default {
this.loadList(); this.loadList();
this.loadTemp(); this.loadTemp();
}, },
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
...@@ -577,7 +548,9 @@ export default { ...@@ -577,7 +548,9 @@ export default {
apsOk() { apsOk() {
this.circleModal = true; this.circleModal = true;
//APS排产前订单优先级功能 //APS排产前订单优先级功能
let parmsOrderpriority = { alls: [] }; let parmsOrderpriority = {
alls: []
};
let arryIds = []; let arryIds = [];
this.list.forEach((e, index) => { this.list.forEach((e, index) => {
let objIds = {}; let objIds = {};
...@@ -601,12 +574,12 @@ export default { ...@@ -601,12 +574,12 @@ export default {
} else { } else {
// this.circleModal = false; // this.circleModal = false;
// this.$Message.error("操作失败：数据校验"); // this.$Message.error("操作失败：数据校验");
this.result=res1.result; this.result = res1.result;
this.resultModal=true; this.resultModal = true;
} }
}) })
.catch( .catch(
function(err) { function (err) {
this.circleModal = false; this.circleModal = false;
this.$Message.error("操作失败"); this.$Message.error("操作失败");
}.bind(this) }.bind(this)
...@@ -621,7 +594,7 @@ export default { ...@@ -621,7 +594,7 @@ export default {
} }
}) })
.catch( .catch(
function(err) { function (err) {
this.circleModal = false; this.circleModal = false;
this.$Message.error("操作失败"); this.$Message.error("操作失败");
}.bind(this) }.bind(this)
...@@ -652,7 +625,7 @@ export default { ...@@ -652,7 +625,7 @@ export default {
} }
}) })
.catch( .catch(
function(err) { function (err) {
this.circleModal = false; this.circleModal = false;
this.$Message.error("操作失败"); this.$Message.error("操作失败");
}.bind(this) }.bind(this)
...@@ -776,29 +749,36 @@ export default { ...@@ -776,29 +749,36 @@ export default {
} }
}; };
</script> </script>
<style lang="less"> <style lang="less">
.drag { .drag {
cursor: move; cursor: move;
} }
.demo-spin-icon-load { .demo-spin-icon-load {
animation: ani-demo-spin 1s linear infinite; animation: ani-demo-spin 1s linear infinite;
} }
@keyframes ani-demo-spin { @keyframes ani-demo-spin {
from { from {
transform: rotate(0deg); transform: rotate(0deg);
} }
50% { 50% {
transform: rotate(180deg); transform: rotate(180deg);
} }
to { to {
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
.demo-spin-col { .demo-spin-col {
height: 100px; height: 100px;
position: relative; position: relative;
border: 0px solid #eee; border: 0px solid #eee;
} }
.vertical-center-modal { .vertical-center-modal {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -808,6 +788,7 @@ export default { ...@@ -808,6 +788,7 @@ export default {
top: 0; top: 0;
} }
} }
.tempModal { .tempModal {
.ivu-modal-body { .ivu-modal-body {
padding: 16px; padding: 16px;
...@@ -816,6 +797,7 @@ export default { ...@@ -816,6 +797,7 @@ export default {
padding-top: 2px; padding-top: 2px;
padding-bottom: 0px; padding-bottom: 0px;
} }
.ivu-modal-footer { .ivu-modal-footer {
border-top: none; border-top: none;
padding: 12px 18px 12px 18px; padding: 12px 18px 12px 18px;
......
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