From 530ef6a6afcc36cea3f91f9cad1d136ccc131b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 2 Aug 2021 16:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/axios/index.js | 2 +-
.../pages/creatProcess/bzqdfb/step1-3.vue | 44 ++--------
.../pages/creatProcess/bzqdfb/step3.vue | 8 +-
.../pages/creatProcess/xmpg/step4.vue | 30 +++----
.../pages/creatProcess/xmpg/step5.vue | 80 ++++++++++---------
.../pages/creatProcess/xmpg/step6.vue | 53 ++++++------
.../pages/creatProcess/xmpg/step7.vue | 56 +++++++------
src/sysConfig/index.js | 4 +-
vue.config.js | 7 --
9 files changed, 136 insertions(+), 148 deletions(-)
diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index c53e52bc9..c069080f4 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -10,7 +10,7 @@ import {Message} from 'element-ui'
export const CancelToken = axios.CancelToken
// import 'element-ui/lib/theme-chalk/index.css'
const _axios = axios.create({
- baseURL: '/'
+ baseURL: 'http://62.234.136.153:8033/'
})
/**
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
index e3f518392..e9af56dc0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
@@ -419,6 +419,7 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1,
totalNo: 0,
+ prcNum: '',
pageSizeNo: this.$store.getters.userInfo.configContent,
listForm: {
listName: "", //清单名称
@@ -454,20 +455,19 @@ export default {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
- console.log(res.mes);
let mes = JSON.parse(res.mes);
this.listForm = mes.form;
- this.detailData = mes.form.detailData
this.dataList = mes.form.dataList;
this.commentText = mes.commentText;
- // this.fileList = mes.form.fileName.split(",")
- // console.log(this.fileList);
+ this.prcNum = mes.prcNum
+ this.fileIds = mes.form.fileId;
this.getFileInfo();
+ this.processTable();
});
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
- prcNum: this.$route.query.prcNum,
+ prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
@@ -650,38 +650,6 @@ export default {
beforeUpload () {
},
- // getData() {
- // return new Promise((resolve, reject) => {
- // inboundLiaisonDetail({
- // taskIds: this.taskIds,
- // pId: this.pId
- // }).then(res => {
- // if (res) {
- // const processForm = JSON.parse(res.mesg)
- // this.getFormFieldList(processForm)
- // }
- // }).catch(e => {
- // })
- // })
- // },
- // /**
- // * @description: 动态表单读取
- // */
- // getFormFieldList (item) {
- // this.$nextTick(() => {
- // this.listForm = JSON.parse(JSON.stringify(item))
- // this.listForm.prcNum = this.prcNum
- // this.listForm.prcName = this.prcName
- // this.listForm['id'] = item.id
- // this.listForm.dataList = item.dataList
- // this.dataList = item.dataList
- // this.listForm.applyUpdUserId = item.applyUpdUserId
- // this.listForm.jlUserId = item.jlUserId
- // this.listForm.zrUserId = item.zrUserId
- // this.fileIds = item.fileId;
- // this.getFileInfo();
- // })
- // },
//保存事件
handleSave() {
this.saveLoading = true;
@@ -765,7 +733,7 @@ export default {
this.setMap(this.standStateOptions);
});
this.getData();
- this.processTable();
+ // this.processTable();
this.getStandData();
},
};
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 35a47aa0a..d82a474de 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -446,8 +446,8 @@ export default {
cnName: "", //中文名称
enName: "", //英文名称
isSubTime: "", //发布日期
- newCarTime: "", //新车型实施日期
- oldCarTime: "", //在产车实施日期
+ XCXSSRQ: "", //新车型实施日期
+ ZCCSSRQ: "", //在产车实施日期
applyCar: "", //适用车型
textState: "", //文本状态
id: ""
@@ -656,6 +656,7 @@ 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)
@@ -694,6 +695,9 @@ export default {
taskInfo: '根据会签意见修订',
form: this.listForm,
roleForm: this.roleForm,
+ prcNum: this.$route.query.prcNum,
+ taskIds: this.$route.query.taskIds,
+ pId: this.$route.query.prcId,
commentText: this.commentText
}));
saveTaskFirst(_formData).then(res => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 97fe79a24..1a4d60404 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -246,21 +246,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 8e59d2f47..4e92accc3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -447,45 +447,53 @@ export default {
},
//驳回事件
beforeBack () {
- this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
- this.listForm.commentText = this.commentText;
- this.listForm.dataList = this.dataList
- this.listForm.fenFlag = '1'
- const json = JSON.stringify(this.listForm);
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json,
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message)
- this.$router.push('/processCenter')
- }
- }, e => {
- });
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('请填写审批意见')
+ } else {
+ this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
+ this.listForm.commentText = this.commentText;
+ this.listForm.dataList = this.dataList
+ this.listForm.fenFlag = '1'
+ const json = JSON.stringify(this.listForm);
+ this.$http.post('lawss/activiti/completeTask', {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json,
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.$router.push('/processCenter')
+ }
+ }, e => {
+ });
+ }
},
//提交事件
handleSubmit() {
- this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
- this.listForm.commentText = this.commentText;
- this.listForm.dataList = this.dataList
- this.listForm.fenFlag = '2'
- const json = JSON.stringify(this.listForm);
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json,
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message)
- this.$router.push('/processCenter')
- }
- }, e => {
- });
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('请填写审批意见')
+ }else {
+ this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
+ this.listForm.commentText = this.commentText;
+ this.listForm.dataList = this.dataList
+ this.listForm.fenFlag = '2'
+ const json = JSON.stringify(this.listForm);
+ this.$http.post('lawss/activiti/completeTask', {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json,
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.$router.push('/processCenter')
+ }
+ }, e => {
+ });
+ }
},
//标准表格选择框改变
selectStandChange(data) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index ea95b1152..eeec0a723 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -443,35 +443,42 @@ export default {
})
},
//驳回事件
- beforeBack () {
+ beforeBack () { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('请填写审批意见')
+ } else {
this.listForm.fenFlag = '2'
this.handleSubmit()
+ }
},
//提交事件
handleSubmit() {
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
- this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
- this.listForm.commentText = this.commentText;
- this.listForm.standId = this.listForm.standId;
- this.listForm.fenFlag = "1";
- this.listForm.dataList = this.dataList
- const json = JSON.stringify(this.listForm);
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json,
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message)
- this.$router.push('/processCenter')
- }
- }, e => {
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('请填写审批意见')
+ } else {
+ this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+ this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+ this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+ this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+ this.listForm.commentText = this.commentText;
+ this.listForm.standId = this.listForm.standId;
+ this.listForm.fenFlag = "1";
+ this.listForm.dataList = this.dataList
+ const json = JSON.stringify(this.listForm);
+ this.$http.post('lawss/activiti/completeTask', {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json,
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.$router.push('/processCenter')
+ }
+ }, e => {
- });
+ });
+ }
},
//标准表格选择框改变
selectStandChange(data) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 7540a8b3a..a1ef9dd2f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -442,34 +442,42 @@ export default {
//驳回事件
beforeBack () {
- this.listForm.fenFlag = '2'
- this.handleSubmit()
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('请填写审批意见')
+ } else {
+ this.listForm.fenFlag = '2'
+ this.handleSubmit()
+ }
},
//提交事件
handleSubmit() {
- this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
- this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
- this.listForm.commentText = this.commentText;
- this.listForm.standId = this.listForm.standId;
- this.listForm.fenFlag = "1";
- this.listForm.dataList = this.dataList
- const json = JSON.stringify(this.listForm);
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json,
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message)
- this.$router.push('/processCenter')
- }
- }, e => {
+ if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+ this.$message.warning('请填写审批意见')
+ } else {
+ this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+ this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+ this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+ this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+ this.listForm.commentText = this.commentText;
+ this.listForm.standId = this.listForm.standId;
+ this.listForm.fenFlag = "1";
+ this.listForm.dataList = this.dataList
+ const json = JSON.stringify(this.listForm);
+ this.$http.post('lawss/activiti/completeTask', {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json,
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.$router.push('/processCenter')
+ }
+ }, e => {
- });
+ });
+ }
},
//标准表格选择框改变
selectStandChange(data) {
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index e31e72934..9acd87737 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
+const devIp = '10.96.10.207'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -30,7 +30,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
-const prodIp = '101.36.227.25'
+const prodIp = '62.234.136.153'
const prodInterfacePORT = '8033'
diff --git a/vue.config.js b/vue.config.js
index dcab907a6..ae56c600c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -78,13 +78,6 @@ module.exports = {
devServer: {
port: 9999,
proxy: {
- '/api': {
- target: interfaceUrl,
- changeOrigin: true,
- pathRewrite: {
- '^/api': ''
- }
- },
'/onlyOffice': {
target: 'http://10.96.10.171',
changeOrigin: true,