Skip to content

M
mes-ui
Commit 27ee0d2c authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

数据包ok

parent 43fcdbab
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 134 deletions
pages/qc/dataTrace/components/reviewCount.vue
View file @ 27ee0d2c
......@@ -25,8 +25,6 @@
@on-ok="ok"
/>
<!-- <basicView ref="basicView" :baseData="basicData" v-show="basicmodal" />
<mainView ref="mainView" :baseData="basicData" v-show="mainmodal" /> -->
<!-- <dispatched ref="dispatched" :baseData="basicData" v-show="dispatchedmodal"/> -->
</Col>
</Row>
......@@ -35,13 +33,10 @@
<script>
import service from "@/plugins/request";
// import basicView from "./basicView.vue";
// import mainView from "./mainView.vue";
//import dispatched from "./dispatched.vue";
export default {
// components: {
// basicView,
// mainView,
// dispatched,
// },
props: {
......@@ -62,7 +57,7 @@ export default {
},
isactive: -1,
nameList: [],
detail: () => import("./basicView"),
detail: null,
actNum: "1",
themeBg: "light",
basicmodal: true,
......@@ -78,10 +73,7 @@ export default {
},
created() {
this.isactive = -1;
if (this.isactive == -1) {
this.detail = () => import("./basicView");
}
// this.openView(this.actNum);
this.detail = () => import("./basicView");
},
mounted() {
// this.actNum = "1";
......@@ -102,52 +94,20 @@ export default {
this.isactive = index;
this.detail = () => import("./mainView");
},
// 更换左侧
// openView(v) {
// // console.log(v);
// this.items.orderId = this.basicData.id;
// if (v == 1) {
// this.detail = () => import("./basicView");
// // this.this.basicmodal = true;
// // this.mainmodal = false;
// } else {
// let i = v - 2;
// this.nameList.forEach((e, index) => {
// if (i == index) {
// this.items.craftData = e;
// this.items.headerid = e.id;
// this.items.routingType = e.routingType;
// }
// });
// this.detail = () => import("./mainView");
// // this.$refs.mainView.getqc(this.mainexecuteid);
// }
// },
loaddata(pamasId) {
// this.basicmodal = true;
// this.mainmodal = false;
// this.dispatchedmodal= false;
// console.warn(pamasId) 获取主工艺信息 10030
let url =
`${technologyUrl}orderrouting/getordersheaderinfo?orderId=` + pamasId;
if (pamasId) {
service.get(`${url}`).then((response) => {
// console.log(response);
if (response.result.length > 0) {
this.nameList = response.result;
if (response.result[0]) {
this.$refs.mainView.craftData = response.result[0]; //工艺信息
// this.headerid = response.result[0].id;
// this.routingType = response.result[0].routingType;
this.getmainorder(pamasId);
}
if (response.result[1]) {
this.$refs.dispatched.craftData = response.result[1];
// this.diHeaderid = response.result[1].id;
// this.diRoutingType = response.result[1].routingType;
this.getdisorder(pamasId);
}
} else {
console.log("获取工艺信息为空.");
......@@ -157,83 +117,6 @@ export default {
});
}
},
// 获取产品号和设备id orderexecute/getorderproductandequip 10050
// getmainorder(pamasId) {
// let headerid = this.headerid;
// let routingType = this.routingType;
// let url01 =
// `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` +
// pamasId +
// `&headerid=` +
// headerid +
// `&routingType=` +
// routingType;
// service
// .get(`${url01}`)
// .then((res) => {
// if (res.success) {
// if (res.result.equipids) {
// let equipids = res.result.equipids;
// this.mainexecuteid = res.result.executeid;
// this.$refs.mainView.getlistall(equipids);
// this.$refs.mainView.getqc(this.mainexecuteid);
// let bandleList = res.result.productCode;
// let codeList = []; // 编号List
// bandleList.map((item, index) => {
// codeList.push(item.productcodes);
// });
// // this.$refs.mainView.mainCodeList = codeList;
// console.warn(codeList);
// } else {
// console.log("获取主工艺设备信息数据为空.");
// }
// } else {
// console.log("获取主工艺设备信息数据失败.");
// }
// })
// .catch((err) => {
// console.log(err);
// });
// },
// getdisorder(pamasId) {
// let diHeaderid = this.diHeaderid;
// let diRoutingType = this.diRoutingType;
// let url02 =
// `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` +
// pamasId +
// `&headerid=` +
// diHeaderid +
// `&routingType=` +
// diRoutingType;
// service
// .get(`${url02}`)
// .then((res) => {
// if (res.success) {
// if (res.result.equipids) {
// let equipids = res.result.equipids;
// this.disexecuteid = res.result.executeid;
// this.$refs.dispatched.getlistall(equipids);
// this.$refs.dispatched.getqc(this.disexecuteid);
// let bandleList = res.result.productCode;
// let boardList = []; // 板次List
// bandleList.map((item, index) => {
// boardList.push(item.boardNumber);
// });
// this.$refs.dispatched.disCodeList = boardList;
// console.warn(boardList);
// } else {
// console.log("获取专业工艺信息数据为空.");
// }
// } else {
// console.log("获取专业工艺信息数据失败.");
// }
// })
// .catch((err) => {
// console.log(err);
// });
// },
cancel() {
this.detail = null;
......@@ -247,9 +130,7 @@ export default {
handler(v, o) {
this.loaddata(v.id);
if (v) {
// this.actNum == "1";
this.items.orderId = v;
// this.openView(this.actNum);
}
},
deep: true,
......
pages/qc/dataTrace/index.vue
View file @ 27ee0d2c
......@@ -300,34 +300,30 @@
title="数据包追溯"
:width="1280"
:mask-closable="false"
@on-close="cancel"
footer-hide
>
<reviewCount
<component
:is="detail"
ref="reviewCount"
:basicData="itemData"
:actValue="actValue"
@on-close="cancel"
/>
<div slot="footer">
<!-- <Button @click="close" style="margin-left:20px;">取消</Button> -->
<Button @click="reviewOk" type="primary" style="margin-left: 10px"
>确定</Button
>
</div>
</Modal>
</div>
</template>
<script>
import service from "@/plugins/request";
import reviewCount from "./components/reviewCount.vue";
export default {
components: {
reviewCount,
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
data() {
return {
detail: null,
search: {
pageIndex: 1, //当前页数
pageSize: 20, //分页数
......@@ -407,10 +403,14 @@ export default {
//追溯
this.reviewModal = true;
this.itemData = item;
this.$refs.reviewCount.isactive = -1;
this.detail = () => import("./components/reviewCount");
},
cancel() {
this.detail = null;
},
reviewOk() {
this.reviewModal = false;
this.detail = null;
},
// 分页
pageChange(pageNum) {
......
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