fixbug

admin-ui/.env.development

@@ -5,8 +5,8 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
-VUE_APP_BASE_API_HOST = 'http://192.168.5.176:9801'
-VUE_APP_BASE_API = 'http://192.168.5.176:9801'
+VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
+VUE_APP_BASE_API = 'http://127.0.0.1:9801'
 #VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
 #VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'

admin-ui/src/views/activity/clothInfo/index.vue

@@ -52,7 +52,7 @@
         </Page>
 
         <!-- 添加或修改活动明细对话框 -->
-        <el-dialog :title="title" :visible.sync="open" size="50%" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" size="50%" append-to-body :close-on-click-modal="false">
             <el-row :gutter="15">
                 <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                     <el-col :span="24">

admin-ui/src/views/activity/clothItem/index.vue

@@ -44,7 +44,7 @@
         </Page>
 
         <!-- 添加或修改指定衣服折扣活动明细对话框 -->
-        <el-dialog :title="title" :visible.sync="open" size="30%" width="50%" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" size="30%" width="50%" append-to-body :close-on-click-modal="false">
             <el-row :gutter="15">
                 <el-form ref="form" :model="form" :rules="rules" label-width="150px">
                     <el-col :span="24">

admin-ui/src/views/activity/couponInfo/index.vue

@@ -86,7 +86,7 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" >
             <template slot-scope="scope">
               <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" >修改</el-button>
-              <el-button type="text" icon="el-icon-s-shop"  @click="handleSetRechargeItems(scope.row)" >设置优惠券</el-button>
+              <el-button type="text" icon="el-icon-s-shop"  @click="handleSetCouponItems(scope.row)" >设置优惠券</el-button>
               <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" >删除</el-button>
             </template>
           </el-table-column>
@@ -94,7 +94,7 @@
         </el-card>
 
         <!-- 编辑弹窗 -->
-        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class="activity-dialog">
+        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class="activity-dialog" :close-on-click-modal="false">
             <el-form ref="form" :model="form" :rules="rules" label-width="100px" size="small">
                 <el-tabs v-model="activeTab">
                     <el-tab-pane label="基本信息" name="basic">

admin-ui/src/views/activity/discountInfo/index.vue

@@ -83,7 +83,7 @@
         </el-card>
 
         <!-- 编辑弹窗 -->
-        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class="activity-dialog">
+        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class="activity-dialog" :close-on-click-modal="false">
             <el-form ref="form" :model="form" :rules="rules" label-width="100px" size="small">
                 <el-tabs v-model="activeTab">
                     <el-tab-pane label="基本信息" name="basic">

admin-ui/src/views/activity/rechargeInfo/index.vue

@@ -71,7 +71,7 @@
         </el-card>
 
         <!-- 编辑弹窗 -->
-        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class="activity-dialog">
+        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body class="activity-dialog" :close-on-click-modal="false">
             <el-form ref="form" :model="form" :rules="rules" label-width="100px" size="small">
                 <el-tabs v-model="activeTab">
                     <el-tab-pane label="基本信息" name="basic">

admin-ui/src/views/app/user/index.vue

@@ -111,7 +111,7 @@
         </Page>
 
         <!-- 会员详情弹窗 -->
-        <el-dialog title="会员详情" :visible.sync="userViewType" width="80%" class="user-detail-dialog" :before-close="usercheckClose" append-to-body>
+        <el-dialog title="会员详情" :visible.sync="userViewType" width="80%" class="user-detail-dialog" :close-on-click-modal="false" append-to-body>
             <div class="user-detail">
                 <!-- 基本信息卡片 -->
                 <el-card class="detail-card" shadow="never">
@@ -128,7 +128,7 @@
                             <el-descriptions-item label="姓名" contentStyle="width: 110px">
                                 <span class="primary-text">{{ userInfo.realName }}</span>
                             </el-descriptions-item>
-                            <el-descriptions-item label="手机号" contentStyle="width: 110px"> 
+                            <el-descriptions-item label="手机号" contentStyle="width: 110px">
                                 {{ userInfo.phoneNumber }}
                             </el-descriptions-item>
                             <el-descriptions-item label="性别" contentStyle="width: 110px">
@@ -336,7 +336,7 @@
             </div>
         </el-dialog>
         <!-- 编辑用户信息 -->
-        <el-dialog :title="title" :visible.sync="open" width="60%" :before-close="closeDialog" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" append-to-body>
             <EditUser :dataSource="form" :isDisabled="isDisabled" @onSubmit="handleSubmit" />
         </el-dialog>
     </div>
@@ -505,7 +505,7 @@ export default {
                 // } else {
                 //     this.isDisabled = true
                 // }
-               
+
                 this.title = '修改用户'
             })
         },

admin-ui/src/views/cloth/clothItem/index.vue

@@ -94,7 +94,7 @@
         </el-card>
 
         <!-- 添加或修改衣服对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body custom-class="cloth-dialog">
+        <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body custom-class="cloth-dialog" :close-on-click-modal="false" :before-close="checkClose">
             <el-form ref="form" :model="form" :rules="rules" label-width="100px">
                 <el-tabs v-model="activeTab">
                     <el-tab-pane label="基本信息" name="basic">

admin-ui/src/views/coupon/type/index.vue

