jiaxiaoqiang 10 miesięcy temu
rodzic
commit
7746e60248

+ 20 - 15
src/views/base/craftManagement/route/components/configs.ts

@@ -208,7 +208,12 @@ export const getTableConfig = (id: string) => {
         },
 
         { label: "标题", prop: "title", addDisabled: true, editDisabled: true },
-        { label: "展示页数", prop: "showAppointPageNum", type: "number" },
+        {
+          label: "展示页数",
+          prop: "showAppointPageNum",
+          type: "number",
+          min: 1,
+        },
         {
           label: "总页数",
           prop: "pageNum",
@@ -237,20 +242,20 @@ export const getTableConfig = (id: string) => {
           addDisabled: true,
           editDisabled: true,
         },
-        {
-          label: "内容",
-          prop: "content",
-          hide: true,
-          addDisabled: true,
-          editDisabled: true,
-        },
-        {
-          label: "排序",
-          prop: "sortNum",
-          hide: true,
-          addDisabled: true,
-          editDisabled: true,
-        },
+        // {
+        //   label: "内容",
+        //   prop: "content",
+        //   hide: true,
+        //   addDisabled: true,
+        //   editDisabled: true,
+        // },
+        // {
+        //   label: "排序",
+        //   prop: "sortNum",
+        //   hide: true,
+        //   addDisabled: true,
+        //   editDisabled: true,
+        // },
         {
           label: "文件",
           prop: "filePath",

Plik diff jest za duży
+ 474 - 241
src/views/device/allocate/index.vue


+ 6 - 1
src/views/device/disable/index.vue

@@ -37,7 +37,7 @@
           >流程</el-button
         >
         <el-button
-          v-if="row.state === 6"
+          v-if="row.state === 0"
           @click="deleteRow(row)"
           icon="el-icon-delete"
           type="danger"
@@ -324,6 +324,10 @@ const maintenanceInfoForm1 = ref("maintenanceInfoForm1");
 const maintenanceInfoForm2 = ref("maintenanceInfoForm2");
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
+const rowSelectable = (row, index) => {
+  return row.state === 0;
+};
+
 onMounted(() => {
   // console.log("crudRef", crudRef)
   dataList();
@@ -409,6 +413,7 @@ const maintenanceSubmit2 = () => {
 option.value = Object.assign(option.value, {
   selection: true,
   delBtn: false,
+  selectable: rowSelectable,
   column: [
     {
       label: "名称",

+ 5 - 1
src/views/pro/traceability/index.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="mainContentBox common-layout">
     <el-container>
-      <el-aside width="600px" style="height: 800px">
+      <el-aside
+        width="600px"
+        style="min-height: 800px; max-height: calc(100vh - 200px)"
+      >
         <avue-crud
           ref="crudRef"
           v-model:search="search"
@@ -11,6 +14,7 @@
           v-model:page="page"
           @cell-click="handleCellClick"
           @search-change="searchChange"
+          @size-change="dataList"
           @current-change="dataList"
           @selection-change="selectionChange"
         >