feat：修改前端接口

bs-admin/pom.xml

@@ -16,7 +16,11 @@
     </description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.16</version>
+        </dependency>
         <!-- spring-boot-devtools -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

bs-ui/src/mixins/table-mixin.js

@@ -62,17 +62,17 @@ export default {
       ).then(() => {
         this.$emit('exportData', {...this.query});
       });
-      
+
     },
     async getTableList() {
       if (this.$refs.seachForm && this.queryRules) {
         const valid = await this.$refs.seachForm.validate();
         if (!valid) {
-          
+
           return;
         }
       }
-      
+
       this.$emit('getTableList', {...this.query});
       if (!this.MXPageInfo().pageListApi) {
         return;
@@ -92,7 +92,7 @@ export default {
         });
     },
     didGetTableList(success) {
-      
+
     },
     queryTable() {
       this.page = {
@@ -147,4 +147,4 @@ export default {
       });
     }
   },
-};
+};

bs-ui/src/views/task-distribut/feedback/other-task/index.vue

@@ -3,8 +3,8 @@
   <div v-loading="tableLoading">
     <el-card class="query-container" shadow="never">
       <!-- 表格查询条件 -->
-      <vab-query-form>
+      <div>
-        <vab-query-form-top-panel :span="24">
+        <div :span="24">
           <el-form ref="seachForm" :inline="true" class="demo-form-inline">
             <el-form-item label="机构代码">
               <el-input
@@ -63,8 +63,8 @@
               </el-button>
             </el-form-item>
           </el-form>
-        </vab-query-form-top-panel>
+        </div>
-      </vab-query-form>
+      </div>
     </el-card>
 
     <el-card class="el-row-main-container box-card box-card--table">
@@ -185,7 +185,7 @@
 <script>
 import AuditDialog from "@/views/task-distribut/send/other-task/components/AuditDialog";
 import TableMixin from "@/mixins/table-mixin";
-// import { pageListBranch } from "";
+import { pageListBranch } from "@/api/task/branch";
 
 export default {
   name: "BranchOtherTask",
@@ -263,4 +263,4 @@ export default {
     },
   },
 };
-</script>
+</script>

bs-ui/src/views/task-distribut/send/other-task/components/AuditDialog.vue

@@ -20,7 +20,7 @@
       </el-timeline-item>
     </el-timeline>
   </div>
-    
+
     <span slot="footer" class="dialog-footer">
       <el-button @click="closeVisible">关闭</el-button>
     </span>
@@ -31,7 +31,7 @@
 import SectionTitle from "@/views/task-distribut/components/SectionTitle.vue";
 import Detail from './Detail.vue';
 import AuditItem from './AuditItem.vue';
