src/HManagement/department/staff/detail/modules/terminalAuditArea.vue

@@ -22,15 +22,6 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination
-      v-if="total > 0"
-      style="margin-top: 10px; text-align: right"
-      @current-change="handleCurrentChange"
-      :current-page="pageNumber"
-      :page-size="pageSize"
-      layout="total, prev, pager, next"
-      :total="total">
-    </el-pagination>
 
     <el-dialog :title="$t('新增审批区域')" append-to-body :visible.sync="dialogVisible" width="600px" :close-on-click-modal="false">
       <el-form ref="form" :model="form" label-width="100px">
@@ -71,9 +62,6 @@ export default {
     return {
       tableData:[],
       searchKeyword:'',
-      pageSize:20,
-      pageNumber:1,
-      total:0,
       dialogVisible:false,
       templateList:[],
       form:{
@@ -112,22 +100,17 @@ export default {
           "where": {
             "condition": this.searchKeyword
           },
-          "pageNumber": this.pageNumber,
-          "pageSize": this.pageSize
+          // 固定传第一页、每页999条
+          "pageNumber": 1,
+          "pageSize": 999
         },
         "languagecode": "zh_CN",
         "accesstoken": "",
         "systemappid": ""
       })
       this.tableData = res.data || []
-      this.total = res.total || 0
     },
     searchList(){
-      this.pageNumber = 1
-      this.queryTableData()
-    },
-    handleCurrentChange(val){
-      this.pageNumber = val
       this.queryTableData()
     },
     openAddDialog(){
@@ -193,7 +176,6 @@ export default {
     }
   },
   mounted() {
-    // this.basicData.arealist()
     this.queryTableData()
   }
 }
