1022

src/views/business/dayworkSelect/index.vue

@@ -217,10 +217,15 @@ const queryItemParams = ref({
   pageSize: 10,
   technologicalProcessDetailId: null,
 });
+const route = useRoute();
 
 /***********************  工段相关事件  ****************************/
 function getList() {
   loading.value = true;
+  console.log(route.params)
+  if (route.params.productionPlanNo != ":productionPlanNo"  ) {
+    queryDayworkParams.value.productionPlanNo = route.params.productionPlanNo
+  }
   getPremission();
   getDayworks();
 }

src/views/business/inventoryCheck/form.vue

@@ -50,14 +50,14 @@
         <el-form-item style="margin-left: 0">
           <el-button type="info" icon="Search" @click="handleQuery">搜索
           </el-button>
-          <el-button type="info" icon="Download" @click="handleExport">导出盘点明细
+          <el-button type="info" icon="Download" @click="handleExport" v-hasPermi="['business:inventoryCheck:inventoryDetailCheck']">导出盘点明细
           </el-button>
           <el-button :disabled="queryParams.deptId == null || queryParams.deptId == '0'" type="primary" icon="Check"   v-hasPermi="['business:inventoryCheck:notProductionCheck']"
             @click="handleTaksLot">未生产批次盘点
           </el-button>
           <el-button v-if="detailInfo.status != 2" type="primary" icon="List" @click="showOutsourceCheckDialog">外协发出单盘点
           </el-button>
-          <el-button type="info" icon="Download" @click="handleExportStorage">导出零存库未领取批次
+          <el-button type="info" icon="Download" @click="handleExportStorage"  v-hasPermi="['business:inventoryCheck:notRetrievalCheck']">导出零存库未领取批次
           </el-button>
         </el-form-item>
       </el-form>

src/views/business/resourcePlan/index.vue

@@ -155,7 +155,11 @@
               prop="productionPlanNo"
               width="100"
               align="center"
-            />
+            >
+            <template #default="scope">
+              <el-button link type="primary" @click="handleColumnClick(scope.row.productionPlanNo)"><span>{{ scope.row.productionPlanNo
+                  }}</span></el-button>
+            </template></el-table-column>
             <el-table-column
               label="序号"
               width="60"
@@ -232,7 +236,8 @@ import {
 import { getDeptList } from "@/api/business/planDetailSubDetail.js";
 import planDetailDialog from "./form";
 import { ref } from "vue";
-
+import router from "@/router";
+const route = useRoute();
 const { proxy } = getCurrentInstance();
 
 /**资源组*/
@@ -301,6 +306,10 @@ function getResourceGroup() {
     }
   });
 }
+/** 打开批次详情页 */
+function handleColumnClick(data) {
+  router.push({ path: "/select/dayworkSelect/" + data });
+}
 
 /**查询资源组 */
 function handleQuery() {

src/views/business/storageRetrieval/index.vue

@@ -42,6 +42,16 @@
           @keydown.enter.prevent
         />
       </el-form-item>
+      <el-form-item label="人员编号：">
+        <el-input
+          placeholder="请输入人员编号"
+          v-model.trim="queryParams.storagerUserName"
+          style="width: 120px"
+          clearable
+          @keyup.enter="handleQuery"
+          @keydown.enter.prevent
+        />
+      </el-form-item>
       <el-form-item label="存录员：">
         <el-input
           placeholder="请输入存录员"
@@ -127,7 +137,7 @@
           />
           <el-table-column
             label="图号"
-            width="100"
+            width="140"
             align="center"
             prop="drawingNumber"
           />
@@ -143,10 +153,11 @@
             align="center"
             prop="deptName"
           />
+          <el-table-column label="人员编号" align="center" width="80" prop="storagerUserName" />
           <el-table-column label="存录员" align="center" width="80" prop="storagerName" />
-          <el-table-column label="零存数量" align="center" width="150"  prop="storageNum" >
+          <el-table-column label="零存数量" align="center" width="80"  prop="storageNum" >
             <template #default="scope">
-              <el-input-number v-if="scope.row.editStatus" controls-position="right" v-model="scope.row.storageNum" style="width: 150px"
+              <el-input-number v-if="scope.row.editStatus" controls-position="right" v-model="scope.row.storageNum" style="width: 80px"
                :min="0" />
                <span v-else>{{ scope.row.storageNum }}</span>
             </template>
@@ -169,7 +180,7 @@
                 <dict-tag :options="is_retrieval" :value="scope.row.status" />
               </template>
             </el-table-column>
-          <el-table-column label="操作" align="center" width="160">
+          <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
               <el-button link v-if="!scope.row.editStatus" type="warning" size="small" icon="Edit"
                                @click="scope.row.editStatus = true" v-hasPermi="['business:storageRetrieval:update']">编辑</el-button>