kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into vite

Browse Source 
# Conflicts:
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/components/Add.vue
#	project/dv/apps/AppGridDV.vue
#	vue.config.js
This commit is contained in:
aixianling
2022-08-23 11:14:38 +08:00
parent cef8dad5f0 de190a9076
commit a5dbdbe778
125 changed files with 15445 additions and 4898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
View File

@@ -302,7 +302,6 @@ import moment from 'dayjs'
import {mapState} from "vuex";
import Viewer from 'v-viewer'
import Vue from 'vue'
import AiDialogBtn from "../../../../components/AiDialogBtn";
import PersonCreditReport from "../../../../components/personCreditReport";
import EnterpriseDialog from "../../../../components/enterpriseDialog";
@@ -310,7 +309,7 @@ Vue.use(Viewer)
export default {
name: "approvalDetail",
components: {EnterpriseDialog, PersonCreditReport, AiDialogBtn},
components: {EnterpriseDialog, PersonCreditReport},
inject: ['approval'],
props: {
instance: Function,

6
project/xiushan/apps/processManagement/massesMessage/components/messageDetail.vue
View File

@@ -130,7 +130,7 @@ export default {
methods: {
getDetailInfo() {
this.data.appLeaveMessageReplyList = []
this.instance.post(`app/appleavemessage/queryDetailById?id=` + this.detailId).then((res) => {
this.instance.post(`/app/appleavemessage/queryDetailById?id=` + this.detailId).then((res) => {
this.data = res.data
this.data.images = JSON.parse(res.data.images)
if (this.data.appLeaveMessageReplyList.length) {
@@ -166,7 +166,7 @@ export default {
createUnitId: this.user.info.unitId,
createUnitName: this.user.info.unitName,
}
this.instance.post(`app/appleavemessagereply/addOrUpdate`, params).then((res) => {
this.instance.post(`/app/appleavemessagereply/addOrUpdate`, params).then((res) => {
console.log(res)
this.maskShow = false
this.getDetailInfo()
@@ -193,7 +193,7 @@ export default {
return item
})
}
this.instance.post(`app/appleavemessage/addOrUpdate`, params).then((res) => {
this.instance.post(`/app/appleavemessage/addOrUpdate`, params).then((res) => {
this.getDetailInfo()
})
})