From 2acc46e81174f5a3d48f2afaf1b6f7dd537f0321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Tue, 15 Oct 2024 16:20:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invoicing/components/consumableList.vue | 3 +--
 src/views/invoicing/components/shopList.vue       | 5 ++---
 src/views/invoicing/consumable/specifications.vue | 4 ++--
 src/views/invoicing/operation_in.vue              | 4 ++--
 src/views/invoicing/operation_out.vue             | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/views/invoicing/components/consumableList.vue b/src/views/invoicing/components/consumableList.vue
index d5e0db7..fa2b63c 100644
--- a/src/views/invoicing/components/consumableList.vue
+++ b/src/views/invoicing/components/consumableList.vue
@@ -1,6 +1,6 @@
 <!-- 耗材列表 -->
 <template>
-    <el-dialog title="选择耗材" :visible.sync="dialogVisible" @open="resetHandle()">
+    <el-dialog title="选择耗材" :visible.sync="dialogVisible">
         <el-form :model="searchForm" inline>
             <el-form-item>
                 <el-input v-model="searchForm.conTypeName" placeholder="耗材类型名称" @input="onInput"></el-input>
@@ -162,7 +162,6 @@ export default {
                 this.goods = []
             }
             this.resetHandle()
-            this.getTableData()
         },
         close() {
             this.dialogVisible = false
diff --git a/src/views/invoicing/components/shopList.vue b/src/views/invoicing/components/shopList.vue
index 5a9e5b0..d1faa58 100644
--- a/src/views/invoicing/components/shopList.vue
+++ b/src/views/invoicing/components/shopList.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="选择商品" :visible.sync="dialogVisible" @open="resetHandle()" @close="reset" top="5vh">
+    <el-dialog title="选择商品" :visible.sync="dialogVisible" @close="reset" top="5vh">
         <el-form :model="searhForm" inline>
             <el-form-item>
                 <el-input v-model="searhForm.name" placeholder="商品名称" @input="onInput"></el-input>
@@ -192,9 +192,8 @@ export default {
             } else {
                 this.goods = []
             }
-            this.resetHandle()
             this.tbShopCategoryGet()
-            this.getTableData()
+            this.resetHandle()
         },
         close() {
             this.dialogVisible = false
diff --git a/src/views/invoicing/consumable/specifications.vue b/src/views/invoicing/consumable/specifications.vue
index 20bdd6c..1c266eb 100644
--- a/src/views/invoicing/consumable/specifications.vue
+++ b/src/views/invoicing/consumable/specifications.vue
@@ -56,7 +56,7 @@
         </el-col>
       </el-row>
     </div>
-    <div class="head-container">
+    <!-- <div class="head-container">
       <el-row>
         <el-col>
           <el-button
@@ -67,7 +67,7 @@
           >
         </el-col>
       </el-row>
-    </div>
+    </div> -->
     <div class="head-container" id="table_drag">
       <el-table
         ref="table"
diff --git a/src/views/invoicing/operation_in.vue b/src/views/invoicing/operation_in.vue
index ef538a1..a3572a9 100644
--- a/src/views/invoicing/operation_in.vue
+++ b/src/views/invoicing/operation_in.vue
@@ -275,7 +275,7 @@ export default {
                 remark: '',
                 time: dayjs().format('YYYY-MM-DD'),
                 totalAmount: 0,
-                type: 'purveyor',
+                type: 'out',
                 shopId: localStorage.getItem('shopId')
             },
             queryRules: {
@@ -503,7 +503,7 @@ export default {
                 item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true)
                 item.stockNumber = 0
                 item.costPrice = item.price
-                item.conInfold = item.id
+                item.conInfoId = item.id
                 return item
             })
             this.tableData.list = [...this.tableData.list, ...arr]
diff --git a/src/views/invoicing/operation_out.vue b/src/views/invoicing/operation_out.vue
index 9c5ab10..f10c465 100644
--- a/src/views/invoicing/operation_out.vue
+++ b/src/views/invoicing/operation_out.vue
@@ -466,7 +466,7 @@ export default {
                 item.number = formatDecimal(item.stockNumber - item.stockConsume, 2, true)
                 item.stockNumber = 0
                 item.costPrice = item.price
-                item.conInfold = item.id
+                item.conInfoId = item.id
                 return item
             })
             this.tableData.list = [...this.tableData.list, ...arr]

From b3ea406b6edc6973c224afec33470b7067249ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Tue, 15 Oct 2024 16:40:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?detail.createdAt=20|=20paidTime=20|=20timeF?=
 =?UTF-8?q?ilter=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order_manage/components/orderDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue
index 19c573c..2503e52 100644
--- a/src/views/order_manage/components/orderDetail.vue
+++ b/src/views/order_manage/components/orderDetail.vue
@@ -47,7 +47,7 @@
         <div class="item">
           <div class="t">支付时间</div>
           <div class="b">
-            {{ detail.createdAt | paidTime | timeFilter }}
+            {{ detail.createdAt | timeFilter }}
           </div>
         </div>
       </div>