推送P2

src/router/index.js

@@ -261,22 +261,6 @@ export const dynamicRoutes = [
         }
       }
     ]
-  },
-  {
-    path: '/basic',
-    component: Layout,
-    hidden: true,
-    permissions: ['business:reject:query'],
-    children: [
-      {
-        path: 'reject/:categoryId(.*)/:carrierCode(.*)',
-        component: () => import('@/views/business/reject/index'),
-        name: 'carrierInfo',
-        meta: {
-          title: '废弃信息'
-        }
-      }
-    ]
   }
 ]
 

src/store/modules/carrier.js

@@ -0,0 +1,17 @@
+
+const carrierStore = defineStore('carrier', {
+  state: () => ({
+      categoryId:null,
+      carrierCode:null
+  }),
+  actions: {
+    setCategoryIdQueryParams(value) { 
+      this.categoryId = value;
+    },
+    setCarrierCodeQueryParams(value) { 
+      this.carrierCode = value;
+    }
+  }
+})
+
+export default carrierStore

src/store/modules/productionPlanDetail.js

@@ -0,0 +1,13 @@
+
+const productionPlanDetailStore = defineStore('productionPlanDetail', {
+  state: () => ({
+      productionPlanNo:null
+  }),
+  actions: {
+    setProductionPlanDetailQueryParams(value) { 
+      this.productionPlanNo = value;
+    }
+  }
+})
+
+export default productionPlanDetailStore

src/views/business/certificate/form.vue

