自适应调整

src/views/basics/merchant/ptAccount/DetailForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="p-2">
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="600px" :draggable="draggable">
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="30%" :draggable="draggable">
       <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
         <el-form-item label="账户名称" prop="accountName">
           <el-input v-model="formData.accountName" placeholder="请输入结算账户名称" />

src/views/basics/merchant/ptOperator/DetailForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="p-2">
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="700px" :draggable="draggable">
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="30%" :draggable="draggable">
       <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="120px">
         <el-form-item label="所属结算账户" prop="accountId">
           <el-select v-model="formData.accountId" filterable placeholder="请选择所属结算账户">

src/views/basics/room/ptRoom/DetailForm.vue

@@ -1,43 +1,68 @@
 <template>
   <div class="p-2">
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="600px" :draggable="draggable">
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="50%" :draggable="draggable">
       <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
-        <el-form-item v-show="false" label="所属区域id" prop="areaId">
-          <el-input v-model="formData.areaId" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="所属区域" prop="areaName">
-          <el-input v-model="formData.areaName" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="房间编码" prop="roomCode">
-          <el-input v-model="formData.roomCode" placeholder="请输入房间编码" />
-        </el-form-item>
-        <el-form-item label="房间名称" prop="roomName">
-          <el-input v-model="formData.roomName" placeholder="请输入房间名称" />
-        </el-form-item>
-        <el-form-item label="房间类型" prop="roomType">
-          <el-select v-model="formData.roomType" placeholder="请选择房间类型">
-            <el-option v-for="dict in FJLX" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="门牌号1" prop="codeOne">
-          <el-input v-model="formData.codeOne" placeholder="请输入门牌号1" />
-        </el-form-item>
-        <el-form-item label="门牌号2" prop="codeTwo">
-          <el-input v-model="formData.codeTwo" placeholder="请输入门牌号2" />
-        </el-form-item>
-        <el-form-item label="门牌号3" prop="codeThree">
-          <el-input v-model="formData.codeThree" placeholder="请输入门牌号3" />
-        </el-form-item>
-        <el-form-item label="门牌号4" prop="codeFour">
-          <el-input v-model="formData.codeFour" placeholder="请输入门牌号4" />
-        </el-form-item>
-        <el-form-item label="门牌号5" prop="codeFive">
-          <el-input v-model="formData.codeFive" placeholder="请输入门牌号5" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="formData.remark" placeholder="请输入备注" />
-        </el-form-item>
+        <el-row>
+          <!-- <el-col :span="12">
+            <el-form-item v-show="false" label="所属区域id" prop="areaId">
+              <el-input v-model="formData.areaId" :disabled="true" />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="所属区域" prop="areaName">
+              <el-input v-model="formData.areaName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="房间编码" prop="roomCode">
+              <el-input v-model="formData.roomCode" placeholder="请输入房间编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="房间名称" prop="roomName">
+              <el-input v-model="formData.roomName" placeholder="请输入房间名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="房间类型" prop="roomType">
+              <el-select v-model="formData.roomType" placeholder="请选择房间类型">
+                <el-option v-for="dict in FJLX" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="门牌号1" prop="codeOne">
+              <el-input v-model="formData.codeOne" placeholder="请输入门牌号1" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="门牌号2" prop="codeTwo">
+              <el-input v-model="formData.codeTwo" placeholder="请输入门牌号2" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="门牌号3" prop="codeThree">
+              <el-input v-model="formData.codeThree" placeholder="请输入门牌号3" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="门牌号4" prop="codeFour">
+              <el-input v-model="formData.codeFour" placeholder="请输入门牌号4" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="门牌号5" prop="codeFive">
+              <el-input v-model="formData.codeFive" placeholder="请输入门牌号5" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
+
       <template #footer>
         <div class="dialog-footer">
           <el-button :loading="formLoading" type="primary" @click="submitForm">确 定</el-button>

src/views/basics/room/ptRoom/index.vue

@@ -130,7 +130,7 @@
     <detail-form ref="detailFormRef" apped-to-body @success="getList" />
 
     <!-- 用户导入对话框 -->
-    <el-dialog v-model="upload.open" :title="upload.title" width="400px" append-to-body>
+    <el-dialog v-model="upload.open" :title="upload.title" width="30%" append-to-body>
       <el-upload
         ref="uploadRef"
         :limit="1"

src/views/consumption/xfDiscount/DetailForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="p-2">
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="600px" :draggable="draggable">
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="35%" :draggable="draggable">
       <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
         <el-form-item label="卡类" prop="cardType">
           <el-select v-model="formData.cardType" placeholder="请选择卡类" clearable style="width: 100%">
