first

src/view/yunyin/product/ProductPar.vue

@@ -55,7 +55,7 @@
               <el-pagination
                 v-model:current-page="page"
                 v-model:page-size="pageSize"
-                :page-sizes="[10, 20, 30, 50]"
+                :page-sizes="[10, 15, 20, 30, 50, 100]"
                 :total="total"
                 layout="total, sizes, prev, pager, next, jumper"
                 background

src/view/yunyin/product/ProductProcess.vue

@@ -84,7 +84,7 @@
                 <el-pagination
                   v-model:current-page="page"
                   v-model:page-size="pageSize"
-                  :page-sizes="[10, 20, 30, 50]"
+                  :page-sizes="[10, 15, 20, 30, 50, 100]"
                   :total="total"
                   layout="total, sizes, prev, pager, next, jumper"
                   background

src/view/yunyin/product/list.vue

@@ -70,6 +70,7 @@
           <el-main>
             <div class="gva-table-box">
               <el-table
+                ref="productTableRef"
                 class="product-list-el-table"
                 :data="tableData"
                 border
@@ -108,7 +109,7 @@
                 <el-pagination
                   v-model:current-page="page"
                   v-model:page-size="pageSize"
-                  :page-sizes="[10, 15, 20, 50, 100]"
+                  :page-sizes="[10, 15, 20, 30, 50, 100]"
                   :total="total"
                   layout="total, sizes, prev, pager, next, jumper"
                   background
@@ -152,7 +153,7 @@
                   <el-pagination
                     v-model:current-page="partPage"
                     v-model:page-size="partPageSize"
-                    :page-sizes="[10, 15, 20, 30, 50]"
+                    :page-sizes="[10, 15, 20, 30, 50, 100]"
                     :total="partTotal"
                     layout="total, sizes, prev, pager, next, jumper"
                     background
@@ -200,7 +201,7 @@
                   <el-pagination
                     v-model:current-page="gyPage"
                     v-model:page-size="gyPageSize"
-                    :page-sizes="[10, 15, 20, 30, 50]"
+                    :page-sizes="[10, 15, 20, 30, 50, 100]"
                     :total="gyTotal"
                     layout="total, sizes, prev, pager, next, jumper"
                     background
@@ -893,6 +894,7 @@ const listDialogBatchTableHeight = 520
 const userStore = useUserStore()
 
 const menuTreeRef = ref(null)
+const productTableRef = ref(null)
 const treeProps = { label: 'label', children: 'children' }
 const menuTreeData = ref([])
 /** ProductTypeMenu 原始 data，与左侧树同源；产品类型下拉用其中的分类 name */
@@ -908,7 +910,7 @@ function pickMenuCategoryName(cat) {
 const tableData = ref([])
 const total = ref(0)
 const page = ref(1)
-const pageSize = ref(15)
+const pageSize = ref(30)
 const searchKeyword = ref('')
 
 /** 左侧选中：null 全部 | category / product；product 可带 presetProductType（所属分类，用于新增产品预填） */
@@ -981,12 +983,12 @@ const processAddBtnTooltip = computed(() => {
 const partList = ref([])
 const partTotal = ref(0)
 const partPage = ref(1)
-const partPageSize = ref(15)
+const partPageSize = ref(30)
 
 const gyList = ref([])
 const gyTotal = ref(0)
 const gyPage = ref(1)
-const gyPageSize = ref(15)
+const gyPageSize = ref(30)
 
 /** ——— 产品弹窗 ——— */
 const productDialogVisible = ref(false)
@@ -2372,7 +2374,7 @@ const fetchProductList = async () => {
   }
 }
 
-const handleNodeClick = (data) => {
+const handleNodeClick = async (data) => {
   if (data.isAll) {
     menuFilter.value = null
   } else if (data.isCategory) {
@@ -2388,7 +2390,22 @@ const handleNodeClick = (data) => {
   }
 
   page.value = 1
-  fetchProductList()
+  await fetchProductList()
+  await nextTick()
+  if (tableData.value.length > 0) {
+    const first = tableData.value[0]
+    onProductRowClick(first)
+    await nextTick()
+    productTableRef.value?.setCurrentRow(first)
+  } else {
+    selectedRow.value = null
+    selectedPartRow.value = null
+    partList.value = []
+    gyList.value = []
+    partTotal.value = 0
+    gyTotal.value = 0
+    productTableRef.value?.setCurrentRow(null)
+  }
 }
 
 const onSearch = () => {

src/view/yunyin/renliziyuan/GroupManagement.vue

@@ -85,7 +85,7 @@
             @closed="resetAddMemberForm"
           >
             <el-form :model="addMemberForm" label-width="100px" class="add-member-form">
-              <el-form-item label="所在工序" required>
+              <el-form-item label="生产工序" required>
                 <el-select
                   v-model="addMemberForm['生产工序']"
                   placeholder="请选择生产工序"
@@ -165,7 +165,7 @@
           >
             <p v-if="changeTeamStaffHint" class="change-team-hint">{{ changeTeamStaffHint }}</p>
             <el-form :model="changeTeamForm" label-width="100px" class="add-member-form">
-              <el-form-item label="所在工序" required>
+              <el-form-item label="生产工序" required>
                 <el-select
                   v-model="changeTeamForm['生产工序']"
                   placeholder="请选择生产工序"

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -72,7 +72,7 @@
               <el-pagination
                 :current-page="page"
                 :page-size="pageSize"
-                :page-sizes="[10, 20, 50, 100, 200]"
+                :page-sizes="[10, 15, 20, 30, 50, 100, 200]"
                 :total="total"
                 layout="total, sizes, prev, pager, next, jumper"
                 background
@@ -110,7 +110,7 @@
                   <el-option v-for="g in genderOptions" :key="g" :label="g" :value="g" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="所在工序">
+              <el-form-item label="生产工序">
                 <el-select
                   v-model="formDataTest['生产工序']"
                   placeholder="请选择生产工序"
@@ -213,7 +213,7 @@ const multipleTableRef = ref(null)
 const searchInfo = ref('')
 const page = ref(1)
 const total = ref(0)
-const pageSize = ref(20)
+const pageSize = ref(50)
 
 const resetToFirstPage = () => {
   page.value = 1