FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
宋伟佳
2021-08-02 16:41:05 +08:00
parent 92cd68ca7f
commit 530ef6a6af
9 changed files with 136 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/axios/index.js
+1 -1
View File
@@ -10,7 +10,7 @@ import {Message} from 'element-ui'
export const CancelToken = axios.CancelToken export const CancelToken = axios.CancelToken
// import 'element-ui/lib/theme-chalk/index.css' // import 'element-ui/lib/theme-chalk/index.css'
const _axios = axios.create({ const _axios = axios.create({
baseURL: '/' baseURL: 'http://62.234.136.153:8033/'
}) })
/** /**
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+6 -38
View File
@@ -419,6 +419,7 @@ export default {
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1, pageNo: 1,
totalNo: 0, totalNo: 0,
prcNum: '',
pageSizeNo: this.$store.getters.userInfo.configContent, pageSizeNo: this.$store.getters.userInfo.configContent,
listForm: { listForm: {
listName: "", //清单名称 listName: "", //清单名称
@@ -454,20 +455,19 @@ export default {
queryTaskFirst({ queryTaskFirst({
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
}).then(res => { }).then(res => {
console.log(res.mes);
let mes = JSON.parse(res.mes); let mes = JSON.parse(res.mes);
this.listForm = mes.form; this.listForm = mes.form;
this.detailData = mes.form.detailData
this.dataList = mes.form.dataList; this.dataList = mes.form.dataList;
this.commentText = mes.commentText; this.commentText = mes.commentText;
// this.fileList = mes.form.fileName.split(",") this.prcNum = mes.prcNum
// console.log(this.fileList); this.fileIds = mes.form.fileId;
this.getFileInfo(); this.getFileInfo();
this.processTable();
}); });
}, },
processTable () { processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '', sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu shunxu: this.shunxu
}, { }, {
@@ -650,38 +650,6 @@ export default {
beforeUpload () { 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() { handleSave() {
this.saveLoading = true; this.saveLoading = true;
@@ -765,7 +733,7 @@ export default {
this.setMap(this.standStateOptions); this.setMap(this.standStateOptions);
}); });
this.getData(); this.getData();
this.processTable(); // this.processTable();
this.getStandData(); this.getStandData();
}, },
}; };
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+6 -2
View File
@@ -446,8 +446,8 @@ export default {
cnName: "", //中文名称 cnName: "", //中文名称
enName: "", //英文名称 enName: "", //英文名称
isSubTime: "", //发布日期 isSubTime: "", //发布日期
newCarTime: "", //新车型实施日期 XCXSSRQ: "", //新车型实施日期
oldCarTime: "", //在产车实施日期 ZCCSSRQ: "", //在产车实施日期
applyCar: "", //适用车型 applyCar: "", //适用车型
textState: "", //文本状态 textState: "", //文本状态
id: "" id: ""
@@ -656,6 +656,7 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg)
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
@@ -694,6 +695,9 @@ export default {
taskInfo: '根据会签意见修订', taskInfo: '根据会签意见修订',
form: this.listForm, form: this.listForm,
roleForm: this.roleForm, roleForm: this.roleForm,
prcNum: this.$route.query.prcNum,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
commentText: this.commentText commentText: this.commentText
})); }));
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+15 -15
View File
@@ -246,21 +246,21 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div> <!-- <div>-->
<el-collapse accordion> <!-- <el-collapse accordion>-->
<el-collapse-item title="填写评估反馈"> <!-- <el-collapse-item title="填写评估反馈">-->
<div style="margin: 10px 0;"> <!-- <div style="margin: 10px 0;">-->
<el-input <!-- <el-input-->
type="textarea" <!-- type="textarea"-->
:rows="3" <!-- :rows="3"-->
resize="none" <!-- resize="none"-->
placeholder="请输入您的评估分析" <!-- placeholder="请输入您的评估分析"-->
v-model="commentText"> <!-- v-model="commentText">-->
</el-input> <!-- </el-input>-->
</div> <!-- </div>-->
</el-collapse-item> <!-- </el-collapse-item>-->
</el-collapse> <!-- </el-collapse>-->
</div> <!-- </div>-->
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+44 -36
View File
@@ -447,45 +447,53 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack () { beforeBack () {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
this.listForm.dataList = this.dataList } else {
this.listForm.fenFlag = '1' this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
const json = JSON.stringify(this.listForm); this.listForm.commentText = this.commentText;
this.$http.post('lawss/activiti/completeTask', { this.listForm.dataList = this.dataList
taskIds: this.taskIds, this.listForm.fenFlag = '1'
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message)
}); this.$router.push('/processCenter')
}
}, e => {
});
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.applyUpdUserId = this.dataList[0].distributePersonId if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.commentText = this.commentText; this.$message.warning('请填写审批意见')
this.listForm.dataList = this.dataList }else {
this.listForm.fenFlag = '2' this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
const json = JSON.stringify(this.listForm); this.listForm.commentText = this.commentText;
this.$http.post('lawss/activiti/completeTask', { this.listForm.dataList = this.dataList
taskIds: this.taskIds, this.listForm.fenFlag = '2'
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message)
}); this.$router.push('/processCenter')
}
}, e => {
});
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+30 -23
View File
@@ -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.listForm.fenFlag = '2'
this.handleSubmit() this.handleSubmit()
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.$message.warning('请填写审批意见')
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; } else {
this.listForm.zrUserId = this.$store.getters.userInfo.userId ; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.commentText = this.commentText; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.standId = this.listForm.standId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.fenFlag = "1"; this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.dataList = this.dataList this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); this.listForm.standId = this.listForm.standId;
this.$http.post('lawss/activiti/completeTask', { this.listForm.fenFlag = "1";
taskIds: this.taskIds, this.listForm.dataList = this.dataList
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
}); });
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+32 -24
View File
@@ -442,34 +442,42 @@ export default {
//驳回事件 //驳回事件
beforeBack () { beforeBack () {
this.listForm.fenFlag = '2' if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.handleSubmit() this.$message.warning('请填写审批意见')
} else {
this.listForm.fenFlag = '2'
this.handleSubmit()
}
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.$message.warning('请填写审批意见')
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; } else {
this.listForm.zrUserId = this.$store.getters.userInfo.userId ; this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.commentText = this.commentText; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.standId = this.listForm.standId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.fenFlag = "1"; this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.dataList = this.dataList this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); this.listForm.standId = this.listForm.standId;
this.$http.post('lawss/activiti/completeTask', { this.listForm.fenFlag = "1";
taskIds: this.taskIds, this.listForm.dataList = this.dataList
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
}, e => { this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
}); });
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
src/sysConfig/index.js
+2 -2
View File
@@ -6,7 +6,7 @@
// 服务器地址 // 服务器地址
// const devIp = '10.96.10.171' // const devIp = '10.96.10.171'
// const devInterfacePORT = '9999' // const devInterfacePORT = '9999'
const devIp = '10.96.170.156' const devIp = '10.96.10.207'
const devInterfacePORT = '9999' const devInterfacePORT = '9999'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' 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' const prodInterfacePORT = '8033'
vue.config.js
-7
View File
@@ -78,13 +78,6 @@ module.exports = {
devServer: { devServer: {
port: 9999, port: 9999,
proxy: { proxy: {
'/api': {
target: interfaceUrl,
changeOrigin: true,
pathRewrite: {
'^/api': ''
}
},
'/onlyOffice': { '/onlyOffice': {
target: 'http://10.96.10.171', target: 'http://10.96.10.171',
changeOrigin: true, changeOrigin: true,