1008xx

src/api/sys/menu.ts

@@ -109,6 +109,7 @@ function buildTree(nodes, parentId = null) {
   for (let node of nodes) {
     if (node.parentid === parentId) {
       node.meta = JSON.parse(node.meta)
+      node.meta.status==='1' && (node.disabled=true)
       node.children = buildTree(nodes, node.id);
       tree.push(node);
     }

src/api/sys/tips.ts

@@ -0,0 +1,24 @@
+import { defHttp } from '/@/utils/http/axios';
+import { session } from "/@/utils/Memory.js";
+
+enum Api {
+    GetSms = '/base-center/sms/getSms'
+}
+
+/**
+ * @description:查询当前用户消息
+ */
+export function getSmsByUserId() {
+    let params = {
+        userid:session.getItem('userId')
+    }
+    return new Promise<void>((resolve, reject) => {
+        defHttp.post({ url: Api.GetSms, params })
+            .then((r) => {
+                resolve(r);
+            }).
+            catch((e) => {
+                reject(e);
+            })
+    })
+}

src/views/dataAdmin/dataAdmin/directoryManagement/index.vue

@@ -20,7 +20,7 @@
       <div class="left">
         <a-card class="box-card" body-style="{height:'100%'}">
           <a-input-search v-model:value="treeSearchValue" style="margin-bottom: 8px" placeholder="搜索关键字" />
-          <a-tree class="tree-list" :tree-data="treeData" @select="select" :expandedKeys="expandedKeys"
+          <a-tree class="tree-list" v-if="treeData.length" :tree-data="treeData" @select="select" :expandedKeys="expandedKeys" :defaultExpandedKeys="expandedKeys"
             :auto-expand-parent="autoExpandParent" @expand="onExpand">
             <template #title="{ title, selected, dataRef }">
               <span v-if="title.indexOf(treeSearchValue) > -1">
@@ -266,6 +266,10 @@ export default defineComponent({
               this.treeData.push(item);
             }
           });
+          this.treeData.forEach(item=>{
+            this.expandedKeys.push(item.id)
+          })
+          // console.log(this.expandedKeys);
           this.generateList(this.treeData)
         })
       })

src/views/dataAdmin/dataAdmin/resourceCataloging/index.vue

@@ -6,7 +6,7 @@
       <div class="left">
         <a-card class="box-card" body-style="{height:'100%'}">
           <a-input-search v-model:value="treeSearchValue" style="margin-bottom: 8px" placeholder="搜索关键字" />
-          <a-tree class="tree-list" :tree-data="treeData" @select="nodeSelect" :expandedKeys="expandedKeys"
+          <a-tree class="tree-list" v-if="treeData.length" :tree-data="treeData" @select="nodeSelect" :expandedKeys="expandedKeys" :defaultExpandedKeys="expandedKeys"
             :auto-expand-parent="autoExpandParent" @expand="onExpand">
             <template #title="{ title }">
               <span v-if="title.indexOf(treeSearchValue) > -1">
@@ -199,13 +199,16 @@ export default defineComponent({
               }
             })
           });
-          console.log(data)
+          // console.log(data)
           // 找出树形数据
           data.forEach((item) => {
             if (item.pid === '') {
               treeData.value = item.children
             }
           })
+          treeData.value.forEach(item=>{
+            expandedKeys.value.push(item.id)
+          })
           generateList(treeData.value)
         }
       });

src/views/interface/item/child/InterfaceCarModal.vue