@@ -19,20 +19,36 @@
           <el-checkbox v-model="formData.rateType" true-value="1" false-value="0" label="启用" border />
         </el-form-item>
         <el-form-item label="折扣率1" prop="oneRate">
-          <el-input v-model="formData.oneRate" type="number" placeholder="请输入折扣率1" style="width: 40%" />
-          <span class="text-red-400">% （各种费率如填入0则表示不限制）</span>
+          <el-input v-model="formData.oneRate" type="number" placeholder="请输入折扣率1" style="width: 40%">
+            <template #suffix>
+              <span>%</span>
+            </template>
+          </el-input>
+          <span class="text-red-400"> （各种费率如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="折扣率2" prop="twoRate">
-          <el-input v-model="formData.twoRate" type="number" placeholder="请输入折扣率2" style="width: 40%" />
-          <span class="text-red-400">% （各种费率如填入0则表示不限制）</span>
+          <el-input v-model="formData.twoRate" type="number" placeholder="请输入折扣率2" style="width: 40%" >
+            <template #suffix>
+              <span>%</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种费率如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="折扣率3" prop="threeRate">
-          <el-input v-model="formData.threeRate" ttype="number" placeholder="请输入折扣率3" style="width: 40%" />
-          <span class="text-red-400">% （各种费率如填入0则表示不限制）</span>
+          <el-input v-model="formData.threeRate" ttype="number" placeholder="请输入折扣率3" style="width: 40%" >
+            <template #suffix>
+              <span>%</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种费率如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="折扣率4" prop="fourRate">
-          <el-input v-model="formData.fourRate" type="number" placeholder="请输入折扣率4" style="width: 40%" />
-          <span class="text-red-400">% （各种费率如填入0则表示不限制）</span>
+          <el-input v-model="formData.fourRate" type="number" placeholder="请输入折扣率4" style="width: 40%" >
+            <template #suffix>
+              <span>%</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种费率如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" placeholder="请输入备注" />

src/views/consumption/xfLimited/DetailForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="p-2">
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="600px" :draggable="draggable">
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="35%" :draggable="draggable">
       <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
         <el-form-item label="卡类" prop="cardType">
           <el-select v-model="formData.cardType" placeholder="请选择卡类" clearable style="width: 40%">
@@ -11,25 +11,44 @@
           <el-checkbox v-model="formData.status" true-value="1" false-value="0" label="启用限次消费" border />
         </el-form-item>
         <el-form-item label="每日次数" prop="dailyCount">
-          <el-input v-model="formData.dailyCount" type="number" placeholder="请输入每日次数" style="width: 40%" />
-          <span class="text-red-400">次</span>
+          <el-input v-model="formData.dailyCount" type="number" placeholder="请输入每日次数" style="width: 40%">
+            <template #suffix>
+              <span>次</span>
+            </template>
+          </el-input>
           <span class="text-red-400 text-xs">（ 如同时启用日限次和餐限次功能；消费时判断顺序是先判断日限次再判断餐限次）</span>
         </el-form-item>
         <el-form-item label="早餐次数" prop="oneCount">
-          <el-input v-model="formData.oneCount" type="number" placeholder="请输入早餐次数" style="width: 40%" />
-          <span class="text-red-400">次 （各种限制次数如填入0则表示不限制）</span>
+          <el-input v-model="formData.oneCount" type="number" placeholder="请输入早餐次数" style="width: 40%">
+            <template #suffix>
+              <span>次</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种限制次数如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="午餐次数" prop="twoCount">
-          <el-input v-model="formData.twoCount" type="number" placeholder="请输入午餐次数" style="width: 40%" />
-          <span class="text-red-400">次 （各种限制次数如填入0则表示不限制）</span>
+          <el-input v-model="formData.twoCount" type="number" placeholder="请输入午餐次数" style="width: 40%">
+            <template #suffix>
+              <span>次</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种限制次数如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="晚餐次数" prop="threeCount">
-          <el-input v-model="formData.threeCount" type="number" placeholder="请输入晚餐次数" style="width: 40%" />
-          <span class="text-red-400">次 （各种限制次数如填入0则表示不限制）</span>
+          <el-input v-model="formData.threeCount" type="number" placeholder="请输入晚餐次数" style="width: 40%">
+            <template #suffix>
+              <span>次</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种限制次数如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="宵夜次数" prop="fourCount">
-          <el-input v-model="formData.fourCount" type="number" placeholder="请输入宵夜次数" style="width: 40%" />
-          <span class="text-red-400">次 （各种限制次数如填入0则表示不限制）</span>
+          <el-input v-model="formData.fourCount" type="number" placeholder="请输入宵夜次数" style="width: 40%">
+            <template #suffix>
+              <span>次</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种限制次数如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" placeholder="请输入备注" />

