Skip to content

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

mesplan

parent 3f32759f
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 151 deletions
pages/aps/aps/index.vue
View file @ 5474c526
...@@ -206,7 +206,8 @@ export default { ...@@ -206,7 +206,8 @@ export default {
title: this.l("spare_qty"), title: this.l("spare_qty"),
align: "right", align: "right",
width: 100, width: 100,
high: true high: true,
hide: true,
}, },
{ {
key: "plan_start", key: "plan_start",
...@@ -240,7 +241,8 @@ export default { ...@@ -240,7 +241,8 @@ export default {
title: this.l("demand_start"), title: this.l("demand_start"),
align: "center", align: "center",
resizable: true, resizable: true,
width: 150 width: 150,
type:"date"
}, },
{ {
key: "demand_finish", key: "demand_finish",
...@@ -248,7 +250,8 @@ export default { ...@@ -248,7 +250,8 @@ export default {
align: "center", align: "center",
high: true, high: true,
resizable: true, resizable: true,
width: 150 width: 150,
type:"date"
}, },
{ {
key: "badjustflag", key: "badjustflag",
......
pages/mesPlan/add.vue
View file @ 5474c526
...@@ -267,7 +267,8 @@ export default { ...@@ -267,7 +267,8 @@ export default {
trigger: "change" trigger: "change"
} }
] ]
} },
disabled:false,
}; };
}, },
mounted(){ mounted(){
......
pages/mesPlan/detail.vue
View file @ 5474c526
...@@ -2,14 +2,20 @@ ...@@ -2,14 +2,20 @@
<div class="detail"> <div class="detail">
<Row> <Row>
<Filed :span="12" :name="l('mesCode')">{{entity.mesCode}}</Filed> <Filed :span="12" :name="l('mesCode')">{{entity.mesCode}}</Filed>
<Filed :span="12" :name="l('taskType')"><state code="plan.order.taskType" :value="entity.taskType" type="text"></state></Filed> <Filed :span="12" :name="l('taskType')">
<state code="plan.order.taskType" :value="entity.taskType" type="text"></state>
</Filed>
<Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed> <Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed>
<Filed :span="12" :name="l('status')"><state code="plan.order.status" :value="entity.status" type="text"></state></Filed> <Filed :span="12" :name="l('status')">
<state code="plan.order.status" :value="entity.status" type="text"></state>
</Filed>
<Filed :span="12" :name="l('productName')">{{entity.productName}}</Filed> <Filed :span="12" :name="l('productName')">{{entity.productName}}</Filed>
<Filed :span="12" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed> <Filed :span="12" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed>
<Filed :span="12" :name="l('batchNumber')">{{entity.batchNumber}}</Filed> <Filed :span="12" :name="l('batchNumber')">{{entity.batchNumber}}</Filed>
<Filed :span="12" :name="l('projectNumber')">{{entity.projectNumber}}</Filed> <Filed :span="12" :name="l('projectNumber')">{{entity.projectNumber}}</Filed>
<Filed :span="12" :name="l('urgencyLevel')"><state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state></Filed> <Filed :span="12" :name="l('urgencyLevel')">
<state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state>
</Filed>
<Filed :span="12" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed> <Filed :span="12" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed>
<Filed :span="12" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed> <Filed :span="12" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed>
<Filed :span="12" :name="l('taskRequire')">{{entity.taskRequire}}</Filed> <Filed :span="12" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
...@@ -23,7 +29,7 @@ export default { ...@@ -23,7 +29,7 @@ export default {
name: "detail", name: "detail",
data() { data() {
return { return {
entity: {}, entity: {}
}; };
}, },
props: { props: {
...@@ -35,19 +41,13 @@ export default { ...@@ -35,19 +41,13 @@ export default {
} }
}, },
methods: { methods: {
// load(v) {
// Api.get({ id: v }).then(r => {
// this.entity = r.result;
// this.$emit("on-load");
// });
// },
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit("on-close");
}, },
l(key) { l(key) {
key = "mes_plan" + "." + key; key = "mes_plan" + "." + key;
return this.$t(key); return this.$t(key);
} },
}, },
watch: { watch: {
row(v) { row(v) {
......
pages/mesPlan/edit.vue
View file @ 5474c526
...@@ -176,9 +176,12 @@ export default { ...@@ -176,9 +176,12 @@ export default {
return { return {
disabled: false, disabled: false,
orderSearchForm: {}, orderSearchForm: {},
rules: { ruleValidate: {
name: [{ required: true, message: "必填", trigger: "blur" }] name: [{ required: true, message: "必填", trigger: "blur" }]
} },
placeholdeinfo:'',
list:[],
data1:[],
}; };
}, },
props: { props: {
......
pages/mesPlan/index.vue
View file @ 5474c526
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
</div> </div>
</Modal> </Modal>
<Modal v-model="sendModal" title="订单派发" width="1200"> <Modal v-model="sendModal" title="订单派发" width="1200">
<Send :row="sendList" ref="orderSplit" /> <Send :row="rowDataArry" ref="orderSplit" />
<div slot="footer"> <div slot="footer">
<Button @click="splitModal = false">取消</Button> <Button @click="sendModal = false">取消</Button>
<Button type="primary" @click="orderSplitOk">确定分解</Button> <!-- <Button type="primary" @click="orderSplitOk">确定分解</Button> -->
</div> </div>
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
...@@ -699,8 +699,10 @@ export default { ...@@ -699,8 +699,10 @@ export default {
taskTypeList: [], //任务类型 taskTypeList: [], //任务类型
statusList: [], //状态类型 statusList: [], //状态类型
rowData: {}, //编辑、查看的当前行数据 rowData: {}, //编辑、查看的当前行数据
rowDataArry:[],
ModalInfoStaut: "", ModalInfoStaut: "",
sendList: [] sendList: [],
metCodesStrTxt:'',
}; };
}, },
created() { created() {
...@@ -709,14 +711,14 @@ export default { ...@@ -709,14 +711,14 @@ export default {
mounted() { mounted() {
this.initTree(); this.initTree();
this.tableHeight = window.innerHeight - 220; this.tableHeight = window.innerHeight - 220;
this.$refs.CustomTable.getTableHeight(this.tableHeight); //this.$refs.CustomTable.getTableHeight(this.tableHeight);
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
return (() => { return (() => {
window.screenHeight = window.innerHeight; window.screenHeight = window.innerHeight;
this.treeHeight = window.screenHeight - 150; this.treeHeight = window.screenHeight - 150;
this.tableHeight = window.screenHeight - 220; this.tableHeight = window.screenHeight - 220;
this.$refs.CustomTable.getTableHeight(this.tableHeight); //this.$refs.CustomTable.getTableHeight(this.tableHeight);
})(); })();
}; };
}, },
...@@ -852,12 +854,12 @@ export default { ...@@ -852,12 +854,12 @@ export default {
//} //}
this.ModalInfo = false; this.ModalInfo = false;
}, },
//打开派发
openSendModal() { openSendModal() {
alert(JSON.stringify(this.sendList)) // alert(JSON.stringify(this.sendList))
alert(this.sendList.length) // alert(this.sendList.length)
if (this.senList.length > 0) { if (this.rowDataArry.length > 0) {
this.sendModal = true; this.sendModal = true;
this.rowData = this.sendList;
} else { } else {
this.$Message.error("请选择订单"); this.$Message.error("请选择订单");
} }
...@@ -915,7 +917,7 @@ export default { ...@@ -915,7 +917,7 @@ export default {
this.orderSearchForm.productId = "-1"; this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = ""; this.orderSearchForm.productName = "";
} }
this.$refs.CustomTable.easySearch(this.orderSearchForm); //this.$refs.CustomTable.easySearch(this.orderSearchForm);
} }
}, },
//得到此树节点下所有是产品的productId //得到此树节点下所有是产品的productId
...@@ -972,7 +974,7 @@ export default { ...@@ -972,7 +974,7 @@ export default {
//批量选择 //批量选择
let selectRows = a; let selectRows = a;
this.arrPartPkId = []; this.arrPartPkId = [];
this.sendList = a; this.rowDataArry = a;
// selectRows.forEach(e => { // selectRows.forEach(e => {
// this.arrPartPkId.push(e.part_task_pk); // this.arrPartPkId.push(e.part_task_pk);
// }); // });
......
pages/mesPlan/send.vue
View file @ 5474c526
<template> <template>
<div style="width:100%;margin:0 auto" :style="{height:divHeight}"> <div style="width:100%;margin:0 auto" >
<Detail v-if="row.length==1" :info="row[0]"></Detail> <Detail ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
<Table <Table
:loading="loading"
border border
:columns="columns1" :columns="columns1"
:data="dataList" :data="dataList"
class="tableCommon" class="tableCommon"
v-if="osrMoreList" v-show="dataList.length>1"
:height="tbHeight"
></Table> ></Table>
<div style="width100%;margin:40px auto"> <div style="width100%;margin:40px auto">
<Form <Form
...@@ -18,22 +18,11 @@ ...@@ -18,22 +18,11 @@
ref="formValidate" ref="formValidate"
> >
<Row> <Row>
<Col span="8" v-if="false">
<FormItem label="主工艺人员" style="width:100%" prop="DistributeMainRouting">
<UserSelect
ref="userSelected"
v-model="orderForm.DistributeMainRouting"
style="width:240px"
:roleTitle="roleTitle"
/>
</FormItem>
</Col>
<Col span="6"> <Col span="6">
<FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople"> <FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople">
<WorkShopSelect <WorkShopSelect
ref="userSelected" ref="userSelected"
v-model="orderForm.ProductingPreparationPeople" v-model="orderForm.ProductingPreparationPeople"
style="width:240px"
/> />
</FormItem> </FormItem>
</Col> </Col>
...@@ -43,7 +32,6 @@ ...@@ -43,7 +32,6 @@
v-model="orderForm.ProductingPreparationFinishDate" v-model="orderForm.ProductingPreparationFinishDate"
type="date" type="date"
placeholder="请选择日期" placeholder="请选择日期"
style="width:240px"
@on-change="getTimeProductPFD" @on-change="getTimeProductPFD"
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
...@@ -53,50 +41,19 @@ ...@@ -53,50 +41,19 @@
<UserSelect <UserSelect
ref="userSelected" ref="userSelected"
v-model="orderForm.QuotationPeople" v-model="orderForm.QuotationPeople"
style="width:240px"
/> />
</FormItem> </FormItem>
</Col> </Col>
<Col span="8" v-if="false">
<FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate">
<DatePicker
v-model="orderForm.MainRoutingFinishDate"
type="date"
placeholder="请选择日期"
style="width:240px"
@on-change="getTimeMainRFD"
></DatePicker>
</FormItem>
</Col>
<Col span="6"> <Col span="6">
<FormItem label="完成时间" style="width:100%" prop="QuotationFinishDate"> <FormItem label="完成时间" style="width:100%" prop="QuotationFinishDate">
<DatePicker <DatePicker
v-model="orderForm.QuotationFinishDate" v-model="orderForm.QuotationFinishDate"
type="date" type="date"
placeholder="请选择日期" placeholder="请选择日期"
style="width:240px"
@on-change="getTimeQuotationFD" @on-change="getTimeQuotationFD"
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" v-if="false">
<FormItem label="专业工艺人员" style="width:100%" prop="MajorRoutingPeople">
<UserSelect ref="userSelected" v-model="orderForm.MajorRoutingPeople" />
</FormItem>
</Col>
<Col span="6" v-if="false">
<FormItem label="完成时间" style="width:100%" prop="MajorRoutingFinishDate">
<DatePicker
v-model="orderForm.MajorRoutingFinishDate"
type="date"
placeholder="请选择日期"
style="width:240px"
@on-change="getTimeMajorRFD"
></DatePicker>
</FormItem>
</Col>
</Row> </Row>
</Form> </Form>
</div> </div>
...@@ -113,7 +70,7 @@ export default { ...@@ -113,7 +70,7 @@ export default {
}, },
data() { data() {
return { return {
divHeight: "260px", divHeight: "400px",
osrOneList: false, //一条数据显示详细 osrOneList: false, //一条数据显示详细
osrMoreList: false, //多条数据只显示列表 osrMoreList: false, //多条数据只显示列表
info: { info: {
...@@ -171,54 +128,10 @@ export default { ...@@ -171,54 +128,10 @@ export default {
} }
], ],
dataList: [], dataList: [],
row1:{},
dataListRetrun: [], //确定后返回数据 dataListRetrun: [], //确定后返回数据
ruleValidate: { ruleValidate: {
// DistributeMainRouting: [
// {
// required: true,
// message: '请选择人员',
// trigger: 'change',
// type: 'number'
// }
// ],
// MainRoutingFinishDate: [
// {
// required: true,
// message: '请选择时间',
// trigger: 'change'
// }
// ],
// MajorRoutingPeople: [
// {
// required: true,
// message: '请选择人员',
// trigger: 'change',
// type: 'number',
// }
// ],
// MajorRoutingFinishDate: [
// {
// required: true,
// message: '请选择时间',
// trigger: 'change'
// }
// ],
// CheckUpPeople: [
// {
// required: true,
// message: '请选择人员',
// trigger: 'change',
// }
// ],
// CheckUpFinishDate: [
// {
// required: true,
// message: '请选择时间',
// trigger: 'change'
// }
// ],
ProductingPreparationPeople: [ ProductingPreparationPeople: [
{ {
required: true, required: true,
...@@ -250,7 +163,9 @@ export default { ...@@ -250,7 +163,9 @@ export default {
} }
] ]
}, },
rowList:[], rowList: [],
row1:{},
tbHeight:0,
}; };
}, },
props: { props: {
...@@ -262,22 +177,6 @@ export default { ...@@ -262,22 +177,6 @@ export default {
} }
}, },
methods: { methods: {
intData(data) {
//打开modal层时给订单list赋值
this.orderInfo = [];
this.dataList = [];
this.dataList = data;
this.osrOneList = false;
this.osrMoreList = false;
if (data.length == 1) {
this.info.status = true;
this.info.orderInfo = data[0];
} else if (data.length > 1) {
this.osrMoreList = true;
this.info.status = false;
this.info.orderInfo = [];
}
},
returnDataList() { returnDataList() {
this.dataListRetrun = []; this.dataListRetrun = [];
this.dataList.forEach(item => { this.dataList.forEach(item => {
...@@ -316,23 +215,28 @@ export default { ...@@ -316,23 +215,28 @@ export default {
} }
}, },
created() { created() {
var theight = window.innerHeight - 400 + "px"; //var theight = window.innerHeight - 400 + "px";
this.divHeight = theight; // this.divHeight = theight;
}, },
mounted() { mounted() {
window.onresize = () => { // window.onresize = () => {
///浏览器窗口大小变化 // ///浏览器窗口大小变化
return (() => { // return (() => {
window.screenHeight = window.innerHeight; // window.screenHeight = window.innerHeight;
this.divHeight = window.screenHeight - 400 + "px"; // this.divHeight = window.screenHeight - 400 + "px";
})(); // })();
}; // };
}, },
watch: { watch: {
row(v) { row(v) {
if (v != []) { if (v != []) {
this.orderSearchForm = this.$u.clone(this.row); this.dataList = this.$u.clone(this.row);
this.row1=this.dataList[0]
this.tbHeight=0
if(this.dataList.length>3)
{
this.tbHeight=200
}
} }
} }
} }
......
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