-// import { listFeedback } from ""; 
+import { listFeedback } from "@/api/task/feedback";
 // import { getDateStr } from "@/utils/util";
 
 export default {
@@ -144,4 +144,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
+</style>

bs-ui/src/views/task-distribut/send/other-task/components/AuditItem.vue

@@ -15,7 +15,7 @@
         <el-descriptions-item label="审核人">
           {{ dialogForm.checkUserName || '-' }}
         </el-descriptions-item>
-        
+
         <template v-if="editAble()">
           <el-descriptions-item :span="2" label="审核信息">
             <el-form-item class="desc-form-item" label="" prop="checkInfo">
@@ -68,14 +68,14 @@
         <el-button type="primary" v-loading="saving" @click="preSubmit('1')">提交</el-button>
       </template>
     </div>
-    
+
   </el-form>
 </template>
 
 <script>
 // status; 0草稿， 1反馈，2通过，-1驳回， null：本地待提交的审核
 import TableEditMixin from "@/mixins/table-edit-mixin";
-// import { addFeedback, updateFeedback } from "";
+import { addFeedback, updateFeedback } from "@/api/task/feedback";
 // import { getDateStr } from "@/utils/util";
 import FileUpload from "@/components/FileUpload";
 
@@ -186,4 +186,4 @@ export default {
 .desc-form-item {
   margin: 0;
 }
-</style>
+</style>

bs-ui/src/views/task-distribut/send/other-task/components/EditDialog.vue

@@ -137,11 +137,11 @@
 import TableEditMixin from "@/mixins/table-edit-mixin";
 import FileUpload from "@/components/FileUpload";
 import BranchCascaderDialog from "@/components/BranchCascaderDialog";
-// import { addOther, updateOther } from "@/api/";
+import { addInfo, updateInfo } from "@/api/task/info";
-// import {
+import {
-//   delBranch,
+  delBranch,
-//   listBranch,
+  listBranch,
-// } from "@/api/";
+} from "@/api/task/branch";
 // import { getDateStr } from "@/utils/";
 
 export default {
@@ -157,8 +157,8 @@ export default {
       endDate: null,
     },
     title: "其他任务",
-    updateApi: updateOther,
+    updateApi: updateInfo,
-    addApi: addOther,
+    addApi: addInfo,
   },
   data() {
     return {
@@ -298,7 +298,7 @@ export default {
         });
         return;
       }
-      
+
       this.submitForm();
     },
     combinDialogForm() {
@@ -330,4 +330,4 @@ export default {
 </script>
 
 <style>
-</style>
+</style>

bs-ui/src/views/task-distribut/send/other-task/components/RemarkDialog.vue

@@ -42,7 +42,8 @@
 <script>
 import TableEditMixin from "@/mixins/table-edit-mixin";
 import FileUpload from "@/components/FileUpload";
-// import { addOther, updateOther } from "@/api/";
+import { addBranch, updateBranch } from "@/api/task/branch";
+
 
 export default {
   name: 'RemarkDialog',
@@ -54,8 +55,8 @@ export default {
     defaultForm: {
     },
     title: "任务备注",
-    updateApi: updateOther,
+    updateApi: updateBranch,
-    // addApi: addOther,
+    // addApi: addBranch,
   },
   data() {
     return {
@@ -70,11 +71,11 @@ export default {
       }`;
       this.dialogVisible = true;
       this.dialogForm = { ...this.$options.pageInfo.defaultForm, ...data };
-      
+
     },
   },
 };
 </script>
 
 <style>
-</style>
+</style>

bs-ui/src/views/task-distribut/send/other-task/index.vue

@@ -3,8 +3,8 @@
   <div v-loading="tableLoading">
       <el-card class="query-container" shadow="never">
         <!-- 表格查询条件 -->
-        <vab-query-form>
+        <div>
-          <vab-query-form-top-panel :span="24">
+          <div :span="24">
             <el-form ref="seachForm" :inline="true" class="demo-form-inline">
               <el-form-item label="机构代码">
                 <el-input
@@ -63,8 +63,8 @@
                 </el-button>
               </el-form-item>
             </el-form>
-          </vab-query-form-top-panel>
+          </div>
-        </vab-query-form>
+        </div>
       </el-card>
 
       <el-card class="el-row-main-container box-card box-card--table">
@@ -192,14 +192,14 @@
       <EditDialog ref="editDialog" @refresh="getTableList"></EditDialog>
       <RemarkDialog ref="remarkDialog" @refresh="getTableList"></RemarkDialog>
   </div>
-  
+
 </template>
 
 <script>
 import EditDialog from "./components/EditDialog";
 import RemarkDialog from "./components/RemarkDialog";
 import TableMixin from "@/mixins/table-mixin";
-// import { pageListOther, delOther, withdrawOther, editByAffiliation } from "@/api/";
+import { pageListInfo, delInfo, getInfo as withdrawOther,getInfo as editByAffiliation } from "@/api/task/info";
 import BranchOtherTask from '@/views/task-distribut/feedback/other-task';
 
 export default {
@@ -212,8 +212,8 @@ export default {
   pageInfo: {
     title: '其他任务',
     exportUrl: '/task/other/export',
-    pageListApi: pageListOther,
+    pageListApi: pageListInfo,
-    deleteApi: delOther,
+    deleteApi: delInfo,
   },
   data() {
     return {
@@ -268,4 +268,4 @@ export default {
     }
   }
 };
-</script>
+</script>