@@ -203,4 +185,4 @@ export default {
 .mb-10{
   margin-bottom: 10px;
 }
-</style>
+</style>

src/HManagement/department/staff/list/modules/add.vue

@@ -279,17 +279,16 @@ export default {
 
   },
   methods:{
-    onShow () {
-      this.$store.dispatch('optiontypeselect','tradefield').then(res=>{
-        this.tradefields = res.data
-      })
+    async onShow () {
+      const tradefieldRes = await this.$store.dispatch('optiontypeselect','tradefield')
+      this.tradefields = tradefieldRes.data
       this.dialogFormVisible = true
       this.form.status = 0
       this.list = []
       this.salerList = []
       // this.form.depname = this.depInfo.data.label
       // this.form.departmentid = this.depInfo.data.departmentid
-      this.$store.dispatch('optiontypeselect','sex')
+      await this.$store.dispatch('optiontypeselect','sex')
 
 
     },

src/HManagement/department/staff/list/modules/edit.vue

@@ -318,15 +318,14 @@ export default {
       });
       return arr
     },
-    onShow () {
+    async onShow () {
       this.list = []
       this.salerList = []
       this.query_hrMain()
       this.department()
-      this.$store.dispatch('optiontypeselect','tradefield').then(res=>{
-        this.tradefields = res.data
-      })
-      this.$store.dispatch('optiontypeselect','sex')
+      const tradefieldRes = await this.$store.dispatch('optiontypeselect','tradefield')
+      this.tradefields = tradefieldRes.data
+      await this.$store.dispatch('optiontypeselect','sex')
       this.dialogFormVisible = true
     },
     selectDep  (data) {

src/bgj/ServiceMaterialClass/index.vue

@@ -7,7 +7,7 @@
       }"
       tableName="brandTable"
       idName="sa_brand_bgjid"
-      :apiId="{query:20220922085104,del:20220922085204}"
+      :apiId="{query:20220922085103,del:20220922085204}"
       :options="options"
     >
       <div slot="custom">

src/bgj/headquartersServiceMaterial/modules/addClass.vue

@@ -82,7 +82,6 @@ export default {
     methods: {
         async onSubmit(data) {
             let res = await this.$api.requested({
-                // id: 20220927090102,
                 id: 20220927090106,
                 content: {
                     itemtype: 1, //1=总部 2=本地
@@ -98,10 +97,9 @@ export default {
         },
         async getClassList() {
             let res = await this.$api.requested({
-                // id: "20230325141103",
-                id: "20230325141106",
+                id: "20230325141103",
                 content: {
-                    sc_brandid: 0,
+                    sa_brandid: 0,
                     itemid: this.$route.query.id,
                     where: {
                         istool: this.data.data.istool ? 1 : 0,
@@ -127,7 +125,7 @@ export default {
                     itemclassname: node.itemclassfullname
                         ? node.itemclassfullname
                         : node.itemclassname,
-                    itemclassid: node.sc_itemclassid,
+                    itemclassid: node.itemclassid,
                     itemclassnum: node.itemclassnum,
                     children: [],
                     disabled: first ? false : true,

src/bgj/terminalWorkBillModule/modules/taskDetail/components/addTop.vue

@@ -18,9 +18,9 @@
         >
         <el-drawer append-to-body :visible.sync="dialogFormVisible" size="70%">
             <div slot="title" style="font-size: 15px">{{ $t("添加工序") }}</div>
-            <div class="drawer__panel">
+            <div class="drawer__content">
                 <el-input
-                    style="width: 250px; margin-bottom: 10px"
+                    style="width: 250px; margin-bottom: 10px; flex-shrink: 0;"
                     size="small"
                     :placeholder="$t('请输入搜索内容')"
                     clearable
@@ -30,159 +30,161 @@
                         getOrderList((params.content.pageNumber = 1))
                     "
                 ></el-input>
-                <selectTable
-                    @selectChange="selectChange"
-                    v-if="dialogFormVisible"
-                    idName="sc_workpresetid"
-                    ref="table"
-                    v-model="result"
-                    :layout="tablecols"
-                    :data="orderList"
-                    :custom="true"
-                    height="500px"
-                    @upDateData="upDateData"
-                >
-                    <template v-slot:customcol="scope">
-                        <div
-                            v-if="scope.column.columnname == 'fileupload'"
-                            :style="
-                                scope.column.data.fileupload
-                                    ? scope.column.data.fileupload == 1
-                                        ? 'color:#008000'
-                                        : 'color:#ff0000'
-                                    : ''
-                            "
-                        >
-                            {{
-                                scope.column.data.fileupload
-                                    ? scope.column.data.fileupload == 1
-                                        ? $t("非必填")
-                                        : $t("必填")
-                                    : $t("无")
-                            }}
-                        </div>
-                        <div
-                            v-else-if="scope.column.columnname == 'additem'"
-                            :style="
-                                scope.column.data.additem
-                                    ? scope.column.data.additem == 1
-                                        ? 'color:#008000'
-                                        : 'color:#ff0000'
-                                    : ''
-                            "
-                        >
-                            {{
-                                scope.column.data.additem
-                                    ? scope.column.data.additem == 1
-                                        ? $t("非必填")
-                                        : $t("必填")
-                                    : $t("无")
-                            }}
-                        </div>
-                        <div
-                            v-else-if="scope.column.columnname == 'formcheck'"
-                            :style="
-                                scope.column.data.formcheck == 1
-                                    ? 'color:#ff0000'
-                                    : 'color:#666666'
-                            "
-                        >
-                            {{
-                                scope.column.data.formcheck == 1
-                                    ? $t("是")
-                                    : $t("否")
-                            }}
-                        </div>
-                        <div
-                            v-else-if="scope.column.columnname == 'panorama'"
-                            :style="
-                                scope.column.data.panorama
-                                    ? scope.column.data.panorama == 1
-                                        ? 'color:#008000'
-                                        : 'color:#ff0000'
-                                    : ''
-                            "
-                        >
-                            {{
-                                scope.column.data.panorama
-                                    ? scope.column.data.panorama == 1
-                                        ? $t("非必填")
-                                        : $t("必填")
-                                    : $t("无")
-                            }}
-                        </div>
-                        <div
-                            v-else-if="scope.column.columnname == 'passcheck'"
-                             :style="
-                                scope.column.data.passcheck == 1
-                                    ? 'color:#ff0000'
-                                    : 'color:#666666'
-                            "
-                        >
-                            {{
-                                scope.column.data.passcheck == 1
-                                    ? $t("是")
-                                    : $t("否")
-                            }}
-                        </div>
-                        <div
-                            v-else-if="scope.column.columnname == 'signature'"
-                            :style="
-                                scope.column.data.signature
-                                    ? scope.column.data.signature == 1
-                                        ? 'color:#008000'
-                                        : 'color:#ff0000'
-                                    : ''
-                            "
-                        >
-                            {{
-                                scope.column.data.signature
-                                    ? scope.column.data.signature == 1
-                                        ? $t("非必填")
-                                        : $t("必填")
-                                    : $t("无")
-                            }}
-                        </div>
-                        <div
-                            v-else-if="scope.column.columnname == 'servicenode'"
-                            :style="
-                                scope.column.data.servicenode == 1
-                                    ? 'color:#ff0000'
-                                    : 'color:#666666'
-                            "
-                        >
-                            {{
-                                scope.column.data.servicenode == 1
-                                    ? $t("是")
-                                    : $t("否")
-                            }}
-                        </div>
-                        <div
-                            v-else-if="scope.column.columnname == 'logreport'"
-                            :style="
-                                scope.column.data.logreport == 1
-                                    ? 'color:#ff0000'
-                                    : 'color:#666666'
-                            "
-                        >
-                            {{
-                                scope.column.data.logreport == 1
-                                    ? $t("是")
-                                    : $t("否")
-                            }}
-                        </div>
-                        <div v-else>
-                            {{
-                                scope.column.data[[scope.column.columnname]]
-                                    ? scope.column.data[
-                                          [scope.column.columnname]
-                                      ]
-                                    : "--"
-                            }}
-                        </div>
-                    </template>
-                </selectTable>
-                <div class="container normal-panel" style="text-align: right">
+                <div class="table-wrapper" ref="tableWrapper">
+                    <selectTable
+                        @selectChange="selectChange"
+                        v-if="dialogFormVisible"
+                        idName="sc_workpresetid"
+                        ref="table"
+                        v-model="result"
+                        :layout="tablecols"
+                        :data="orderList"
+                        :custom="true"
+                        :height="tableHeight"
+                        @upDateData="upDateData"
+                    >
+                        <template v-slot:customcol="scope">
+                            <div
+                                v-if="scope.column.columnname == 'fileupload'"
+                                :style="
+                                    scope.column.data.fileupload
+                                        ? scope.column.data.fileupload == 1
+                                            ? 'color:#008000'
+                                            : 'color:#ff0000'
+                                        : ''
+                                "
+                            >
+                                {{
+                                    scope.column.data.fileupload
+                                        ? scope.column.data.fileupload == 1
+                                            ? $t("非必填")
+                                            : $t("必填")
+                                        : $t("无")
+                                }}
+                            </div>
+                            <div
+                                v-else-if="scope.column.columnname == 'additem'"
+                                :style="
+                                    scope.column.data.additem
+                                        ? scope.column.data.additem == 1
+                                            ? 'color:#008000'
+                                            : 'color:#ff0000'
+                                        : ''
+                                "
+                            >
+                                {{
+                                    scope.column.data.additem
+                                        ? scope.column.data.additem == 1
+                                            ? $t("非必填")
+                                            : $t("必填")
+                                        : $t("无")
+                                }}
+                            </div>
+                            <div
+                                v-else-if="scope.column.columnname == 'formcheck'"
+                                :style="
+                                    scope.column.data.formcheck == 1
+                                        ? 'color:#ff0000'
+                                        : 'color:#666666'
+                                "
+                            >
+                                {{
+                                    scope.column.data.formcheck == 1
+                                        ? $t("是")
+                                        : $t("否")
+                                }}
+                            </div>
+                            <div
+                                v-else-if="scope.column.columnname == 'panorama'"
+                                :style="
+                                    scope.column.data.panorama
+                                        ? scope.column.data.panorama == 1
+                                            ? 'color:#008000'
+                                            : 'color:#ff0000'
+                                        : ''
+                                "
+                            >
+                                {{
+                                    scope.column.data.panorama
+                                        ? scope.column.data.panorama == 1
+                                            ? $t("非必填")
+                                            : $t("必填")
+                                        : $t("无")
+                                }}
+                            </div>
+                            <div
+                                v-else-if="scope.column.columnname == 'passcheck'"
+                                :style="
+                                    scope.column.data.passcheck == 1
+                                        ? 'color:#ff0000'
+                                        : 'color:#666666'
+                                "
+                            >
+                                {{
+                                    scope.column.data.passcheck == 1
+                                        ? $t("是")
+                                        : $t("否")
+                                }}
+                            </div>
+                            <div
+                                v-else-if="scope.column.columnname == 'signature'"
+                                :style="
+                                    scope.column.data.signature
+                                        ? scope.column.data.signature == 1
+                                            ? 'color:#008000'
+                                            : 'color:#ff0000'
+                                        : ''
+                                "
+                            >
+                                {{
+                                    scope.column.data.signature
+                                        ? scope.column.data.signature == 1
+                                            ? $t("非必填")
+                                            : $t("必填")
+                                        : $t("无")
+                                }}
+                            </div>
+                            <div
+                                v-else-if="scope.column.columnname == 'servicenode'"
+                                :style="
+                                    scope.column.data.servicenode == 1
+                                        ? 'color:#ff0000'
+                                        : 'color:#666666'
+                                "
+                            >
+                                {{
+                                    scope.column.data.servicenode == 1
+                                        ? $t("是")
+                                        : $t("否")
+                                }}
+                            </div>
+                            <div
+                                v-else-if="scope.column.columnname == 'logreport'"
+                                :style="
+                                    scope.column.data.logreport == 1
+                                        ? 'color:#ff0000'
+                                        : 'color:#666666'
+                                "
+                            >
+                                {{
+                                    scope.column.data.logreport == 1
+                                        ? $t("是")
+                                        : $t("否")
+                                }}
+                            </div>
+                            <div v-else>
+                                {{
+                                    scope.column.data[[scope.column.columnname]]
+                                        ? scope.column.data[
+                                            [scope.column.columnname]
+                                        ]
+                                        : "--"
+                                }}
+                            </div>
+                        </template>
+                    </selectTable>
+                </div>
+                <div class="container normal-panel pagination-wrapper" >
                     <el-pagination
                         style="text-align: right"
                         background
@@ -197,7 +199,7 @@
                     </el-pagination>
                 </div>
             </div>
-            <div class="fixed__btn__panel">
+            <div class="fixed__btn__panel ">
                 <el-button
                     size="small"
                     @click="dialogFormVisible = false"
@@ -232,6 +234,7 @@ export default {
             orderList: [],
             tablecols: [],
             total: 0,
+            tableHeight: 400,
             params: {
                 id: 2026051416494002,
                 content: {
@@ -249,16 +252,38 @@ export default {
         dialogFormVisible(val) {
             if (!val) {
                 this.$refs.table.allArr = [];
+                window.removeEventListener("resize", this.calcTableHeight);
             }
         },
     },
+    mounted() {
+        this.calcTableHeight = this.calcTableHeight.bind(this);
+    },
+    beforeDestroy() {
+        window.removeEventListener("resize", this.calcTableHeight);
+    },
     methods: {
+        calcTableHeight() {
+            this.$nextTick(() => {
+                if (this.$refs.tableWrapper) {
+                    const wrapperHeight =
+                        this.$refs.tableWrapper.clientHeight;
+                    if (wrapperHeight > 0) {
+                        this.tableHeight = wrapperHeight;
+                    }
+                }
+            });
+        },
         addBtn() {
             this.dialogFormVisible = true;
             this.getOrderList();
             this.tablecols = this.tool.tabelCol(
                 this.$route.name
             ).serviceWorkItemTable.tablecols;
+            this.$nextTick(() => {
+                this.calcTableHeight();
+                window.addEventListener("resize", this.calcTableHeight);
+            });
         },
         async onSubmit() {
             let data = this.$refs.table.allArr.map((item, index) => {
@@ -317,4 +342,20 @@ export default {
 .el-select {
     width: 100%;
 }
+.drawer__content {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    border-top: 1px solid #eeeeee;
+    padding: 20px 16px 70px;
+}
+.table-wrapper {
+    flex: 1;
+    overflow: hidden;
+    min-height: 0;
+}
+.pagination-wrapper {
+    flex-shrink: 0;
+    text-align: right;
+}
 </style>