完善

src/components/lazy_treeCode_components.vue

@@ -453,9 +453,10 @@ export default {
         console.log(codeResult, 55555555);
         if (codeResult.data.code == 200) {
           //判断是否有下级
+          // + "[" + realCodeItem.id + "]"
           codeResult.data.data.rows.forEach((realCodeItem) => {
             realCodeItem.label =
-              realCodeItem.label + "[" + realCodeItem.id + "]";
+              realCodeItem.label;
             if (realCodeItem.parentFlag == "true") {
               realCodeItem.leaf = false;
             } else {

src/views/baxz/queryBaxz.vue

@@ -48,7 +48,27 @@
                  @handleSizeChange="handleSizeChange"
                  @handleCurrentChange="handleCurrentChange"
                  @rowBtn="rowBtn"
-                 @rowOperation="rowOperation"></Mytable>
+                 @rowOperation="rowOperation">
+          <template #btnGroup="scope">
+            <el-button class="hbyp"
+                       type="text"
+                       v-if="scope.scope.xzzt=='0'||scope.scope.xzzt=='1'"
+                       size="mini"
+                       @click="editBtn(scope.scope)">修改</el-button>
+            <el-button class="hbyp"
+                       type="text"
+                       v-if="scope.scope.xzzt=='0'&&scope.scope.xxczryGmsfhm==userAuth.identitycard"
+                       size="mini"
+                       :loading="loadingAPP"
+                       @click="toApprovalBtn(scope.scope)">提交审核</el-button>
+            <el-button class="hbyp"
+                       type="text"
+                       :loading="loadingBack"
+                       v-if="scope.scope.xzzt=='1'&&scope.scope.xxczryGmsfhm==userAuth.identitycard"
+                       size="mini"
+                       @click="backBtn(scope.scope)">退回</el-button>
+          </template>
+        </Mytable>
       </div>
     </div>
   </div>
@@ -58,6 +78,7 @@
 import Mytable from '@/components/Mytable.vue'
 import {
   selectAll,//协助查询
+  shXzqqXx,//审批
 } from "@/api/statistical.js"
 import SelectTreeDialog from "@c/treeCode_components.vue";
 import { mapGetters } from "vuex"
@@ -68,12 +89,14 @@ export default {
   data () {
 
     return {
+      loadingAPP: false,
+      loadingBack: false,
       leftMenus: [
         //左侧导航(模块第一个页面需要)
         {
           id: "queryBaxz",
           label: "协作管理",
-          newAuth: ["C1901", "F010101"],
+          newAuth: [],
           index: "/queryBaxz",
           className: "iconfont icon-ziyuanliebiao1",
           hasChildren: true,
@@ -81,7 +104,7 @@ export default {
             {
               id: "queryBaxz",
               label: "协作列表",
-              newAuth: ["C1901", "F010101"],
+              newAuth: [],
               index: "/queryBaxz",
               className: "iconfont icon-shenpi",
               hasChildren: false,
@@ -89,7 +112,7 @@ export default {
             {
               id: "queryDshxz",
               label: "待审核协作",
-              newAuth: ["C1901", "C1902", "F010101"],
+              newAuth: ["C1902", "F010101"],
               index: "/queryDshxz",
               className: "iconfont icon-shenpi",
               hasChildren: false,
@@ -97,7 +120,7 @@ export default {
             {
               id: "queryDbxz",
               label: "待办协作",
-              newAuth: ["C1901", "F010101"],
+              newAuth: [],
               index: "/queryDbxz",
               className: "iconfont icon-shenpi",
               hasChildren: false,
@@ -105,7 +128,7 @@ export default {
             {
               id: "queryYbxz",
               label: "已办协作",
-              newAuth: ["C1901", "F010101"],
+              newAuth: [],
               index: "/queryYbxz",
               className: "iconfont icon-shenpi",
               hasChildren: false,
@@ -115,7 +138,7 @@ export default {
         {
           id: "queryApproval",
           label: "注册审核管理",
-          newAuth: ["C1901", "C1903", "F010101"],
+          newAuth: ["C1903", "F010101"],
           index: "/queryApproval",
           className: "iconfont icon-ziyuanliebiao1",
           hasChildren: false,
@@ -186,14 +209,13 @@ export default {
           },
           {
             isOperation: true,
-            type: 'basicXz',
+            type: 'basicSlot',
             label: "操作",
             width: "180",
             align: "center",
             fixed: "right",
             sortable: false,
             operation: [
-
               {
                 operation: "edit",
                 type: "text",
@@ -215,7 +237,7 @@ export default {
 
   },
   computed: {
-    ...mapGetters(["userInfo"])
+    ...mapGetters(["userAuth"])
   },
   mounted () {
     document.getElementsByClassName("el-pagination__jump")[0].childNodes[0].nodeValue = "跳至";
@@ -227,6 +249,46 @@ export default {
     window.removeEventListener("message", this.messageReciver, false);
   },
   methods: {
+    editBtn (rows) {
+      this.$router.pushToTab({
+        path: '/editBaxz',
+        query: {
+          id: rows.xxzjbh,
+        }
+      })
+    },
+    async backBtn (rows) {
+      this.loadingBack = true
+      const params = new FormData()
+      params.append('xzzt', '0')
+      params.append('xxzjbh', rows.xxzjbh)
+      let res = await shXzqqXx(params)
+      try {
+        if (res && res.code == 200) {
+          this.loadingBack = false
+          this.$message.success('退回成功！')
+          this.getList()
+        }
+      } catch (error) {
+
+      }
+    },
+    async toApprovalBtn (rows) {
+      this.loadingAPP = true
+      const params = new FormData()
+      params.append('xzzt', '1')
+      params.append('xxzjbh', rows.xxzjbh)
+      let res = await shXzqqXx(params)
+      try {
+        if (res && res.code == 200) {
+          this.loadingAPP = false
+          this.$message.success('提交审核成功！')
+          this.getList()
+        }
+      } catch (error) {
+
+      }
+    },
     messageReciver (e) {
       if (e.origin == location.origin && e.data == 'appReloadData') {
         this.getList();

src/views/baxz/queryDbxz.vue

@@ -300,7 +300,7 @@ export default {
         let res = await selectAll(params)
         if (res && res.code == 200) {
           this.tableData = res.data.rows
-          this.total = res.data.total
+          this.pageObj.total = res.data.total
           this.loadings = false;
         } else {
           this.loadings = false;

src/views/baxz/queryDshxz.vue

@@ -238,11 +238,21 @@ export default {
           params.append('spyj', this.formPer.spsm)
           params.append('xzzt', this.formPer.result)
           let res = await shXzqqXx(params)
-          if (res && res.code == 200) {
-            this.$message.success('审核成功')
-            this.dialogVisiblePermisson = false;
+          try {
+            if (res && res.code == 200) {
+              this.$message.success('审核成功')
+              this.dialogVisiblePermisson = false;
+              this.loadingPer = false
+              this, this.getList()
+            } else {
+              console.log(123, res);
+              this.$message.error(`${res.message}`)
+              this.loadingPer = false
+            }
+          } catch (error) {
+            console.log(error, res, 333);
             this.loadingPer = false
-            this, this.getList()
+
           }
         }
       })
@@ -295,7 +305,7 @@ export default {
         let res = await selectAll(params)
         if (res && res.code == 200) {
           this.tableData = res.data.rows
-          this.total = res.data.total
+          this.pageObj.total = res.data.total
           this.loadings = false;
         } else {
           this.loadings = false;

src/views/baxz/queryYbxz.vue

@@ -219,7 +219,7 @@ export default {
         let res = await selectAll(params)
         if (res && res.code == 200) {
           this.tableData = res.data.rows
-          this.total = res.data.total
+          this.pageObj.total = res.data.total
 
           this.loadings = false;
         } else {