@@ -113,7 +113,7 @@
         </el-card>
 
         <!-- 添加或修改优惠券类型对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body :close-on-click-modal="false">
             <el-tabs v-model="activeTab">
                 <!-- 基本信息 Tab -->
                 <el-tab-pane label="基本信息" name="basic">
@@ -174,26 +174,26 @@
                                     <template v-if="form.discountWay == 1">
                                         <el-col :span="12">
                                             <el-form-item label="满减件数" prop="minAmount">
-                                                <el-input-number v-model="form.minAmount" placeholder="请输入满减件数" :min="form.deductAmount" :max="999999" style="width: 100%" />
+                                                <el-input-number v-model="form.minAmount" placeholder="请输入满减件数" :min="0" :max="999999" style="width: 100%" />
                                             </el-form-item>
                                         </el-col>
                                         <el-col :span="12">
                                             <el-form-item label="抵扣件数" prop="deductAmount">
-                                                <el-input-number v-model="form.deductAmount" placeholder="请输入抵扣件数" :min="0" :max="form.minAmount" style="width: 100%" />
+                                                <el-input-number v-model="form.deductAmount" placeholder="请输入抵扣件数" :min="0" :max="99" style="width: 100%" />
                                             </el-form-item>
                                         </el-col>
                                     </template>
                                     <template v-if="form.discountWay == 2">
                                         <el-col :span="12">
                                             <el-form-item label="折扣率" prop="discountRate">
-                                                <el-input-number v-model="form.discountRate" placeholder="请输入折扣率" :step="1" :min="1" :max="99" style="width: 100%">
+                                                <el-input-number v-model="form.discountRate" placeholder="请输入折扣率" :step="1" :min="1" :max="99" >
                                                     <template slot="append">%</template>
                                                 </el-input-number>
                                             </el-form-item>
                                         </el-col>
                                         <el-col :span="12">
                                             <el-form-item label="最大折扣金额" prop="deductAmount">
-                                                <el-input-number v-model="form.deductAmount" placeholder="请输入最大折扣金额" :step="0.01" :min="0" style="width: 100%" />
+                                                <el-input-number v-model="form.deductAmount" placeholder="请输入最大折扣金额" :step="1" :min="1" :max="999" />
                                             </el-form-item>
                                         </el-col>
                                     </template>
@@ -354,7 +354,11 @@ export default {
         this.getList()
     },
     methods: {
+      handleChange(val) {
+        console.log('Current value:', val, 'Type:', typeof val);
+      },
         formatAmount(amount) {
+          if (!amount) return '0'
             return parseFloat(amount).toFixed(2)
         },
         getThirdPartyList() {
@@ -362,11 +366,6 @@ export default {
                 this.thirdPartyList = response.rows
             })
         },
-      formatAmount(amount) {
-        if (!amount) return '0'
-        const value = amount.toString().replace('-', '')
-        return value
-      },
         /** 查询优惠券类型列表 */
         getList() {
             this.loading = true
@@ -432,7 +431,7 @@ export default {
         changeDiscountWay() {
             this.form.minAmount = 1
             if (this.form.discountWay == 2) {
-                this.form.deductAmount = 0.01
+                this.form.deductAmount = 1
             } else {
                 this.form.deductAmount = 0
             }

admin-ui/src/views/goods/commonGoods/index.vue

@@ -120,7 +120,7 @@
     </Page>
     <!-- 分页 -->
     <!-- 添加或修改商品管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false"  :before-close="checkClose">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-tabs v-model="activeTab">
           <!-- 基本信息 tab -->

admin-ui/src/views/system/factory/index.vue

@@ -88,7 +88,7 @@
             </Page>
         </el-card>
 
-        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body @opened="onDialogOpened" destroy-on-close :close-on-click-modal="false">
+        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body @opened="onDialogOpened" destroy-on-close :before-close="checkClose" :close-on-click-modal="false">
             <Add_factory ref="AddFactory" @closeDialog="closeDialog" />
         </el-dialog>
     </div>

admin-ui/src/views/system/store/index.vue

@@ -113,7 +113,7 @@
         </Page>
 
         <!-- 新增/编辑弹窗 -->
-        <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body @opened="onDialogOpened" destroy-on-close class="store-dialog">
+        <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body @opened="onDialogOpened"   :before-close="checkClose" :close-on-click-modal="false" destroy-on-close class="store-dialog">
             <Add_store ref="AddStore" @closeDialog="closeDialog" />
         </el-dialog>
     </div>

admin-ui/src/views/system/user/index.vue

@@ -130,7 +130,7 @@
         </el-row>
 
         <!-- 添加或修改用户配置对话框 -->
-        <el-dialog :title="title" :visible.sync="open" size="70%" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" size="70%" append-to-body :before-close="checkClose" :close-on-click-modal="false">
             <el-form ref="form" :model="form" :rules="rules" label-width="120px">
                 <el-row>
                     <el-col :span="24">
@@ -331,11 +331,12 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { listFactory } from '@/api/system/factory'
 import { listStore } from '@/api/system/store'
+import Add_store from '@/views/system/store/add_store.vue'
 
 export default {
     name: 'User',
     dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_marital_status', 'sys_cert_type', 'sys_contract_nature', 'sys_education_type'],
-    components: { Treeselect },
+    components: { Add_store, Treeselect },
     data() {
         return {
             sourceType: '00',