Przeglądaj źródła

1.图纸资料新增文件提示文件格式
2.流程角色新增分页

liziliang 2 miesięcy temu
rodzic
commit
226ae00c7a

+ 1 - 1
src/views/base/information/index.vue

@@ -24,7 +24,7 @@
           v-model:pdf-list="pdfUrlList"
           v-model:file-name-list="fileNameList"
           :limit="10"
-          :show-tip="false"
+          :show-tip="true"
           :generate-pdf="true"
           @finished="testFiles"
         />

+ 21 - 11
src/views/flow/flowRole/index.vue

@@ -36,9 +36,13 @@
   <div class="mainContentBox" style="width:50%;float: left;">
     <avue-crud
         ref="crudRef2"
+        v-model:search="data1.search"
         v-model="form"
-        :data="data1"
-        :option="option1"
+        :data="data1.data"
+        v-model:page="data1.page"
+        @size-change="data1.Methords.dataList"
+        @current-change="data1.Methords.dataList"
+        :option="data1.option"
         @row-del="delUser"
     >
       <template #menu="{ size, row, index }">
@@ -98,7 +102,8 @@ const roleDisabled = ref(false)
 const rowClick = (row) => {
   selectRow.value = row
   crudRef1.value.setCurrentRow(row);
-  queryUsers(row.roleName)
+  data1.value.search.roleName = row.roleName
+  data1.value.Methords.dataList();
 };
 const selectRow = ref()
 const todelete = (row, type) =>{
@@ -159,6 +164,11 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
   useCrud({
     src: "/api/v1/flowRole",
   });
+const data1 = ref(
+  useCrud({
+    dataListUrl: "/api/v1/flowRole/userPage",
+  })
+);
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
@@ -195,8 +205,7 @@ option.value = Object.assign(option.value, {
     },
   ],
 });
-const data1 = ref([])
-const option1 = ref({
+data1.value.option = Object.assign(data1.value.option, {
   delBtn: false,
   selection: false,
   viewBtn: false,
@@ -250,14 +259,15 @@ const queryUsers = (code)=>{
 getUserTree().then((data) => {
   userList.value = data.data;
 });
-const queryUserList = ()=>{
-  getUserList({}).then((res)=>{
-    userList.value = res.data
-  })
-}
+// const queryUserList = ()=>{
+//   getUserList({}).then((res)=>{
+//     userList.value = res.data
+//   })
+// }
 onMounted(() => {
   queryDataList();
-  queryUserList()
+  // queryUserList()
+  data1.value.Methords.dataList();
   getUserTree().then((data) => {
     userList.value = data.data;
   });