Skip to content

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

aps

parent cdc5aad4
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 190 deletions
components/orderOperator/orderSend.vue
View file @ a5a983b0
...@@ -18,45 +18,58 @@ ...@@ -18,45 +18,58 @@
ref="formValidate" ref="formValidate"
> >
<Row> <Row>
<Col span="8"> <Col span="8" v-if="false">
<FormItem label="主工艺人员" style="width:100%" prop="DistributeMainRouting"> <FormItem label="主工艺人员" style="width:100%" prop="DistributeMainRouting">
<UserSelect ref="userSelected" v-model="orderForm.DistributeMainRouting" style="width:240px" :roleTitle="roleTitle"/> <UserSelect
ref="userSelected"
v-model="orderForm.DistributeMainRouting"
style="width:240px"
:roleTitle="roleTitle"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="6">
<FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople"> <FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople">
<WorkShopSelect ref="userSelected" v-model="orderForm.ProductingPreparationPeople" style="width:240px"/> <WorkShopSelect
</FormItem> ref="userSelected"
</Col> v-model="orderForm.ProductingPreparationPeople"
style="width:240px"
<Col span="8"> />
<FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople">
<UserSelect ref="userSelected" v-model="orderForm.QuotationPeople" style="width:240px"/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="6">
<FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate"> <FormItem label="完成时间" style="width:100%" prop="ProductingPreparationFinishDate">
<DatePicker <DatePicker
v-model="orderForm.MainRoutingFinishDate" v-model="orderForm.ProductingPreparationFinishDate"
type="date" type="date"
placeholder="请选择日期" placeholder="请选择日期"
style="width:240px" style="width:240px"
@on-change="getTimeMainRFD" @on-change="getTimeProductPFD"
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8"> <Col span="6">
<FormItem label="完成时间" style="width:100%" prop="ProductingPreparationFinishDate"> <FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople">
<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 <DatePicker
v-model="orderForm.ProductingPreparationFinishDate" v-model="orderForm.MainRoutingFinishDate"
type="date" type="date"
placeholder="请选择日期" placeholder="请选择日期"
style="width:240px" style="width:240px"
@on-change="getTimeProductPFD" @on-change="getTimeMainRFD"
></DatePicker> ></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8">
<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"
...@@ -91,69 +104,69 @@ ...@@ -91,69 +104,69 @@
</template> </template>
<script> <script>
import OrderInfos from '@/components/orderOperator/orderInfos' import OrderInfos from "@/components/orderOperator/orderInfos";
var myDate = new Date() var myDate = new Date();
export default { export default {
name: 'orderSend', name: "orderSend",
components: { components: {
OrderInfos OrderInfos
}, },
data() { data() {
return { return {
divHeight: '260px', divHeight: "260px",
osrOneList: false, //一条数据显示详细 osrOneList: false, //一条数据显示详细
osrMoreList: false, //多条数据只显示列表 osrMoreList: false, //多条数据只显示列表
info: { info: {
status: true, status: true,
orderInfo: [] orderInfo: []
}, },
roleTitle:'工艺员', roleTitle: "工艺员",
orderForm: { orderForm: {
DistributeMainRouting: null, //主工艺人员 DistributeMainRouting: null, //主工艺人员
MainRoutingFinishDate: '', //主工艺人员完成时间 MainRoutingFinishDate: "", //主工艺人员完成时间
MajorRoutingPeople: null, //专业工艺人员 MajorRoutingPeople: null, //专业工艺人员
MajorRoutingFinishDate: '', //专业工艺人员完成时间 MajorRoutingFinishDate: "", //专业工艺人员完成时间
CheckUpPeople: 1, //校对人员 暂时不用 CheckUpPeople: 1, //校对人员 暂时不用
CheckUpFinishDate: '2019-12-19', //校对人员完成时间 CheckUpFinishDate: "2019-12-19", //校对人员完成时间
ProductingPreparationPeople: null, //生产准备人员 ProductingPreparationPeople: null, //生产准备人员
ProductingPreparationFinishDate: '', //生产准备完成时间 ProductingPreparationFinishDate: "", //生产准备完成时间
QuotationPeople: null, //订单报价人员 QuotationPeople: null, //订单报价人员
QuotationFinishDate: '' //订单报价完成时间 QuotationFinishDate: "" //订单报价完成时间
}, },
columns1: [ columns1: [
{ {
title: '订单编码', title: "订单编码",
key: 'mesCode', key: "mesCode",
width: 180, width: 180,
tooltip: true tooltip: true
}, },
{ {
title: '任务类型', title: "任务类型",
key: 'taskType', key: "taskType",
align: 'center', align: "center",
width: 100, width: 100,
tooltip: true tooltip: true
}, },
{ {
title: '产品名称', title: "产品名称",
key: 'productName', key: "productName",
tooltip: true tooltip: true
}, },
{ {
title: '阶段', title: "阶段",
key: 'stage', key: "stage",
width: 80 width: 80
}, },
{ {
title: '材料', title: "材料",
key: 'materialId', key: "materialId",
width: 100, width: 100,
tooltip: true tooltip: true
}, },
{ {
title: '数量', title: "数量",
key: 'quantity', key: "quantity",
align: 'right', align: "right",
width: 70 width: 70
} }
], ],
...@@ -161,21 +174,21 @@ export default { ...@@ -161,21 +174,21 @@ export default {
dataListRetrun: [], //确定后返回数据 dataListRetrun: [], //确定后返回数据
ruleValidate: { ruleValidate: {
DistributeMainRouting: [ // DistributeMainRouting: [
{ // {
required: true, // required: true,
message: '请选择人员', // message: '请选择人员',
trigger: 'change', // trigger: 'change',
type: 'number' // type: 'number'
} // }
], // ],
MainRoutingFinishDate: [ // MainRoutingFinishDate: [
{ // {
required: true, // required: true,
message: '请选择时间', // message: '请选择时间',
trigger: 'change' // trigger: 'change'
} // }
], // ],
// MajorRoutingPeople: [ // MajorRoutingPeople: [
// { // {
// required: true, // required: true,
...@@ -209,102 +222,102 @@ export default { ...@@ -209,102 +222,102 @@ export default {
ProductingPreparationPeople: [ ProductingPreparationPeople: [
{ {
required: true, required: true,
message: '请选择人员', message: "请选择人员",
trigger: 'change', trigger: "change",
type: 'number' type: "number"
} }
], ],
ProductingPreparationFinishDate: [ ProductingPreparationFinishDate: [
{ {
required: true, required: true,
message: '请选择时间', message: "请选择时间",
trigger: 'change' trigger: "change"
} }
], ],
QuotationPeople: [ QuotationPeople: [
{ {
required: true, required: true,
message: '请选择人员', message: "请选择人员",
trigger: 'change', trigger: "change",
type: 'number' type: "number"
} }
], ],
QuotationFinishDate: [ QuotationFinishDate: [
{ {
required: true, required: true,
message: '请选择时间', message: "请选择时间",
trigger: 'change' trigger: "change"
} }
] ]
} }
} };
}, },
methods: { methods: {
intData(data) { intData(data) {
//打开modal层时给订单list赋值 //打开modal层时给订单list赋值
this.orderInfo = [] this.orderInfo = [];
this.dataList = [] this.dataList = [];
this.dataList = data this.dataList = data;
this.osrOneList = false this.osrOneList = false;
this.osrMoreList = false this.osrMoreList = false;
if (data.length == 1) { if (data.length == 1) {
this.info.status = true this.info.status = true;
this.info.orderInfo = data[0] this.info.orderInfo = data[0];
} else if (data.length > 1) { } else if (data.length > 1) {
this.osrMoreList = true this.osrMoreList = true;
this.info.status = false this.info.status = false;
this.info.orderInfo = [] this.info.orderInfo = [];
} }
}, },
returnDataList() { returnDataList() {
this.dataListRetrun = [] this.dataListRetrun = [];
this.dataList.forEach((item) => { this.dataList.forEach(item => {
let objStr = {} let objStr = {};
objStr.id = item.id objStr.id = item.id;
objStr.mesCode = item.mesCode objStr.mesCode = item.mesCode;
objStr.DistributeMainRouting = this.orderForm.DistributeMainRouting objStr.DistributeMainRouting = this.orderForm.DistributeMainRouting;
objStr.MainRoutingFinishDate = this.orderForm.MainRoutingFinishDate objStr.MainRoutingFinishDate = this.orderForm.MainRoutingFinishDate;
objStr.MajorRoutingPeople = this.orderForm.MajorRoutingPeople objStr.MajorRoutingPeople = this.orderForm.MajorRoutingPeople;
objStr.MajorRoutingFinishDate = this.orderForm.MajorRoutingFinishDate objStr.MajorRoutingFinishDate = this.orderForm.MajorRoutingFinishDate;
objStr.CheckUpPeople = this.orderForm.CheckUpPeople objStr.CheckUpPeople = this.orderForm.CheckUpPeople;
objStr.CheckUpFinishDate = this.orderForm.CheckUpFinishDate objStr.CheckUpFinishDate = this.orderForm.CheckUpFinishDate;
objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople;
objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate;
objStr.QuotationPeople = this.orderForm.QuotationPeople objStr.QuotationPeople = this.orderForm.QuotationPeople;
objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate;
this.dataListRetrun.push(objStr) this.dataListRetrun.push(objStr);
}) });
//返回审批数据 //返回审批数据
return this.dataListRetrun return this.dataListRetrun;
}, },
getTimeMainRFD(value) { getTimeMainRFD(value) {
this.orderForm.MainRoutingFinishDate = value this.orderForm.MainRoutingFinishDate = value;
}, },
getTimeMajorRFD(value) { getTimeMajorRFD(value) {
this.orderForm.MajorRoutingFinishDate = value this.orderForm.MajorRoutingFinishDate = value;
}, },
getTimeCheckFD(value) { getTimeCheckFD(value) {
this.orderForm.CheckUpFinishDate = value this.orderForm.CheckUpFinishDate = value;
}, },
getTimeProductPFD(value) { getTimeProductPFD(value) {
this.orderForm.ProductingPreparationFinishDate = value this.orderForm.ProductingPreparationFinishDate = value;
}, },
getTimeQuotationFD(value) { getTimeQuotationFD(value) {
this.orderForm.QuotationFinishDate = value this.orderForm.QuotationFinishDate = value;
} }
}, },
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";
})() })();
} };
} }
} };
</script> </script>
\ No newline at end of file
pages/aps/aps/components/excute.vue
View file @ a5a983b0
...@@ -455,44 +455,6 @@ export default { ...@@ -455,44 +455,6 @@ export default {
this.data1 = res.result; this.data1 = res.result;
} }
}); });
//加载数据
//alert(id);
// let arr1 = {
// id: '1',
// op_task_pk: '001',
// part_task_pk: '001',
// task_seq: '1',
// task_name: '测试工序1',
// put_into_qty: '10',
// plan_start: '04/05/2020',
// plan_finish: '06/05/2020',
// setup_time: '5',
// run_time: '1',
// transport_time: '1',
// check_time: '1',
// efficiency_value: '0.5',
// singleout: '2',
// first_equip: 'NTY-0012',
// equip_type: '加工设备',
// cal_id: '日历id',
// machine_rule: '优先',
// plan_method: '是',
// over_time: '1',
// isdiscrete: '是',
// discrete_value: '1.2',
// multi_machine: '5',
// notes: '暂无备注信息test',
// insert_flag: 1,
// outside_time: '04/06/2020',
// taskseq_des: '',
// workshopcode: '',
// routing_detail_id: '',
// routing_header_id: '',
// comb_param: '',
// rule_qty: ''
// }
// this.data1.push(arr1)
}, },
//插单事件start---- //插单事件start----
......
pages/aps/aps/index.vue
View file @ a5a983b0
...@@ -61,48 +61,48 @@ export default { ...@@ -61,48 +61,48 @@ export default {
deletelModal: false, deletelModal: false,
apsModal: false, apsModal: false,
list: [ list: [
{ // {
id: 1, // id: 1,
part_task_pk: '2092', // part_task_pk: '2092',
priority: '1', // priority: '1',
plan_qty: '6', // plan_qty: '6',
spare_qty: '0', // spare_qty: '0',
plan_start: '13/03/2020', // plan_start: '13/03/2020',
plan_finish: '06/04/2020', // plan_finish: '06/04/2020',
notes: '', // notes: '',
demand_start: '17/01/2020', // demand_start: '17/01/2020',
demand_finish: '24/01/2020', // demand_finish: '24/01/2020',
insert_flag: 0, // insert_flag: 0,
badjustflag: '0' // badjustflag: '0'
}, // },
{ // {
id: 2, // id: 2,
part_task_pk: '2095', // part_task_pk: '2095',
priority: '2', // priority: '2',
plan_qty: '7', // plan_qty: '7',
spare_qty: '0', // spare_qty: '0',
plan_start: '13/03/2020', // plan_start: '13/03/2020',
plan_finish: '09/04/2020', // plan_finish: '09/04/2020',
notes: 'null', // notes: 'null',
demand_start: '17/01/2020', // demand_start: '17/01/2020',
demand_finish: '24/01/2020', // demand_finish: '24/01/2020',
insert_flag: 1, // insert_flag: 1,
badjustflag: '0' // badjustflag: '0'
}, // },
{ // {
id: 3, // id: 3,
part_task_pk: '2096', // part_task_pk: '2096',
priority: '3', // priority: '3',
plan_qty: '9', // plan_qty: '9',
spare_qty: '0', // spare_qty: '0',
plan_start: '13/03/2020', // plan_start: '13/03/2020',
plan_finish: '26/03/2020', // plan_finish: '26/03/2020',
notes: 'null', // notes: 'null',
demand_start: '20/01/2020', // demand_start: '20/01/2020',
demand_finish: '24/01/2020', // demand_finish: '24/01/2020',
insert_flag: 0, // insert_flag: 0,
badjustflag: '0' // badjustflag: '0'
} // }
], ],
curId: 0, curId: 0,
columns: [ columns: [
...@@ -271,7 +271,8 @@ export default { ...@@ -271,7 +271,8 @@ export default {
} }
}, },
mounted() { mounted() {
console.log(this) //console.log(this)
this.loadList()
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
......
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