Commit 81b5493b authored by renjintao's avatar renjintao

计划管理-->配套派发 cancel

parent 9dc1f424
<template> <template>
<div class="h100"> <div class="h100">
<DataGrid <DataGrid :columns="columns" ref="grid" :action="action" @on-selection-change="selectInfo" :batch="false">
:columns="columns"
ref="grid"
:action="action"
@on-selection-change="selectInfo"
:batch="false"
>
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input <Input search enter-button placeholder="请输入关键字订单编号/项目名称" v-model="easySearch.keys.value" v-width="300" @on-search="search" />
search
enter-button
placeholder="请输入关键字订单编号/项目名称"
v-model="easySearch.keys.value"
v-width="300"
@on-search="search"
/>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<template slot="searchBack"> <template slot="searchBack">
<Badge <Badge :count="this.$store.state.countAps" overflow-count="99" style="margin-right: 15px" type="info" v-if="showAps">
:count="this.$store.state.countAps"
overflow-count="99"
style="margin-right: 15px"
type="info"
v-if="showAps"
>
<a href="javascript:;" @click="goAps">APS排产&nbsp;&nbsp;&nbsp;</a> <a href="javascript:;" @click="goAps">APS排产&nbsp;&nbsp;&nbsp;</a>
</Badge> </Badge>
<Badge <Badge :count="this.$store.state.countAi" overflow-count="99" style="margin-right: 15px" type="info" v-if="showAi">
:count="this.$store.state.countAi"
overflow-count="99"
style="margin-right: 15px"
type="info"
v-if="showAi"
>
<a href="javascript:;" @click="goAi">智能排产&nbsp;&nbsp;&nbsp;</a> <a href="javascript:;" @click="goAi">智能排产&nbsp;&nbsp;&nbsp;</a>
</Badge> </Badge>
<Badge <Badge :count="this.$store.state.countAll" overflow-count="99" style="margin-right: 15px" type="info" v-if="showAll">
:count="this.$store.state.countAll"
overflow-count="99"
style="margin-right: 15px"
type="info"
v-if="showAll"
>
<a @click="goCemplate">整机排产&nbsp;&nbsp;&nbsp;</a> <a @click="goCemplate">整机排产&nbsp;&nbsp;&nbsp;</a>
</Badge> </Badge>
<Badge <Badge :count="this.$store.state.countRun" overflow-count="99" type="info" v-if="showRun">
:count="this.$store.state.countRun"
overflow-count="99"
type="info"
v-if="showRun"
>
<a @click="goStream">流水排产&nbsp;&nbsp;&nbsp;</a> <a @click="goStream">流水排产&nbsp;&nbsp;&nbsp;</a>
</Badge> </Badge>
</template> </template>
...@@ -65,15 +29,11 @@ ...@@ -65,15 +29,11 @@
</DataGrid> </DataGrid>
<FooterToolbar extra v-if="footerBar" class="ftball"> <FooterToolbar extra v-if="footerBar" class="ftball">
<Row> <Row>
<Checkbox @on-change="handleSelectAll(single)" v-model="single" <Checkbox @on-change="handleSelectAll(single)" v-model="single">全选</Checkbox>
>全选</Checkbox
>
<span class="footerSpan">已选 {{ selectCount }} 项</span> <span class="footerSpan">已选 {{ selectCount }} 项</span>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<Button type="primary" @click="modalDispatch">工艺派发</Button <Button type="primary" @click="modalDispatch">工艺派发</Button>&nbsp;&nbsp;&nbsp;&nbsp;
>&nbsp;&nbsp;&nbsp;&nbsp; <Button type="primary" @click="modalSchedule">移入排产</Button>&nbsp;&nbsp;&nbsp;&nbsp;
<Button type="primary" @click="modalSchedule">移入排产</Button
>&nbsp;&nbsp;&nbsp;&nbsp;
<Button @click="canselFooter">取消</Button> <Button @click="canselFooter">取消</Button>
</Row> </Row>
</FooterToolbar> </FooterToolbar>
...@@ -86,12 +46,7 @@ ...@@ -86,12 +46,7 @@
<Modal v-model="detailModal" title="详情"> <Modal v-model="detailModal" title="详情">
<Detail :eid="curId" /> <Detail :eid="curId" />
</Modal> </Modal>
<Modal <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
v-model="deletelModal"
title="删除"
@on-ok="removeOk"
@on-cancel="cancel"
>
<p>确定删除?</p> <p>确定删除?</p>
</Modal> </Modal>
<Modal v-model="dispatchModal" title="工艺派发" footer-hide width="800"> <Modal v-model="dispatchModal" title="工艺派发" footer-hide width="800">
...@@ -110,11 +65,7 @@ ...@@ -110,11 +65,7 @@
@on-change="onchangeScheduleType" @on-change="onchangeScheduleType"
></Dictionary> ></Dictionary>
--> -->
<RadioGroup <RadioGroup v-model="scheduleType" class="radioList" @on-change="onchangeScheduleType">
v-model="scheduleType"
class="radioList"
@on-change="onchangeScheduleType"
>
<Radio :label="1" border :disabled="this.$store.state.countAi > 0"> <Radio :label="1" border :disabled="this.$store.state.countAi > 0">
<span>Aps排产</span> <span>Aps排产</span>
</Radio> </Radio>
...@@ -131,8 +82,7 @@ ...@@ -131,8 +82,7 @@
<p class="pl30 pt10" v-show="scheduleType != null"> <p class="pl30 pt10" v-show="scheduleType != null">
确定将订单 确定将订单
<span class="fwBold">{{ resultsOrderList }}</span> 移入 <span class="fwBold">{{ resultsOrderList }}</span> 移入
<span class="red fwBold">{{ scheduleTypeName }}</span <span class="red fwBold">{{ scheduleTypeName }}</span>
>
</p> </p>
<p>&nbsp;</p> <p>&nbsp;</p>
<p>&nbsp;</p> <p>&nbsp;</p>
...@@ -141,28 +91,13 @@ ...@@ -141,28 +91,13 @@
<Button type="primary" @click="scheduleOk">确定</Button> <Button type="primary" @click="scheduleOk">确定</Button>
</div> </div>
</Modal> </Modal>
<Modal <Modal v-model="orderSupportModal" title="配套下发" footer-hide width="1300">
v-model="orderSupportModal"
title="配套下发"
footer-hide
width="1300"
>
<orderSupport ref="orderSupport"></orderSupport> <orderSupport ref="orderSupport"></orderSupport>
</Modal> </Modal>
<Modal v-model="modalAccessory" :title="title" fullscreen footer-hide> <Modal v-model="modalAccessory" :title="title" fullscreen footer-hide>
<component <component :is="details" :eid="orderId" :mesCode="mesCode" :productName="productName" :drawnNumber="drawnNumber" :productingPreparationPeople="productingPreparationPeople" :count="count" @on-close="cancel" @on-ok="addOk" />
:is="details"
:eid="orderId"
:mesCode="mesCode"
:productName="productName"
:drawnNumber="drawnNumber"
:productingPreparationPeople="productingPreparationPeople"
:count="count"
@on-close="cancel"
@on-ok="addOk"
/>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
...@@ -201,8 +136,7 @@ export default { ...@@ -201,8 +136,7 @@ export default {
scheduleModal: false, scheduleModal: false,
orderSupportModal: false, orderSupportModal: false,
curId: 0, curId: 0,
statuList: statuList: this.$store.getters.dictionaryByKey("aps.plan.supportingStatus") || [],
this.$store.getters.dictionaryByKey("aps.plan.supportingStatus") || [],
name: "", name: "",
items: null, items: null,
title: "", title: "",
...@@ -215,8 +149,7 @@ export default { ...@@ -215,8 +149,7 @@ export default {
drawnNumber: "", drawnNumber: "",
count: 0, count: 0,
modalAccessory: false, modalAccessory: false,
columns: [ columns: [{
{
key: "selection", key: "selection",
title: "多选", title: "多选",
type: "selection", type: "selection",
...@@ -258,8 +191,7 @@ export default { ...@@ -258,8 +191,7 @@ export default {
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h( return h(
"op", "op", {
{
attrs: { attrs: {
oprate: "detail", oprate: "detail",
}, },
...@@ -426,20 +358,17 @@ export default { ...@@ -426,20 +358,17 @@ export default {
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h( return h(
"div", "div", {
{
class: "action", class: "action",
}, },
[ [
h( h(
"op", "op", {
{
attrs: { attrs: {
oprate: "detail", oprate: "detail",
title: title: params.row.mainRoutingSetStatus == 0 ?
params.row.mainRoutingSetStatus == 0 "工艺派发" :
? "工艺派发" "移入排产",
: "移入排产",
}, },
style: { style: {
color: params.row.mainRoutingSetStatus == 0 ? "red" : "", color: params.row.mainRoutingSetStatus == 0 ? "red" : "",
...@@ -447,46 +376,46 @@ export default { ...@@ -447,46 +376,46 @@ export default {
on: { on: {
click: () => click: () =>
params.row.mainRoutingSetStatus == 0 || params.row.mainRoutingSetStatus == 0 ||
params.row.mainRoutingSetStatus == 1 params.row.mainRoutingSetStatus == 1 ?
? this.goMethod(params.row) this.goMethod(params.row) :
: null, null,
}, },
}, },
params.row.mainRoutingSetStatus == 0 && params.row.mainRoutingSetStatus == 0 &&
params.row.isPreschedule == 0 params.row.isPreschedule == 0 ?
? "工艺派发" "工艺派发" :
: params.row.mainRoutingSetStatus == 1 && params.row.mainRoutingSetStatus == 1 &&
params.row.isPreschedule == 0 params.row.isPreschedule == 0 ?
? "移入排产" "移入排产" :
: "" ""
),
h(
"op",
{
attrs: {
oprate: "detail",
title:
params.row.isSupportingFinish == 2 ||
params.row.isSupportingFinish == 3
? "配套派发"
: "",
},
style: {
color: params.row.mainRoutingSetStatus == 0 ? "red" : "",
},
on: {
click: () =>
params.row.isSupportingFinish == 2 ||
params.row.isSupportingFinish == 3
? this.supportDis(params.row)
: null,
},
},
params.row.isSupportingFinish == 2 ||
params.row.isSupportingFinish == 3
? "配套派发"
: ""
), ),
// h(
// "op",
// {
// attrs: {
// oprate: "detail",
// title:
// params.row.isSupportingFinish == 2 ||
// params.row.isSupportingFinish == 3
// ? "配套派发"
// : "",
// },
// style: {
// color: params.row.mainRoutingSetStatus == 0 ? "red" : "",
// },
// on: {
// click: () =>
// params.row.isSupportingFinish == 2 ||
// params.row.isSupportingFinish == 3
// ? this.supportDis(params.row)
// : null,
// },
// },
// params.row.isSupportingFinish == 2 ||
// params.row.isSupportingFinish == 3
// ? "配套派发"
// : ""
// ),
] ]
); );
}, },
...@@ -516,7 +445,10 @@ export default { ...@@ -516,7 +445,10 @@ export default {
mounted() { mounted() {
this.loadInitCount(); this.loadInitCount();
}, },
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
......
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