src/views/consumption/xfQuota/DetailForm.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="p-2">
-    <el-dialog v-model="dialog.visible" :title="dialog.title" width="650px" :draggable="draggable">
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="35%" :draggable="draggable">
       <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
         <el-form-item label="卡类" prop="cardType">
           <el-select v-model="formData.cardType" placeholder="请选择卡类" clearable style="width: 40%">
@@ -11,25 +11,44 @@
           <el-checkbox v-model="formData.status" true-value="1" false-value="0" label="启用限额消费" border />
         </el-form-item>
         <el-form-item label="每日金额" prop="dailyMoney">
-          <el-input v-model="formData.dailyMoney" type="number" placeholder="请输入每日金额" style="width: 40%" />
-          <span class="text-red-400">元</span>
+          <el-input v-model="formData.dailyMoney" type="number" placeholder="请输入每日金额" style="width: 40%">
+            <template #suffix>
+              <span>元</span>
+            </template>
+          </el-input>
           <span class="text-red-400 text-xs">（ 如同时启用日限额和餐限额功能；消费时的判断顺序是先判断日限额再判断餐限额）</span>
         </el-form-item>
         <el-form-item label="早餐金额" prop="oneMoney">
-          <el-input v-model="formData.oneMoney" type="number" placeholder="请输入早餐金额" style="width: 40%" />
-          <span class="text-red-400">元 （各种限制额度如填入0则表示不限制）</span>
+          <el-input v-model="formData.oneMoney" type="number" placeholder="请输入早餐金额" style="width: 40%">
+            <template #suffix>
+              <span>元</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种限制额度如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="午餐金额" prop="twoMoney">
-          <el-input v-model="formData.twoMoney" type="number" placeholder="请输入午餐金额" style="width: 40%" />
-          <span class="text-red-400">元 （各种限制额度如填入0则表示不限制）</span>
+          <el-input v-model="formData.twoMoney" type="number" placeholder="请输入午餐金额" style="width: 40%">
+            <template #suffix>
+              <span>元</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种限制额度如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="晚餐金额" prop="threeMoney">
-          <el-input v-model="formData.threeMoney" type="number" placeholder="请输入晚餐金额" style="width: 40%" />
-          <span class="text-red-400">元 （各种限制额度如填入0则表示不限制）</span>
+          <el-input v-model="formData.threeMoney" type="number" placeholder="请输入晚餐金额" style="width: 40%">
+            <template #suffix>
+              <span>元</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种限制额度如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="宵夜金额" prop="fourMoney">
-          <el-input v-model="formData.fourMoney" type="number" placeholder="请输入宵夜金额" style="width: 40%" />
-          <span class="text-red-400">元 （各种限制额度如填入0则表示不限制）</span>
+          <el-input v-model="formData.fourMoney" type="number" placeholder="请输入宵夜金额" style="width: 40%">
+            <template #suffix>
+              <span>元</span>
+            </template>
+          </el-input>
+          <span class="text-red-400">（各种限制额度如填入0则表示不限制）</span>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" placeholder="请输入备注" />

src/views/consumption/xfTerm/index.vue

@@ -66,12 +66,10 @@
                     <el-icon class="el-icon--right"><arrow-down /></el-icon
                   ></el-button>
                   <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item v-hasPermi="['consumption:xfTerm:export']" icon="Download" @click="handleExportTemplate"
-                        >下载模板</el-dropdown-item
-                      >
-                      <el-dropdown-item v-hasPermi="['consumption:xfTerm:import']" icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>
-                      <el-dropdown-item v-hasPermi="['consumption:xfTerm:export']" icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>
+                    <el-dropdown-menu v-hasPermi="['consumption:xfTerm:export']">
+                      <el-dropdown-item icon="Download" @click="handleExportTemplate">下载模板</el-dropdown-item>
+                      <el-dropdown-item icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>
+                      <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>
                     </el-dropdown-menu>
                   </template>
                 </el-dropdown>
@@ -80,7 +78,14 @@
             </el-row>
           </template>
 
-          <el-table v-loading="loading" :data="xfTermList" max-height="calc(100vh - 25.6rem)" flexible table-layout="auto" @selection-change="handleSelectionChange">
+          <el-table
+            v-loading="loading"
+            :data="xfTermList"
+            max-height="calc(100vh - 25.6rem)"
+            flexible
+            table-layout="auto"
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column v-if="columns[0].visible" label="设备机号" align="center" prop="termNo" width="90" />
             <el-table-column v-if="columns[1].visible" label="设备名称" align="left" header-align="center" prop="termName" show-overflow-tooltip />