@@ -356,6 +356,7 @@ function handleGenerate() {
   const loading = ElLoading.service({
     lock: true,
   });
+  console.log(form.value);
   generateQrCode(form.value).then((res) => {
     loading.close();
     if (res.code === 200) {

src/views/business/consult/index.vue

@@ -21,15 +21,19 @@
       </el-form-item>
       <el-form-item label="咨询类别：">
         <el-select
-          v-model="queryParams.isProcessInspection"
+          v-model="queryParams.type"
           clearable
           placeholder="请选择类别"
           style="width: 130px"
         >
           <el-option label="全部" value="" />
           <el-option label="分选" value="0" />
-          <el-option label="序检" value="1" />
-          <el-option label="外协序检" value="2" />
+          <el-option label="巡检" value="1" />
+          <el-option label="交检" value="2" />
+          <el-option label="首件检" value="3" />
+          <el-option label="仪器室" value="4" />
+          <el-option label="外协检" value="5" />
+          <el-option label="出厂检" value="6" />
         </el-select>
       </el-form-item>
       <el-form-item label="计划单号/批次号：">
@@ -93,9 +97,13 @@
           </el-table-column>
           <el-table-column label="咨询类别" align="center" width="80">
             <template #default="scope">
-              <span v-if="scope.row.processInspectionId == 0 && scope.row.isOutsourcedInspection == 0">分选</span>
-              <span v-if="scope.row.processInspectionId !=0 && scope.row.isOutsourcedInspection==0">序检</span>
-              <span v-if="scope.row.isOutsourcedInspection==1">外协序检</span>
+              <span v-if="scope.row.processInspectionId == 0">分选</span>
+              <span v-if="scope.row.type == 'patrolInspection'">巡检</span>
+              <span v-if="scope.row.type == 'deliveryInspection'">交检</span>
+              <span v-if="scope.row.type == 'firstArticleInspection'">首件检</span>
+              <span v-if="scope.row.type == 'instrumentRoomInspection'">仪器室</span>
+              <span v-if="scope.row.type == 'outsourcedInspector'">外协检</span>
+              <span v-if="scope.row.type == 'factoryInspection'">出厂检</span>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" width="64">

src/views/business/dayworkSelect/index.vue

@@ -135,6 +135,7 @@ import router from "@/router";
 import dayworkItemForm from "./form";
 import sortItemForm from "./sortForm";
 import useUserStore from "@/store/modules/user";
+import productionPlanDetailStore from "@/store/modules/productionPlanDetail";
 import { stubArray } from "lodash-es";
 
 const is_identification = ref([{
@@ -217,10 +218,17 @@ const queryItemParams = ref({
   pageSize: 10,
   technologicalProcessDetailId: null,
 });
+const route = useRoute();
 
 /***********************  工段相关事件  ****************************/
 function getList() {
   loading.value = true;
+  console.log(route.params)
+  console.log(productionPlanDetailStore().productionPlanNo)
+  if (productionPlanDetailStore().productionPlanNo !=null  ) {
+    queryDayworkParams.value.productionPlanNo = productionPlanDetailStore().productionPlanNo
+    productionPlanDetailStore().setProductionPlanDetailQueryParams(null)
+  }
   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/outsourceInspectionVerify/index.vue

@@ -77,7 +77,7 @@
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+          <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
             <template #default="scope">
               <el-button v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2" link type="warning"
                 icon="Check" @click="handleConfirm(scope.row)" v-hasPermi="['business:beforeCheckoutVerify:edit']">

src/views/business/reject/index.vue

@@ -165,7 +165,7 @@
 import { listCategory } from "@/api/business/carrier";
 import { listReject } from "@/api/business/reject";
 const { proxy } = getCurrentInstance();
-const route = useRoute();
+import carrierStore from "@/store/modules/carrier";
 /** 字典数组区 */
 const { carrier_status } = proxy.useDict("carrier_status");
 /** 载具类别变量 */
@@ -201,8 +201,7 @@ const getCategories = () => {
     if (carrierCategoryList.value.length > 0) {
       currentCategory.value = carrierCategoryList.value[0];
       nextTick(() => {
-        console.log(route.params.categoryId)
-        if (route.params.categoryId != ":categoryId" && route.params.categoryId != undefined ) {
+        if (carrierStore().categoryId != null && carrierStore().carrierCode != null) {
           console.log("11")
           let a = 0;
           let b = 0;
@@ -210,7 +209,7 @@ const getCategories = () => {
           for(let i = 0;i< carrierCategoryList.value.length;i++) {
             if(carrierCategoryList.value.children) {
             for(let j = 0;j< carrierCategoryList.value[i].children.length;j++) {
-              if(carrierCategoryList.value[i].children[j].id == route.params.categoryId) {
+              if(carrierCategoryList.value[i].children[j].id == carrierStore().categoryId) {
                 a = i;
                 b = j
                 return
@@ -219,8 +218,11 @@ const getCategories = () => {
           }
           }
           currentCategory.value = carrierCategoryList.value[a].children[b];
+          queryCarrierRejectParams.value.code = carrierStore().carrierCode
           console.log(currentCategory.value)
-          proxy.$refs.categoryTable.setCurrentKey(route.params.categoryId)
+          proxy.$refs.categoryTable.setCurrentKey(carrierStore().categoryId) 
+          carrierStore().setCategoryIdQueryParams(null)
+          carrierStore().setCarrierCodeQueryParams(null)    
             }else{
               console.log("22")
               proxy.$refs.categoryTable.setCurrentKey(currentCategory.value.id);
@@ -275,10 +277,6 @@ function getNodeIndex(data) {
 const getCarriersReject = () => {
   carrierRejectLoading.value = true;
   queryCarrierRejectParams.value.categoryId = currentCategory.value.id;
-  if (route.params.carrierCode != ":carrierCode") {
-          console.log("11")
-         queryCarrierRejectParams.value.code = route.params.carrierCode
-            }
   listReject(queryCarrierRejectParams.value).then((res) => {
     carrierRejectLoading.value = false;
     carrierRejectList.value = res.rows;
@@ -291,7 +289,7 @@ const handleQueryCarrier = () => {
   getCarriersReject();
 };
 onMounted(() => {
-  getCategories();
+  getCategories()
 });
 </script>
 <style scoped>

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,9 @@ import {
 import { getDeptList } from "@/api/business/planDetailSubDetail.js";
 import planDetailDialog from "./form";
 import { ref } from "vue";
-
+import router from "@/router";
+import productionPlanDetailStore from "@/store/modules/productionPlanDetail";
+const route = useRoute();
 const { proxy } = getCurrentInstance();
 
 /**资源组*/
@@ -301,6 +307,12 @@ function getResourceGroup() {
     }
   });
 }
+/** 打开批次详情页 */
+function handleColumnClick(data) {
+  console.log(data)
+  productionPlanDetailStore().setProductionPlanDetailQueryParams(data)
+  router.push({ path: "/select/dayworkSelect/" });
+}
 
 /**查询资源组 */
 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="90"  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="false" v-model="scope.row.storageNum" style="width: 90px"
                :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>