Skip to content

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

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents d11aeedd 1b457162
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2210 additions and 1760 deletions
components/page/dataGrid.vue
View file @ 687df1cc
...@@ -143,8 +143,10 @@ ...@@ -143,8 +143,10 @@
</template> </template>
<script> <script>
import ColumnSlot from "./treeGrid/columnSolt";
export default { export default {
name: "DataGrid", name: "DataGrid",
components: { ColumnSlot },
data() { data() {
return { return {
keys: "", keys: "",
...@@ -155,7 +157,7 @@ export default { ...@@ -155,7 +157,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
sortBy: "id", sortBy: "id",
isDesc:true, isDesc: true,
conditions: [], conditions: [],
}, },
searchConditions: this.search, searchConditions: this.search,
...@@ -294,15 +296,16 @@ export default { ...@@ -294,15 +296,16 @@ export default {
default: "", default: "",
}, },
}, },
provide() {
return {
tableRoot: this.slots,
};
},
created() { created() {
this.columns.forEach((u) => {
if (!u.hide) {
u.hide = false;
}
});
this.columnsCur = this.$u.clone(this.columns);
}, },
mounted() { mounted() {
this.initColumns();
if (this.data && this.data.length > 0) { if (this.data && this.data.length > 0) {
this.list = this.data; this.list = this.data;
return; return;
...@@ -350,7 +353,41 @@ export default { ...@@ -350,7 +353,41 @@ export default {
this.getRoutingHeaderData(); this.getRoutingHeaderData();
this.getAllUser(); //获取所有用户 this.getAllUser(); //获取所有用户
}, },
methods: { methods: {
//列初始化 slot 支持;
slots() {
return this.$scopedSlots;
},
initColumns() {
this.columns.forEach((u) => {
if (!u.hide) {
u.hide = false;
}
});
var items=this.$u.clone(this.columns);
var soct=this.$scopedSlots;
console.warn("that.$scopedSlots()",soct["action"]());
items.forEach((u) => {
if (u.slot) {
u.render = (h, params) => {
return h(
"span",
// soct[u.slot]({
// row: params.row,
// column: params.column,
// index: params.index,
// })
params.row.id
);
};
delete u.slot;
}
});
this.columnsCur = items;
console.log("cur", items,this.columnsCur);
},
//数据加载 //数据加载
load() { load() {
if (this.action) { if (this.action) {
......
components/page/treeGrid/columnSolt.js 0 → 100644
View file @ 687df1cc
export default {
name: 'ColumnSlot',
functional: true,
inject: ['tableRoot'],
props: {
row: Object,
index: Number,
column: {
type: Object,
default: null
}
},
render: (h, ctx) => {
return h('span', ctx.injections.tableRoot()[ctx.props.column.slot]({
row: ctx.props.row,
column: ctx.props.column,
index: ctx.props.index
}));
}
};
\ No newline at end of file
components/page/treeGrid/index.vue
View file @ 687df1cc
This diff is collapsed.
components/treeGrid/slot.js 0 → 100644
View file @ 687df1cc
export default {
name: 'TableSlot',
functional: true,
inject: ['tableRoot'],
props: {
row: Object,
index: Number,
column: {
type: Object,
default: null
}
},
render: (h, ctx) => {
return h('div', ctx.injections.tableRoot.$scopedSlots[ctx.props.column.slot]({
row: ctx.props.row,
column: ctx.props.column,
index: ctx.props.index
}));
}
};
\ No newline at end of file
pages/aps/aps/components/edit.vue
View file @ 687df1cc
...@@ -157,8 +157,8 @@ export default { ...@@ -157,8 +157,8 @@ export default {
this.resources = this.$u.clone(r.result); this.resources = this.$u.clone(r.result);
//alert(JSON.stringify(this.resources)) //alert(JSON.stringify(this.resources))
this.entity = v; this.entity = v;
this.entity.resourceCode = v.firsT_EQUIP_CODE; this.entity.resourceCode = v.first_equip;
let code = v.firsT_EQUIP_CODE; let code = v.first_equip;
this.entity.resource = [] this.entity.resource = []
//let code = 'PCZYBZBH_20200804_1' //let code = 'PCZYBZBH_20200804_1'
if (code && code != '') { if (code && code != '') {
......
pages/aps/aps/components/excute.vue
View file @ 687df1cc
...@@ -144,9 +144,9 @@ export default { ...@@ -144,9 +144,9 @@ export default {
key: "firsT_EQUIP_CODE", key: "firsT_EQUIP_CODE",
title: this.l("first_equip"), title: this.l("first_equip"),
align: "left", align: "left",
render: (h, params) => { //test:PCZYBZBH_20200804_1 params.row.firsT_EQUIP_CODE // render: (h, params) => { //test:PCZYBZBH_20200804_1 params.row.firsT_EQUIP_CODE
return h("span", {}, this.getResourceName(params.row.firsT_EQUIP_CODE)) // return h("span", {}, this.getResourceName(params.row.firsT_EQUIP_CODE))
} // }
}, },
{ {
key: "setup_time", key: "setup_time",
......
pages/aps/plan/add.vue
View file @ 687df1cc
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('upId')" prop="upId"> <FormItem :label="l('upId')" prop="upId">
...@@ -138,10 +138,7 @@ ...@@ -138,10 +138,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish"> <FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.is_supporting_finish" v-model="entity.isSupportingFinish"></Dictionary>
code="mes_xingchi_plan.mes_order.is_supporting_finish"
v-model="entity.isSupportingFinish"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -191,10 +188,7 @@ ...@@ -191,10 +188,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus"> <FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.order_quotation_status" v-model="entity.orderQuotationStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.order_quotation_status"
v-model="entity.orderQuotationStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -233,10 +227,7 @@ ...@@ -233,10 +227,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem <FormItem :label="l('productingPreparationFinishDate')" prop="productingPreparationFinishDate">
:label="l('productingPreparationFinishDate')"
prop="productingPreparationFinishDate"
>
<DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker> <DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
...@@ -292,34 +283,22 @@ ...@@ -292,34 +283,22 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus"> <FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.main_routing_set_status" v-model="entity.mainRoutingSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.main_routing_set_status"
v-model="entity.mainRoutingSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus"> <FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.major_routing_set_status" v-model="entity.majorRoutingSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.major_routing_set_status"
v-model="entity.majorRoutingSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus"> <FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.material_bill_set_status" v-model="entity.materialBillSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.material_bill_set_status"
v-model="entity.materialBillSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus"> <FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.routing_data_set_status" v-model="entity.routingDataSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.routing_data_set_status"
v-model="entity.routingDataSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -329,18 +308,12 @@ ...@@ -329,18 +308,12 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus"> <FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.main_routing_execute_status" v-model="entity.mainRoutingExecuteStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.main_routing_execute_status"
v-model="entity.mainRoutingExecuteStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus"> <FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.major_routing_execute_status" v-model="entity.majorRoutingExecuteStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.major_routing_execute_status"
v-model="entity.majorRoutingExecuteStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -385,10 +358,7 @@ ...@@ -385,10 +358,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isPreschedule')" prop="isPreschedule"> <FormItem :label="l('isPreschedule')" prop="isPreschedule">
<Dictionary <Dictionary code="aps.plan.ispreschedule" v-model="entity.isPreschedule"></Dictionary>
code="mes_xingchi_plan.mes_order.is_preschedule"
v-model="entity.isPreschedule"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -416,9 +386,11 @@ ...@@ -416,9 +386,11 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script>
<script>
import Api from "./api"; import Api from "./api";
export default { export default {
name: "Add", name: "Add",
...@@ -426,7 +398,11 @@ export default { ...@@ -426,7 +398,11 @@ export default {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
required: true,
message: "必填",
trigger: "blur"
}],
}, },
}; };
}, },
......
pages/aps/plan/edit.vue
View file @ 687df1cc
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('upId')" prop="upId"> <FormItem :label="l('upId')" prop="upId">
...@@ -138,10 +138,7 @@ ...@@ -138,10 +138,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish"> <FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.is_supporting_finish" v-model="entity.isSupportingFinish"></Dictionary>
code="mes_xingchi_plan.mes_order.is_supporting_finish"
v-model="entity.isSupportingFinish"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -191,10 +188,7 @@ ...@@ -191,10 +188,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus"> <FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.order_quotation_status" v-model="entity.orderQuotationStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.order_quotation_status"
v-model="entity.orderQuotationStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -233,10 +227,7 @@ ...@@ -233,10 +227,7 @@
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem <FormItem :label="l('productingPreparationFinishDate')" prop="productingPreparationFinishDate">
:label="l('productingPreparationFinishDate')"
prop="productingPreparationFinishDate"
>
<DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker> <DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
...@@ -292,34 +283,22 @@ ...@@ -292,34 +283,22 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus"> <FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.main_routing_set_status" v-model="entity.mainRoutingSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.main_routing_set_status"
v-model="entity.mainRoutingSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus"> <FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.major_routing_set_status" v-model="entity.majorRoutingSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.major_routing_set_status"
v-model="entity.majorRoutingSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus"> <FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.material_bill_set_status" v-model="entity.materialBillSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.material_bill_set_status"
v-model="entity.materialBillSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus"> <FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.routing_data_set_status" v-model="entity.routingDataSetStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.routing_data_set_status"
v-model="entity.routingDataSetStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -329,18 +308,12 @@ ...@@ -329,18 +308,12 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus"> <FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.main_routing_execute_status" v-model="entity.mainRoutingExecuteStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.main_routing_execute_status"
v-model="entity.mainRoutingExecuteStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus"> <FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus">
<Dictionary <Dictionary code="mes_xingchi_plan.mes_order.major_routing_execute_status" v-model="entity.majorRoutingExecuteStatus"></Dictionary>
code="mes_xingchi_plan.mes_order.major_routing_execute_status"
v-model="entity.majorRoutingExecuteStatus"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -385,10 +358,7 @@ ...@@ -385,10 +358,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('isPreschedule')" prop="isPreschedule"> <FormItem :label="l('isPreschedule')" prop="isPreschedule">
<Dictionary <Dictionary code="aps.plan.ispreschedule" v-model="entity.isPreschedule"></Dictionary>
code="mes_xingchi_plan.mes_order.is_preschedule"
v-model="entity.isPreschedule"
></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -416,8 +386,9 @@ ...@@ -416,8 +386,9 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
...@@ -426,7 +397,11 @@ export default { ...@@ -426,7 +397,11 @@ export default {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
required: true,
message: "必填",
trigger: "blur"
}],
}, },
}; };
}, },
...@@ -435,7 +410,9 @@ export default { ...@@ -435,7 +410,9 @@ export default {
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then((r) => { Api.get({
id: v
}).then((r) => {
this.entity = r.result; this.entity = r.result;
this.$emit("on-load"); this.$emit("on-load");
}); });
......
pages/aps/plan/index.vue
View file @ 687df1cc
...@@ -266,6 +266,14 @@ export default { ...@@ -266,6 +266,14 @@ export default {
high: true, high: true,
hide: true, hide: true,
}, },
{
key: "isPreschedule",
title: this.l("isPreschedule"),
align: "center",
width: 100,
high: true,
code: "aps.plan.ispreschedule",
},
{ {
key: "demandStart", key: "demandStart",
title: this.l("demandStart"), title: this.l("demandStart"),
......
pages/aps/plan/search.vue
View file @ 687df1cc
This diff is collapsed.
pages/qc/dataTrace/components/basicView.vue
View file @ 687df1cc
<template> <template>
<div class=""> <div class="orderDetail">
<Form :label-width="190" inline>
<Row> <Row>
<Col span="12"> <Col span="8">
<FormItem label="订单编号：" style="width:100%"> <span class="fwBold">{{l('mesCode')}}</span>
<h3>{{baseData.mesCode}}</h3> <p>{{baseData.mesCode}}</p>
</FormItem>
</Col> </Col>
<Col span="12" class=""> <Col span="8">
<FormItem label="产品名称：" style="width:100%"> <span class="fwBold">{{l('taskType')}}</span>
<h4>{{baseData.productName}}</h4> <p>
</FormItem> <state code="plan.order.taskType" :value="baseData.taskType" type="text"></state>
</p>
</Col> </Col>
<Col span="12" class=""> <Col span="8">
<FormItem label="产品图号：" style="width:100%"> <span class="fwBold">{{l('quantity')}}</span>
<h4>{{baseData.drawnNumber}}</h4> <p>{{baseData.quantity}}</p>
</FormItem>
</Col> </Col>
<Col span="12" class=""> </Row>
<FormItem label="任务类型：" style="width:100%"> <Row>
<state code="plan.order.taskType" :value="baseData.taskType+''" type="text"></state> <Col span="8">
</FormItem> <span class="fwBold">{{l('status')}}</span>
</Col> <p>
<Col span="8" class=""> <state code="plan.order.status" :value="baseData.status" type="text"></state>
<FormItem label="阶段：" style="width:100%"> </p>
<state code="plan.order.stage" :value="baseData.stage+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="材料：" style="width:100%">
<state code="plan.order.material" :value="baseData.materialId+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="数量：" style="width:100%">
<span>{{baseData.quantity}}</span>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="工艺方法：" style="width:100%">
<state code="plan.order.routingMethod" :value="baseData.routing_Method+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="甲方客户：" style="width:100%">
<state code="plan.order.guestName" :value="baseData.guestName+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="外包络尺寸(mm)：" style="width:100%">
<span>{{baseData.outer_Envelope_Size}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="开始时间：" style="width:100%">
<span>{{baseData.demandStartDate}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="完成时间：" style="width:100%">
<span>{{baseData.demandFinishDate}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="任务节点要求：" style="width:100%">
<span>{{baseData.taskRequire}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="厂内责任机关：" style="width:100%">
<span>{{baseData.functionaryOffice}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="厂内责任主体部门：" style="width:100%">
<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>
<Col span="12" class=""> <Col span="8">
<FormItem label="甲方技术输入文件(编号)：" style="width:100%"> <span class="fwBold">{{l('productName')}}</span>
<span>{{baseData.technologyDocmentCode}}</span> <p>{{baseData.productName}}</p>
</FormItem>
</Col> </Col>
<Col span="12" class=""> <Col span="8">
<FormItem label="外部图号/模型号：" style="width:100%"> <span class="fwBold">{{l('drawnNumber')}}</span>
<span>{{baseData.outerDrawnNumber}}</span> <p>{{baseData.drawnNumber}}</p>
</FormItem>
</Col> </Col>
<Col span="12" class=""> </Row>
<FormItem label="模型版本：" style="width:100%"> <Row>
<span>{{baseData.modelVersion}}</span> <Col span="8">
</FormItem> <span class="fwBold">{{l('batchNumber')}}</span>
<p>{{baseData.batchNumber}}</p>
</Col> </Col>
<Col span="12" class=""> <Col span="8">
<FormItem label="甲方任务号：" style="width:100%"> <span class="fwBold">{{l('projectNumber')}}</span>
<span>{{baseData.taskCode}}</span> <p>{{baseData.projectNumber}}</p>
</FormItem>
</Col> </Col>
<Col span="12" class=""> <Col span="8">
<FormItem label="甲方设计人员：" style="width:100%"> <span class="fwBold">{{l('urgencyLevel')}}</span>
<span>{{baseData.designer}}</span> <p>
</FormItem> <state code="plan.order.urgencyLevel" :value="baseData.urgencyLevel" type="text"></state>
</p>
</Col> </Col>
<Col span="12" class=""> </Row>
<FormItem label="厂内机关负责人：" style="width:100%"> <Row>
<span>{{baseData.officeFunctionary}}</span> <Col span="8">
</FormItem> <span class="fwBold">{{l('demandStartDate')}}</span>
<p>
<DTSpan type="date" v-model="baseData.demandStartDate"></DTSpan>
</p>
</Col>
<Col span="8">
<span class="fwBold">{{l('demandFinishDate')}}</span>
<p>
<DTSpan type="date" v-model="baseData.demandFinishDate"></DTSpan>
</p>
</Col>
<Col span="8">
<span class="fwBold">{{l('taskRequire')}}</span>
<p>{{baseData.taskRequire}}</p>
</Col> </Col>
<Col span="12" class=""> </Row>
<FormItem label="厂内主工艺人员：" style="width:100%"> <Row class="lastRow">
<span>{{baseData.mainRoutingPeople}}</span> <Col span="24">
</FormItem> <span class="fwBold">{{l('remark')}}</span>
<p>{{baseData.remark}}</p>
</Col> </Col>
</Row> </Row>
</Form>
</div> </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 lang="less">
.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> </style>
pages/qc/dataTrace/components/reviewCount.vue
View file @ 687df1cc
<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">
...@@ -15,22 +15,27 @@ ...@@ -15,22 +15,27 @@
</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,21 +46,21 @@ export default { ...@@ -41,21 +46,21 @@ 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)
...@@ -63,30 +68,30 @@ export default { ...@@ -63,30 +68,30 @@ export default {
}) })
}, },
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,21 +100,21 @@ export default { ...@@ -95,21 +100,21 @@ 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
...@@ -125,28 +130,27 @@ export default { ...@@ -125,28 +130,27 @@ 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 {
...@@ -157,10 +161,10 @@ export default { ...@@ -157,10 +161,10 @@ export default {
}) })
}, },
// 更换左侧 // 更换左侧
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);
} }
...@@ -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,15 +195,18 @@ export default { ...@@ -191,15 +195,18 @@ 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;
} }
......
pages/qc/dataTrace/index.vue
View file @ 687df1cc
This diff is collapsed.
pages/test.vue
View file @ 687df1cc
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
<template> <template>
<div class="flex fd test_layout"> <div class="flex fd test_layout">
<div> <div>
<Menu mode="horizontal" theme="light" active-name="0"> <Menu mode="horizontal" theme="light" active-name="a0">
<div class="layout-assistant"> <div class="layout-assistant">
<MenuItem name="0" to="/test/example">基础组件</MenuItem> <MenuItem name="a0" to="/test/example">基础组件</MenuItem>
<MenuItem name="1" to="/test/user">人员选择</MenuItem> <MenuItem name="a1" to="/test/user">人员选择</MenuItem>
<MenuItem name="2" to="/test/com">异步组件</MenuItem> <MenuItem name="a2" to="/test/com">异步组件</MenuItem>
<MenuItem name="4" to="/test/resource">资源选择</MenuItem> <MenuItem name="a4" to="/test/resource">资源选择</MenuItem>
<MenuItem name="3" to="/test/view">详情拖拽排版</MenuItem> <MenuItem name="a3" to="/test/view">详情拖拽排版</MenuItem>
</div> </div>
</Menu> </Menu>
</div> </div>
......
pages/test/api.js
View file @ 687df1cc
...@@ -13,10 +13,16 @@ export const exampleRouter = [ ...@@ -13,10 +13,16 @@ export const exampleRouter = [
}, },
{ {
route: '/test/example/table', route: '/test/example/table',
title: 'treeGrid组件', title: '表格',
name: 'components-table', name: 'components-table',
icon: 'md-aperture' icon: 'md-aperture'
}, },
{
route: '/test/example/tree',
title: '树',
name: 'tree',
icon: 'md-aperture'
},
{ {
route: '/test/example/select', route: '/test/example/select',
title: 'select组件', title: 'select组件',
......
pages/test/example/table/index.vue
View file @ 687df1cc
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<template slot-scope="{row,column,index}" slot="action">
<strong>aaaa</strong>
</template>
</DataGrid> </DataGrid>
</div> </div>
</template> </template>
...@@ -62,6 +65,7 @@ export default { ...@@ -62,6 +65,7 @@ export default {
easy: true, easy: true,
sortable:true, sortable:true,
high: true, high: true,
slot:"cardNo",
tooltip: true, tooltip: true,
}, },
], ],
......
pages/test/example/tree/index.vue 0 → 100644
View file @ 687df1cc
<template>
<div class="tree">
<TreeGrid :columns="columns" :items="treeData">
<template slot-scope="{row,column,index}" slot="name">
<Icon type="md-folder" /> {{row.name}}
</template>
<template slot-scope="{row,column,index}" slot="action">
<strong>{{row.action}}</strong>
</template>
</TreeGrid>
<!-- <Input v-model="data" type="textarea" rows="20" placeholder=""></Input> -->
</div>
</template>
<script>
import Mock from "mockjs";
export default {
name: "",
data() {
return {
columns: [
{
type: "selection",
width:50,
align:"center"
},
{
key: "name",
title: "名称",
tree:true,
slot:"name"
},
{
key: "status",
title: "状态",
width: "100"
},
{
key: "action",
title: "操作",
width: "100",
sortable:true,
slot:"action"
},
],
treeData1: [],
treeData: [
{
action: "510000202006085435",
name: "书加部保处",
status: 0,
children: [
{ action: "430000200008054924", name: "越组大过越", status: 0 },
{ action: "350000200106195747", name: "反走和报山", status: 1 },
{ action: "46000019920810827X", name: "强级法量少务持", status: 1 },
{ action: "620000198005286979", name: "况题米", status: 1 },
{ action: "440000200901093872", name: "又多为", status: 0 },
],
},
{ action: "510000199304272074", name: "参什叫", status: 1 },
{ action: "710000199110144186", name: "情克应个该农", status: 1 },
{ action: "140000201204175550", name: "阶研其交式", status: 1 },
{ action: "500000198710051748", name: "议开你集", status: 1 },
],
data: "",
};
},
mounted() {
// this.init();
},
methods: {
init() {
var data = Mock.mock({
"data|5": [
{
action: "@id",
name: "@ctitle",
"status|1": [0, 1],
},
],
});
console.warn(data);
this.data = JSON.stringify(data.data);
this.treeData = data.data;
},
},
};
</script>
<style lang="less" >
</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