流程调整

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

@@ -604,9 +604,13 @@ export default {
                         return e.data
                     }).toString()
                 }
+                const houseIds = []
+                _this.formData.houseIds.forEach(item => {
+                    houseIds.push(item[3])
+                })
                 const formData = {
                     ...this.formData,
-                    houseId: _this.formData.houseIds[3]
+                    houseId: houseIds.join(',')
                 }
                 this.loading = true
 

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

@@ -179,7 +179,7 @@
     </div>
     <div slot="footer">
       <el-button @click="dialogVisible=false">取消</el-button>
-      <el-button type="primary" @click="handelConfirm">确定</el-button>
+      <el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
     </div>
   </el-dialog>
 
@@ -203,6 +203,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
+            loading: false,
             row: {},
             confirmList: [],
             selectList: [],
@@ -407,9 +408,10 @@ export default {
                 // if (!valid) return
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
-
+                this.loading = true
                 const { data } = await this.baseRequest1('ApplyBuyingMoreController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
+                    this.loading = false
                     this.$message.success('处理成功')
                     this.form = {}
                     this.confirmForm = { confirmContent: '' }

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

@@ -606,8 +606,13 @@ export default {
                         return e.data
                     }).toString()
                 }
+                const houseIds = []
+                _this.formData.houseIds.forEach(item => {
+                    houseIds.push(item[3])
+                })
                 const formData = {
-                    ...this.formData
+                    ...this.formData,
+                    houseId: houseIds.join(',')
                 }
                 this.loading = true
 

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

@@ -174,7 +174,7 @@
     </div>
     <div slot="footer">
       <el-button @click="dialogVisible=false">取消</el-button>
-      <el-button type="primary" @click="handelConfirm">确定</el-button>
+      <el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
     </div>
   </el-dialog>
 
@@ -198,6 +198,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
+            loading: false,
             row: {},
             confirmList: [],
             selectList: [],
@@ -400,9 +401,10 @@ export default {
                 // if (!valid) return
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
-
+                this.loading = true
                 const { data } = await this.baseRequest1('ApplyCheckInController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
+                    this.loading = false
                     this.$message.success('处理成功')
                     this.form = {}
                     this.confirmForm = { confirmContent: '' }

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

@@ -606,8 +606,13 @@ export default {
                         return e.data
                     }).toString()
                 }
+                const houseIds = []
+                _this.formData.houseIds.forEach(item => {
+                    houseIds.push(item[3])
+                })
                 const formData = {
-                    ...this.formData
+                    ...this.formData,
+                    houseId: houseIds.join(',')
                 }
                 this.loading = true
 

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

@@ -179,7 +179,7 @@
     </div>
     <div slot="footer">
       <el-button @click="dialogVisible=false">取消</el-button>
-      <el-button type="primary" @click="handelConfirm">确定</el-button>
+      <el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
     </div>
   </el-dialog>
 
@@ -203,6 +203,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
+            loading: false,
             row: {},
             confirmList: [],
             selectList: [],
@@ -403,20 +404,22 @@ export default {
         },
 
         async handelConfirm() {
-            this.$refs['elForm'].validate(async valid => {
-                // if (!valid) return
-                // ApplyAddWorkController/AddConfirmResultAddWork
-                console.log(this.confirmForm)
-
-                const { data } = await this.baseRequest1('ApplyContractController', 'AddConfirmResult', { ...this.confirmForm })
-                if (data.code == 200) {
-                    this.$message.success('处理成功')
-                    this.form = {}
-                    this.confirmForm = { confirmContent: '' }
-                    this.dialogVisible = false
-                    this.$emit('getData')
-                }
-            })
+            window.location.href = 'http://112.25.69.137:8088//workflow/request/ViewRequestOS.jsp?reflush=1'
+            // this.$refs['elForm'].validate(async valid => {
+            //     // if (!valid) return
+            //     // ApplyAddWorkController/AddConfirmResultAddWork
+            //     console.log(this.confirmForm)
+            //     this.loading = true
+            //     const { data } = await this.baseRequest1('ApplyContractController', 'AddConfirmResult', { ...this.confirmForm })
+            //     if (data.code == 200) {
+            //         this.loading = false
+            //         this.$message.success('处理成功')
+            //         this.form = {}
+            //         this.confirmForm = { confirmContent: '' }
+            //         this.dialogVisible = false
+            //         this.$emit('getData')
+            //     }
+            // })
         },
         findRoomTree: function() {
             const _this = this

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

@@ -606,8 +606,13 @@ export default {
                         return e.data
                     }).toString()
                 }
