Skip to content

M
mes-ui
Commit 15e31e54 authored by 仇晓婷's avatar 仇晓婷 Committed by 佟礼
Browse files
Options

工艺规程管理

parents 242d293a bcc0ae07
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 244 deletions
components/customTable/customTable.vue
View file @ 15e31e54
......@@ -290,6 +290,21 @@ export default {
title: '紧急程度',
key: 'urgencyLevel',
width: 100,
filters: this.getArry(
this.$store.getters.dictionaryByKey('plan.order.urgencyLevel')
),
filterMethod(value, row) {
return row.urgencyLevel.indexOf(value) > -1
},
render: (h, params) => {
return h('state', {
props: {
code: 'plan.order.urgencyLevel',
type: 'text',
value: params.row.urgencyLevel + ''
}
})
}
},
// {
// title: '任务类型',
......
components/orderOperator/createOrder.vue
View file @ 15e31e54
......@@ -116,7 +116,7 @@
</Col>-->
<Col span="8">
<FormItem label="项目号" style="width:100%">
<Input v-model="orderSearchForm.projectNumber" style="width:240px" />
<Input v-model="orderSearchForm.projectNumber" style="width:240px" />
</FormItem>
</Col>
</Row>
......@@ -128,7 +128,11 @@
</Col>
<Col span="8">
<FormItem label="紧急程度" style="width:100%">
<dictionary style="width:240px" code="plan.order.urgencyLevel" v-model="orderSearchForm.urgencyLevel" ></dictionary>
<dictionary
style="width:240px"
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
></dictionary>
</FormItem>
</Col>
<!-- <Col span="8">
......@@ -172,7 +176,7 @@
<Input v-model="orderSearchForm.outerDrawnNumber" placeholder style="width:240px" />
</FormItem>
</Col>-->
<!-- <Col span="8">
<FormItem label="模型版本" style="width:100%">
<Input v-model="orderSearchForm.modelVersion" placeholder style="width:240px" />
......@@ -184,7 +188,7 @@
<Input v-model="orderSearchForm.designer" placeholder style="width:240px" />
</FormItem>
</Col>-->
<!-- <Col span="8">
<FormItem label="厂内机关负责人" style="width:100%">
<Input v-model="orderSearchForm.officeFunctionary" placeholder style="width:240px" />
......@@ -213,240 +217,243 @@
</div>
</template>
<script>
var myDate = new Date()
var dayTomorrow = new Date()
dayTomorrow.setTime(dayTomorrow.getTime() + 24 * 60 * 60 * 1000)
var myDate = new Date();
var dayTomorrow = new Date();
dayTomorrow.setTime(dayTomorrow.getTime() + 24 * 60 * 60 * 1000);
var nowDate =
myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate()
myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + myDate.getDate();
var tomorrowDate =
dayTomorrow.getFullYear() +
'-' +
"-" +
(dayTomorrow.getMonth() + 1) +
'-' +
dayTomorrow.getDate()
"-" +
dayTomorrow.getDate();
export default {
name: 'createOrder',
name: "createOrder",
data() {
return {
divHeight: '260px',
divHeight: "260px",
list: [],
data1: [],
selectdata: [],
placeholdeinfo: '请选择',
placeholdeinfo: "请选择",
orderSearchForm: {
id: null,
productId: null, //产品id
productName: '', //产品名称
productName: "", //产品名称
drawnNumber: null, //图号
taskType: null, //任务类型
stage: null, //阶段
materialId: null, //材料
quantity: 1, //数量
guestName: '', //甲方客户
printSupply: '', //3D打印承制单位
functionaryOffice: '', //厂内责任机关
mainDepartmentId: '', //厂内责任主体部门ID
taskRequire: '', //任务接点要求
putintDocmentCode: '', //甲方投产输入文件编号
technologyDocmentCode: '', //甲方技术输入文件编号
outerDrawnNumber: '', //外部图号/模型号
modelVersion: '', //模型版本
taskCode: '', //甲方任务号
designer: '', //甲方设计人员
officeFunctionary: '', //厂内机关负责人
mainRoutingPeople: '', //厂内主工艺人员
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: null, //工艺方法
outer_Envelope_Size: '', //包装尺寸
outer_Envelope_Size: "", //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
remark: '', //备注
projectNumber:'',//项目号
batchNumber:'',//批次号
urgencyLevel:null,//紧急程度
remark: "", //备注
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
},
ruleValidate: {
productId: [
{
required: true,
message: '请选择产品名称',
type: 'number',
trigger: 'change'
message: "请选择产品名称",
type: "number",
trigger: "change"
}
],
taskType: [
{
required: true,
message: '请选择任务类型',
trigger: 'change',
type: 'number'
message: "请选择任务类型",
trigger: "change",
type: "number"
}
],
stage: [
{
required: true,
message: '请选择阶段',
type: 'number',
trigger: 'change'
message: "请选择阶段",
type: "number",
trigger: "change"
}
],
materialId: [
{
required: true,
message: '请选择材料',
type: 'number',
trigger: 'change'
message: "请选择材料",
type: "number",
trigger: "change"
}
],
quantity: [
{
required: true,
message: '请输入数量',
type: 'number',
trigger: 'change'
message: "请输入数量",
type: "number",
trigger: "change"
}
],
routing_Method: [
{
required: true,
message: '请选择工艺方法',
type: 'number',
trigger: 'change'
message: "请选择工艺方法",
type: "number",
trigger: "change"
}
]
}
}
};
},
methods: {
addOrderOk() {
return this.orderSearchForm
return this.orderSearchForm;
},
handleSelect(data) {
if (data.length > 0) {
this.selectdata = []
this.selectdata = data
this.list = []
this.list.push({ label: data[0].title, value: data[0].id })
if (data[0].isProduct == '1') {
this.orderSearchForm.productName = data[0].title
this.orderSearchForm.productId = data[0].productId
this.orderSearchForm.drawnNumber = data[0].drawingNo
this.selectdata = [];
this.selectdata = data;
this.list = [];
this.list.push({ label: data[0].title, value: data[0].id });
if (data[0].isProduct == "1") {
this.orderSearchForm.productName = data[0].title;
this.orderSearchForm.productId = data[0].productId;
this.orderSearchForm.drawnNumber = data[0].drawingNo;
} else {
this.$Message.error('此节点不是产品,请选择产品节点!')
this.$Message.error("此节点不是产品,请选择产品节点!");
}
}
},
resetFields() {
;(this.placeholdeinfo = '请选择'),
(this.placeholdeinfo = "请选择"),
(this.orderSearchForm = {
productId: null, //产品id
productName: '', //产品名称
productName: "", //产品名称
drawnNumber: null, //图号
taskType: null, //任务类型
stage: null, //阶段
materialId: null, //材料
quantity: 1, //数量
guestName: '', //甲方客户
printSupply: '', //3D打印承制单位
functionaryOffice: '', //厂内责任机关
mainDepartmentId: '', //厂内责任主体部门ID
taskRequire: '', //任务接点要求
putintDocmentCode: '', //甲方投产输入文件编号
technologyDocmentCode: '', //甲方技术输入文件编号
outerDrawnNumber: '', //外部图号/模型号
modelVersion: '', //模型版本
taskCode: '', //甲方任务号
designer: '', //甲方设计人员
officeFunctionary: '', //厂内机关负责人
mainRoutingPeople: '', //厂内主工艺人员
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: null, //工艺方法
outer_Envelope_Size: '', //包装尺寸
outer_Envelope_Size: "", //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
remark: '' //备注
})
remark: "" //备注
});
},
inidate(data) {
this.orderSearchForm = data
this.orderSearchForm.productId = parseInt(data.productId)
this.orderSearchForm.taskType = parseInt(data.taskType)
this.orderSearchForm.stage = parseInt(data.stage)
this.orderSearchForm.materialId = parseInt(data.materialId)
this.orderSearchForm.routing_Method = parseInt(data.routing_Method)
this.orderSearchForm.guestName = parseInt(data.guestName)
this.orderSearchForm.printSupply = parseInt(data.printSupply)
this.orderSearchForm.mainDepartmentId = parseInt(data.mainDepartmentId)
this.orderSearchForm = data;
this.orderSearchForm.productId = parseInt(data.productId);
this.orderSearchForm.taskType = parseInt(data.taskType);
this.orderSearchForm.stage = parseInt(data.stage);
this.orderSearchForm.materialId = parseInt(data.materialId);
this.orderSearchForm.routing_Method = parseInt(data.routing_Method);
this.orderSearchForm.guestName = parseInt(data.guestName);
this.orderSearchForm.printSupply = parseInt(data.printSupply);
this.orderSearchForm.mainDepartmentId = parseInt(data.mainDepartmentId);
this.orderSearchForm.urgencyLevel = parseInt(data.urgencyLevel);
this.orderSearchForm.demandStartDate = this.getFormatDate(
data.demandStartDate
)
);
this.orderSearchForm.demandFinishDate = this.getFormatDate(
data.demandFinishDate
)
this.placeholdeinfo = data.productName
);
this.placeholdeinfo = data.productName;
},
iniTree(data) {
this.data1 = data
this.data1 = data;
},
renderContent(h, { root, node, data }) {
//渲染树的样式
return h(
'span',
"span",
{
style: {
color: data.isProduct != '1' ? '#249E91' : '#333', //根据选中状态设置样式
cursor: 'pointer'
color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
cursor: "pointer"
},
on: {
click: () => {
let arrTree = []
arrTree.push(data)
this.handleSelect(arrTree) //手动选择树节点
let arrTree = [];
arrTree.push(data);
this.handleSelect(arrTree); //手动选择树节点
}
}
},
data.title
)
);
},
getStartDate(value) {
if (value == '') {
this.orderSearchForm.demandStartDate = this.getFormatDate(nowDate)
if (value == "") {
this.orderSearchForm.demandStartDate = this.getFormatDate(nowDate);
} else {
this.orderSearchForm.demandStartDate = this.getFormatDate(value)
this.orderSearchForm.demandStartDate = this.getFormatDate(value);
}
},
getFinishedDate(value) {
if (value == '') {
this.orderSearchForm.demandFinishDate = this.getFormatDate(tomorrowDate)
if (value == "") {
this.orderSearchForm.demandFinishDate = this.getFormatDate(
tomorrowDate
);
} else {
this.orderSearchForm.demandFinishDate = this.getFormatDate(value)
this.orderSearchForm.demandFinishDate = this.getFormatDate(value);
}
},
getFormatDate(dates) {
const d = new Date(dates)
const d = new Date(dates);
const resDate =
d.getFullYear() +
'-' +
"-" +
this.p(d.getMonth() + 1) +
'-' +
this.p(d.getDate())
return resDate
"-" +
this.p(d.getDate());
return resDate;
},
p(s) {
return s < 10 ? '0' + s : s
return s < 10 ? "0" + s : s;
}
},
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/processManage/Process/detailfiles.vue
View file @ 15e31e54
......@@ -103,9 +103,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingFile: dataValidate
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/index.vue
View file @ 15e31e54
......@@ -226,7 +226,7 @@ export default {
doUpload: '/api/up/file',
tableHeight: '',
myloading: true,
gymodaltitle: '创建主工艺',
gymodaltitle: '创建工艺',
processviewModal: false,
isview: false,
issendAudit: false,
......@@ -672,10 +672,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/processNew.vue
View file @ 15e31e54
......@@ -544,9 +544,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingDetail: this.formprocessValidate
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/stepModel.vue
View file @ 15e31e54
......@@ -171,9 +171,9 @@ let isvalidate = false;
service
.post(
`${url}`,
JSON.stringify({
{
routingStep: this.newModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/supporting.vue
View file @ 15e31e54
......@@ -304,7 +304,7 @@ export default {
var url = `${designUrl}/routingsupporting/createorupdate`
service
.post(`${url}`, JSON.stringify(this.formprocessValidate))
.post(`${url}`, this.formprocessValidate)
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......
pages/processManage/Process/testingModel.vue
View file @ 15e31e54
......@@ -353,9 +353,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingQcCard: this.cardModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/setProcess/index.vue
View file @ 15e31e54
......@@ -389,7 +389,7 @@ export default {
list: [],
data2: [],
tabstatus: '1', //暂存tab状态（）主工艺||专业工艺
gymodaltitle: '创建主工艺',
gymodaltitle: '创建工艺',
selectdata: [],
value1: false,
drawerShow: false,
......@@ -1076,9 +1076,7 @@ export default {
saveHeader(next) {
var a = this.$refs.processMain
if (a.formValidate.routingType == 1) {
this.savebill()
}
var filelist = a.getfile()
let isvalidate = false
......@@ -1107,10 +1105,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
}
)
.then((response) => {
if (response.success) {
......@@ -1209,9 +1207,7 @@ export default {
this.$refs.processNew.formprocessValidate.routing_header_id = this.headerid
this.$refs.processNew.loaddata()
} else {
if (this.addpdefm.formValidate.routingType == 1) {
this.savebill()
}
var a = this.addpdefm
this.headerid = this.addpdefm.formValidate.id
......@@ -1231,9 +1227,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
orderRouting: orderRoutingobj
})
}
)
.then((response) => {
if (response.success) {
......@@ -1296,15 +1292,12 @@ export default {
modalShowCancel() {
this.modalShow = false
},
savebill() {
this.$refs.modelTable.$refs.quotationBox2.saveData()
this.$refs.modelTable.$refs.quotationBox3.saveData()
},
saveOK() {
var url = `${PlanUrl}/OrderMaterial/createorupdate`
// JSON.stringify({Process:this.formValidate})
service
.post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate }))
.post(`${url}`, { orderMaterial: this.formValidate })
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......@@ -1334,7 +1327,7 @@ export default {
let ordercombid = 0
this.createtype = 1
if (routingType == 1) {
this.gymodaltitle = '设置主工艺规程'
this.gymodaltitle = '设置工艺规程'
for (let i = 0; i < this.data1.length; i++) {
let obj1 = this.data1[i]
......@@ -1346,24 +1339,14 @@ export default {
}
}
this.$refs.modelTable.issetProcess1 = true
this.$refs.modelTable.selectFault = 'greateArt'
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else {
this.$refs.modelTable.issetProcess1 = false
this.gymodaltitle = '设置专业工艺规程'
ordercombid = params.row.specialtyOrderCombID
if (ordercombid != 0) {
this.$refs.modelTable.issetProcess1 = false
this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i]
......@@ -1450,16 +1433,9 @@ export default {
let orderids = new Array()
let orderlist = new Array()
if (routingType == 1) {
// ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else {
// ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
ordercombid = params.row.orderCombID
this.addpdefm.formValidate.ordercombid = ordercombid
if (orders == null) {
for (let i = 0; i < this.data1.length; i++) {
......@@ -1493,13 +1469,8 @@ export default {
this.addpdefm.dataTop = orderlist
if (routingType == 1) {
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.selectFault = 'greateArt'
}
if (routingType == 1) {
this.gymodaltitle = '设置工艺规程'
......@@ -1539,13 +1510,9 @@ export default {
let orderids = new Array()
let orderlist = new Array()
let ordercombid = 0
if (routingType == 1) {
ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
} else {
ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i]
......@@ -1568,22 +1535,10 @@ export default {
}
this.addpdefm.dataTop = orderlist
if (routingType == 1) {
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.selectFault = 'greateArt'
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
}
if (routingType == 1) {
this.gymodaltitle = '查看工艺规程'
} else {
this.gymodaltitle = '查看工艺规程'
}
var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate = response.result
......@@ -1613,9 +1568,7 @@ export default {
this.addpdefm.formValidate = this.headerInfo
this.addpdefm.isview = this.isview
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
this.addpdefm.ProductName = this.headerInfo.productName
this.addpdefm.ProductCode = this.headerInfo.productCode
......
pages/processManage/setProcess/processMain.vue
View file @ 15e31e54
......@@ -445,36 +445,7 @@ export default {
this.$refs.refFile.routing_header_id = 0;
this.$refs.refFile.intFiles();
},
LoadprocessList() {
this.processList = [];
let url = `${designUrl}/routingheader/getlistbyids?` + this.Mianids,
that = this;
service.get(`${url}`).then(res => {
let selectdata = res.result;
selectdata.forEach(item => {
this.processList.push({
value: item.id,
name: item.code,
ver: item.version
});
});
this.formValidate.up_id = this.processList[0].value;
this.MianVer = this.processList[0].ver;
this.MianCode = this.processList[0].name;
});
},
MainProcess_selected(val) {
//这里的val默认拿到的是：value绑定的那个
this.formValidate.up_id = val;
this.processList.forEach(item => {
if (val == item.value) {
this.MianVer = item.ver;
}
});
},
quotationBox() {
this.$refs.generateQuotation.modalShow = true;
},
......@@ -558,9 +529,10 @@ export default {
});
},
setparentcreatetype(type, headerid) {
this.$parent.$parent.createtype = type
this.$parent.$parent.headerid = headerid
this.$parent.$parent.$parent.createtype = type;
this.$parent.$parent.$parent.headerid = headerid;
},
......@@ -575,11 +547,9 @@ export default {
});
},
setshow() {
if (this.formValidate.routingType == 2) {
this.isshow = true;
} else {
this.isshow = false;
}
if (this.formValidate.id != 0) {
this.isedit = true;
......@@ -590,14 +560,11 @@ export default {
this.Loadfile(0);
}
if (this.Mianids != "") {
this.LoadprocessList();
}
this.createtype = "1";
this.selectpdefmid = 0;
this.RoutingList = [];
this.calcplatesnum();
// this.calcplatesnum();
}
}
};
......
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