From f704b4a997973ea978969a66e8b3d66bc96f38fc Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 16 Oct 2024 15:26:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A1=A3=E6=A1=88=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=20=20=20=20=20=20=E7=82=B9=E5=87=BB=20=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=20=20=20=E8=B7=B3=E8=BD=AC=E5=88=B0=20=20?=
 =?UTF-8?q?=20=20=E4=B8=8A=E4=BC=A0=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=86=E5=88=AB=202=E3=80=81=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=20=20=20=20=20=20=E5=85=88=E6=9F=A5=E5=87=BA?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9B=AE=E5=BD=95=20=20=20=E7=84=B6=E5=90=8E?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E9=87=8F=203=E3=80=81=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E7=9B=AE=E5=BD=95=E3=80=81=E6=A1=A3=E6=A1=88=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=20=20=20=20=20=20=E5=B1=95=E5=BC=80/=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E5=90=8E=E6=8E=92=E5=BA=8F=20=20=EF=BC=88=E6=8C=89?=
 =?UTF-8?q?=E6=8B=BC=E9=9F=B3=EF=BC=8C=E9=A1=BA=E5=BA=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/api/dangan/catalog.js           | 19 +++++
 dangan-ui/src/views/dangan/catalog/index.vue  | 83 ++++++++++++++++++-
 .../src/views/dangan/pictureRecard/index.vue  |  1 +
 3 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/dangan-ui/src/api/dangan/catalog.js b/dangan-ui/src/api/dangan/catalog.js
index c130bc5..d3c35df 100644
--- a/dangan-ui/src/api/dangan/catalog.js
+++ b/dangan-ui/src/api/dangan/catalog.js
@@ -9,6 +9,25 @@ export function listCatalog(query) {
   })
 }
 
+
+// 查询档案目录列表 count
+export function countCatalog(query) {
+  return request({
+    url: '/dangan/catalog/count',
+    method: 'get',
+    params: query
+  })
+}
+
+// 排序 number
+export function getCatalogNumber(id) {
+  return request({
+    url: '/dangan/catalog/number/' + id,
+    method: 'get'
+  })
+}
+
+
 // 查询档案目录详细
 export function getCatalog(id) {
   return request({
diff --git a/dangan-ui/src/views/dangan/catalog/index.vue b/dangan-ui/src/views/dangan/catalog/index.vue
index f1fbe22..cf60142 100644
--- a/dangan-ui/src/views/dangan/catalog/index.vue
+++ b/dangan-ui/src/views/dangan/catalog/index.vue
@@ -35,6 +35,51 @@
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-if="queryParams.spell===null"
+          plain
+          size="mini"
+          @click="onSpell(0)"
+        >拼音</el-button>
+        <el-button
+          plain
+          v-if="queryParams.spell===0"
+          icon="el-icon-sort-up"
+          size="mini"
+          @click="onSpell(1)"
+        >拼音</el-button>
+        <el-button
+          plain
+          v-if="queryParams.spell===1"
+          icon="el-icon-sort-down"
+          size="mini"
+          @click="onSpell(0)"
+        >拼音</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-if="queryParams.xuhao===null"
+          plain
+          size="mini"
+          @click="onXuhao(0)"
+        >序号</el-button>
+        <el-button
+          plain
+          v-if="queryParams.xuhao===0"
+          icon="el-icon-sort-up"
+          size="mini"
+          @click="onXuhao(1)"
+        >序号</el-button>
+        <el-button
+          plain
+          v-if="queryParams.xuhao===1"
+          icon="el-icon-sort-down"
+          size="mini"
+          @click="onXuhao(0)"
+        >序号</el-button>
+      </el-col>
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -250,7 +295,7 @@
 </template>
 
 <script>
-import { listCatalog, getCatalog, delCatalog, addCatalog, updateCatalog } from "@/api/dangan/catalog";
+import { listCatalog, getCatalog, delCatalog, addCatalog, updateCatalog, countCatalog, getCatalogNumber } from "@/api/dangan/catalog";
 import { listAreaSort } from "@/api/dangan/areaSort";
 import { listPictureRecard } from "@/api/dangan/pictureRecard";
 import Treeselect from "@riophae/vue-treeselect";
@@ -282,6 +327,8 @@ export default {
       queryParams: {
         muName: null,
         pid: null,
+        spell: null,
+        xuhao: 1,
       },
       // 表单参数
       form: {},
@@ -341,6 +388,10 @@ export default {
       listCatalog(this.queryParams).then(response => {
         this.list = this.handleTree(response.data, "id","pid");
         this.loading = false;
+
+        countCatalog(this.queryParams).then(response => {
+          this.list = this.handleTree(response.data, "id","pid");
+        });
       });
     },
     /** 转换目录数据结构 */
@@ -460,13 +511,19 @@ export default {
     },
     // 档案上传记录
     handleSCJL(row){
-      this.$router.push("/pictureRecard?muId=" + row.id+"&ywType=" + row.ywType);
+      this.$router.push("/pictureRecard?muId=" + row.id+"&ywType=" + row.ywType+"&recognize=1");
     },
     // 上级类目选择
-    selectPid(){
+    selectPid(row){
       this.form.ywType = undefined;
       this.form.picPath = undefined;
       this.form.muName = undefined;
+
+      if(row.id!==0){
+        getCatalogNumber(row.id).then(response => {
+          this.form.orderNum = response.orderNum;
+        });
+      }
     },
     // 业务类型
     changeYwType(val){
@@ -563,6 +620,26 @@ export default {
     carouselChange(i){
       console.log('carouselChange',i);
       this.dtyl.index = i
+    },
+    onSpell(val){
+      this.queryParams.xuhao=null
+      if(val===0){
+        this.queryParams.spell=0;
+        this.getList();
+      }else {
+        this.queryParams.spell=1;
+        this.getList();
+      }
+    },
+    onXuhao(val){
+      this.queryParams.spell=null;
+      if(val===0){
+        this.queryParams.xuhao=0;
+        this.getList();
+      }else {
+        this.queryParams.xuhao=1;
+        this.getList();
+      }
     }
   }
 };
diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index ea649ad..2587443 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -324,6 +324,7 @@ export default {
   created() {
     this.queryParams.muId = this.$route.query.muId || undefined
     this.queryParams.ywType = this.$route.query.ywType || 'option1'
+    this.queryParams.recognize = this.$route.query.recognize || '0'
     this.getList();
   },
   methods: {