From 32e24c6d5286ed8ef43035d69c4d11e6f25b6d8f Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 8 May 2026 17:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/operation_in/index.vue | 20 ++++++++++++--------
 src/views/product/index.vue                |  6 +++---
 src/views/product/indexconfig/addgoods.vue |  2 +-
 src/views/shop/list/pay_setting.vue        |  4 ++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/views/inventory/operation_in/index.vue b/src/views/inventory/operation_in/index.vue
index d939b9e..f8495a5 100644
--- a/src/views/inventory/operation_in/index.vue
+++ b/src/views/inventory/operation_in/index.vue
@@ -158,7 +158,7 @@
     <!-- 选择耗材 -->
     <ConsumableList ref="ConsumableList" @success="selectConsumable" />
     <el-dialog v-model="showResult" :show-close="false" :close-on-press-escape="false" :close-on-click-modal="false">
-      <el-result icon="success" title="入库提交成功" :subTitle="`共操作${tableData.list.length}件商品`">
+      <el-result icon="success" :title="`提交成功，3秒后自动关闭`" :subTitle="`共操作${tableData.list.length}件商品`">
         <template #extra>
           <template>
             <el-button type="primary" size="medium" @click="resetHandle">创建新的入库单</el-button>
@@ -173,7 +173,7 @@
 </template>
 
 <script>
-import { ElMessage, ElMessageBox } from "element-plus";
+import { ElMessage } from "element-plus";
 import consApi from "@/api/product/cons";
 import Decimal from "decimal.js";
 import vendorApi from "@/api/product/vendor";
@@ -402,13 +402,17 @@ export default {
             }
             this.queryFormLoading = false;
             // const title = this.type == "in" ? "入库" : "出库";
-            ElMessage({
-              // message: title + "提交成功",
-              message: "提交成功",
-              type: "success",
-            });
-            this.$router.push("/inventory/consumables");
+            // ElMessage({
+            //   // message: title + "提交成功",
+            //   message: "提交成功",
+            //   type: "success",
+            // });
             this.showResult = true;
+
+            setTimeout(() => {
+              this.$router.push("/inventory/consumables");
+            }, 3000);
+
             // this.$refs.shopList.reset()//清除选项
             // this.$refs.ConsumableList.reset()//清除选项
           } catch (error) {
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 4365068..11cb7d8 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -50,9 +50,9 @@
       </template>
 
       <template #tuikuantuihui="scope">
-        <el-switch v-if="!scope.row.productId" v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
-          @click="handleSwitchhaocai(scope.row)"></el-switch>
-        <!-- <el-text>{{ returnLabel(scope.row[scope.prop]) }}</el-text> -->
+        <!-- <el-switch v-if="!scope.row.productId" v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
+          @click="handleSwitchhaocai(scope.row)"></el-switch> -->
+        <el-text>{{ returnLabel(scope.row[scope.prop]) }}</el-text>
       </template>
       <template #sellOut="scope">
         <el-switch v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index a3092b1..75d77de 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -184,7 +184,7 @@
             <el-form-item label="重量" v-if="ruleForm.type == 'weight'">
               <el-col :span="12">
                 <div style="display: block">
-                  <el-input v-model="ruleForm.weight" placeholder="纯文本描述"></el-input>
+                  <el-input v-model="ruleForm.weight" placeholder="可输入每份重量向顾客展示，如：500克/份"></el-input>
                   <!-- <div style="color: #999;">用于快递或配送运费计重</div> -->
                 </div>
               </el-col>
diff --git a/src/views/shop/list/pay_setting.vue b/src/views/shop/list/pay_setting.vue
index c454ec5..2e466df 100644
--- a/src/views/shop/list/pay_setting.vue
+++ b/src/views/shop/list/pay_setting.vue
@@ -20,9 +20,9 @@
     </div>
     <div class="gyq_content row mt14">
       <tabHeader v-model="tabActiveIndex" :list="tabList" />
-      <payStatusCard name="payStatusCard" key="payStatusCard" ref="payStatusCardRef" v-if="tabActiveIndex == 0" />
+      <!-- <payStatusCard name="payStatusCard" key="payStatusCard" ref="payStatusCardRef" v-if="tabActiveIndex == 0" /> -->
       <detailModal name="detailModal" key="detailModal" ref="detailModalRef" v-model="detail"
-        v-if="tabActiveIndex == 1" />
+        v-if="tabActiveIndex == 0" />
     </div>
   </div>
 </template>