Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue

@@ -106,15 +106,21 @@
 
     <!-- 列表 -->
     <ContentWrap>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
+      <el-table v-loading="loading" :data="list" :stripe="true"  class="hl-table">
         <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-        <el-table-column label="入库单号" align="center" prop="stockNo" min-width="200" fixed />
+        <el-table-column label="入库单号" align="center" prop="stockNo" min-width="210" fixed >
+          <template #default="scope">
+            <el-button text type="primary" @click="openDetail('review',scope.row.id)">
+              {{scope.row.stockNo}}
+            </el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="入库类型" align="center" prop="stockInType" min-width="120">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.HELI_STORAGE_IN_TYPE" :value="scope.row.stockInType" />
           </template>
         </el-table-column>
-        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="100" />
+        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="200" />
         <el-table-column label="入库仓库" align="center" prop="whId" min-width="120">
           <template #default="scope">
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
@@ -163,7 +169,7 @@
             <dict-tag :type="DICT_TYPE.HELI_STORAGE_STATUS" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="150" fixed="right">
+        <el-table-column label="操作" align="center" min-width="180" fixed="right">
           <template #default="scope">
             <el-button link type="primary" @click="openDetail('update', scope.row.id)">
               编辑

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue

@@ -108,13 +108,19 @@
     <ContentWrap>
       <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
         <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-        <el-table-column label="出库单号" align="center" prop="stockNo" fixed min-width="200" />
+        <el-table-column label="出库单号" align="center" prop="stockNo" fixed min-width="210" >
+            <template #default="scope">
+            <el-button text type="primary" @click="openDetail('review',scope.row.id)">
+              {{scope.row.stockNo}}
+            </el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="出库类型" align="center" prop="stockInType" min-width="120">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.HELI_STORAGE_OUT_TYPE" :value="scope.row.stockInType" />
           </template>
         </el-table-column>
-        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="180" />
+        <el-table-column label="上游单号" align="center" prop="headerNo" min-width="200" />
         <el-table-column label="出库仓库" align="center" prop="whId" min-width="120">
           <template #default="scope">
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}