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

Merge remote-tracking branch 'origin/develop_new' into develop_new

Browse Source
This commit is contained in:
CD
2022-12-15 13:38:54 +08:00
parent 1e4662e1cf d17e99e4b4
commit 73c115220a
5 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue
+72 -42
View File
@@ -56,6 +56,7 @@
{{ form.hzfileName }} {{ form.hzfileName }}
</div> </div>
<el-button <el-button
:disabled="disabledXX"
size="small" size="small"
@click="updateFile(form.hzfileId)" @click="updateFile(form.hzfileId)"
icon="el-icon-download" icon="el-icon-download"
@@ -435,48 +436,77 @@
}) })
}, },
getData() { getData() {
this.$http.get("lawss/activiti/queryTaskIndex", { return new Promise((resolve, reject) => {
prcId:this.$route.query.processInstanceId, this.$http.get("lawss/activiti/queryTaskIndex", {
index:this.$route.query.index prcId: this.$route.query.processInstanceId,
}, { index: this.$route.query.index
_this: this }, {
}, res => { _this: this
console.log(res) }, res => {
}, e => { this.$nextTick(()=>{
}); let data = JSON.parse(res.mesg)
return new Promise((resolve, reject) => { let jsonData = JSON.parse(res.mesg)
inboundLiaisonDetail({ this.jsonData = jsonData.form ? jsonData.form : jsonData
taskIds: this.taskIds, this.form.title = data.title || data.form.title
pId: this.pId this.form.processName = data.processName || data.form.processName
}).then(res => { this.form.date = data.date || data.form.date
let data = JSON.parse(res.mesg) let arr = data.responUserList || data.form.responUserList
let jsonData = JSON.parse(res.mesg) let newArr = []
this.jsonData = jsonData.form ? jsonData.form : jsonData for (let a = 0; a < arr.length; a++) {
this.commentText5 = data.commentText5 || '' arr[a].institutionName = ''
this.form.title = data.title || data.form.title this.$http.get('sarUser/user/selectDeptByDY', {
this.form.processName = data.processName || data.form.processName ids: arr[a].dockUser
this.form.date = data.date || data.form.date }, {
let arr = data.responUserList || data.form.responUserList _this: this
let newArr = [] }, res => {
for (let a = 0; a <arr.length; a++) { arr[a].institutionName = res.data[0].institutionName
arr[a].institutionName = '' })
this.$http.get('sarUser/user/selectDeptByDY', { newArr.push(arr[a])
ids: arr[a].dockUser }
}, { this.tableData = newArr
_this: this this.form.hzfileId = data.fileId
}, res => { this.form.hzfileName = data.fileName
arr[a].institutionName = res.data[0].institutionName this.newDocUser = data.form ? data.form.docUser : data.docUser
}) this.json = data || data.form
newArr.push(arr[a])
} this.commentText5 = res.commitText || ''
this.tableData = newArr })
this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '') }, e => {
this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '') });
this.newDocUser = data.form ? data.form.docUser : data.docUser })
this.json = data || data.form // return new Promise((resolve, reject) => {
}).catch(e => { // inboundLiaisonDetail({
}) // taskIds: this.taskIds,
}) // pId: this.pId
// }).then(res => {
// let data = JSON.parse(res.mesg)
// let jsonData = JSON.parse(res.mesg)
// this.jsonData = jsonData.form ? jsonData.form : jsonData
// this.commentText5 = data.commentText5 || ''
// this.form.title = data.title || data.form.title
// this.form.processName = data.processName || data.form.processName
// this.form.date = data.date || data.form.date
// let arr = data.responUserList || data.form.responUserList
// let newArr = []
// for (let a = 0; a <arr.length; a++) {
// arr[a].institutionName = ''
// this.$http.get('sarUser/user/selectDeptByDY', {
// ids: arr[a].dockUser
// }, {
// _this: this
// }, res => {
// arr[a].institutionName = res.data[0].institutionName
// })
// newArr.push(arr[a])
// }
// this.tableData = newArr
// this.form.hzfileId = data.form ? data.form.hzfileId : (data.hzfileId ? data.hzfileId : '')
// this.form.hzfileName = data.form ? data.form.hzfileName : (data.hzfileName ? data.hzfileName : '')
// this.newDocUser = data.form ? data.form.docUser : data.docUser
// this.json = data || data.form
// }).catch(e => {
// })
// })
}, },
}, },
mounted () { mounted () {
src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue
+1
View File
@@ -601,6 +601,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
this.commentText = res.commitText || ''
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
} }
src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue
+1 -1
View File
@@ -676,7 +676,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg); let data = JSON.parse(res.mesg);
this.commentText5 = data.commentText5 || '' this.commentText5 = data.commentText || ''
this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue
+1 -3
View File
@@ -454,6 +454,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
this.commentText = res.commitText || ''
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
} }
@@ -489,12 +490,9 @@ export default {
titleList.push(data.title); titleList.push(data.title);
} }
}) })
console.log(titleList,"titleList!!!!")
console.log(this.dataList,"dataList 进入方法前 !!!!")
titleList.forEach(tl => { titleList.forEach(tl => {
this.dataList.forEach(data=>{ this.dataList.forEach(data=>{
if (data.title === tl){ if (data.title === tl){
console.log(data.title,"方法中的title !!!!")
ordelTitleList.push(data) ordelTitleList.push(data)
} }
}) })
src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue
+1
View File
@@ -866,6 +866,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
this.commentText = res.commitText || ''
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
let commitStatus = res.commitStatus let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){ if(commitStatus && commitStatus > 0){