@@ -101,7 +101,7 @@ export default defineComponent({
         const statusOptions = [
             {
                 label: "未提交",
-                value: "未审核"
+                value: "未提交"
             },
             {
                 label: "审核中",

src/views/resource/plat/index.vue

@@ -7,7 +7,7 @@
         </div>
         <div class="ztree-container">
           <a-directory-tree :tree-data="treeData" v-model:expandedKeys="expandedKeys" v-model:selectedKeys="selectedKeys"
-            v-if="treeData.length" :defaultExpandAll="false" v-model:checkedKeys="checkedKeys"
+            v-if="treeData.length" v-model:checkedKeys="checkedKeys" :defaultExpandedKeys="expandedKeys"
             :replaceFields="replaceFields" @select="nodeSelect"
             >
             <template #title="item">{{ `${item.name}（${item.count}）` }}</template>
@@ -76,6 +76,9 @@ export default defineComponent({
         if (r) {
           treeData.value = r[0].child[0].child
           console.log(r);
+          treeData.value.forEach(item=>{
+            expandedKeys.value.push(item.id)
+          })
         }
       });
       platList().then((r) => { if (r) console.log(r), achieveList.value = r });

src/views/resource/plat/item/child/ResCarModal.vue

@@ -84,7 +84,7 @@ export default defineComponent({
         const statusOptions = [
             {
                 label: "未提交",
-                value: "未审核"
+                value: "未提交"
             },
             {
                 label: "审核中",

src/views/systemAdmin/system/account/AccountModal1.vue

@@ -116,7 +116,7 @@ export default defineComponent({
         const checkLoginName = (rule, value, callback) => {
             if (!value) {
                 // callback(new Error("请输入用户名"));
-                return Promise.reject("请输入用户名")
+                return Promise.reject("请输入登录名")
             } else {
                 //如果字符串 string 中含有与 RegExpObject 匹配的文本，则返回 true，否则返回 false。
                 if (ChineseRegexp.test(value)) {
@@ -207,14 +207,15 @@ export default defineComponent({
         const formRef = ref()
 
         onMounted(() => {
+            
+            structureList().then(res => {
+                data.treeData = res
+            })
             if (Object.keys(props.formData).length) {
                 for (let key in form) {
                     form[key] = props.formData[key]
                 }
             }
-            structureList().then(res => {
-                data.treeData = res
-            })
             roleList().then(res => {
                 if (res.length) {
                     res.forEach(item => {
@@ -287,6 +288,7 @@ export default defineComponent({
         watch(
             () => form.ssjg,
             (val) => {
+                form.sszw = ''
                 data.gwOption = []
                 if (val !== '') {
                     //查询职位
@@ -315,6 +317,7 @@ export default defineComponent({
         watch(
             () => form.sszw,
             (val) => {
+                form.ssgw = ''
                 if (val !== '') {
                     //查询岗位
                     let params = {

src/views/systemAdmin/system/menu/menu.data.ts

@@ -62,12 +62,12 @@ export const columns: BasicColumn[] = [
       return h(Tag, { color: color }, () => text);
     },
   },
-  {
-    title: t('routes.common.system.tableTitleSystemCreateTime'), //'创建时间'
-    // title:'创建时间',
-    dataIndex: 'createtime',
-    width: 180,
-  },
+  // {
+  //   title: t('routes.common.system.tableTitleSystemCreateTime'), //'创建时间'
+  //   // title:'创建时间',
+  //   dataIndex: 'createtime',
+  //   width: 180,
+  // },
 ];
 
 const isDir = (type: string) => type === '0';

src/views/systemAdmin/system/structure/StructureModal.vue

@@ -16,7 +16,7 @@
                 </a-form-item>
                 <!-- 排序 -->
                 <a-form-item label="机构排序" name="orderId">
-                    <a-input v-model:value="form.orderId" style="width: 100%" placeholder="请输入序号" />
+                    <a-input type="number" v-model:value="form.orderId" style="width: 100%" placeholder="请输入序号" />
                 </a-form-item>
             </a-form>
         </div>
@@ -76,6 +76,7 @@ export default defineComponent({
             }],
             orderId: [{
                 required: true,
+                type: 'number',
                 message: '请输入序号',
                 trigger: 'blur'
             }]

src/views/tips/index.vue

@@ -75,6 +75,7 @@
 import { defineComponent, reactive, ref, toRefs, computed, onMounted, watch } from 'vue';
 import { useAppStore } from '/@/store/modules/app';
 import { Modal } from 'ant-design-vue';
+import { getSmsByUserId } from '/@/api/sys/tips';
 
 export default defineComponent({
     name: 'tips',
@@ -333,6 +334,9 @@ export default defineComponent({
         }
 
         onMounted(() => {
+            getSmsByUserId().then(res=>{
+                console.log(res);
+            })
         })
 
         return {