流程

src/views/workflow/components/myProcess/applyAgainBuyingMore.vue

@@ -60,7 +60,7 @@
                 <el-col :span="24">
                   <el-form-item label="回购说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -289,7 +289,7 @@ export default {
             })
         },
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyBuyingMoreController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -307,7 +307,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyBuyingMoreController', 'getInfoByFlowMainId', { flowMainId: row.id })
             this.formData = data
             if (this.formData.isNoContract || this.formData.isNoContract == 0) {
                 this.formData.isNoContract = String(this.formData.isNoContract)
@@ -354,7 +354,7 @@ export default {
                 this.loading = true
                 formData.flowMainCcList = []
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckInAgain', { ...formData })
+                const { data } = await this.baseRequest1('ApplyBuyingMoreController', 'addApplyBuyingMoreAgain', { ...formData })
                 this.loading = false
                 if (data.code == 200) {
                     this.$message.success('回购申请发起成功')

src/views/workflow/components/myProcess/applyAgainCheckIn.vue

@@ -60,7 +60,7 @@
                 <el-col :span="24">
                   <el-form-item label="入驻说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"

src/views/workflow/components/myProcess/applyAgainContract.vue

@@ -60,7 +60,7 @@
                 <el-col :span="24">
                   <el-form-item label="合同用章说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -289,7 +289,7 @@ export default {
             })
         },
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyContractController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -307,7 +307,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyContractController', 'getInfoByFlowMainId', { flowMainId: row.id })
             this.formData = data
             if (this.formData.isNoContract || this.formData.isNoContract == 0) {
                 this.formData.isNoContract = String(this.formData.isNoContract)
@@ -354,7 +354,7 @@ export default {
                 this.loading = true
                 formData.flowMainCcList = []
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckInAgain', { ...formData })
+                const { data } = await this.baseRequest1('ApplyContractController', 'addApplyContractAgain', { ...formData })
                 this.loading = false
                 if (data.code == 200) {
                     this.$message.success('合同用章申请发起成功')

src/views/workflow/components/myProcess/applyAgainFinance.vue

@@ -60,7 +60,7 @@
                 <el-col :span="24">
                   <el-form-item label="上交财政说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -289,7 +289,7 @@ export default {
             })
         },
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyFinanceController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -307,7 +307,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyFinanceController', 'getInfoByFlowMainId', { flowMainId: row.id })
             this.formData = data
             if (this.formData.isNoContract || this.formData.isNoContract == 0) {
                 this.formData.isNoContract = String(this.formData.isNoContract)
@@ -354,7 +354,7 @@ export default {
                 this.loading = true
                 formData.flowMainCcList = []
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckInAgain', { ...formData })
+                const { data } = await this.baseRequest1('ApplyFinanceController', 'addApplyFinanceAgain', { ...formData })
                 this.loading = false
                 if (data.code == 200) {
                     this.$message.success('上交财政申请发起成功')

src/views/workflow/components/myProcess/applyAgainInvoiceRed.vue

@@ -60,7 +60,7 @@
                 <el-col :span="24">
                   <el-form-item label="发票红冲说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -289,7 +289,7 @@ export default {
             })
         },
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyInvoiceRedController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -307,7 +307,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyInvoiceRedController', 'getInfoByFlowMainId', { flowMainId: row.id })
             this.formData = data
             if (this.formData.isNoContract || this.formData.isNoContract == 0) {
                 this.formData.isNoContract = String(this.formData.isNoContract)
@@ -354,7 +354,7 @@ export default {
                 this.loading = true
                 formData.flowMainCcList = []
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckInAgain', { ...formData })
+                const { data } = await this.baseRequest1('ApplyInvoiceRedController', 'addApplyInvoiceRedAgain', { ...formData })
                 this.loading = false
                 if (data.code == 200) {
                     this.$message.success('发票红冲申请发起成功')

src/views/workflow/components/myProcess/applyAgainReceivablesAdjust.vue

@@ -60,7 +60,7 @@
                 <el-col :span="24">
                   <el-form-item label="应收款调整说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -289,7 +289,7 @@ export default {
             })
         },
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyReceivablesAdjustController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -307,7 +307,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyReceivablesAdjustController', 'getInfoByFlowMainId', { flowMainId: row.id })
             this.formData = data
             if (this.formData.isNoContract || this.formData.isNoContract == 0) {
                 this.formData.isNoContract = String(this.formData.isNoContract)
@@ -354,7 +354,7 @@ export default {
                 this.loading = true
                 formData.flowMainCcList = []
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckInAgain', { ...formData })
+                const { data } = await this.baseRequest1('ApplyReceivablesAdjustController', 'addApplyReceivablesAdjustAgain', { ...formData })
                 this.loading = false
                 if (data.code == 200) {
                     this.$message.success('应收款调整申请发起成功')

src/views/workflow/components/myProcess/applyBuyingMore.vue

@@ -55,7 +55,6 @@
                         :append-to-body="false"
                         style="width: 100%;"
                         :options="TreeData"
-                        :props="{ multiple: true}"
                       />
                     </el-form-item>
                   </el-form-item>
@@ -63,7 +62,7 @@
                 <el-col :span="24">
                   <el-form-item label="回购说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -114,7 +113,7 @@
 
                   </div>
                 </div>
-                <div v-show="true" id="containeraddwork1" style="width: 100%" />
+                <div v-show="true" id="containeraddwork6" style="width: 100%" />
               </el-col>
             </el-row>
           </div>
@@ -473,7 +472,7 @@ export default {
         },
         createNodeCanvas() {
             this.$nextTick(() => {
-                const chartDom = document.getElementById('containeraddwork1')
+                const chartDom = document.getElementById('containeraddwork6')
                 var myCharts = echarts.init(chartDom)
                 const charts = {
                     nodes: this.nodes,
@@ -547,7 +546,7 @@ export default {
         },
 
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyBuyingMoreController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             this.formData.truename = userinfo.truename
             this.formData.deptName = userinfo.deptName
@@ -579,6 +578,7 @@ export default {
         },
         async handelConfirm() {
             const _this = this
+            console.log('_this.formData.houseIds', _this.formData.houseIds)
             if (_this.formData.houseIds == undefined || _this.formData.houseIds.length < 1) {
                 _this.$message({
                     message: '请选择出租载体',
@@ -586,15 +586,13 @@ export default {
                 })
                 return
             } else {
-                _this.formData.houseIds.forEach(item => {
-                    if (item.length < 4) {
-                        _this.$message({
-                            message: '有房间尚未选择,请校验后重新选择',
-                            type: 'warning'
-                        })
-                        return
-                    }
-                })
+                if (_this.formData.houseIds.length < 4) {
+                    _this.$message({
+                        message: '有房间尚未选择,请校验后重新选择',
+                        type: 'warning'
+                    })
+                    return
+                }
             }
             this.$refs['elForm'].validate(async valid => {
                 if (!valid) return
@@ -607,11 +605,12 @@ export default {
                     }).toString()
                 }
                 const formData = {
-                    ...this.formData
+                    ...this.formData,
+                    houseId: _this.formData.houseIds[3]
                 }
                 this.loading = true
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckIn', { ...formData })
+                const { data } = await this.baseRequest1('ApplyBuyingMoreController', 'addApplyBuyingMore', { ...formData })
                 if (data.code == 200) {
                     this.loading = false
                     this.$message.success('回购申请发起成功')
@@ -642,7 +641,7 @@ export default {
 	}
 }
 
-#containeraddwork1 {
+#containeraddwork6 {
 	height: 600px;
 	width: 100%;
 	background: #F5F5F5;

src/views/workflow/components/myProcess/applyBuyingMoreConfirm.vue

@@ -50,7 +50,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -343,7 +343,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyBuyingMoreController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -356,7 +356,7 @@ export default {
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
+            const { data } = await this.baseRequest1('ApplyBuyingMoreController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             const noAndbackstatus = await this.baseRequest1('FlowMainController', 'getOutgoingFlowsByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             for (let i = 0; i < noAndbackstatus.data.length; i++) {
@@ -408,7 +408,7 @@ export default {
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'AddConfirmResult', { ...this.confirmForm })
+                const { data } = await this.baseRequest1('ApplyBuyingMoreController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
                     this.$message.success('处理成功')
                     this.form = {}

src/views/workflow/components/myProcess/applyBuyingMoreDetail.vue

@@ -52,7 +52,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -395,7 +395,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyBuyingMoreController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -407,7 +407,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyBuyingMoreController', 'getInfoByFlowMainId', { flowMainId: row.id })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             this.tableData = flowHistroy
             this.formData = data

src/views/workflow/components/myProcess/applyCheckIn.vue

@@ -63,7 +63,7 @@
                 <el-col :span="24">
                   <el-form-item label="入驻说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -114,7 +114,7 @@
 
                   </div>
                 </div>
-                <div v-show="true" id="containeraddwork1" style="width: 100%" />
+                <div v-show="true" id="containeraddwork2" style="width: 100%" />
               </el-col>
             </el-row>
           </div>
@@ -473,7 +473,7 @@ export default {
         },
         createNodeCanvas() {
             this.$nextTick(() => {
-                const chartDom = document.getElementById('containeraddwork1')
+                const chartDom = document.getElementById('containeraddwork2')
                 var myCharts = echarts.init(chartDom)
                 const charts = {
                     nodes: this.nodes,
@@ -642,7 +642,7 @@ export default {
 	}
 }
 
-#containeraddwork1 {
+#containeraddwork2 {
 	height: 600px;
 	width: 100%;
 	background: #F5F5F5;

src/views/workflow/components/myProcess/applyCheckInConfirm.vue

@@ -45,7 +45,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"

src/views/workflow/components/myProcess/applyCheckInDetail.vue

@@ -52,7 +52,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"

src/views/workflow/components/myProcess/applyContract.vue

@@ -63,7 +63,7 @@
                 <el-col :span="24">
                   <el-form-item label="合同用章说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -114,7 +114,7 @@
 
                   </div>
                 </div>
-                <div v-show="true" id="containeraddwork1" style="width: 100%" />
+                <div v-show="true" id="containeraddwork3" style="width: 100%" />
               </el-col>
             </el-row>
           </div>
@@ -473,7 +473,7 @@ export default {
         },
         createNodeCanvas() {
             this.$nextTick(() => {
-                const chartDom = document.getElementById('containeraddwork1')
+                const chartDom = document.getElementById('containeraddwork3')
                 var myCharts = echarts.init(chartDom)
                 const charts = {
                     nodes: this.nodes,
@@ -547,7 +547,7 @@ export default {
         },
 
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyContractController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             this.formData.truename = userinfo.truename
             this.formData.deptName = userinfo.deptName
@@ -611,7 +611,7 @@ export default {
                 }
                 this.loading = true
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckIn', { ...formData })
+                const { data } = await this.baseRequest1('ApplyContractController', 'addApplyContract', { ...formData })
                 if (data.code == 200) {
                     this.loading = false
                     this.$message.success('合同用章申请发起成功')
@@ -642,7 +642,7 @@ export default {
 	}
 }
 
-#containeraddwork1 {
+#containeraddwork3 {
 	height: 600px;
 	width: 100%;
 	background: #F5F5F5;

src/views/workflow/components/myProcess/applyContractConfirm.vue

@@ -50,7 +50,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -343,7 +343,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyContractController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -356,7 +356,7 @@ export default {
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
+            const { data } = await this.baseRequest1('ApplyContractController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             const noAndbackstatus = await this.baseRequest1('FlowMainController', 'getOutgoingFlowsByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             for (let i = 0; i < noAndbackstatus.data.length; i++) {
@@ -408,7 +408,7 @@ export default {
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'AddConfirmResult', { ...this.confirmForm })
+                const { data } = await this.baseRequest1('ApplyContractController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
                     this.$message.success('处理成功')
                     this.form = {}

src/views/workflow/components/myProcess/applyContractDetail.vue

@@ -52,7 +52,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -395,7 +395,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyContractController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -407,7 +407,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyContractController', 'getInfoByFlowMainId', { flowMainId: row.id })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             this.tableData = flowHistroy
             this.formData = data

src/views/workflow/components/myProcess/applyFinance.vue

@@ -63,7 +63,7 @@
                 <el-col :span="24">
                   <el-form-item label="上交财政说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -114,7 +114,7 @@
 
                   </div>
                 </div>
-                <div v-show="true" id="containeraddwork1" style="width: 100%" />
+                <div v-show="true" id="containeraddwork7" style="width: 100%" />
               </el-col>
             </el-row>
           </div>
@@ -473,7 +473,7 @@ export default {
         },
         createNodeCanvas() {
             this.$nextTick(() => {
-                const chartDom = document.getElementById('containeraddwork1')
+                const chartDom = document.getElementById('containeraddwork7')
                 var myCharts = echarts.init(chartDom)
                 const charts = {
                     nodes: this.nodes,
@@ -547,7 +547,7 @@ export default {
         },
 
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyFinanceController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             this.formData.truename = userinfo.truename
             this.formData.deptName = userinfo.deptName
@@ -611,7 +611,7 @@ export default {
                 }
                 this.loading = true
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckIn', { ...formData })
+                const { data } = await this.baseRequest1('ApplyFinanceController', 'addApplyFinance', { ...formData })
                 if (data.code == 200) {
                     this.loading = false
                     this.$message.success('上交财政申请发起成功')
@@ -642,7 +642,7 @@ export default {
 	}
 }
 
-#containeraddwork1 {
+#containeraddwork7 {
 	height: 600px;
 	width: 100%;
 	background: #F5F5F5;

src/views/workflow/components/myProcess/applyFinanceConfirm.vue

@@ -50,7 +50,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -343,7 +343,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyFinanceController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -356,7 +356,7 @@ export default {
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
+            const { data } = await this.baseRequest1('ApplyFinanceController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             const noAndbackstatus = await this.baseRequest1('FlowMainController', 'getOutgoingFlowsByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             for (let i = 0; i < noAndbackstatus.data.length; i++) {
@@ -408,7 +408,7 @@ export default {
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'AddConfirmResult', { ...this.confirmForm })
+                const { data } = await this.baseRequest1('ApplyFinanceController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
                     this.$message.success('处理成功')
                     this.form = {}

src/views/workflow/components/myProcess/applyFinanceDetail.vue

@@ -52,7 +52,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -395,7 +395,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyFinanceController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -407,7 +407,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyFinanceController', 'getInfoByFlowMainId', { flowMainId: row.id })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             this.tableData = flowHistroy
             this.formData = data

src/views/workflow/components/myProcess/applyInvoiceRed.vue

@@ -63,7 +63,7 @@
                 <el-col :span="24">
                   <el-form-item label="发票红冲说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -114,7 +114,7 @@
 
                   </div>
                 </div>
-                <div v-show="true" id="containeraddwork1" style="width: 100%" />
+                <div v-show="true" id="containeraddwork5" style="width: 100%" />
               </el-col>
             </el-row>
           </div>
@@ -473,7 +473,7 @@ export default {
         },
         createNodeCanvas() {
             this.$nextTick(() => {
-                const chartDom = document.getElementById('containeraddwork1')
+                const chartDom = document.getElementById('containeraddwork5')
                 var myCharts = echarts.init(chartDom)
                 const charts = {
                     nodes: this.nodes,
@@ -547,7 +547,7 @@ export default {
         },
 
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyInvoiceRedController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             this.formData.truename = userinfo.truename
             this.formData.deptName = userinfo.deptName
@@ -611,7 +611,7 @@ export default {
                 }
                 this.loading = true
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckIn', { ...formData })
+                const { data } = await this.baseRequest1('ApplyInvoiceRedController', 'addApplyInvoiceRed', { ...formData })
                 if (data.code == 200) {
                     this.loading = false
                     this.$message.success('发票红冲申请发起成功')
@@ -642,7 +642,7 @@ export default {
 	}
 }
 
-#containeraddwork1 {
+#containeraddwork5 {
 	height: 600px;
 	width: 100%;
 	background: #F5F5F5;

src/views/workflow/components/myProcess/applyInvoiceRedConfirm.vue

@@ -50,7 +50,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -343,7 +343,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyInvoiceRedController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -356,7 +356,7 @@ export default {
             this.getUserInfo(row.applyUser)
             this.findRoomTree()
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
+            const { data } = await this.baseRequest1('ApplyInvoiceRedController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             const noAndbackstatus = await this.baseRequest1('FlowMainController', 'getOutgoingFlowsByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             for (let i = 0; i < noAndbackstatus.data.length; i++) {
@@ -408,7 +408,7 @@ export default {
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'AddConfirmResult', { ...this.confirmForm })
+                const { data } = await this.baseRequest1('ApplyInvoiceRedController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
                     this.$message.success('处理成功')
                     this.form = {}

src/views/workflow/components/myProcess/applyInvoiceRedDetail.vue

@@ -52,7 +52,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -395,7 +395,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyInvoiceRedController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -407,7 +407,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyInvoiceRedController', 'getInfoByFlowMainId', { flowMainId: row.id })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             this.tableData = flowHistroy
             this.formData = data

src/views/workflow/components/myProcess/applyReceivablesAdjust.vue

@@ -63,7 +63,7 @@
                 <el-col :span="24">
                   <el-form-item label="应收款调整说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -114,7 +114,7 @@
 
                   </div>
                 </div>
-                <div v-show="true" id="containeraddwork1" style="width: 100%" />
+                <div v-show="true" id="containeraddwork4" style="width: 100%" />
               </el-col>
             </el-row>
           </div>
@@ -473,7 +473,7 @@ export default {
         },
         createNodeCanvas() {
             this.$nextTick(() => {
-                const chartDom = document.getElementById('containeraddwork1')
+                const chartDom = document.getElementById('containeraddwork4')
                 var myCharts = echarts.init(chartDom)
                 const charts = {
                     nodes: this.nodes,
@@ -547,7 +547,7 @@ export default {
         },
 
         async getUserInfo() {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: '' })
+            const { data: userinfo } = await this.baseRequest1('ApplyReceivablesAdjustController', 'getUserInfoByUserId', { userId: '' })
             this.userinfo = userinfo
             this.formData.truename = userinfo.truename
             this.formData.deptName = userinfo.deptName
@@ -611,7 +611,7 @@ export default {
                 }
                 this.loading = true
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'addApplyCheckIn', { ...formData })
+                const { data } = await this.baseRequest1('ApplyReceivablesAdjustController', 'addApplyReceivablesAdjust', { ...formData })
                 if (data.code == 200) {
                     this.loading = false
                     this.$message.success('应收款调整申请发起成功')
@@ -642,7 +642,7 @@ export default {
 	}
 }
 
-#containeraddwork1 {
+#containeraddwork4 {
 	height: 600px;
 	width: 100%;
 	background: #F5F5F5;

src/views/workflow/components/myProcess/applyReceivablesAdjustConfirm.vue

@@ -50,7 +50,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -343,7 +343,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyReceivablesAdjustController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -355,7 +355,7 @@ export default {
             this.row = row
             this.getUserInfo(row.applyUser)
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
+            const { data } = await this.baseRequest1('ApplyReceivablesAdjustController', 'getInfoByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             const noAndbackstatus = await this.baseRequest1('FlowMainController', 'getOutgoingFlowsByFlowMainPushId', { flowMainPushId: row.flowMainPushId })
             for (let i = 0; i < noAndbackstatus.data.length; i++) {
@@ -407,7 +407,7 @@ export default {
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
 
-                const { data } = await this.baseRequest1('ApplyCheckInController', 'AddConfirmResult', { ...this.confirmForm })
+                const { data } = await this.baseRequest1('ApplyReceivablesAdjustController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
                     this.$message.success('处理成功')
                     this.form = {}

src/views/workflow/components/myProcess/applyReceivablesAdjustDetail.vue

@@ -52,7 +52,7 @@
                 <el-col :span="24">
                   <el-form-item label="说明">
                     <el-input
-                      v-model="formData.payRemark"
+                      v-model="formData.remark"
                       :autosize="{minRows: 4, maxRows: 4}"
                       :style="{width: '100%'}"
                       placeholder="请填写"
@@ -396,7 +396,7 @@ export default {
             this.formData.totalAddTime = totalAddTime
         },
         async getUserInfo(applyUser) {
-            const { data: userinfo } = await this.baseRequest1('ApplyCheckInController', 'getUserInfoByUserId', { userId: applyUser })
+            const { data: userinfo } = await this.baseRequest1('ApplyReceivablesAdjustController', 'getUserInfoByUserId', { userId: applyUser })
             this.userinfo = userinfo
             console.log(this.userinfo)
         },
@@ -408,7 +408,7 @@ export default {
             this.activeName = 'first'
             this.getUserInfo(row.applyUser)
             this.confirmForm.flowMainPushId = row.flowMainPushId
-            const { data } = await this.baseRequest1('ApplyCheckInController', 'getInfoByFlowMainId', { flowMainId: row.id })
+            const { data } = await this.baseRequest1('ApplyReceivablesAdjustController', 'getInfoByFlowMainId', { flowMainId: row.id })
             const { data: flowHistroy } = await this.baseRequest1('FlowMainController', 'getFlowHistroyByFlowMainId', { flowMainId: row.id })
             this.tableData = flowHistroy
             this.formData = data