diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index fb9021132..03a84bfed 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -28,14 +28,16 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
index 18a0232bd..3d1c61169 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
@@ -25,26 +25,28 @@
@@ -284,6 +286,17 @@ export default {
handleTabs(name) {
this.active = name;
},
+ // 点击查看
+ handlePreview(item) {
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank");
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -303,7 +316,6 @@ export default {
*/
getFormFieldList (item) {
this.$nextTick(() => {
- console.log(item);
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
index 1984c73f1..06374bbb5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
@@ -25,28 +25,30 @@
@@ -402,6 +404,17 @@ export default {
handleTabs(name) {
this.active = name;
},
+ //点击查看详情
+ handlePreview(item){
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank")
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -424,7 +437,7 @@ export default {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
- this.listForm['id'] = item.id
+ this.listForm.id = item.id
this.dataList = item.dataList
})
},
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index df6bed631..e51aa3b71 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -28,14 +28,16 @@
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 801ca865e..9d2296c0b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -25,26 +25,28 @@
@@ -352,6 +354,17 @@ export default {
handleTabs(name) {
this.active = name;
},
+ // 点击查看
+ handlePreview(item) {
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank");
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -371,7 +384,6 @@ export default {
*/
getFormFieldList (item) {
this.$nextTick(() => {
- console.log(item);
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 423aa3dd0..1d3755fc8 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -25,28 +25,30 @@
@@ -57,7 +59,8 @@
-
-
+
+
@@ -220,11 +224,11 @@
@@ -233,7 +237,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew } from "api/process";
export default {
name: "xmpgStep3",
@@ -274,8 +278,8 @@ export default {
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
- lsIndex: '',
- lsType: '',
+ lsIndex: "",
+ lsType: "",
bringData: [],
commentText: "", //填写会签意见
page: 1,
@@ -289,7 +293,7 @@ export default {
qualityEngineer: "", //质量工程师
breakdownList: [{ //分解单数据
implementer: "",
- implementerId:'',
+ implementerId: "",
applyArctic: "",
busStandCover: "",
claimType: "",
@@ -302,7 +306,7 @@ export default {
}],
dataList: [{
implementer: "",
- implementerId:'',
+ implementerId: "",
projectLine: "", //产品线
uname: "",//产品线责任人
distributePerson: "", //分发责任人
@@ -327,7 +331,7 @@ export default {
},
roleForm: {
implementer: "",
- implementerId: "",
+ implementerId: ""
},
choiceForm: {}, //选择标准清单列表
user1: "",
@@ -340,45 +344,45 @@ export default {
},
methods: {
//确认转办
- checkedTransferRole (data) {
- this.assigneeNewLoading = true
+ checkedTransferRole(data) {
+ this.assigneeNewLoading = true;
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
- this.isTransfer = false
+ this.isTransfer = false;
if (res.success) {
- this.drawerModal = false
- this.$message.success('调整成功')
+ this.drawerModal = false;
+ this.$message.success("调整成功");
this.$router.push("/processCenter");
- this.processNum()
+ this.processNum();
} else {
- this.$message.warning(res.message)
+ this.$message.warning(res.message);
}
- })
+ });
},
// 请求转换流程图
- processNum (row) {
+ processNum(row) {
axios.request({
- url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
- responseType: 'blob',
- method: 'get',
+ url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
+ responseType: "blob",
+ method: "get",
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
- this.processStep = window.URL.createObjectURL(res.data)
- })
+ this.processStep = window.URL.createObjectURL(res.data);
+ });
},
//转办事件
- handleTransfer(){
- this.drawerModal = true
- this.drawerTitle = '转办处理人'
- this.selectPeople = row
+ handleTransfer() {
+ this.drawerModal = true;
+ this.drawerTitle = "转办处理人";
+ this.selectPeople = row;
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
@@ -397,13 +401,23 @@ export default {
handleTabs(name) {
this.active = name;
},
+ //点击查看详情
+ handlePreview(item) {
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank");
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
- console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -417,7 +431,7 @@ export default {
*/
getFormFieldList(item) {
this.listForm = JSON.parse(JSON.stringify(item));
- if(item.form === undefined){
+ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
@@ -425,12 +439,11 @@ export default {
this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
- console.log(item.pepdtos[i].xCXSSRQ === null);
- if(item.pepdtos[i].xCXSSRQ === null){
- item.pepdtos[i].xCXSSRQ = ''
+ if (item.pepdtos[i].xCXSSRQ === null) {
+ item.pepdtos[i].xCXSSRQ = "";
}
- if(item.pepdtos[i].zCCSSRQ === null){
- item.pepdtos[i].zCCSSRQ = ''
+ if (item.pepdtos[i].zCCSSRQ === null) {
+ item.pepdtos[i].zCCSSRQ = "";
}
this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -449,54 +462,55 @@ export default {
qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
- xCXSSRQ : item.pepdtos[i].XCXSSRQ,
- zCCSSRQ : item.pepdtos[i].ZCCSSRQ,
+ id: item.pepdtos[0].id,
+ xCXSSRQ: item.pepdtos[i].XCXSSRQ,
+ zCCSSRQ: item.pepdtos[i].ZCCSSRQ
});
}
}
} else {
- this.listForm = item.form
- this.listForm.breakdownList = item.form.breakdownList
+ this.listForm = item.form;
+ this.listForm.breakdownList = item.form.breakdownList;
}
},
- checkedRole (data) {
+ checkedRole(data) {
if (this.type === 1) {
- this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id
- this.listForm.breakdownList[this.lsIndex].implementer = data[0].name
- } else if(this.type === 2) {
- this.listForm.breakdownList.forEach( item => {
- this.selectList.forEach( items => {
+ this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id;
+ this.listForm.breakdownList[this.lsIndex].implementer = data[0].name;
+ } else if (this.type === 2) {
+ this.listForm.breakdownList.forEach(item => {
+ this.selectList.forEach(items => {
if (item === items) {
- item.implementerId = data[0].id
- item.implementer = data[0].name
+ item.implementerId = data[0].id;
+ item.implementer = data[0].name;
}
- })
- })
+ });
+ });
}
- this.modalshowflag = false
+ this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
},
- choiceZRRS (row, type, index) {
- this.type = type
+ choiceZRRS(row, type, index) {
+ this.type = type;
if (type === 1) {
- this.drawerTitle = '选择责任人'
- this.nodeList = []
- this.lsIndex = index
- this.lsType = type
- this.nodeList.push(row)
- this.modalshowflag = true
+ this.drawerTitle = "选择责任人";
+ this.nodeList = [];
+ this.lsIndex = index;
+ this.lsType = type;
+ this.nodeList.push(row);
+ this.modalshowflag = true;
} else if (type === 2) {
// 批量
if (this.selectList.length > 0) {
- this.lsType = type
- this.nodeList = []
- this.modalshowflag = true
- this.drawerTitle = '批量选择责任人'
+ this.lsType = type;
+ this.nodeList = [];
+ this.modalshowflag = true;
+ this.drawerTitle = "批量选择责任人";
} else {
- this.$message.warning('请选择要分发的数据')
+ this.$message.warning("请选择要分发的数据");
}
}
},
@@ -507,24 +521,24 @@ export default {
},
//保存事件
- // handleSave() {
- // this.saveLoading = true;
- // let _formData = new FormData();
- // _formData.append("id", this.bpnId || "");
- // _formData.append("prcType", "5");
- // _formData.append('taskIds', this.taskIds)
- // _formData.append("json", JSON.stringify({
- // form: this.listForm,
- // commentText: this.commentText
- // }));
- // saveTaskForPub(_formData).then(res => {
- // this.saveLoading = false;
- // this.$message.success("保存成功");
- // this.bpnId = res.result;
- // }).catch(e => {
- // this.saveLoading = false;
- // });
- // },
+ handleSave() {
+ this.saveLoading = true;
+ let _formData = new FormData();
+ _formData.append("id", this.bpnId || "");
+ _formData.append("prcType", "5");
+ _formData.append("taskIds", this.taskIds);
+ _formData.append("json", JSON.stringify({
+ form: this.listForm,
+ commentText: this.commentText
+ }));
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false;
+ this.$message.success("保存成功");
+ this.bpnId = res.result;
+ }).catch(e => {
+ this.saveLoading = false;
+ });
+ },
//提交事件
handleSubmit() {
this.listForm.breakdownList.forEach(item => {
@@ -543,7 +557,7 @@ export default {
this.listForm.approvalOpinion = "";
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm.breakdownList);
- this.isSubmit = true
+ this.isSubmit = true;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -555,7 +569,7 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
- this.isSubmit = false
+ this.isSubmit = false;
}, e => {
});
} else {
@@ -573,7 +587,7 @@ export default {
},
//标准表格选择框改变
selectStandChange(data) {
- this.selectList = data
+ this.selectList = data;
},
selectThree() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 703b60f80..f929be1c4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -25,28 +25,30 @@
@@ -492,6 +494,17 @@ export default {
handleTabs(name) {
this.active = name;
},
+ //点击查看详情
+ handlePreview(item){
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank")
+ },
//将时间戳转换为日期格式
getLocalTime(item) {
return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
@@ -509,7 +522,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
- console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -545,6 +557,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.standName = item.step3DTOS[0].standName;
this.listForm.standNumber = item.step3DTOS[0].standNumber;
+ this.listForm.id = item.step3DTOS[0].id;
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
this.listForm.itemsName = item.step3DTOS[0].itemsName;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index b838b003b..26b190f2d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -25,28 +25,30 @@
@@ -470,6 +472,17 @@ export default {
handleTabs(name) {
this.active = name;
},
+ //点击查看详情
+ handlePreview(item){
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank")
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -492,10 +505,10 @@ export default {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
- this.listForm['id'] = item.id
this.dataList = item.dataList
this.listForm.standName = item.standName
this.listForm.standNumber = item.standNumber
+ this.listForm.id = item.id
this.listForm.qualityEngineerName = item.qualityEngineerName
this.listForm.certifiedEngineerName = item.certifiedEngineerName
this.listForm.responsibleUnit = item.responsibleUnit
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 51123b86d..b84dcec69 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -25,28 +25,30 @@
@@ -469,6 +471,17 @@ export default {
handleTabs(name) {
this.active = name;
},
+ //点击查看详情
+ handlePreview(item){
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank")
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -491,8 +504,8 @@ export default {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
- this.listForm['id'] = item.id
this.dataList = item.dataList
+ this.listForm.id = item.step3DTOS[0].id
this.listForm.standName = item.step3DTOS[0].standName
this.listForm.standNumber = item.step3DTOS[0].standNumber
this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index d7f86783d..300c8af2a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -25,28 +25,30 @@
@@ -469,6 +471,17 @@ export default {
handleTabs(name) {
this.active = name;
},
+ //点击查看详情
+ handlePreview(item){
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank")
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -491,7 +504,7 @@ export default {
this.listForm = JSON.parse(JSON.stringify(item))
this.listForm.prcNum = this.prcNum
this.listForm.prcName = this.prcName
- this.listForm['id'] = item.id
+ this.listForm.id = item.id
this.dataList = item.dataList
})
},