Skip to content

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

Paged_Img_RoutingDetail

parent f0812e33
Hide whitespace changes
Inline Side-by-side
Showing with 484 additions and 510 deletions
pages/aps/ai/components/excute.vue
View file @ ac452b97
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
high: true high: true
}, },
{ {
key: "first_equip", key: "firsT_EQUIP_CODE",
title: this.l("first_equip"), title: this.l("first_equip"),
align: "left", align: "left",
easy: true, easy: true,
......
pages/aps/results/table-expand.vue
View file @ ac452b97
<template> <template>
<div class="result-aps"> <div class="result-aps">
<Row class="expand-row"> <Row class="expand-row">
<Col span="4"> <Col span="4">
<span class="expand-key">工序序号</span> <span class="expand-key">工序序号</span>
</Col> </Col>
<Col span="3"> <Col span="3">
<span class="expand-key">工序名称</span> <span class="expand-key">工序名称</span>
</Col> </Col>
<Col span="3"> <Col span="3">
<span class="expand-key">投入数量</span> <span class="expand-key">投入数量</span>
</Col> </Col>
<Col span="3"> <Col span="3">
<span class="expand-key">派工数量</span> <span class="expand-key">派工数量</span>
</Col> </Col>
<Col span="4"> <Col span="4">
<span class="expand-key">计划开始时间</span> <span class="expand-key">计划开始时间</span>
</Col> </Col>
<Col span="4"> <Col span="4">
<span class="expand-key">计划结束时间</span> <span class="expand-key">计划结束时间</span>
</Col> </Col>
<Col span="3"> <Col span="3">
<span class="expand-key">设备编号</span> <span class="expand-key">首选资源</span>
</Col> </Col>
</Row> </Row>
<Row v-for="(item,index) in dataList" :key="item.index"> <Row v-for="(item,index) in dataList" :key="item.index">
<Col span="4" class="expand-value"> <Col span="4" class="expand-value">
<span>{{ item.task_seq }}</span> <span>{{ item.task_seq }}</span>
</Col> </Col>
<Col span="3" class="expand-value"> <Col span="3" class="expand-value">
<span>{{ item.task_name }}</span> <span>{{ item.task_name }}</span>
</Col> </Col>
<Col span="3" class="expand-value"> <Col span="3" class="expand-value">
<span>{{ item.put_into_qty }}</span> <span>{{ item.put_into_qty }}</span>
</Col> </Col>
<Col span="3" class="expand-value"> <Col span="3" class="expand-value">
<span>{{ item.dispatch_qty }}</span> <span>{{ item.dispatch_qty }}</span>
</Col> </Col>
<Col span="4" class="expand-value"> <Col span="4" class="expand-value">
<span>{{ item.plan_start }}</span> <span>{{ item.plan_start }}</span>
</Col> </Col>
<Col span="4" class="expand-value"> <Col span="4" class="expand-value">
<span>{{ item.plan_finish }}</span> <span>{{ item.plan_finish }}</span>
</Col> </Col>
<Col span="3" class="expand-value"> <Col span="3" class="expand-value">
<span>{{ item.equip_id }}</span> <span>{{ item.equip_id }}</span>
</Col> </Col>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
props: { props: {
row: Object row: Object
}, },
data() { data() {
return { return {
dataList: [] dataList: []
}; };
}, },
mounted() { mounted() {
this.getList(this.row); this.getList(this.row);
}, },
methods: { methods: {
getList(row) { getList(row) {
Api.getdetail({ Api.getdetail({
part_task_pk: row.id, part_task_pk: row.id,
scheduleId: row.schedule_id scheduleId: row.schedule_id
}).then(r => { }).then(r => {
if (r.success) { if (r.success) {
this.dataList = r.result; this.dataList = r.result;
}
});
} }
});
} }
}
}; };
</script> </script>
<style lang='less'>
<style lang="less">
.result-aps { .result-aps {
.expand-row { .expand-row {
text-align: center; text-align: center;
margin: 5px 0; margin: 5px 0;
font-weight: bold; font-weight: bold;
} }
.expand-value {
text-align: center; .expand-value {
margin: 3px 0; text-align: center;
} margin: 3px 0;
}
} }
td.ivu-table-expanded-cell { td.ivu-table-expanded-cell {
padding: 0 !important; padding: 0 !important;
} }
</style> </style>
\ No newline at end of file
pages/produce/api.js
View file @ ac452b97
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
index: `${PlanUrl}/orderexecutenew/paged_img`, index: `${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`,
paged(params) { paged(params) {
return Api.post(`${PlanUrl}/orderexecutenew/paged_img`, params); return Api.post(`${PlanUrl}/orderexecutenew/Paged_Img_RoutingDetail`, params);
}, },
getCardList(params) { getCardList(params) {
return Api.post(`${PlanUrl}/orderexecutenew/list`, params); return Api.post(`${PlanUrl}/orderexecutenew/list`, params);
......
pages/produce/execute/starOrder/index.vue
View file @ ac452b97
<template> <template>
<div> <div>
<div class="star" v-if="dispatchStatus == 12"> <div class="star" v-if="dispatchStatus == 12">
<a class="start" @click="starFun"> <Icon type="md-play" />开工 </a> <a class="start" @click="starFun">
<Icon type="md-play" />开工
</a>
</div> </div>
<div class="star" v-else> <div class="star" v-else>
<div class="flex fc-b"> <div class="flex fc-b">
<Button <Button class="button" size="large" type="primary" @click="pauseFun" v-show="btnTextStatus">
class="button" <Icon type="ios-pause" />
size="large" {{ btnText }}
type="primary" </Button>
@click="pauseFun" <Button class="button" size="large" type="primary" @click="goPage(8, '数据填报')">
v-show="btnTextStatus" <Icon type="logo-angular" />数据填报
> </Button>
<Icon type="ios-pause" /> <Button class="button" size="large" type="primary" @click="goPage(7, '质量判定')">
{{ btnText }} <Icon type="ios-checkmark-circle-outline" />质量判定
</Button> </Button>
<Button <Button class="button" size="large" type="primary" @click="transferFn">
class="button" <Icon type="md-swap" />转序交接
size="large" </Button>
type="primary"
@click="goPage(8, '数据填报')"
>
<Icon type="logo-angular" />数据填报
</Button>
<Button
class="button"
size="large"
type="primary"
@click="goPage(7, '质量判定')"
>
<Icon type="ios-checkmark-circle-outline" />质量判定
</Button>
<Button class="button" size="large" type="primary" @click="transferFn">
<Icon type="md-swap" />转序交接
</Button>
</div>
<div class="star_step" v-if="false">
<div class="step_item" v-for="i of 6" :key="i">
<p class="icon_A" v-if="i >= 4">
<Icon type="md-checkmark-circle" />
</p>
<p class="icon_B" v-else>
<Icon type="md-arrow-dropright-circle" />
</p>
<p>
<a>开工</a>
</p>
<ul>
<li>暂停 2020-02-06 15:35</li>
<li>继续 2020-02-06 15:35</li>
</ul>
</div> </div>
<!-- <p><span></span> <div class="star_step" v-if="false">
<div class="step_item" v-for="i of 6" :key="i">
<p class="icon_A" v-if="i >= 4">
<Icon type="md-checkmark-circle" />
</p>
<p class="icon_B" v-else>
<Icon type="md-arrow-dropright-circle" />
</p>
<p>
<a>开工</a>
</p>
<ul>
<li>暂停 2020-02-06 15:35</li>
<li>继续 2020-02-06 15:35</li>
</ul>
</div>
<!-- <p><span></span>
2020-02-06 15:35 2020-02-06 15:35
</p>--> </p>-->
<!-- <Steps :current="6"> <!-- <Steps :current="6">
<Step icon="md-arrow-dropright-circle" v-for="i of 6" :key="i" :content="contentMsge"></Step> <Step icon="md-arrow-dropright-circle" v-for="i of 6" :key="i" :content="contentMsge"></Step>
</Steps>--> </Steps>-->
</div> </div>
</div> </div>
<div class="footer_box"> <div class="footer_box">
<div class="ul_box fl"> <div class="ul_box fl">
<ul> <ul>
<li>产品名称：{{ entity.productName }}</li> <li>产品名称：{{ entity.productName }}</li>
<li>图号：{{ entity.drawnNumber }}</li> <li>图号：{{ entity.drawnNumber }}</li>
<li> <li>
状态： 状态：
<state <state code="plan.order.status" ref="state" :value="entity.status" type="text"></state>
code="plan.order.status" </li>
ref="state" <li>订单编号：{{ entity.mesCode }}</li>
:value="entity.status" <li>批次号：{{ entity.batchNumber }}</li>
type="text" <li>计划数量：{{ entity.quantity }}</li>
></state> <li>节点日期：{{ entity.demandFinishDate }}</li>
</li> </ul>
<li>订单编号：{{ entity.mesCode }}</li> </div>
<li>批次号：{{ entity.batchNumber }}</li> <div class="ul_box fl">
<li>计划数量：{{ entity.quantity }}</li> <ul>
<li>节点日期：{{ entity.demandFinishDate }}</li> <li>工序名称：{{ entity.seqName }}</li>
</ul> <li>工序序号：{{ entity.seqNo }}</li>
</div> <li>派工数量：{{ entity.dispatchQuantity }}</li>
<div class="ul_box fl"> <li>人员信息：{{ entity.userNames }}</li>
<ul> <li>准备工时：{{ entity.setupTime }}</li>
<li>工序名称：{{ entity.seqName }}</li> <li>
<li>工序序号：{{ entity.seqNo }}</li> 工单状态：
<li>派工数量：{{ entity.dispatchQuantity }}</li> <state code="taskList.status" ref="state1" :value="dispatchStatus" type="text"></state>
<li>人员信息：{{ entity.userNames }}</li> </li>
<li>准备工时：{{ entity.setupTime }}</li> </ul>
<li> </div>
工单状态： <div class="img_box fl">
<state <ViewerImg :images="images" v-if="images" />
code="taskList.status" <img src="@/assets/imgicon/chan_Pin.png" width="70%" height="100%" />
ref="state1" </div>
:value="dispatchStatus"
type="text"
></state>
</li>
</ul>
</div>
<div class="img_box fl">
<ViewerImg :images="images" v-if="images" />
<img src="@/assets/imgicon/chan_Pin.png" width="70%" height="100%" />
</div>
</div> </div>
<Modal <Modal v-model="ransferModal" :title="transferTitle" fullscreen style="z-index: 99999" :footer-hide="cardlist.length == 0">
v-model="ransferModal" <div class="wu_bgModal">
:title="transferTitle" <div class="mass_box">
fullscreen <div class="mass_list">
style="z-index: 99999" <h2 class="btn_play tl">
:footer-hide="cardlist.length == 0" 选择产品（{{ cardlist.length }}）
> <Button class="button" type="primary" @click="allcheck">全选</Button>
<div class="wu_bgModal"> <Button class="button" type="primary" @click="rechecked">反选</Button>
<div class="mass_box"> </h2>
<div class="mass_list"> <div class="list01 tl">
<h2 class="btn_play tl"> <Tag type="dot" :checkable="true" class="tag_card" size="large" v-for="(item, index) in cardlist" :name="item.id" :key="index" :checked="item.checked" color="primary" @on-change="changeCards">{{ item.product_code }}</Tag>
选择产品（{{ cardlist.length }}） </div>
<Button class="button" type="primary" @click="allcheck" </div>
>全选</Button </div>
> <div class="mass_box">
<Button class="button" type="primary" @click="rechecked" <UserSelect ref="userSelected" :datas="userlist" v-model="user" v-width="300" />
>反选</Button
>
</h2>
<div class="list01 tl">
<Tag
type="dot"
:checkable="true"
class="tag_card"
size="large"
v-for="(item, index) in cardlist"
:name="item.id"
:key="index"
:checked="item.checked"
color="primary"
@on-change="changeCards"
>{{ item.product_code }}</Tag
>
</div> </div>
</div>
</div> </div>
<div class="mass_box"> <div slot="footer">
<UserSelect <Button class="button" @click="ransferModal = false">取消</Button>
ref="userSelected" <Button class="button" type="primary" @click="ransOk">确定</Button>
:datas="userlist"
v-model="user"
v-width="300"
/>
</div> </div>
</div>
<div slot="footer">
<Button class="button" @click="ransferModal = false">取消</Button>
<Button class="button" type="primary" @click="ransOk">确定</Button>
</div>
</Modal> </Modal>
</div> <Modal v-model="workOrderPauseModal" title="工单暂停原因" width="800" footer-hide class="suspend">
<EntryPause @on-ok="pauseOk" ref="addBug" :info="info" />
</Modal>
</div>
</template> </template>
<script> <script>
import Api from "../api"; import Api from "../api";
import EntryPause from "../../../order/monitoring/entryPause";
import ApiTech from "../../../technology/productMix/product/api"; import ApiTech from "../../../technology/productMix/product/api";
export default { export default {
name: "starOrder", name: "starOrder",
data() { components: {
return { EntryPause
starmodal: true,
downUrl: fileUrlDown,
contentMsge:
"<ul><li>暂停 2020-02-06 15:35</li><li>继续 2020-02-06 15:35</li></ul>",
ransferModal: false,
transferTitle: "确认转序",
images: [],
iamges1: [
{
thumbnail: iconImg + "noPic_product.png",
source: iconImg + "noPic_product.png",
},
],
entity: {},
id: Number(this.$route.query.id),
orderId: Number(this.$route.query.orderId),
dispatchStatus: Number(this.$route.query.dispatchStatus),
eid: "",
btnText:
Number(this.$route.query.dispatchStatus) == 14
? "暂停"
: Number(this.$route.query.dispatchStatus) == 5
? "继续"
: "",
btnTextStatus:
Number(this.$route.query.dispatchStatus) == 14
? true
: Number(this.$route.query.dispatchStatus) == 5
? true
: false,
cardlist: [],
detailId: null,
nextDetailId: null,
operatorId: null,
userlist: [],
user: null,
};
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary");
},
mounted() {
this.load(this.id);
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun() {
//开工
let params = {
id: this.id,
orderid: this.orderId + "",
};
Api.entrystart(params)
.then((res) => {
if (res.success) {
this.$Message.success("开工成功！");
this.dispatchStatus = 14;
this.textBtn();
} else {
this.$Message.error("开工失败！");
}
})
.catch((err) => {
this.$Message.error("连接错误");
});
}, },
pauseFun() { data() {
//暂停or继续 return {
let params = { starmodal: true,
id: this.id, downUrl: fileUrlDown,
orderid: this.orderId + "", contentMsge: "<ul><li>暂停 2020-02-06 15:35</li><li>继续 2020-02-06 15:35</li></ul>",
}; ransferModal: false,
if (this.btnText == "暂停") { transferTitle: "确认转序",
Api.entrypause(params) images: [],
.then((res) => { iamges1: [{
if (res.success) { thumbnail: iconImg + "noPic_product.png",
this.$Message.success("暂停成功！"); source: iconImg + "noPic_product.png",
this.dispatchStatus = 5; }, ],
this.btnText = "继续"; entity: {},
this.textBtn(); id: Number(this.$route.query.id),
} else { orderId: Number(this.$route.query.orderId),
this.$Message.error("暂停失败！"); dispatchStatus: Number(this.$route.query.dispatchStatus),
} eid: "",
}) btnText: Number(this.$route.query.dispatchStatus) == 14 ?
.catch((err) => { "暂停" : Number(this.$route.query.dispatchStatus) == 5 ?
this.$Message.error("连接错误"); "继续" : "",
}); btnTextStatus: Number(this.$route.query.dispatchStatus) == 14 ?
} else if (this.btnText == "继续") { true : Number(this.$route.query.dispatchStatus) == 5 ?
Api.entrentrycontinuestart(params) true : false,
.then((res) => { cardlist: [],
if (res.success) { detailId: null,
this.$Message.success("继续成功！"); nextDetailId: null,
this.dispatchStatus = 14; operatorId: null,
this.btnText = "暂停"; userlist: [],
this.textBtn(); user: null,
} else { workOrderPauseModal: false,
this.$Message.error("继续失败！"); info: {}
} };
})
.catch((err) => {
this.$Message.error("连接错误");
});
}
}, },
textBtn() { created() {
//控制第一个按钮的text及显示 // this.treeHeight = window.innerHeight - 120;
if (this.dispatchStatus == 14) {
this.btnText = "暂停";
this.btnTextStatus = true;
} else if (this.dispatchStatus == 5) {
this.btnText = "继续";
this.btnTextStatus = true;
} else {
this.btnText = "";
this.btnTextStatus = false;
}
}, },
transferFn() { async fetch({
this.ransferModal = true; store,
this.getProduce(); params
}) {
await store.dispatch("loadDictionary");
}, },
load(v) { mounted() {
//加载基础数据 this.load(this.id);
let params = { window.onresize = () => {
id: v, ///浏览器窗口大小变化
}; return (() => {
Api.orderanddispatchinfos(params) this.treeHeight = window.innerHeight - 120;
.then((r) => { })();
if (r.success && r.result) { };
this.entity = r.result; },
if (r.result.productId && r.result.productId > 0) { methods: {
ApiTech.get({ id: r.result.productId }).then((res) => { starFun() {
if (res.success && res.result) { //开工
if ( let params = {
res.result.productUrlList && id: this.id,
res.result.productUrlList.length > 0 orderid: this.orderId + "",
) { };
this.eid = res.result.productUrlList; Api.entrystart(params)
} else { .then((res) => {
this.eid = this.$u.guid(); if (res.success) {
} this.$Message.success("开工成功！");
//查询上传到文件服务器上的文件 this.dispatchStatus = 14;
let parms = { this.textBtn();
app: "technology", } else {
eid: this.eid, this.$Message.error("开工失败！");
name: "", }
field: "", })
}; .catch((err) => {
this.$http.sysUser this.$Message.error("连接错误");
.getFile(parms) });
.then((res1) => { },
if (res1.data != [] && res1.data.length > 0) { pauseFun() {
this.images.splice(0); //暂停or继续
res1.data.forEach((datas) => { let params = {
let objImag = {}; id: this.id,
objImag.thumbnail = this.downUrl + datas.downloadPath; orderid: this.orderId + "",
objImag.source = this.downUrl + datas.downloadPath; };
this.images.push(objImag); if (this.btnText == "暂停") {
}); this.pause();
} else { // Api.entrypause(params)
this.images = this.iamges1; // .then((res) => {
} // if (res.success) {
// this.$Message.success("暂停成功！");
// this.dispatchStatus = 5;
// this.btnText = "继续";
// this.textBtn();
// } else {
// this.$Message.error("暂停失败！");
// }
// })
// .catch((err) => {
// this.$Message.error("连接错误");
// });
} else if (this.btnText == "继续") {
Api.entrentrycontinuestart(params)
.then((res) => {
if (res.success) {
this.$Message.success("继续成功！");
this.dispatchStatus = 14;
this.btnText = "暂停";
this.textBtn();
} else {
this.$Message.error("继续失败！");
}
}) })
.catch((err) => { .catch((err) => {
this.images = this.iamges1; this.$Message.error("连接错误");
}); });
}
});
} }
} },
}) pause() {
.catch((e) => { //暂停工单
this.$Message.error("连接错误"); this.info = {
}); dispatch_id: this.id,
}, execute_id: Number(this.$route.query.executeId),
inited(viewer) { order_id: this.orderId
this.$viewer = viewer; };
}, this.workOrderPauseModal = true;
show() { },
this.$viewer.show(); pauseOk() {
}, this.workOrderPauseModal = false;
goPage(type, title) { this.dispatchStatus = 5;
this.$parent.changeTitle(type, title); this.btnText = "继续";
}, this.textBtn();
getProduce() { },
this.cardlist = []; textBtn() {
let pid = Number(this.$route.query.id); // JSON.stringify() //控制第一个按钮的text及显示
let params = { if (this.dispatchStatus == 14) {
id: Number(this.$route.query.id), this.btnText = "暂停";
executeId: Number(this.$route.query.executeId), this.btnTextStatus = true;
}; } else if (this.dispatchStatus == 5) {
Api.productsandoperators(params) this.btnText = "继续";
.then((res) => { this.btnTextStatus = true;
if (res.success && res.result) { } else {
this.detailId = res.result.detailId; this.btnText = "";
this.nextDetailId = res.result.nextDetailId; this.btnTextStatus = false;
}
},
transferFn() {
this.ransferModal = true;
this.getProduce();
},
load(v) {
//加载基础数据
let params = {
id: v,
};
Api.orderanddispatchinfos(params)
.then((r) => {
if (r.success && r.result) {
this.entity = r.result;
if (r.result.productId && r.result.productId > 0) {
ApiTech.get({
id: r.result.productId
}).then((res) => {
if (res.success && res.result) {
if (
res.result.productUrlList &&
res.result.productUrlList.length > 0
) {
this.eid = res.result.productUrlList;
} else {
this.eid = this.$u.guid();
}
//查询上传到文件服务器上的文件
let parms = {
app: "technology",
eid: this.eid,
name: "",
field: "",
};
this.$http.sysUser
.getFile(parms)
.then((res1) => {
if (res1.data != [] && res1.data.length > 0) {
this.images.splice(0);
res1.data.forEach((datas) => {
let objImag = {};
objImag.thumbnail = this.downUrl + datas.downloadPath;
objImag.source = this.downUrl + datas.downloadPath;
this.images.push(objImag);
});
} else {
this.images = this.iamges1;
}
})
.catch((err) => {
this.images = this.iamges1;
});
}
});
}
}
})
.catch((e) => {
this.$Message.error("连接错误");
});
},
inited(viewer) {
this.$viewer = viewer;
},
show() {
this.$viewer.show();
},
goPage(type, title) {
this.$parent.changeTitle(type, title);
},
getProduce() {
this.cardlist = [];
let pid = Number(this.$route.query.id); // JSON.stringify()
let params = {
id: Number(this.$route.query.id),
executeId: Number(this.$route.query.executeId),
};
Api.productsandoperators(params)
.then((res) => {
if (res.success && res.result) {
this.detailId = res.result.detailId;
this.nextDetailId = res.result.nextDetailId;
let users = res.result.users; let users = res.result.users;
this.userlist = []; this.userlist = [];
users.forEach((u) => { users.forEach((u) => {
(u.value = u.id), (u.label = u.userName); (u.value = u.id), (u.label = u.userName);
this.userlist.push(u); this.userlist.push(u);
}); });
let resoult = res.result.products; let resoult = res.result.products;
resoult.filter((u) => { resoult.filter((u) => {
u.checked = false; u.checked = false;
this.cardlist.push(u); this.cardlist.push(u);
});
}
})
.catch((e) => {
this.$Message.error("连接错误");
});
},
// 全选
allcheck() {
let cardslist = this.cardlist;
cardslist.map((a) => {
a.checked = true;
}); });
} },
}) // 反选
.catch((e) => { rechecked() {
this.$Message.error("连接错误"); let cardslist = this.cardlist;
}); cardslist.map((b) => {
}, b.checked = !b.checked;
// 全选 });
allcheck() { },
let cardslist = this.cardlist; // 单选
cardslist.map((a) => { changeCards(checked, name) {
a.checked = true; let cardlist = this.cardlist;
}); cardlist.map((u, i) => {
}, if (u.id == name) {
// 反选 u.checked = checked;
rechecked() { }
let cardslist = this.cardlist; });
cardslist.map((b) => { },
b.checked = !b.checked; //确定转续
}); ransOk() {
}, let userInfo = this.$refs.userSelected.getSelectItems();
// 单选 let cardlist = this.cardlist;
changeCards(checked, name) { let upList = [];
let cardlist = this.cardlist; cardlist.map((u, i) => {
cardlist.map((u, i) => { if (u.checked) {
if (u.id == name) { upList.push(u.id);
u.checked = checked; }
} });
}); if (upList.length == 0) {
}, this.$Message.error("请选择转续的产品！");
//确定转续 return;
ransOk() { }
let userInfo = this.$refs.userSelected.getSelectItems(); if (!userInfo || userInfo.length == 0) {
let cardlist = this.cardlist; this.$Message.error("请选择人员！");
let upList = []; return;
cardlist.map((u, i) => { }
if (u.checked) { let params = {
upList.push(u.id); id: Number(this.$route.query.id),
} detailId: this.detailId,
}); nextDetailId: this.nextDetailId,
if (upList.length == 0) { productIds: upList,
this.$Message.error("请选择转续的产品！"); operatorId: userInfo[0].id,
return; operator: userInfo[0].userName,
} };
if (!userInfo || userInfo.length == 0) {
this.$Message.error("请选择人员！");
return;
}
let params = {
id: Number(this.$route.query.id),
detailId: this.detailId,
nextDetailId: this.nextDetailId,
productIds: upList,
operatorId: userInfo[0].id,
operator: userInfo[0].userName,
};
Api.confirmproductsandoperator(params) Api.confirmproductsandoperator(params)
.then((res) => { .then((res) => {
if (res.success && res.result) { if (res.success && res.result) {
this.$Message.success("转续成功"); this.$Message.success("转续成功");
this.ransferModal = false; this.ransferModal = false;
} else { } else {
this.$Message.error("转续失败"); this.$Message.error("转续失败");
} }
}) })
.catch((e) => { .catch((e) => {
this.$Message.error("连接错误"); this.$Message.error("连接错误");
}); });
}, },
},
watch: {
"$route.query.id"(v1) {
this.images = [];
this.id = v1;
this.load(v1);
},
"$route.query.dispatchStatus"(v2) {
this.dispatchStatus = v2;
if (v2 == 14) {
this.btnText = "暂停";
this.btnTextStatus = true;
} else if (v2 == 5) {
this.btnText = "继续";
this.btnTextStatus = true;
} else {
this.btnText = "";
this.btnTextStatus = false;
}
},
"$route.query.orderId"(v3) {
this.orderId = v3;
}, },
images(v) { watch: {
this.images = v; "$route.query.id"(v1) {
this.images = [];
this.id = v1;
this.load(v1);
},
"$route.query.dispatchStatus"(v2) {
this.dispatchStatus = v2;
if (v2 == 14) {
this.btnText = "暂停";
this.btnTextStatus = true;
} else if (v2 == 5) {
this.btnText = "继续";
this.btnTextStatus = true;
} else {
this.btnText = "";
this.btnTextStatus = false;
}
},
"$route.query.orderId"(v3) {
this.orderId = v3;
},
images(v) {
this.images = v;
},
}, },
},
}; };
</script> </script>
pages/produce/orderSupport.vue
View file @ ac452b97
...@@ -368,7 +368,7 @@ export default { ...@@ -368,7 +368,7 @@ export default {
this.newModel = true; this.newModel = true;
}, },
loaddata(orderid) { loaddata(orderid) {
var url = `${technologyUrl}/ordermateriallist/getbyorderid?id=` + orderid; var url = `${technologyUrl}ordermateriallist/getbyorderid?id=` + orderid;
service.get(`${url}`).then(response => { service.get(`${url}`).then(response => {
this.formValidate = response.result.orderMaterial; this.formValidate = response.result.orderMaterial;
......
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