From 1bb607be453291bdec5651e4f81c0557289d479c 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, 4 Apr 2023 14:50:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E7=AD=9B=E9=80=89=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicData/SupplierManage/SupplierTime.vue | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
index e0bf2dd84..89b691ad3 100644
--- a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
@@ -151,9 +151,13 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier",
+            this.isFilter("code", this.CreateFormData.supplierCode)
+          )},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
+        
         { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -162,9 +166,13 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier",
+            this.isFilter("code", this.editFormData.supplierCode)
+          )},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
+        
         { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -191,6 +199,18 @@ export default {
     this.paging();
   },
   methods: {
+    //过滤查询条件
+    isFilter (val, data) {
+      let filter = [
+        {
+          logic: "And",
+          column: val,
+          action: "==",
+          value: data
+        }
+      ]
+      return filter
+    },
     addNewDataPush (val) {
       if (this.theEvent == 'newly') {
         if (val[1].prop == 'supplierCode' || val[1].prop == 'supplierName') {