0908问题优化

src/views/dataAdmin/dataAdmin/dataBackup/index.vue

@@ -390,7 +390,7 @@ export default defineComponent({
             tableSetting: { fullScreen: false },
             showIndexColumn: true,
             pagination: {
-                pageSize: 10,
+                // pageSize: 10,
                 hideOnSinglePage: false
             },
             rowKey: (record) => record.id,

src/views/dataAdmin/dataAdmin/version/index.vue

@@ -315,7 +315,7 @@ export default defineComponent({
             tableSetting: { fullScreen: false },
             showIndexColumn: true,
             pagination: {
-                pageSize: 10,
+                // pageSize: 10,
                 hideOnSinglePage: false
             },
             rowKey: (record) => record.vid,

src/views/systemAdmin/system/log/operate/index.vue

@@ -184,7 +184,10 @@ export default defineComponent({
                 slots: { customRender: 'action' },
             },
             // rowSelection: { type: 'radio' },
-            pagination: { pageSize: 10 },
+            pagination: { 
+                // pageSize: 10,
+                hideOnSinglePage: false 
+            },
             showTableSetting: true,  // 显示表格设置
             tableSetting: { fullScreen: false },
             showIndexColumn: true,

src/views/systemAdmin/system/log/user/index.vue

@@ -189,7 +189,10 @@ export default defineComponent({
                 slots: { customRender: 'action' },
             },
             // rowSelection: { type: 'radio' },
-            pagination: { pageSize: 10 },
+            pagination: { 
+                // pageSize: 10,
+                hideOnSinglePage: false 
+            },
             showTableSetting: true,  // 显示表格设置
             tableSetting: { fullScreen: false },
             showIndexColumn: true,

src/views/systemAdmin/system/position/PositionDrawer.vue

@@ -60,7 +60,7 @@ export default defineComponent({
             oabaseid: "",
             name: '',
             duty: '',
-            sort: 0,
+            sort: '',
         });
         const rules = {
             name: [{
@@ -76,7 +76,7 @@ export default defineComponent({
             sort: [{
                 required: true,
                 message: '请输入序号',
-                trigger: 'change'
+                trigger: 'blur'
             }]
         };
         const title = ref(props.drawerTitle)
@@ -89,6 +89,7 @@ export default defineComponent({
                     form[key] = props.formData[key]
                 }
             }
+            form.sort+=''
         })
         watch(
             () => [props.formData, props.drawerTitle],
@@ -96,6 +97,7 @@ export default defineComponent({
                 for (let key in form) {
                     form[key] = props.formData[key]
                 }
+                form.sort+=''
                 title.value = newD
             },
             {
@@ -111,6 +113,7 @@ export default defineComponent({
             resetForm()
         };
         const onSubmit = () => {
+            console.log(form);
             formRef.value.validate().then(() => {
                 //此处调用新增
                 if (title.value === '新增岗位') {

src/views/systemAdmin/system/position/index.vue

@@ -37,14 +37,15 @@
 </template>
 
 <script>
-import { defineComponent, reactive, ref, toRefs, computed, onMounted, watch } from 'vue';
+import { defineComponent, reactive, ref, toRefs, computed, onMounted, watch, createVNode } from 'vue';
 import PositionDrawer from './PositionDrawer.vue';
 import { structureList, getPostsList, getPositionList, delPosition } from '/@/api/sys/position';
-import { message } from 'ant-design-vue';
+import { message,Modal } from 'ant-design-vue';
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 
 export default defineComponent({
     name: 'position',
-    components: { PositionDrawer },
+    components: { PositionDrawer, ExclamationCircleOutlined },
     setup(props, { emit }) {
         const drawerRef = ref(null)
         const data = reactive({
@@ -113,6 +114,8 @@ export default defineComponent({
                 getPositionList(params).then(res => {
                     if (res.datas && res.datas.length) {
                         data.position.data = res.datas
+                    }else{
+                        message.info('该职位下无岗位数据')
                     }
                 })
             } else {
@@ -177,18 +180,29 @@ export default defineComponent({
             } else if (data.position.currentId === "") {
                 message.error('请先选择岗位！')
             } else {
-                let params = {
-                    oabaseid: data.posts.currentId,
-                    id: data.position.currentId
-                }
-                delPosition(params).then(res => {
-                    if (res.datas === 1) {
-                        message.success('操作成功')
-                        onSubmit(true)
-                    } else {
-                        message.error('操作失败')
-                    }
-                })
+                Modal.confirm({
+                    title: '删除提示',
+                    icon: createVNode(ExclamationCircleOutlined),
+                    content: '确定删除岗位？',
+                    centered: true,
+                    okText: '确定',
+                    okType: 'danger',
+                    cancelText: '取消',
+                    onOk: (() => {
+                        let params = {
+                            oabaseid: data.posts.currentId,
+                            id: data.position.currentId
+                        }
+                        delPosition(params).then(res => {
+                            if (res.datas === 1) {
+                                message.success('操作成功')
+                                onSubmit(true)
+                            } else {
+                                message.error('操作失败')
+                            }
+                        })
+                    })
+                });
             }
         }
         const onSubmit = (e) => {

src/views/systemAdmin/system/tag/index.vue

@@ -315,7 +315,7 @@ export default defineComponent({
             tableSetting: { fullScreen: false },
             showIndexColumn: true,
             pagination: {
-                pageSize: 10,
+                // pageSize: 10,
                 hideOnSinglePage: false
             },
             rowKey: (record) => record.id,
@@ -356,7 +356,7 @@ export default defineComponent({
             tableSetting: { fullScreen: false },
             showIndexColumn: true,
             pagination: {
-                pageSize: 10,
+                // pageSize: 10,
                 hideOnSinglePage: false
             },
             // actionColumn: {

src/views/systemAdmin/system/zhiwei/ZhiweiDrawer.vue

@@ -54,7 +54,7 @@ export default defineComponent({
             departid: "",
             parentId: "",
             departName: "",
-            orderId: 0,
+            orderId: '',
             orgId: ""
         });
         const rules = {
@@ -79,6 +79,7 @@ export default defineComponent({
                     form[key] = props.formData[key]
                 }
             }
+            form.orderId+=''
         })
         watch(
             () => [props.formData, props.drawerTitle],
@@ -86,6 +87,7 @@ export default defineComponent({
                 for (let key in form) {
                     form[key] = props.formData[key]
                 }
+                form.orderId+=''
                 title.value = newD
             },
             {

src/views/systemAdmin/system/zhiwei/index.vue

@@ -28,14 +28,15 @@
 </template>
 
 <script>
-import { defineComponent, reactive, ref, toRefs, computed, onMounted, watch } from 'vue';
+import { defineComponent, reactive, ref, toRefs, computed, onMounted, watch, createVNode } from 'vue';
 import ZhiweiDrawer from './ZhiweiDrawer.vue';
 import { structureList, getPostsList, delPosts } from '/@/api/sys/zhiwei';
-import { message } from 'ant-design-vue';
+import { message, Modal } from 'ant-design-vue';
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 
 export default defineComponent({
     name: 'zhiwei',
-    components: { ZhiweiDrawer },
+    components: { ZhiweiDrawer, ExclamationCircleOutlined },
     setup(props, { emit }) {
         const drawerRef = ref(null)
         const data = reactive({
@@ -75,6 +76,9 @@ export default defineComponent({
             getPostsList(params).then(res => {
                 if (res.datas) {
                     data.posts.data = res.datas
+                    !res.datas.length && message.info('该部门下无职位数据')
+                }else{
+                    message.info('该部门下无职位数据')
                 }
             })
         };
@@ -137,18 +141,30 @@ export default defineComponent({
             } else if (data.posts.currentId === "") {
                 message.error('请先选择职位！')
             } else {
-                let params = {
-                    orgId: data.currentNode,
-                    departid: data.posts.currentId
-                }
-                delPosts(params).then(res => {
-                    if (res.datas === 1) {
-                        message.success('操作成功')
-                        onSubmit(true)
-                    } else {
-                        message.error('操作失败')
-                    }
-                })
+                Modal.confirm({
+                    title: '删除提示',
+                    icon: createVNode(ExclamationCircleOutlined),
+                    content: '确定删除岗位？',
+                    centered: true,
+                    okText: '确定',
+                    okType: 'danger',
+                    cancelText: '取消',
+                    onOk: (() => {
+                        let params = {
+                            orgId: data.currentNode,
+                            departid: data.posts.currentId
+                        }
+                        delPosts(params).then(res => {
+                            if (res.datas === 1) {
+                                message.success('操作成功')
+                                onSubmit(true)
+                            } else {
+                                message.error('操作失败')
+                            }
+                        })
+                    })
+                });
+
             }
         }
         const onSubmit = (e) => {