Skip to content

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

数据包追溯

parent 89ab7cb6
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 216 deletions
pages/qc/dataTrace/components/basicView.vue
View file @ 6f7d2086
<template> <template>
<div class=""> <div class="orderDetail">
<Form :label-width="190" inline> <Row>
<Row> <Col span="8">
<Col span="12"> <span class="fwBold">{{l('mesCode')}}</span>
<FormItem label="订单编号：" style="width:100%"> <p>{{baseData.mesCode}}</p>
<h3>{{baseData.mesCode}}</h3> </Col>
</FormItem> <Col span="8">
</Col> <span class="fwBold">{{l('taskType')}}</span>
<Col span="12" class=""> <p>
<FormItem label="产品名称：" style="width:100%"> <state code="plan.order.taskType" :value="baseData.taskType" type="text"></state>
<h4>{{baseData.productName}}</h4> </p>
</FormItem> </Col>
</Col> <Col span="8">
<Col span="12" class=""> <span class="fwBold">{{l('quantity')}}</span>
<FormItem label="产品图号：" style="width:100%"> <p>{{baseData.quantity}}</p>
<h4>{{baseData.drawnNumber}}</h4> </Col>
</FormItem> </Row>
</Col> <Row>
<Col span="12" class=""> <Col span="8">
<FormItem label="任务类型：" style="width:100%"> <span class="fwBold">{{l('status')}}</span>
<state code="plan.order.taskType" :value="baseData.taskType+''" type="text"></state> <p>
</FormItem> <state code="plan.order.status" :value="baseData.status" type="text"></state>
</Col> </p>
<Col span="8" class=""> </Col>
<FormItem label="阶段：" style="width:100%"> <Col span="8">
<state code="plan.order.stage" :value="baseData.stage+''" type="text"></state> <span class="fwBold">{{l('productName')}}</span>
</FormItem> <p>{{baseData.productName}}</p>
</Col> </Col>
<Col span="8" class=""> <Col span="8">
<FormItem label="材料：" style="width:100%"> <span class="fwBold">{{l('drawnNumber')}}</span>
<state code="plan.order.material" :value="baseData.materialId+''" type="text"></state> <p>{{baseData.drawnNumber}}</p>
</FormItem> </Col>
</Col> </Row>
<Col span="8" class=""> <Row>
<FormItem label="数量：" style="width:100%"> <Col span="8">
<span>{{baseData.quantity}}</span> <span class="fwBold">{{l('batchNumber')}}</span>
</FormItem> <p>{{baseData.batchNumber}}</p>
</Col> </Col>
<Col span="8" class=""> <Col span="8">
<FormItem label="工艺方法：" style="width:100%"> <span class="fwBold">{{l('projectNumber')}}</span>
<state code="plan.order.routingMethod" :value="baseData.routing_Method+''" type="text"></state> <p>{{baseData.projectNumber}}</p>
</FormItem> </Col>
</Col> <Col span="8">
<Col span="8" class=""> <span class="fwBold">{{l('urgencyLevel')}}</span>
<FormItem label="甲方客户：" style="width:100%"> <p>
<state code="plan.order.guestName" :value="baseData.guestName+''" type="text"></state> <state code="plan.order.urgencyLevel" :value="baseData.urgencyLevel" type="text"></state>
</FormItem> </p>
</Col> </Col>
<Col span="8" class=""> </Row>
<FormItem label="外包络尺寸(mm)：" style="width:100%"> <Row>
<span>{{baseData.outer_Envelope_Size}}</span> <Col span="8">
</FormItem> <span class="fwBold">{{l('demandStartDate')}}</span>
</Col> <p>
<Col span="12" class=""> <DTSpan type="date" v-model="baseData.demandStartDate"></DTSpan>
<FormItem label="开始时间：" style="width:100%"> </p>
<span>{{baseData.demandStartDate}}</span> </Col>
</FormItem> <Col span="8">
</Col> <span class="fwBold">{{l('demandFinishDate')}}</span>
<Col span="12" class=""> <p>
<FormItem label="完成时间：" style="width:100%"> <DTSpan type="date" v-model="baseData.demandFinishDate"></DTSpan>
<span>{{baseData.demandFinishDate}}</span> </p>
</FormItem> </Col>
</Col> <Col span="8">
<Col span="12" class=""> <span class="fwBold">{{l('taskRequire')}}</span>
<FormItem label="任务节点要求：" style="width:100%"> <p>{{baseData.taskRequire}}</p>
<span>{{baseData.taskRequire}}</span> </Col>
</FormItem> </Row>
</Col> <Row class="lastRow">
<Col span="12" class=""> <Col span="24">
<FormItem label="厂内责任机关：" style="width:100%"> <span class="fwBold">{{l('remark')}}</span>
<span>{{baseData.functionaryOffice}}</span> <p>{{baseData.remark}}</p>
</FormItem> </Col>
</Col> </Row>
<Col span="12" class="">
<FormItem label="厂内责任主体部门：" style="width:100%"> </div>
<state code="plan.order.mainDepartment" :value="baseData.mainDepartmentId+''" type="text"></state>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="3D打印承制单位：" style="width:100%">
<state code="plan.order.printSupply" :value="baseData.printSupply+''" type="text"></state>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="甲方投产输入文件(编号)：" style="width:100%">
<span>{{baseData.putintDocmentCode}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="甲方技术输入文件(编号)：" style="width:100%">
<span>{{baseData.technologyDocmentCode}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="外部图号/模型号：" style="width:100%">
<span>{{baseData.outerDrawnNumber}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="模型版本：" style="width:100%">
<span>{{baseData.modelVersion}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="甲方任务号：" style="width:100%">
<span>{{baseData.taskCode}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="甲方设计人员：" style="width:100%">
<span>{{baseData.designer}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="厂内机关负责人：" style="width:100%">
<span>{{baseData.officeFunctionary}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="厂内主工艺人员：" style="width:100%">
<span>{{baseData.mainRoutingPeople}}</span>
</FormItem>
</Col>
</Row>
</Form>
</div>
</template> </template>
<script> <script>
export default { export default {
props: ['baseData'], props: ['baseData'],
data() { data() {
return { return {
themeBg:'light', themeBg: 'light',
basicData:{}, basicData: {},
} }
}, },
methods: { methods: {
l(key) {
key = "mes_plan" + "." + key;
return this.$t(key);
}
}, },
} }
</script> </script>
<style scoped>
</style> <style lang="less">
\ No newline at end of file .orderDetail {
line-height: 30px;
width: 90%;
margin: 0 auto;
.ivu-row {
padding-top: 20px;
padding-bottom: 20px;
border-bottom: #ccc solid 1px;
}
.lastRow {
border-bottom: none;
}
}
</style>
pages/qc/dataTrace/components/reviewCount.vue
View file @ 6f7d2086
<template> <template>
<div class="reve_cont"> <div class="reve_cont">
<Row> <Row>
<Col span="4"> <Col span="4">
<Menu :active-name="actNum" ref="actNum" class="menuBg" @on-select="openView" :theme="themeBg"> <Menu :active-name="actNum" ref="actNum" class="menuBg" @on-select="openView" :theme="themeBg">
<MenuItem name="1" replace> <MenuItem name="1" replace>
基本信息 基本信息
</MenuItem> </MenuItem>
<MenuItem name="2" replace> <MenuItem name="2" replace>
工艺信息 工艺信息
</MenuItem> </MenuItem>
<!-- <MenuItem name="3" replace> <!-- <MenuItem name="3" replace>
专业工艺 专业工艺
</MenuItem> --> </MenuItem> -->
</Menu> </Menu>
</Col> </Col>
<Col span="20" class="revieweBox"> <Col span="20" class="revieweBox">
<basicView ref="basicView" :baseData="basicData" v-show="basicmodal"/> <basicView ref="basicView" :baseData="basicData" v-show="basicmodal" />
<mainView ref="mainView" :baseData="basicData" v-show="mainmodal" /> <mainView ref="mainView" :baseData="basicData" v-show="mainmodal" />
<!-- <dispatched ref="dispatched" :baseData="basicData" v-show="dispatchedmodal"/> --> <!-- <dispatched ref="dispatched" :baseData="basicData" v-show="dispatchedmodal"/> -->
</Col> </Col>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import service from '@/plugins/request' import service from '@/plugins/request'
import basicView from './basicView.vue'; import basicView from './basicView.vue';
import mainView from './mainView.vue'; import mainView from './mainView.vue';
import dispatched from './dispatched.vue'; import dispatched from './dispatched.vue';
export default { export default {
components:{basicView,mainView,dispatched}, components: {
basicView,
mainView,
dispatched
},
props: { props: {
basicData:null, basicData: null,
actValue: { actValue: {
type: Number, type: Number,
default: 1 default: 1
...@@ -41,52 +46,52 @@ export default { ...@@ -41,52 +46,52 @@ export default {
}, },
data() { data() {
return { return {
actNum:'1', actNum: '1',
themeBg:'light', themeBg: 'light',
basicmodal: true, basicmodal: true,
mainmodal: false, mainmodal: false,
dispatchedmodal: false, dispatchedmodal: false,
headerid:'',//暂存传字段 headerid: '', //暂存传字段
routingType:'',//工艺类型（主/专业） routingType: '', //工艺类型（主/专业）
diHeaderid:'',//暂存传字段 diHeaderid: '', //暂存传字段
diRoutingType:'',//工艺类型（主/专业） diRoutingType: '', //工艺类型（主/专业）
disexecuteid:0, disexecuteid: 0,
mainexecuteid:0 mainexecuteid: 0
} }
}, },
mounted(){ mounted() {
this.$nextTick(()=>{ this.$nextTick(() => {
this.actNum == this.$route.path.slice(1) this.actNum == this.$route.path.slice(1)
this.$refs.actNum.updateActiveName(); this.$refs.actNum.updateActiveName();
// this.shop = this.$route.path.slice(1) // this.shop = this.$route.path.slice(1)
// this.$refs.shop.updateActiveName() // this.$refs.shop.updateActiveName()
}) })
}, },
methods: { methods: {
loaddata(pamasId){ loaddata(pamasId) {
this.basicmodal=true; this.basicmodal = true;
this.mainmodal= false; this.mainmodal = false;
// this.dispatchedmodal= false; // this.dispatchedmodal= false;
// console.warn(pamasId) 获取主工艺信息 10030 // console.warn(pamasId) 获取主工艺信息 10030
let url = `${designUrl}/orderrouting/getordersheaderinfo?orderId=` + pamasId; let url = `${designUrl}/orderrouting/getordersheaderinfo?orderId=` + pamasId;
if(pamasId){ if (pamasId) {
service.get(`${url}`).then((response) => { service.get(`${url}`).then((response) => {
console.log(response) console.log(response)
if(response.result.length>0){ if (response.result.length > 0) {
if(response.result[0]){ if (response.result[0]) {
this.$refs.mainView.craftData = response.result[0]; this.$refs.mainView.craftData = response.result[0];
this.headerid = response.result[0].id; this.headerid = response.result[0].id;
this.routingType = response.result[0].routingType; this.routingType = response.result[0].routingType;
this.getmainorder(pamasId) this.getmainorder(pamasId)
} }
if(response.result[1]){ if (response.result[1]) {
this.$refs.dispatched.craftData = response.result[1]; this.$refs.dispatched.craftData = response.result[1];
this.diHeaderid = response.result[1].id; this.diHeaderid = response.result[1].id;
this.diRoutingType = response.result[1].routingType; this.diRoutingType = response.result[1].routingType;
this.getdisorder(pamasId) this.getdisorder(pamasId)
} }
this.$refs.dispatched.getmaterialsupport(pamasId) //this.$refs.dispatched.getmaterialsupport(pamasId)
}else{ } else {
console.log('获取工艺信息为空.') console.log('获取工艺信息为空.')
this.$refs.mainView.craftData = {}; this.$refs.mainView.craftData = {};
this.$refs.dispatched.craftData = {}; this.$refs.dispatched.craftData = {};
...@@ -95,25 +100,25 @@ export default { ...@@ -95,25 +100,25 @@ export default {
} }
}, },
// 获取产品号和设备id orderexecute/getorderproductandequip 10050 // 获取产品号和设备id orderexecute/getorderproductandequip 10050
getmainorder(pamasId){ getmainorder(pamasId) {
let headerid = this.headerid; let headerid = this.headerid;
let routingType = this.routingType; let routingType = this.routingType;
let url01 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId let url01 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId +
+`&headerid=`+headerid +`&routingType=`+ routingType; `&headerid=` + headerid + `&routingType=` + routingType;
service.get(`${url01}`).then((res) => { service.get(`${url01}`).then((res) => {
if(res.success){ if (res.success) {
if(res.result.equipids){ if (res.result.equipids) {
let equipids = res.result.equipids; let equipids = res.result.equipids;
this.mainexecuteid = res.result.executeid; this.mainexecuteid = res.result.executeid;
this.$refs.mainView.getlistall(equipids) this.$refs.mainView.getlistall(equipids)
this.$refs.mainView.getqc(this.mainexecuteid); this.$refs.mainView.getqc(this.mainexecuteid);
let bandleList = res.result.productCode; let bandleList = res.result.productCode;
let codeList = [];// 编号List let codeList = []; // 编号List
bandleList.map((item,index)=>{ bandleList.map((item, index) => {
codeList.push(item.productcodes) codeList.push(item.productcodes)
}) })
this.$refs.mainView.mainCodeList = codeList this.$refs.mainView.mainCodeList = codeList
console.warn(codeList) console.warn(codeList)
} else { } else {
console.log('获取主工艺设备信息数据为空.') console.log('获取主工艺设备信息数据为空.')
...@@ -125,44 +130,43 @@ export default { ...@@ -125,44 +130,43 @@ export default {
console.log(err) console.log(err)
}) })
}, },
getdisorder(pamasId){ getdisorder(pamasId) {
let diHeaderid = this.diHeaderid; let diHeaderid = this.diHeaderid;
let diRoutingType = this.diRoutingType; let diRoutingType = this.diRoutingType;
let url02 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId let url02 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId +
+`&headerid=`+diHeaderid +`&routingType=`+ diRoutingType; `&headerid=` + diHeaderid + `&routingType=` + diRoutingType;
service.get(`${url02}`).then((res) => { service.get(`${url02}`).then((res) => {
if(res.success){ if (res.success) {
if(res.result.equipids){ if (res.result.equipids) {
let equipids = res.result.equipids; let equipids = res.result.equipids;
this.disexecuteid = res.result.executeid; this.disexecuteid = res.result.executeid;
this.$refs.dispatched.getlistall(equipids) this.$refs.dispatched.getlistall(equipids)
this.$refs.dispatched.getqc(this.disexecuteid); this.$refs.dispatched.getqc(this.disexecuteid);
let bandleList = res.result.productCode; let bandleList = res.result.productCode;
let boardList = [];// 板次List let boardList = []; // 板次List
bandleList.map((item,index)=>{ bandleList.map((item, index) => {
boardList.push(item.boardNumber) boardList.push(item.boardNumber)
}) })
this.$refs.dispatched.disCodeList = boardList this.$refs.dispatched.disCodeList = boardList
console.warn(boardList) console.warn(boardList)
} } else {
else {
console.log('获取专业工艺信息数据为空.') console.log('获取专业工艺信息数据为空.')
} }
} else { } else {
console.log('获取专业工艺信息数据失败.') console.log('获取专业工艺信息数据失败.')
} }
}).catch((err) => { }).catch((err) => {
console.log(err) console.log(err)
}) })
}, },
// 更换左侧 // 更换左侧
openView(v){ openView(v) {
if(v==2){ if (v == 2) {
this.basicmodal= false; this.basicmodal = false;
this.mainmodal= true; this.mainmodal = true;
// this.dispatchedmodal= false; // this.dispatchedmodal= false;
this.$refs.mainView.getqc(this.mainexecuteid); this.$refs.mainView.getqc(this.mainexecuteid);
} }
// else if(v==3){ // else if(v==3){
// this.basicmodal= false; // this.basicmodal= false;
...@@ -170,18 +174,18 @@ export default { ...@@ -170,18 +174,18 @@ export default {
// // this.dispatchedmodal= true; // // this.dispatchedmodal= true;
//  this.$refs.dispatched.getqc(this.disexecuteid); //  this.$refs.dispatched.getqc(this.disexecuteid);
// } // }
else{ else {
this.basicmodal= true; this.basicmodal = true;
this.mainmodal= false; this.mainmodal = false;
// this.dispatchedmodal= false; // this.dispatchedmodal= false;
} }
}, },
}, },
watch:{ watch: {
basicData: { basicData: {
handler(v, o) { handler(v, o) {
this.loaddata(v.id) this.loaddata(v.id)
if(v){ if (v) {
this.actNum == '1' this.actNum == '1'
this.openView(1) this.openView(1)
} }
...@@ -191,16 +195,19 @@ export default { ...@@ -191,16 +195,19 @@ export default {
}, },
} }
</script> </script>
<style scoped> <style scoped>
.menuBg{ .menuBg {
background: none; background: none;
height: 630px; height: 630px;
} }
.menuBg .ivu-menu-item{
.menuBg .ivu-menu-item {
color: #000; color: #000;
} }
.revieweBox{
.revieweBox {
padding: 0 0 0 60px; padding: 0 0 0 60px;
height: 630px; height: 630px;
} }
</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