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 @@
ref="formValidate"
>
<Row>
<Col span="8">
<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"/>
<UserSelect
ref="userSelected"
v-model="orderForm.DistributeMainRouting"
style="width:240px"
:roleTitle="roleTitle"
/>
</FormItem>
</Col>
<Col span="8">
<Col span="6">
<FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople">
<WorkShopSelect ref="userSelected" v-model="orderForm.ProductingPreparationPeople" style="width:240px"/>
</FormItem>
</Col>
<Col span="8">
<FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople">
<UserSelect ref="userSelected" v-model="orderForm.QuotationPeople" style="width:240px"/>
<WorkShopSelect
ref="userSelected"
v-model="orderForm.ProductingPreparationPeople"
style="width:240px"
/>
</FormItem>
</Col>
<Col span="8">
<FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate">
<Col span="6">
<FormItem label="完成时间" style="width:100%" prop="ProductingPreparationFinishDate">
<DatePicker
v-model="orderForm.MainRoutingFinishDate"
v-model="orderForm.ProductingPreparationFinishDate"
type="date"
placeholder="请选择日期"
style="width:240px"
@on-change="getTimeMainRFD"
@on-change="getTimeProductPFD"
></DatePicker>
</FormItem>
</Col>
<Col span="8">
<FormItem label="完成时间" style="width:100%" prop="ProductingPreparationFinishDate">
<Col span="6">
<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
v-model="orderForm.ProductingPreparationFinishDate"
v-model="orderForm.MainRoutingFinishDate"
type="date"
placeholder="请选择日期"
style="width:240px"
@on-change="getTimeProductPFD"
@on-change="getTimeMainRFD"
></DatePicker>
</FormItem>
</Col>
<Col span="8">
<Col span="6">
<FormItem label="完成时间" style="width:100%" prop="QuotationFinishDate">
<DatePicker
v-model="orderForm.QuotationFinishDate"
......@@ -91,69 +104,69 @@
</template>
<script>
import OrderInfos from '@/components/orderOperator/orderInfos'
var myDate = new Date()
import OrderInfos from "@/components/orderOperator/orderInfos";
var myDate = new Date();
export default {
name: 'orderSend',
name: "orderSend",
components: {
OrderInfos
},
data() {
return {
divHeight: '260px',
divHeight: "260px",
osrOneList: false, //一条数据显示详细
osrMoreList: false, //多条数据只显示列表
info: {
status: true,
orderInfo: []
},
roleTitle:'工艺员',
roleTitle: "工艺员",
orderForm: {
DistributeMainRouting: null, //主工艺人员
MainRoutingFinishDate: '', //主工艺人员完成时间
MainRoutingFinishDate: "", //主工艺人员完成时间
MajorRoutingPeople: null, //专业工艺人员
MajorRoutingFinishDate: '', //专业工艺人员完成时间
MajorRoutingFinishDate: "", //专业工艺人员完成时间
CheckUpPeople: 1, //校对人员 暂时不用
CheckUpFinishDate: '2019-12-19', //校对人员完成时间
CheckUpFinishDate: "2019-12-19", //校对人员完成时间
ProductingPreparationPeople: null, //生产准备人员
ProductingPreparationFinishDate: '', //生产准备完成时间
ProductingPreparationFinishDate: "", //生产准备完成时间
QuotationPeople: null, //订单报价人员
QuotationFinishDate: '' //订单报价完成时间
QuotationFinishDate: "" //订单报价完成时间
},
columns1: [
{
title: '订单编码',
key: 'mesCode',
title: "订单编码",
key: "mesCode",
width: 180,
tooltip: true
},
{
title: '任务类型',
key: 'taskType',
align: 'center',
title: "任务类型",
key: "taskType",
align: "center",
width: 100,
tooltip: true
},
{
title: '产品名称',
key: 'productName',
title: "产品名称",
key: "productName",
tooltip: true
},
{
title: '阶段',
key: 'stage',
title: "阶段",
key: "stage",
width: 80
},
{
title: '材料',
key: 'materialId',
title: "材料",
key: "materialId",
width: 100,
tooltip: true
},
{
title: '数量',
key: 'quantity',
align: 'right',
title: "数量",
key: "quantity",
align: "right",
width: 70
}
],
......@@ -161,21 +174,21 @@ export default {
dataListRetrun: [], //确定后返回数据
ruleValidate: {
DistributeMainRouting: [
{
required: true,
message: '请选择人员',
trigger: 'change',
type: 'number'
}
],
MainRoutingFinishDate: [
{
required: true,
message: '请选择时间',
trigger: 'change'
}
],
// DistributeMainRouting: [
// {
// required: true,
// message: '请选择人员',
// trigger: 'change',
// type: 'number'
// }
// ],
// MainRoutingFinishDate: [
// {
// required: true,
// message: '请选择时间',
// trigger: 'change'
// }
// ],
// MajorRoutingPeople: [
// {
// required: true,
......@@ -209,102 +222,102 @@ export default {
ProductingPreparationPeople: [
{
required: true,
message: '请选择人员',
trigger: 'change',
type: 'number'
message: "请选择人员",
trigger: "change",
type: "number"
}
],
ProductingPreparationFinishDate: [
{
required: true,
message: '请选择时间',
trigger: 'change'
message: "请选择时间",
trigger: "change"
}
],
QuotationPeople: [
{
required: true,
message: '请选择人员',
trigger: 'change',
type: 'number'
message: "请选择人员",
trigger: "change",
type: "number"
}
],
QuotationFinishDate: [
{
required: true,
message: '请选择时间',
trigger: 'change'
message: "请选择时间",
trigger: "change"
}
]
}
}
};
},
methods: {
intData(data) {
//打开modal层时给订单list赋值
this.orderInfo = []
this.dataList = []
this.dataList = data
this.osrOneList = false
this.osrMoreList = false
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]
this.info.status = true;
this.info.orderInfo = data[0];
} else if (data.length > 1) {
this.osrMoreList = true
this.info.status = false
this.info.orderInfo = []
this.osrMoreList = true;
this.info.status = false;
this.info.orderInfo = [];
}
},
returnDataList() {
this.dataListRetrun = []
this.dataList.forEach((item) => {
let objStr = {}
objStr.id = item.id
objStr.mesCode = item.mesCode
objStr.DistributeMainRouting = this.orderForm.DistributeMainRouting
objStr.MainRoutingFinishDate = this.orderForm.MainRoutingFinishDate
objStr.MajorRoutingPeople = this.orderForm.MajorRoutingPeople
objStr.MajorRoutingFinishDate = this.orderForm.MajorRoutingFinishDate
objStr.CheckUpPeople = this.orderForm.CheckUpPeople
objStr.CheckUpFinishDate = this.orderForm.CheckUpFinishDate
objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople
objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate
objStr.QuotationPeople = this.orderForm.QuotationPeople
objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate
this.dataListRetrun.push(objStr)
})
this.dataListRetrun = [];
this.dataList.forEach(item => {
let objStr = {};
objStr.id = item.id;
objStr.mesCode = item.mesCode;
objStr.DistributeMainRouting = this.orderForm.DistributeMainRouting;
objStr.MainRoutingFinishDate = this.orderForm.MainRoutingFinishDate;
objStr.MajorRoutingPeople = this.orderForm.MajorRoutingPeople;
objStr.MajorRoutingFinishDate = this.orderForm.MajorRoutingFinishDate;
objStr.CheckUpPeople = this.orderForm.CheckUpPeople;
objStr.CheckUpFinishDate = this.orderForm.CheckUpFinishDate;
objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople;
objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate;
objStr.QuotationPeople = this.orderForm.QuotationPeople;
objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate;
this.dataListRetrun.push(objStr);
});
//返回审批数据
return this.dataListRetrun
return this.dataListRetrun;
},
getTimeMainRFD(value) {
this.orderForm.MainRoutingFinishDate = value
this.orderForm.MainRoutingFinishDate = value;
},
getTimeMajorRFD(value) {
this.orderForm.MajorRoutingFinishDate = value
this.orderForm.MajorRoutingFinishDate = value;
},
getTimeCheckFD(value) {
this.orderForm.CheckUpFinishDate = value
this.orderForm.CheckUpFinishDate = value;
},
getTimeProductPFD(value) {
this.orderForm.ProductingPreparationFinishDate = value
this.orderForm.ProductingPreparationFinishDate = value;
},
getTimeQuotationFD(value) {
this.orderForm.QuotationFinishDate = value
this.orderForm.QuotationFinishDate = value;
}
},
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.screenHeight = window.innerHeight;
this.divHeight = window.screenHeight - 400 + "px";
})();
};
}
}
};
</script>
\ No newline at end of file
pages/aps/aps/components/excute.vue
View file @ a5a983b0
......@@ -455,44 +455,6 @@ export default {
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----
......
pages/aps/aps/index.vue
View file @ a5a983b0
......@@ -61,48 +61,48 @@ export default {
deletelModal: false,
apsModal: false,
list: [
{
id: 1,
part_task_pk: '2092',
priority: '1',
plan_qty: '6',
spare_qty: '0',
plan_start: '13/03/2020',
plan_finish: '06/04/2020',
notes: '',
demand_start: '17/01/2020',
demand_finish: '24/01/2020',
insert_flag: 0,
badjustflag: '0'
},
{
id: 2,
part_task_pk: '2095',
priority: '2',
plan_qty: '7',
spare_qty: '0',
plan_start: '13/03/2020',
plan_finish: '09/04/2020',
notes: 'null',
demand_start: '17/01/2020',
demand_finish: '24/01/2020',
insert_flag: 1,
badjustflag: '0'
},
{
id: 3,
part_task_pk: '2096',
priority: '3',
plan_qty: '9',
spare_qty: '0',
plan_start: '13/03/2020',
plan_finish: '26/03/2020',
notes: 'null',
demand_start: '20/01/2020',
demand_finish: '24/01/2020',
insert_flag: 0,
badjustflag: '0'
}
// {
// id: 1,
// part_task_pk: '2092',
// priority: '1',
// plan_qty: '6',
// spare_qty: '0',
// plan_start: '13/03/2020',
// plan_finish: '06/04/2020',
// notes: '',
// demand_start: '17/01/2020',
// demand_finish: '24/01/2020',
// insert_flag: 0,
// badjustflag: '0'
// },
// {
// id: 2,
// part_task_pk: '2095',
// priority: '2',
// plan_qty: '7',
// spare_qty: '0',
// plan_start: '13/03/2020',
// plan_finish: '09/04/2020',
// notes: 'null',
// demand_start: '17/01/2020',
// demand_finish: '24/01/2020',
// insert_flag: 1,
// badjustflag: '0'
// },
// {
// id: 3,
// part_task_pk: '2096',
// priority: '3',
// plan_qty: '9',
// spare_qty: '0',
// plan_start: '13/03/2020',
// plan_finish: '26/03/2020',
// notes: 'null',
// demand_start: '20/01/2020',
// demand_finish: '24/01/2020',
// insert_flag: 0,
// badjustflag: '0'
// }
],
curId: 0,
columns: [
......@@ -271,7 +271,8 @@ export default {
}
},
mounted() {
console.log(this)
//console.log(this)
this.loadList()
},
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