+                const houseIds = []
+                _this.formData.houseIds.forEach(item => {
+                    houseIds.push(item[3])
+                })
                 const formData = {
-                    ...this.formData
+                    ...this.formData,
+                    houseId: houseIds.join(',')
                 }
                 this.loading = true
 

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

@@ -179,7 +179,7 @@
     </div>
     <div slot="footer">
       <el-button @click="dialogVisible=false">取消</el-button>
-      <el-button type="primary" @click="handelConfirm">确定</el-button>
+      <el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
     </div>
   </el-dialog>
 
@@ -203,6 +203,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
+            loading: false,
             row: {},
             confirmList: [],
             selectList: [],
@@ -407,9 +408,10 @@ export default {
                 // if (!valid) return
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
-
+                this.loading = true
                 const { data } = await this.baseRequest1('ApplyFinanceController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
+                    this.loading = false
                     this.$message.success('处理成功')
                     this.form = {}
                     this.confirmForm = { confirmContent: '' }

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

@@ -606,8 +606,13 @@ export default {
                         return e.data
                     }).toString()
                 }
+                const houseIds = []
+                _this.formData.houseIds.forEach(item => {
+                    houseIds.push(item[3])
+                })
                 const formData = {
-                    ...this.formData
+                    ...this.formData,
+                    houseId: houseIds.join(',')
                 }
                 this.loading = true
 

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

@@ -179,7 +179,7 @@
     </div>
     <div slot="footer">
       <el-button @click="dialogVisible=false">取消</el-button>
-      <el-button type="primary" @click="handelConfirm">确定</el-button>
+      <el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
     </div>
   </el-dialog>
 
@@ -203,6 +203,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
+            loading: false,
             row: {},
             confirmList: [],
             selectList: [],
@@ -407,9 +408,10 @@ export default {
                 // if (!valid) return
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
-
+                this.loading = true
                 const { data } = await this.baseRequest1('ApplyInvoiceRedController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
+                    this.loading = false
                     this.$message.success('处理成功')
                     this.form = {}
                     this.confirmForm = { confirmContent: '' }

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

@@ -606,8 +606,13 @@ export default {
                         return e.data
                     }).toString()
                 }
+                const houseIds = []
+                _this.formData.houseIds.forEach(item => {
+                    houseIds.push(item[3])
+                })
                 const formData = {
-                    ...this.formData
+                    ...this.formData,
+                    houseId: houseIds.join(',')
                 }
                 this.loading = true
 

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

@@ -179,7 +179,7 @@
     </div>
     <div slot="footer">
       <el-button @click="dialogVisible=false">取消</el-button>
-      <el-button type="primary" @click="handelConfirm">确定</el-button>
+      <el-button :loading="loading" type="primary" @click="handelConfirm">确定</el-button>
     </div>
   </el-dialog>
 
@@ -203,6 +203,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
+            loading: false,
             row: {},
             confirmList: [],
             selectList: [],
@@ -406,9 +407,10 @@ export default {
                 // if (!valid) return
                 // ApplyAddWorkController/AddConfirmResultAddWork
                 console.log(this.confirmForm)
-
+                this.loading = true
                 const { data } = await this.baseRequest1('ApplyReceivablesAdjustController', 'AddConfirmResult', { ...this.confirmForm })
                 if (data.code == 200) {
+                    this.loading = false
                     this.$message.success('处理成功')
                     this.form = {}
                     this.confirmForm = { confirmContent: '' }