Skip to content

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

mesplan

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