站点列表修改：新增停车减免二维码显示

admin-web/src/views/admin/station/list/dialog.vue

@@ -21,7 +21,7 @@
           label-width="100px"
           class="mt5">
         <div class="sub-group-bottom">基本信息</div>
-        <el-form-item label="站点ID" prop="stationId" class="wd350">
+        <el-form-item label="站点ID：" prop="stationId" class="wd350">
           <el-input
               v-model="state.ruleForm.stationId"
               placeholder="站点id"
@@ -29,7 +29,7 @@
               class="wd100">
           </el-input>
         </el-form-item>
-        <el-form-item label="工位数量" prop="parkingNum">
+        <el-form-item label="工位数量：" prop="parkingNum">
           <el-input
               v-model="state.ruleForm.parkingNum"
               placeholder="工位数量"
@@ -37,7 +37,7 @@
               class="wd100">
           </el-input>
         </el-form-item>
-        <el-form-item label="站点名称" prop="stationName" >
+        <el-form-item label="站点名称：" prop="stationName" >
           <el-input
               v-model="state.ruleForm.stationName"
               placeholder="站点名称"
@@ -45,7 +45,7 @@
               class="wd200">
           </el-input>
         </el-form-item>
-        <el-form-item label="站点照片" prop="pictures">
+        <el-form-item label="站点照片：" prop="pictures">
           <ext-upload v-model="state.ruleForm.pictures" multiple max="6"></ext-upload>
 <!--          <el-input
               v-model="state.ruleForm.pictures"
@@ -56,16 +56,16 @@
         </el-form-item>
 
         <el-form-item class="w100"></el-form-item>
-        <el-form-item label="站点状态" prop="stationStatus">
+        <el-form-item label="站点状态：" prop="stationStatus">
           <ext-d-select type="WashStation.status" class="wd200" v-model="state.ruleForm.stationStatus"></ext-d-select>
         </el-form-item>
 
-        <el-form-item label="站点类型" prop="stationType">
+        <el-form-item label="站点类型：" prop="stationType">
           <ext-d-select type="WashStation.type" class="wd200" v-model="state.ruleForm.stationType"></ext-d-select>
 
         </el-form-item>
 
-        <el-form-item label="地址" prop="address" class="w100">
+        <el-form-item label="地址：" prop="address" class="w100">
           <el-input
               v-model="state.ruleForm.address"
               placeholder="地址"
@@ -75,7 +75,7 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="经度坐标" prop="location">
+        <el-form-item label="经度坐标：" prop="location">
           <el-input
               v-model="state.location.stationLng"
               placeholder="经度坐标"
@@ -84,7 +84,7 @@
               class="wd200">
           </el-input>
         </el-form-item>
-        <el-form-item label="纬度坐标" prop="location">
+        <el-form-item label="纬度坐标：" prop="location">
           <el-input
               v-model="state.location.stationLat"
               placeholder="纬度坐标"
@@ -93,7 +93,7 @@
               class="wd200">
           </el-input>
         </el-form-item>
-        <el-form-item label="服务电话" prop="serviceTel">
+        <el-form-item label="服务电话：" prop="serviceTel">
           <el-input
               v-model="state.ruleForm.serviceTel"
               placeholder="服务电话"
@@ -101,7 +101,7 @@
               class="wd350">
           </el-input>
         </el-form-item>
-        <el-form-item label="站点电话" prop="stationTel">
+        <el-form-item label="站点电话：" prop="stationTel">
           <el-input
               v-model="state.ruleForm.stationTel"
               placeholder="站点电话"
@@ -111,7 +111,7 @@
         </el-form-item>
 
 
-        <el-form-item label="营业时间描述" prop="businessHours"  class="w100">
+        <el-form-item label="营业时间描述：" prop="businessHours"  class="w100">
           <el-input
               v-model="state.ruleForm.businessHours"
               placeholder="营业时间描述"
@@ -121,7 +121,7 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="停车费描述" prop="parkingFee" class="w100">
+        <el-form-item label="停车费描述：" prop="parkingFee" class="w100">
           <el-input
               v-model="state.ruleForm.parkingFee"
               type="textarea"
@@ -131,8 +131,18 @@
           </el-input>
         </el-form-item>
 
+        <el-form-item label="停车费减免二维码文本：" prop="parkingQrCode" class="w100">
+          <el-input
+              v-model="state.ruleForm.parkingQrCode"
+              type="textarea"
+              placeholder="停车费减免二维码文本"
+              clearable
+              class="w100">
+          </el-input>
+        </el-form-item>
+
 
-        <el-form-item label="备注" prop="remark" class="w100">
+        <el-form-item label="备注：" prop="remark" class="w100">
           <el-input
               v-model="state.ruleForm.remark"
               placeholder="备注"
@@ -257,4 +267,4 @@ defineExpose({
 });
 
 
-</script>
+</script>

admin-web/src/views/admin/station/list/index.vue

@@ -160,8 +160,10 @@ const state = reactive({
     {label: '站点类型', prop: 'stationType', query: true, type: 'dict',conf:{dict:'WashStation.type'}, resizable: true},
     {label: '地址', prop: 'address', query: true, type: 'text', resizable: true},
     {label: '服务电话', prop: 'serviceTel', query: true, type: 'text', resizable: true},
-    {label: '营业时间描述', prop: 'businessHours', query: false, type: 'text', resizable: true},
+    {label: '营业时间', prop: 'businessHours', query: false, type: 'text', resizable: true},
     {label: '工位数量', prop: 'parkingNum', query: false, type: '', resizable: true},
+    {label: '停车费用', prop: 'parkingFee', query: false, type: '', resizable: true},
+    {label: '停车减免二维码', prop: 'parkingQrCode', query: false, type: '', resizable: true},
     {label: '创建时间 ', prop: 'createTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
     {label: '更新时间', prop: 'updateTime', query: false, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
     {
@@ -233,4 +235,4 @@ const handleRowDelete = (row: any) => {
 // defineExpose({
 //     loadData,
 // });
-</script>
+</script>

car-wash-entity/src/main/java/com/kym/entity/WashStation.java

@@ -66,6 +66,11 @@ public class WashStation extends BaseEntity {
      */
     private String parkingFee;
 
+    /**
+     * 停车优惠二维码
+     */
+    private String parkingQrCode;
+
     /**
      * 站点坐标
      */