From 623b924f3e421e9ed39b888b66905ae739dcf3b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 18 Jul 2023 11:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=87=E6=B3=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceRegByOrder.vue       | 11 +++-
 src/views/inout/InvoiceSelectRegByOrder.vue | 64 +++++++++++++--------
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index e2691ed..56aedab 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
+              <el-input v-model="filterQuery.billNo" placeholder="请输入单号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -104,6 +104,13 @@
           </el-col>
 
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="备注:">
+              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注" style="width: 90%" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -169,6 +176,7 @@
         </el-table-column>
         <el-table-column label="总金额" prop="allAmount" width="120">
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -557,6 +565,7 @@ export default {
         startTime: null,
         endTime: null,
         invCode: null,
+        unionRemark: null,
       },
       determineVisible: false,
       determineData: null,
diff --git a/src/views/inout/InvoiceSelectRegByOrder.vue b/src/views/inout/InvoiceSelectRegByOrder.vue
index 2a07081..c9155e1 100644
--- a/src/views/inout/InvoiceSelectRegByOrder.vue
+++ b/src/views/inout/InvoiceSelectRegByOrder.vue
@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="单号:">
-              <el-input v-model="filterQuery.billNo" placeholder="单号"
+              <el-input v-model="filterQuery.billNo" placeholder="请输入单号"
                         style="width: 90%"
                         clearable="true"
               ></el-input>
@@ -48,32 +48,16 @@
         </el-row>
         <el-row>
 
-          <el-col :span="8" v-if="showSup">
-            <el-form-item class="query-form-item" label="送货单位:">
-              <el-select
-                v-model="filterQuery.fromCorp"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="送货单位"
-                :remote-method="findMethod"
-                size="mini"
-                :loading="corpLoading"
-                style="width: 90%"
-              >
-                <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="备注:">
+              <el-input v-model="filterQuery.unionRemark" placeholder="请输入备注"
+                        style="width: 90%"
+                        clearable="true"
+              ></el-input>
             </el-form-item>
           </el-col>
 
+
           <el-col :span="8">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
@@ -108,6 +92,34 @@
           </el-col>
 
         </el-row>
+        <el-row>
+          <el-col :span="8" v-if="showSup">
+            <el-form-item class="query-form-item" label="送货单位:">
+              <el-select
+                v-model="filterQuery.fromCorp"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="送货单位"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
@@ -143,6 +155,7 @@
         </el-table-column>
         <el-table-column label="总金额" prop="allAmount" width="120">
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据状态" prop="status" width="100">
           <template slot-scope="scope">
             <el-tag :type="statusFilterType(scope.row.status)">{{
@@ -399,7 +412,8 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
-        invCode: null
+        invCode: null,
+        unionRemark: null
       },
       determineVisible: false,
       determineData: null,