shish 1 päivä sitten
vanhempi
commit
0fdd13b2ff
1 muutettua tiedostoa jossa 28 lisäystä ja 8 poistoa
  1. 28 8
      pt/src/saas/shop/shop.vue

+ 28 - 8
pt/src/saas/shop/shop.vue

@@ -57,7 +57,7 @@
                 :disabled="selectedShops.length === 0"
                 @click="batchEditShop"
               >
-                批量修改 ({{ selectedShops.length }})
+                批量修改信息 ({{ selectedShops.length }})
               </el-button>
             </template>
 
@@ -102,7 +102,7 @@
         <!-- 修改门店信息弹窗 -->
         <el-dialog :visible.sync="editShopPop" :close-on-click-modal="false" width="550px" title="修改门店信息">
           <el-form :model="editShopForm" :rules="editShopRule" ref="editShopRef" label-width="110px" class="demo-form">
-            <el-form-item label="商家/门店">
+            <el-form-item label="门店">
               <span style="font-weight: bold; color: #333;">{{ editShopForm.merchantName }} - {{ editShopForm.shopName }}</span>
             </el-form-item>
             <el-form-item label="商户号" prop="lklSjNo">
@@ -139,6 +139,10 @@
                 size="small"
                 style="width: 100%;"
               ></el-date-picker>
+              <div style="margin-top: 6px; display: flex; align-items: center; gap: 8px;">
+                <span style="font-size: 12px; color: #888;">快捷选择:</span>
+                <el-button size="mini" type="primary" plain @click="setQuickBeforeDeadline('edit')">此刻</el-button>
+              </div>
             </el-form-item>
             <el-form-item label="续费状态" prop="hasRenew">
               <el-radio-group v-model="editShopForm.hasRenew">
@@ -194,6 +198,10 @@
                 size="small"
                 style="width: 100%;"
               ></el-date-picker>
+              <div style="margin-top: 6px; display: flex; align-items: center; gap: 8px;">
+                <span style="font-size: 12px; color: #888;">快捷选择:</span>
+                <el-button size="mini" type="primary" plain @click="setQuickBeforeDeadline('batch')">此刻</el-button>
+              </div>
             </el-form-item>
             <el-form-item label="续费状态">
               <el-radio-group v-model="batchEditShopForm.hasRenew">
@@ -329,6 +337,18 @@ export default {
             this.batchEditShopForm.deadline = formatted;
           }
         },
+        /**
+         * 上次到期时间快捷选择 (此刻)
+         * @param {string} type 'edit' | 'batch'
+         */
+        setQuickBeforeDeadline(type) {
+          const nowFormatted = dayjs().format('YYYY-MM-DD HH:mm:ss');
+          if (type === 'edit') {
+            this.editShopForm.beforeDeadline = nowFormatted;
+          } else if (type === 'batch') {
+            this.batchEditShopForm.beforeDeadline = nowFormatted;
+          }
+        },
         resetEditShopForm() {
           if (this.$refs['editShopRef']) {
             this.$refs['editShopRef'].resetFields();
@@ -472,12 +492,6 @@ export default {
                             width: '100',
                             align: 'center'
                         },
-                        {
-                            prop: 'needRenew',
-                            label: '提醒',
-                            width: '90',
-                            align: 'center'
-                        },
                         {
                             prop: 'deadline',
                             label: '到期时间',
@@ -490,6 +504,12 @@ export default {
                             width: '120',
                             align: 'center'
                         },
+                        {
+                            prop: 'needRenew',
+                            label: '提醒',
+                            width: '90',
+                            align: 'center'
+                        },
                         {
                             prop: 'province',
                             label: '省',