Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/router/index.js

@@ -261,6 +261,22 @@ 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/views/business/carrier/index.vue

@@ -54,11 +54,16 @@
       <el-form class="list-search-container" :model="carrierParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="载具管理" />
         <el-form-item label="载具编号：">
-          <el-input placeholder="请输入载具编号" :disabled="!carrierFlag" clearable style="width: 180px"
+          <el-input placeholder="请输入载具编号" :disabled="!carrierFlag" clearable style="width: 120px"
             v-model.trim="carrierParams.code" @keydown.enter.prevent />
         </el-form-item>
+        <el-form-item label="载具状态：">
+          <el-select placeholder="请选择载具状态" clearable style="width: 140px" v-model.trim="carrierParams.isAbandoned">
+            <el-option v-for="dict in carrier_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="打印状态：">
-          <el-select placeholder="请选择打印状态" clearable style="width: 90px" v-model.trim="carrierParams.isPrint">
+          <el-select placeholder="请选择打印状态" clearable style="width: 140px" v-model.trim="carrierParams.isPrint">
             <el-option v-for="dict in printStatus" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
@@ -83,7 +88,7 @@
             <el-table-column type="selection" width="40" align="center" :reserve-selection="true" />
             <el-table-column type="index" label="行号" width="50" align="center" />
             <el-table-column prop="code" label="载具编号" width="80" align="center" />
-            <el-table-column label="状态" width="80" prop="isAbandoned" align="center">
+            <el-table-column label="载具状态" width="80" prop="isAbandoned" align="center">
               <template #default="scope">
                 <dict-tag :options="carrier_status" :value="scope.row.isAbandoned" />
               </template>
@@ -134,6 +139,10 @@
                 <!--                >-->
                 <!--                  编辑-->
                 <!--                </el-button>-->
+                <el-button  link type="primary" icon="Comment"
+                  @click="handleCheckHidtory(scope.row)" >
+                  废弃明细
+                </el-button>
                 <el-button v-if="scope.row.isAbandoned === 0" link type="danger" icon="Delete"
                   @click="handleShowAbandonDialog(scope.row.id)" v-hasPermi="['business:carrier:abandonment']">
                   废弃
@@ -185,6 +194,7 @@ import printJS from "print-js";
 import carrierCategoryForm from "./formCategory";
 import carrierAbandonmentForm from "./formAbandonment";
 import multipleCategoryForm from "./multipleForm";
+import router from "@/router";
 import { nextTick } from "vue";
 import JSZip from "jszip";
 import { saveAs } from "file-saver";
@@ -247,6 +257,17 @@ const getCategories = () => {
 const handleMultipleCategoryDialog = () => {
   proxy.$refs.multipleCategoryRef.open();
 };
+//查看历史记录
+function handleCheckHidtory(row) {
+  console.log(row)
+  router.push({
+    name: "carrierInfo",
+    params: {
+      categoryId: row.categoryId,
+      carrierCode: row.code,
+    },
+  });
+}
 /**载具类别点击事件 */
 const handleCurrentCategoryChange = (row) => {
   if (row) {

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/reject/index.vue

@@ -165,6 +165,7 @@
 import { listCategory } from "@/api/business/carrier";
 import { listReject } from "@/api/business/reject";
 const { proxy } = getCurrentInstance();
+const route = useRoute();
 /** 字典数组区 */
 const { carrier_status } = proxy.useDict("carrier_status");
 /** 载具类别变量 */
@@ -200,7 +201,31 @@ const getCategories = () => {
     if (carrierCategoryList.value.length > 0) {
       currentCategory.value = carrierCategoryList.value[0];
       nextTick(() => {
-        proxy.$refs.categoryTable.setCurrentKey(currentCategory.value.id);
+        console.log(route.params.categoryId)
+        if (route.params.categoryId != ":categoryId" && route.params.categoryId != undefined ) {
+          console.log("11")
+          let a = 0;
+          let b = 0;
+          console.log(carrierCategoryList.value)
+          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) {
+                a = i;
+                b = j
+                return
+              }
+            }
+          }
+          }
+          currentCategory.value = carrierCategoryList.value[a].children[b];
+          console.log(currentCategory.value)
+          proxy.$refs.categoryTable.setCurrentKey(route.params.categoryId)
+            }else{
+              console.log("22")
+              proxy.$refs.categoryTable.setCurrentKey(currentCategory.value.id);
+            }
+        
         handleCurrentCategoryChange(currentCategory.value);
       });
     } else {
@@ -250,6 +275,10 @@ 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;

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>