From 9a6187b5381132d65b6be9a2e8b2b096cc4ecfb6 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 10 Nov 2023 10:34:51 +0800
Subject: [PATCH] up

---
 src/views/outbounds/component/addoutbounds.vue | 14 +++++++++++---
 src/views/outbounds/index.vue                  |  4 ++--
 src/views/stocks/component/addRuku.vue         | 16 +++++++++++++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue
index a0ed4fb..6a570c6 100644
--- a/src/views/outbounds/component/addoutbounds.vue
+++ b/src/views/outbounds/component/addoutbounds.vue
@@ -215,8 +215,11 @@
     </Modal>
     <!-- 选择库存 -->
     <Modal v-model="isShowWuzi" title="库存选择">
-      <div class="searchCompanys">
-        <el-input type="text" @keyup.enter.native="getWuzi" v-model="keyword" placeholder="请输入关键词查找库存"></el-input>
+      <div class="searchCompanys">
+        <el-input style="margin-right:10px" clearable type="text" @keyup.enter.native="getWuzi" v-model="wuzibianmakeyword" placeholder="请输入物资编码查找库存"></el-input>
+        <el-input style="margin-right:10px" clearable type="text" @keyup.enter.native="getWuzi" v-model="keyword" placeholder="请输入物资名称查找库存"></el-input>
+
+
         <el-button type="primary" @click="getWuzi">查询</el-button>
       </div>
       <Table highlight-row ref="currentRowTable" :columns="wuziColumns" :data="wuziList"
@@ -249,7 +252,8 @@
         id: '',
         authName: "",
         titleName: '',
-        keyword: '',
+        keyword: '',
+        wuzibianmakeyword:'',
         chukuType: '',
         tableName: 'outbounds',
         cangkuList: [],
@@ -507,6 +511,10 @@
             "key": "zichanmingcheng",
             "op": "like",
             "value": this.keyword
+          },{
+            "key": "wuzibianma",
+            "op": "like",
+            "value": this.wuzibianmakeyword
           }]
         })
         for (var m of res.data) {
diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue
index a95ed52..21b9369 100644
--- a/src/views/outbounds/index.vue
+++ b/src/views/outbounds/index.vue
@@ -5,7 +5,7 @@
       <lx-header icon="md-apps" :text="`${chukuType}出库管理`" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <slot>
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
-            <Input v-model="select.keyword" style="width: 200px;margin-right: 10px;" placeholder="借用人搜索" />
+            <Input v-model="select.keyword" style="width: 200px;margin-right: 10px;" placeholder="经办人搜索" />
             <Button type="primary" @click="getindex">查询</Button>
             <Button icon="ios-add" type="primary" style="margin-left: 10px;"
               @click="$refs['addoutbounds'].isShow = true,$refs['addoutbounds'].type = 'add',
@@ -216,7 +216,7 @@
           page_size: this.select.pageSize,
           page: this.select.pageIndex,
           table_name: 'outbounds',
-          filter:[{"key":"jieyongren","op":"like","value":this.select.keyword},
+          filter:[{"key":"jilurenyuan","op":"like","value":this.select.keyword},
           {"key":"chukuleixing","op":"like","value":this.chukuType}],
         })
         this.list = res.data
diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue
index 5813983..3d430a6 100644
--- a/src/views/stocks/component/addRuku.vue
+++ b/src/views/stocks/component/addRuku.vue
@@ -296,8 +296,9 @@
     </Modal>
     <!-- 选择物资编号 -->
     <Modal v-model="isShowWuzi" title="物资选择">
-      <div class="searchCompanys">
-        <el-input type="text" @keyup.enter.native="getList" v-model="keyword" placeholder="请输入关键词查找"></el-input>
+      <div class="searchCompanys">
+        <el-input style="margin-right:10px" clearable type="text" @keyup.enter.native="getList" v-model="wuzibianmakeyword" placeholder="请输入物资编码查找库存"></el-input>
+        <el-input style="margin-right:10px" clearable type="text" @keyup.enter.native="getList" v-model="keyword" placeholder="请输入资产名称查找"></el-input>
         <el-button type="primary" @click="getList">查询</el-button>
       </div>
       <Table highlight-row ref="currentRowTable" :columns="wuziColumns" :data="showList"
@@ -496,7 +497,8 @@
         kucunList: [],
         showList: [],
         wuziPageIndex: 1,
-        keyword: '',
+        keyword: '',
+        wuzibianmakeyword:'',
         showTotal: 0,
         wuziTotal: 0,
         kucunTotal: 0,
@@ -1027,6 +1029,10 @@
             "key": "zichanmingcheng",
             "op": "like",
             "value": this.keyword
+          },{
+            "key": "wuzibianma",
+            "op": "like",
+            "value": this.wuzibianmakeyword
           }]
         })
         for (var m of res.data) {
@@ -1045,6 +1051,10 @@
             "key": "zichanmingcheng",
             "op": "like",
             "value": this.keyword
+          },{
+            "key": "wuzibianma",
+            "op": "like",
+            "value": this.wuzibianmakeyword
           }]
         })
         for (var m of res.data) {