Skip to content

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

mesplan

parent c104f68f
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 367 deletions
components/orderOperator/process.vue
View file @ 91adb124
......@@ -71,28 +71,46 @@ export default {
load(v) {
this.dataImmut = [];
this.dataMut = [];
let url = `${workflowUrl}/schema/intend`;
// this.$api.get(url, { schemaId: v }).then(r => {
// if (r.success) {
// // console.warn("VVVV",r)
// r.result.nodes.map((u, i) => {
// if (i > 0) {
// let ids = u.defaultUsers.immutable.concat(u.defaultUsers.mutable);
// u.defaultUsers.immutable = ids;
// u.userIds = this.$u.clone(ids);
// } else {
// u.userIds = [this.currentUserId];
// }
// });
// this.dataImmut = r.result.nodes;
// this.processTitle = r.result.name;
// // if (this.dataImmut.length >= 1) {
// // this.immutData = this.dataImmut[1].defaultUsers.immutable
// // }
// this.userIds();
// }
// });
//判断流程是否启用
let params = {
id: v
};
this.$api.get(`${workflowUrl}/schema/getbyid`, params).then(res => {
if (res.success) {
let wfStatus = res.result.status;
if (wfStatus == 0) {
//启用
let url = `${workflowUrl}/schema/intend`;
this.$api.get(url, { schemaId: v }).then(r => {
if (r.success) {
// console.warn("VVVV",r)
r.result.nodes.map((u, i) => {
if (i > 0) {
let ids = u.defaultUsers.immutable.concat(
u.defaultUsers.mutable
);
u.defaultUsers.immutable = ids;
u.userIds = this.$u.clone(ids);
} else {
u.userIds = [this.currentUserId];
}
});
this.dataImmut = r.result.nodes;
this.processTitle = r.result.name;
// if (this.dataImmut.length >= 1) {
// this.immutData = this.dataImmut[1].defaultUsers.immutable
// }
this.userIds();
}
});
}
// else {
// this.$Message.error("流程未启用");
// }
} else {
this.$Message.error("操作失败");
}
});
},
userIds() {
var ids = [];
......
pages/mesPlan/add.vue
View file @ 91adb124
......@@ -171,10 +171,25 @@ export default {
}
]
},
disabled: false
disabled: false,
wfstatu: 1
};
},
mounted() {
let params = {
id: "123327da-42b3-41f6-b785-cf933f137a95"
};
this.$api.get(`${workflowUrl}/schema/getbyid`, params).then(res => {
if (res.success) {
let wfStatus = res.result.status;
if (wfStatus == 0) {
this.wfstatu = 1;
} else {
this.wfstatu = 3;
}
}
});
this.loadTree();
},
methods: {
......@@ -182,7 +197,7 @@ export default {
this.$refs.formValidate.validate(v => {
if (v) {
this.disabled = true;
this.orderSearchForm.status = 1;
this.orderSearchForm.status = this.wfstatu;
Api.mesplancreate(this.orderSearchForm)
.then(r => {
this.disabled = false;
......
pages/mesPlan/edit.vue
View file @ 91adb124
......@@ -147,7 +147,8 @@ export default {
},
placeholdeinfo: "",
list: [],
data1: []
data1: [],
wfstatu: 1
};
},
props: {
......@@ -159,6 +160,19 @@ export default {
}
},
mounted() {
let params = {
id: "123327da-42b3-41f6-b785-cf933f137a95"
};
this.$api.get(`${workflowUrl}/schema/getbyid`, params).then(res => {
if (res.success) {
let wfStatus = res.result.status;
if (wfStatus == 0) {
this.wfstatu = 1;
} else {
this.wfstatu = 3;
}
}
});
this.loadTree();
},
methods: {
......@@ -172,7 +186,7 @@ export default {
this.$refs.formValidate.validate(v => {
if (v) {
this.disabled = true;
this.orderSearchForm.status = 1;
this.orderSearchForm.status = this.wfstatu;
Api.mesorderupdate(this.orderSearchForm)
.then(r => {
this.disabled = false;
......
pages/mesPlan/index.vue
View file @ 91adb124
......@@ -51,6 +51,12 @@
<Button type="primary" @click="addModal=true">创建</Button>
</template>
<template slot="batch">
<Button
type="primary"
class="mr10 ml10"
@click="openSendViewModal"
v-if="this.wfstatu==1"
>订单送审</Button>
<Button type="primary" class="mr10 ml10" @click="openSendModal">订单派发</Button>
<Button type="primary" class="mr10 ml10" @click="removeList">批量删除</Button>
</template>
......@@ -71,6 +77,13 @@
<Button type="primary" @click="orderSplitOk">确定分解</Button>
</div>
</Modal>
<Modal v-model="sendViewModal" title="订单送审" width="1200">
<SendView :row="rowDataArry" ref="orderSendView" />
<div slot="footer">
<Button @click="sendViewModal = false">取消</Button>
<Button type="primary" @click="sendViewOk">确定送审</Button>
</div>
</Modal>
<Modal v-model="sendModal" title="订单派发" width="1200">
<Send :row="rowDataArry" ref="orderSend" />
<div slot="footer">
......@@ -108,6 +121,7 @@ import Detail from "./detail";
import Search from "./search";
import Split from "./split";
import Send from "./send";
import SendView from "./SendView";
import ProductTree from "@/components/page/productTree.vue";
export default {
name: "list",
......@@ -118,6 +132,7 @@ export default {
Search,
Split,
Send,
SendView,
ProductTree
},
data() {
......@@ -139,6 +154,7 @@ export default {
splitModal: false,
ModalInfo: false,
sendModal: false,
sendViewModal: false,
curId: 0,
id: "id",
columns: [
......@@ -328,7 +344,6 @@ export default {
high: true,
width: 180
},
{
title: "操作",
key: "action",
......@@ -350,11 +365,19 @@ export default {
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row) },
style:
(params.row.status == 1 &&
params.row.id == params.row.rootId &&
params.row.divideMark != 0) ||
params.row.id != params.row.rootId ||
params.row.status != 1
this.wfstatu == 1
? (params.row.status == 1 &&
params.row.id == params.row.rootId &&
params.row.divideMark != 0) ||
params.row.id != params.row.rootId ||
params.row.status != 1
? "display:none"
: ""
: (params.row.status == 3 &&
params.row.id == params.row.rootId &&
params.row.divideMark != 0) ||
params.row.id != params.row.rootId ||
params.row.status != 3
? "display:none"
: ""
},
......@@ -366,10 +389,19 @@ export default {
attrs: { oprate: "remove" },
on: { click: () => this.remove(params.row) },
style:
(params.row.status == 1 &&
params.row.id == params.row.rootId &&
params.row.divideMark != 0) ||
params.row.status != 1
this.wfstatu == 1
? (params.row.status == 1 &&
params.row.id == params.row.rootId &&
params.row.divideMark != 0) ||
params.row.id != params.row.rootId ||
params.row.status != 1
? "display:none"
: ""
: (params.row.status == 3 &&
params.row.id == params.row.rootId &&
params.row.divideMark != 0) ||
params.row.id != params.row.rootId ||
params.row.status != 3
? "display:none"
: ""
},
......@@ -381,10 +413,17 @@ export default {
attrs: { oprate: "detail" },
on: { click: () => this.split(params.row) },
style:
(params.row.divideMark != 0 &&
params.row.id == params.row.rootId) ||
params.row.status != 1 ||
params.row.quantity <= 1
this.wfstatu == 1
? (params.row.divideMark != 0 &&
params.row.id == params.row.rootId) ||
params.row.status != 1 ||
params.row.quantity <= 1
? "display:none"
: ""
: (params.row.divideMark != 0 &&
params.row.id == params.row.rootId) ||
params.row.status != 3 ||
params.row.quantity <= 1
? "display:none"
: ""
},
......@@ -477,205 +516,7 @@ export default {
list: [],
//data测试数据
dataT: [],
dataTemp: [
{
mesCode: "DDBH_20200414_32",
taskType: 2,
productId: 71,
quantity: 10,
remark: "5",
taskRequire: "4",
status: 1,
divideMark: 1,
productName: "铅笔",
drawnNumber: "qianbii11",
rootId: 0,
batchNumber: "5",
projectNumber: "5",
urgencyLevel: 2,
productingPreparationPeople: 0,
productingPreparationFinishDate: "0001-01-01 00:00:00",
quotationPeople: 0,
quotationFinishDate: "0001-01-01 00:00:00",
upId: 0,
demandStartDate: "2020-04-14 00:00:01",
demandFinishDate: "2020-04-15 00:00:01",
rootCode: "DDBH_20200414_32",
creationTime: "2020-04-16 17:21:03",
id: 46
},
{
mesCode: "DDBH_20200414_3202",
taskType: 2,
productId: 71,
quantity: 6,
remark: "5",
taskRequire: "4",
status: 4,
divideMark: 0,
productCode: "No1~No6",
productName: "铅笔",
drawnNumber: "qianbii11",
rootId: 46,
batchNumber: "5",
projectNumber: "5",
urgencyLevel: 2,
productingPreparationPeople: 56,
productingPreparationFinishDate: "2020-04-17 23:59:59",
quotationPeople: 108,
quotationFinishDate: "2020-04-17 23:59:59",
upId: 46,
demandStartDate: "2020-04-14 00:00:01",
demandFinishDate: "2020-04-15 00:00:01",
rootCode: "DDBH_20200414_32",
lastModificationTime: "2020-04-15 10:40:22",
lastModifierUserId: 1,
creationTime: "2020-04-14 17:32:13",
creatorUserId: 1,
id: 52
},
{
mesCode: "DDBH_20200414_320101",
taskType: 2,
productId: 71,
quantity: 3,
remark: "5",
taskRequire: "4",
status: 1,
divideMark: 0,
productName: "铅笔",
drawnNumber: "qianbii11",
rootId: 46,
batchNumber: "5",
projectNumber: "5",
urgencyLevel: 2,
productingPreparationPeople: 0,
productingPreparationFinishDate: "0001-01-01 00:00:00",
quotationPeople: 0,
quotationFinishDate: "0001-01-01 00:00:00",
upId: 51,
demandStartDate: "2020-04-14 00:00:01",
demandFinishDate: "2020-04-15 00:00:01",
rootCode: "DDBH_20200414_32",
lastModificationTime: "2020-04-14 17:50:18",
lastModifierUserId: 1,
creationTime: "2020-04-14 17:32:13",
creatorUserId: 1,
id: 53
},
{
mesCode: "DDBH_20200414_320102",
taskType: 2,
productId: 71,
quantity: 1,
remark: "5",
taskRequire: "4",
status: 1,
divideMark: 0,
productName: "铅笔",
drawnNumber: "qianbii11",
rootId: 46,
batchNumber: "5",
projectNumber: "5",
urgencyLevel: 2,
productingPreparationPeople: 0,
productingPreparationFinishDate: "0001-01-01 00:00:00",
quotationPeople: 0,
quotationFinishDate: "0001-01-01 00:00:00",
upId: 51,
demandStartDate: "2020-04-14 00:00:01",
demandFinishDate: "2020-04-15 00:00:01",
rootCode: "DDBH_20200414_32",
lastModificationTime: "2020-04-14 17:50:18",
lastModifierUserId: 1,
creationTime: "2020-04-14 17:32:13",
creatorUserId: 1,
id: 54
},
{
mesCode: "DDBH_20200414_31",
taskType: 2,
productId: 70,
quantity: 8,
remark: "5",
taskRequire: "4",
status: 4,
divideMark: 0,
productCode: "No1~No8",
productName: "口罩模具",
drawnNumber: "LXG_KZ_001",
rootId: 0,
batchNumber: "5",
projectNumber: "5",
urgencyLevel: 2,
productingPreparationPeople: 56,
productingPreparationFinishDate: "2020-04-16 23:59:59",
quotationPeople: 108,
quotationFinishDate: "2020-04-16 23:59:59",
upId: 0,
demandStartDate: "2020-04-14 00:00:01",
demandFinishDate: "2020-04-15 00:00:01",
rootCode: "DDBH_20200414_31",
isDeleted: false,
creationTime: "2020-04-16 17:21:03",
id: 45
},
{
mesCode: "DDBH_20200414_30",
taskType: 2,
productId: 69,
quantity: 18,
remark: "5",
taskRequire: "4",
status: 4,
divideMark: 0,
productCode: "No1~No18",
productName: "护目镜",
drawnNumber: "LXG_HMJ_001",
rootId: 0,
batchNumber: "5",
projectNumber: "5",
urgencyLevel: 2,
productingPreparationPeople: 56,
productingPreparationFinishDate: "2020-04-16 23:59:59",
quotationPeople: 1,
quotationFinishDate: "2020-04-24 23:59:59",
upId: 0,
demandStartDate: "2020-04-14 00:00:01",
demandFinishDate: "2020-04-15 00:00:01",
rootCode: "DDBH_20200414_30",
isDeleted: false,
creationTime: "2020-04-16 17:21:03",
id: 44
},
{
mesCode: "DDBH_20200414_28",
taskType: 1,
productId: 22,
quantity: 15,
remark: "rr",
taskRequire: "r",
status: 1,
divideMark: 0,
productName: "te",
drawnNumber: "te",
rootId: 0,
batchNumber: "r",
projectNumber: "rr",
urgencyLevel: 2,
productingPreparationPeople: 0,
productingPreparationFinishDate: "0001-01-01 00:00:00",
quotationPeople: 0,
quotationFinishDate: "0001-01-01 00:00:00",
upId: 0,
demandStartDate: "2020-04-14 00:00:01",
demandFinishDate: "2020-04-15 00:00:01",
rootCode: "DDBH_20200414_28",
isDeleted: false,
creationTime: "2020-04-16 17:21:03",
id: 42
}
],
dataTemp: [],
data1: [],
selectdata: [],
//以下为手写死数据集：
......@@ -700,7 +541,14 @@ export default {
actMescodes: [],
delNum: 0, //判断是否可以进行修改
arrayIds: [], //选择列表后的ids
delMsg: "" //删除提示信息
delMsg: "", //删除提示信息
dataListRetrunNew: {
schemaId: "123327da-42b3-41f6-b785-cf933f137a95", //订单送审的schemaId
idList: [], //订单id List
codeList: [], //订单编号List
operatorIdList: [] //操作员id
}, //确定后返回数据
wfstatu: 1 //流程是否启用1 禁用 0启用
};
},
created() {
......@@ -708,6 +556,20 @@ export default {
},
mounted() {
this.initTree();
let params = {
id: "123327da-42b3-41f6-b785-cf933f137a95"
};
this.$api.get(`${workflowUrl}/schema/getbyid`, params).then(res => {
if (res.success) {
let wfStatus = res.result.status;
if (wfStatus == 0) {
this.wfstatu = 1;
} else {
this.wfstatu = 3;
}
}
});
//this.dataformat();//data传数据转为tree类型
this.tableHeight = window.innerHeight - 220;
//this.$refs.CustomTable.getTableHeight(this.tableHeight);
......@@ -847,47 +709,53 @@ export default {
});
this.splitModal = false;
this.ModalInfo = false;
//确定批量操作
// if (this.ModalInfoStaut == 'orderSendReview') {
// this.$http.order.batchstart(this.dataListRetrun).then((res) => {
// if (res.success) {
// this.$Message.success('订单送审成功!')
// this.easySearch('')
// } else {
// this.$Message.error('订单送审失败!')
// }
// })
// this.ModalOrderSendReview = false
// } else if (this.ModalInfoStaut == 'delOrder') {
// this.$http.order.delOrder(this.dataListRetrunParam).then((res) => {
// if (res.result) {
// this.$Message.success('删除成功!')
// this.easySearch('')
// } else {
// this.$Message.error('删除失败!')
// }
// this.$refs.createOrder.resetFields()
// this.createShow = false
// })
// } else if (this.ModalInfoStaut == 'orderSend') {
// this.$http.order.orderSend(this.dataListRetrun).then((res) => {
// if (res.result) {
// this.$Message.success('订单派发成功!')
// this.easySearch('')
// this.ModalOrderSend = false
// } else {
// this.$Message.error('订单派发失败!')
// }
// })
// } else {
// Api.mesorderdivide(this.dataListRetrun).then(res => {
// if (res.result) {
// this.$Message.success("订单分解成功!");
// } else {
// this.$Message.error("订单分解失败!");
// }
// });
//}
},
//打开送审modal
openSendViewModal() {
this.actIds = [];
this.delNum = 0;
if (this.rowDataArry.length > 0) {
this.rowDataArry.forEach(data => {
this.actIds.push(data.id);
if (data.status != 1) {
//判断非新建状态的订单
this.delNum += 1;
}
});
setTimeout(() => {
if (this.delNum > 0) {
this.$Message.error("所选的订单中有不可送审的订单！");
this.actIds = [];
this.sendViewModal = false;
} else {
this.sendViewModal = true;
}
}, 400);
} else {
this.$Message.error("请选择订单");
}
},
//确定送审
sendViewOk() {
this.dataListRetrunNew.idList = [];
this.dataListRetrunNew.codeList = [];
this.dataListRetrunNew.operatorIdList = [];
this.rowDataArry.forEach(item => {
this.dataListRetrunNew.idList.push(item.id);
this.dataListRetrunNew.codeList.push(item.mesCode);
});
let ues = this.$refs.userProcess;
this.dataListRetrunNew.operatorIdList = this.$refs.orderSendView.getUsers();
//返回审批数据
this.$http.order.batchstart(this.dataListRetrunNew).then(res => {
if (res.success) {
this.$Message.success("订单送审成功!");
this.$refs.grid.load();
} else {
this.$Message.error("订单送审失败!");
}
});
},
//打开派发
openSendModal() {
......@@ -896,7 +764,7 @@ export default {
if (this.rowDataArry.length > 0) {
this.rowDataArry.forEach(data => {
this.actIds.push(data.id);
if (data.status != 1) {
if (data.status != 3) {
//判断非新建状态的订单
this.delNum += 1;
}
......
pages/mesPlan/sendView.vue
View file @ 91adb124
<template>
<div style="width:100%;margin:0 auto">
<Detail ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
<Table
border
:columns="columns1"
:data="dataList"
class="tableCommon"
v-show="dataList.length>1"
:height="tbHeight"
></Table>
<Table border :columns="columns1" :data="dataList" class="tableCommon" :height="tbHeight"></Table>
<div style="width100%;margin:40px auto">
<Form
:model="orderForm"
:label-width="110"
class="margin-top-20 margin-bottom-50"
:rules="ruleValidate"
ref="formValidate"
>
<Row>
<Col span="6">
<FormItem label="生产车间" style="width:100%" prop="ProductingPreparationPeople">
<WorkShopSelect ref="userSelected" v-model="orderForm.ProductingPreparationPeople" />
</FormItem>
</Col>
<Col span="6">
<FormItem label="完成时间" style="width:100%" prop="ProductingPreparationFinishDate">
<DatePicker
v-model="orderForm.ProductingPreparationFinishDate"
type="date"
placeholder="请选择日期"
@on-change="getTimeProductPFD"
></DatePicker>
</FormItem>
</Col>
<Col span="6">
<FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople">
<UserSelect ref="userSelected" v-model="orderForm.QuotationPeople" />
</FormItem>
</Col>
<Col span="6">
<FormItem label="完成时间" style="width:100%" prop="QuotationFinishDate">
<DatePicker
v-model="orderForm.QuotationFinishDate"
type="date"
placeholder="请选择日期"
@on-change="getTimeQuotationFD"
></DatePicker>
</FormItem>
</Col>
</Row>
</Form>
<Row>
<Process ref="userProcess" schemaIdVal="123327da-42b3-41f6-b785-cf933f137a95" />
</Row>
</div>
</div>
</template>
<script>
import Detail from "./detail";
import Process from "@/components/orderOperator/process";
var myDate = new Date();
export default {
name: "send",
components: {
Detail
Detail,
Process
},
data() {
return {
......@@ -146,7 +103,7 @@ export default {
},
rowList: [],
row1: {},
tbHeight: 0
tbHeight: 0,
};
},
props: {
......@@ -167,46 +124,17 @@ export default {
//返回审批数据
return objStr;
},
getTimeProductPFD(value) {
this.orderForm.ProductingPreparationFinishDate = this.getFormatDateEnd(
value
);
},
getTimeQuotationFD(value) {
this.orderForm.QuotationFinishDate = this.getFormatDateEnd(value);
},
getFormatDateEnd(dates) {
const d = new Date(dates);
const resDate =
d.getFullYear() +
"-" +
this.p(d.getMonth() + 1) +
"-" +
this.p(d.getDate()) +
" 23:59:59";
return resDate;
},
p(s) {
return s < 10 ? "0" + s : s;
getUsers() {
let ues = this.$refs.userProcess;
return ues.immutData;
},
l(key) {
let vkey = "mes_plan" + "." + key;
return this.$t(vkey) || key;
}
},
created() {
//var theight = window.innerHeight - 400 + "px";
// this.divHeight = theight;
},
mounted() {
// window.onresize = () => {
// ///浏览器窗口大小变化
// return (() => {
// window.screenHeight = window.innerHeight;
// this.divHeight = window.screenHeight - 400 + "px";
// })();
// };
},
created() {},
mounted() {},
watch: {
row(v) {
if (v != []) {
......
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