From 35f614722ca9cfbdc6ed1eea7c4ed998b77c5b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 14 May 2024 17:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=9B=9E=E6=94=B6?=
 =?UTF-8?q?=E6=96=99=E5=8E=9F=E6=96=99=E7=9A=84=E7=AE=B1=E7=A0=81=E5=85=88?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8E=9F=E6=96=99=E5=BA=93=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-api.js                      |  9 +++++++++
 fe/PC/src/filters/status.js                   |  2 +-
 fe/PC/src/mixins/filter-Select.js             |  2 +-
 fe/PC/src/router/index.js                     |  6 +++---
 .../materialsAdjustmentFunc.vue               | 20 +++++++++++++++++--
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 43b1aaa22..981b1e481 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -735,6 +735,15 @@ export function handleRequestIsHasNewJob(URL,requestNumber,data) {
   })
 }
 
+// 通过类型获取库位
+export async function getLocationByTypes(params) {
+  return request({
+    url: baseURL + 'basedata/Location/list/by-types',
+    method: 'get',
+    params:params
+  })
+}
+
 
 // 客户退拆任务-完成 todo
 // export async function productionRecycleJobComplete(id) {
diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index d5d26b7b7..1103ccd45 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -134,7 +134,7 @@ import store from '@/store/index'
     30: {
       label: "等待",
       value: 30,
-      background:"#EC5B28",
+      background:"#00b6ff",
     },
   }
   return Enum(status, index, prop)
diff --git a/fe/PC/src/mixins/filter-Select.js b/fe/PC/src/mixins/filter-Select.js
index d1cbd0048..ee5b0a07c 100644
--- a/fe/PC/src/mixins/filter-Select.js
+++ b/fe/PC/src/mixins/filter-Select.js
@@ -37,7 +37,7 @@ export const filterSelectMixins = {
     }
   },
   methods: {
-    getFilterList(type,params,url,newFilter,resultCount){
+    async getFilterList(type,params,url,newFilter,resultCount){
       // 正常过滤条件获取列表（getPageList）
       return new Promise(resolve => {
         if(!type || type == "getPageList"){
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 1afc7d258..b96cf60b9 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -321,7 +321,7 @@ export const constantRoutes = [
       name: 'IssueRequestZP',
       meta: {
         keepAlive : true, 
-        title: '人工发料申请（装配）',
+        title: '装配申请',
         icon: '成品发运任务',
       }
     }]
@@ -337,7 +337,7 @@ export const constantRoutes = [
       name: 'IssueJobZP',
       meta: {
         keepAlive : true, 
-        title: '人工发料任务（装配）',
+        title: '装配任务',
         icon: '成品发运任务',
       }
     }]
@@ -353,7 +353,7 @@ export const constantRoutes = [
       name: 'IssueNoteZP',
       meta: {
         keepAlive : true, 
-        title: '人工发料记录（装配）',
+        title: '装配记录',
         icon: '成品发运任务',
       }
     }]
diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
index ed367a5cd..6350001f0 100644
--- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
+++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
@@ -110,7 +110,7 @@ import { requestData } from "@/utils/processButtonData"
 import currenTableFlex from "@/components/currenTableFlex"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import detailsRules from '@/utils/rules';
-import { getPageList,itemTransformNewCreate } from "@/api/wms-api"
+import { getPageList,itemTransformNewCreate,getLocationByTypes } from "@/api/wms-api"
 import { postInventoryLabelCode_count } from "@/api/wms-core"
 import { getNowToT,formatTimeStampToNorm } from '@/utils/formatTime'
 import {initPrintPackingCodeData } from "@/mixins/printMixin"
@@ -207,7 +207,7 @@ export default {
         },
         { type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "packingCode", optionsValue: "packingCode", clearable:true,
           beforeFocus:(tableScope)=>{if(!this.addPopData_YL[tableScope.$index].itemCode || this.addPopData_YL[tableScope.$index].length <= 0){this.$message.error('请选择物品代码'); return false}else{return true}},
-          focus: (type,val,tableScope) => { return this.getFilterList(type, val, "wms/inventory/Inventory-Balance",this.isFilter("itemCode", this.addPopData_YL[tableScope.$index].itemCode),1000)},
+          focus: async (type,val,tableScope) => { return this.getFilterList(type, val, "wms/inventory/Inventory-Balance",await this.getPackingFilterYl(this.addPopData_YL[tableScope.$index].itemCode),1000)},
           width:"auto",
         },
         // 库存数量、库位：自动带出
@@ -693,6 +693,22 @@ export default {
         this.addPopData_FS[scope.$index].poNumber = null
       }
     },
+    // 原料箱标签筛选条件
+    async getPackingFilterYl(itemCode){
+      let _filters = []
+      _filters = this.isFilter("itemCode",itemCode)
+      // 获取原料库的库位代码
+      let _locationsYL = await getLocationByTypes({types:2})
+      let _ylArr = []
+      _locationsYL.forEach(item=>{ _ylArr.push(item.code)})
+      _filters.push({
+        logic: "And",
+        column: "locationCode",
+        action: "In",
+        value: JSON.stringify(_ylArr)
+      })
+      return _filters
+    },
     // 原料下拉
     pushYL(data){
       if(data[1].prop=="itemCode"){