Browse Source

接口联调

duwendi 1 year ago
parent
commit
b07789c147

+ 7 - 4
src/api/article_z.js

@@ -2,7 +2,6 @@
2 2
 import axios from "../util/ajax";
3 3
 
4 4
 export default {
5
-
6 5
   // 订单查询
7 6
   queryProductOrderSearchByPage(params) {
8 7
     return axios.get(`/opt/product/order/search/page`, {params})
@@ -315,6 +314,10 @@ export default {
315 314
   queryTaskAuditSmsByPage(params) {
316 315
     return axios.get(`/opt/task/audit/sms/page`, {params})
317 316
   },
317
+  // 任务审核-审核任务
318
+  auditTask(params) {
319
+    return axios.post('/opt/task/audit/edit', params)
320
+  },
318 321
   // 任务追缴——获取任务追缴分页-电话
319 322
   queryTaskRecoveryPhoneByPage(params) {
320 323
     return axios.get(`/opt/task/recovery/phone/page`, {params})
@@ -323,15 +326,15 @@ export default {
323 326
   queryTaskRecoverySmsByPage(params) {
324 327
     return axios.get(`/opt/task/recovery/sms/page`, {params})
325 328
   },
326
-  // 基础配置——添加设备信息
329
+  // 添加任务追缴 - 形式: 短信-电话
327 330
   addTaskRecovery(params) {
328 331
     return axios.post(`/opt/task/recovery/add`, params)
329 332
   },
330
-  // 基础配置——编辑设备信息
333
+  // 任务追缴——获取任务追缴分页-短信
331 334
   editTaskRecovery(params) {
332 335
     return axios.post(`/opt/task/recovery/edit`, params)
333 336
   },
334
-  // 基础配置——删除设备信息
337
+  // 任务追缴——获取任务追缴
335 338
   deleteTaskRecovery(params) {
336 339
     return axios.post(`/opt/task/recovery/delete`, params)
337 340
   },

+ 23 - 46
src/pages/index/components/task_audit.vue

@@ -45,9 +45,9 @@
45 45
           <div class="form-div">
46 46
             <el-form label-position="left" label-width="85px" :model="formLabelAlign">
47 47
               <el-form-item label="审核状态">
48
-                <el-radio-group v-model="formLabelAlign.status">
49
-                  <el-radio label="同意"></el-radio>
50
-                  <el-radio label="拒绝"></el-radio>
48
+                <el-radio-group v-model="formLabelAlign.auditStatus">
49
+                  <el-radio label="通过"></el-radio>
50
+                  <el-radio label="未通过"></el-radio>
51 51
                 </el-radio-group>
52 52
               </el-form-item>
53 53
               <el-form-item label="备注">
@@ -55,7 +55,7 @@
55 55
                   type="textarea"
56 56
                   :rows="2"
57 57
                   placeholder="请输入内容"
58
-                  v-model="formLabelAlign.remark">
58
+                  v-model="formLabelAlign.auditResult">
59 59
                 </el-input>
60 60
               </el-form-item>
61 61
             </el-form>
@@ -110,9 +110,9 @@
110 110
           <div class="form-div">
111 111
             <el-form label-position="left" label-width="85px" :model="formLabelAlign2">
112 112
               <el-form-item label="审核状态">
113
-                <el-radio-group v-model="formLabelAlign2.status">
114
-                  <el-radio label="同意"></el-radio>
115
-                  <el-radio label="拒绝"></el-radio>
113
+                <el-radio-group v-model="formLabelAlign2.auditStatus">
114
+                  <el-radio label="通过"></el-radio>
115
+                  <el-radio label="未通过"></el-radio>
116 116
                 </el-radio-group>
117 117
               </el-form-item>
118 118
               <el-form-item label="备注">
@@ -120,14 +120,14 @@
120 120
                   type="textarea"
121 121
                   :rows="2"
122 122
                   placeholder="请输入内容"
123
-                  v-model="formLabelAlign2.remark">
123
+                  v-model="formLabelAlign2.auditResult">
124 124
                 </el-input>
125 125
               </el-form-item>
126 126
             </el-form>
127 127
           </div>
128 128
           <span slot="footer" class="dialog-footer">
129
-            <el-button @click="dialogVisible = false">取 消</el-button>
130
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
129
+            <el-button @click="dialogVisible2 = false">取 消</el-button>
130
+            <el-button type="primary" @click="handleConfirm2">确 定</el-button>
131 131
         </span>
132 132
         </el-dialog>
133 133
       </el-tab-pane>
@@ -157,18 +157,6 @@ export default {
157 157
           label: '欠缴金额',
158 158
           key: 'arrearsAmount'
159 159
         },
160
-        {
161
-          label: '追缴日期',
162
-          key: 'recoveryTime'
163
-        },
164
-        {
165
-          label: '追缴状态',
166
-          key: 'recoveryStatus'
167
-        },
168
-        {
169
-          label: '追缴结果',
170
-          key: 'recoveryResult'
171
-        },
172 160
       ],
173 161
       tableData1: [{parkingCardName:'昌建东外滩西南停车场',type:'实地考察',questionDescription:'部分车位存在一车多位的占用现象',creatTime:'2023-12-30'}],
174 162
       total1: 0,
@@ -177,8 +165,9 @@ export default {
177 165
       title:'任务审核',
178 166
       dialogVisible:false,
179 167
       formLabelAlign: {
180
-        status: '',
181
-        ramark: '',
168
+        id: '',
169
+        auditStatus: '',
170
+        auditResult: '',
182 171
       },
183 172
       columns2: [
184 173
         {
@@ -193,18 +182,6 @@ export default {
193 182
           label: '欠缴金额',
194 183
           key: 'arrearsAmount'
195 184
         },
196
-        {
197
-          label: '追缴日期',
198
-          key: 'recoveryTime'
199
-        },
200
-        {
201
-          label: '追缴状态',
202
-          key: 'recoveryStatus'
203
-        },
204
-        {
205
-          label: '追缴结果',
206
-          key: 'recoveryResult'
207
-        },
208 185
       ],
209 186
       tableData2: [{parkingCardName:'昌建东外滩西南停车场',type:'实地考察',questionDescription:'部分车位存在一车多位的占用现象',creatTime:'2023-12-30'}],
210 187
       total2: 0,
@@ -221,8 +198,9 @@ export default {
221 198
       },
222 199
       dialogVisible2:false,
223 200
       formLabelAlign2: {
224
-        status: '',
225
-        ramark: '',
201
+        id: '',
202
+        auditStatus: '',
203
+        auditResult: '',
226 204
       },
227 205
     }
228 206
   },
@@ -246,21 +224,20 @@ export default {
246 224
       this.dialogVisible2 = true
247 225
     },
248 226
     handleConfirm() {
249
-      const {id} = this.formLabelAlign2.id
250
-      api_z.applyResource({id, applyType: this.radio}).then(res => {
227
+      api_z.auditTask({...this.formLabelAlign}).then(res => {
251 228
         if(res.code === 200) {
252
-          this.dialogVisible2 = false
229
+          this.dialogVisible = false
253 230
           this.$message({
254
-            message: '操作成功!',
231
+            message: '审核成功!',
255 232
             type: 'success'
256 233
           })
257
-          this.getTableData2()
234
+          this.getTableData1()
258 235
         }
259 236
       })
260 237
     },
261 238
     handleConfirm2() {
262 239
       const {id} = this.formLabelAlign2.id
263
-      api_z.applyResource({id, applyType: this.radio}).then(res => {
240
+      api_z.auditTask({...this.formLabelAlign2}).then(res => {
264 241
         if(res.code === 200) {
265 242
           this.dialogVisible2 = false
266 243
           this.$message({
@@ -276,7 +253,7 @@ export default {
276 253
     },
277 254
     getTableData1() {
278 255
       const {pageNum1, pageSize1} = this
279
-      api_z.queryTaskAuditPhoneByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
256
+      api_z.queryTaskAuditPhoneByPage({current: pageNum1, size: pageSize1, ...this.formInline1, auditStatus: '未审核'}).then(res => {
280 257
         this.tableData1 = res.data.records || []
281 258
         this.total1 = res.data.total
282 259
       })
@@ -286,7 +263,7 @@ export default {
286 263
     },
287 264
     getTableData2() {
288 265
       const {pageNum2, pageSize2} = this
289
-      api_z.queryTaskAuditSmsByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
266
+      api_z.queryTaskAuditSmsByPage({current: pageNum2, size: pageSize2, ...this.formInline2, auditStatus: '未审核'}).then(res => {
290 267
         this.tableData2 = res.data.records || []
291 268
         this.total2 = res.data.total
292 269
       })

+ 2 - 2
src/pages/index/components/task_recovery.vue

@@ -310,7 +310,7 @@ export default {
310 310
           }
311 311
         })
312 312
       } else {
313
-        api_z.addTaskRecovery({...this.formLabelAlign}).then(res => {
313
+        api_z.addTaskRecovery({...this.formLabelAlign, recoveryType: '电话'}).then(res => {
314 314
           if (res.code === 200) {
315 315
             this.dialogVisible = false
316 316
             this.$message({
@@ -358,7 +358,7 @@ export default {
358 358
           }
359 359
         })
360 360
       } else {
361
-        api_z.addTaskRecovery({...this.formLabelAlign2}).then(res => {
361
+        api_z.addTaskRecovery({...this.formLabelAlign2, recoveryType: '短信'}).then(res => {
362 362
           if (res.code === 200) {
363 363
             this.dialogVisible2 = false
364 364
             this.$message({

+ 2 - 6
src/pages/index/components/task_report.vue

@@ -81,11 +81,7 @@ export default {
81 81
         {
82 82
           label: '执行结果',
83 83
           key: 'recoveryResult'
84
-        },
85
-        {
86
-          label: '追缴形式',
87
-          key: 'recoveryType'
88
-        },
84
+        }
89 85
       ],
90 86
       tableData:[],
91 87
       total: 0,
@@ -107,7 +103,7 @@ export default {
107 103
     },
108 104
     getTableData() {
109 105
       const {pageNum, pageSize} = this
110
-      api_z.queryTaskReportByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
106
+      api_z.queryTaskReportByPage({current: pageNum, size: pageSize, ...this.formInline, auditStatus: '通过'}).then(res => {
111 107
         this.tableData = res.data.records || []
112 108
         this.total = res.data.total
113 109
       })