skyline 1 день тому
батько
коміт
81f112804e

+ 12 - 0
admin-mp/src/pages/station/detail.vue

@@ -67,6 +67,18 @@
       <view class="info-card">
         <text class="card-title">运营信息</text>
         <view class="info-list">
+          <view class="info-item">
+            <text class="item-label">运营主体</text>
+            <text class="item-value">{{ detail.operationEntity || '-' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="item-label">统一社会信用代码</text>
+            <text class="item-value">{{ detail.creditCode || '-' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="item-label">场站联系人</text>
+            <text class="item-value">{{ detail.contactPerson || '-' }}</text>
+          </view>
           <view class="info-item">
             <text class="item-label">营业时间</text>
             <text class="item-value">{{ detail.businessHours || '-' }}</text>

+ 1 - 1
admin-web/src/views/admin/finance/wallet-flow.vue

@@ -204,8 +204,8 @@ const state = reactive({
       {label: '交易后余额', prop: 'afterBalance', width: 120, resizable: true},
       {label: '交易前赠款', prop: 'beforeGrantsBalance', width: 120, resizable: true},
       {label: '交易后赠款', prop: 'afterGrantsBalance', width: 120, resizable: true},
-      {label: '状态', prop: 'status', width: 100, resizable: true},
       {label: '交易时间', prop: 'transactionTime', width: 170, resizable: true, fixed: 'right'},
+      {label: '状态', prop: 'status', width: 100, resizable: true},
       {label: '备注', prop: 'remark', minWidth: 150, resizable: true},
     ],
   },

+ 24 - 0
admin-web/src/views/admin/station/list/dialog.vue

@@ -67,6 +67,30 @@
 
             </el-form-item>
 
+            <el-form-item label="运营主体:" prop="operationEntity" class="wd350">
+              <el-input
+                  v-model="state.ruleForm.operationEntity"
+                  placeholder="运营主体"
+                  clearable
+                  class="wd100">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="统一社会信用代码:" prop="creditCode" class="wd350">
+              <el-input
+                  v-model="state.ruleForm.creditCode"
+                  placeholder="统一社会信用代码"
+                  clearable
+                  class="wd100">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="场站联系人:" prop="contactPerson" class="wd350">
+              <el-input
+                  v-model="state.ruleForm.contactPerson"
+                  placeholder="场站联系人"
+                  clearable
+                  class="wd100">
+              </el-input>
+            </el-form-item>
             <el-form-item label="地址:" prop="address" class="w100">
               <el-input
                   v-model="state.ruleForm.address"

+ 3 - 0
admin-web/src/views/admin/station/list/index.vue

@@ -160,6 +160,9 @@ const state = reactive({
     {label: '站点照片', prop: 'pictures', query: false, type: 'text', resizable: true},
     {label: '站点状态', prop: 'stationStatus', query: true, type: 'dict', conf:{dict:'WashStation.status'},resizable: true},
     {label: '站点类型', prop: 'stationType', query: true, type: 'dict',conf:{dict:'WashStation.type'}, resizable: true},
+    {label: '运营主体', prop: 'operationEntity', query: true, type: 'text', resizable: true},
+    {label: '信用代码', prop: 'creditCode', query: true, type: 'text', resizable: true},
+    {label: '场站联系人', prop: 'contactPerson', query: true, type: 'text', 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},

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

@@ -101,4 +101,19 @@ public class WashStation extends BaseEntity {
      * 备注
      */
     private String remark;
+
+    /**
+     * 运营主体
+     */
+    private String operationEntity;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String creditCode;
+
+    /**
+     * 场站联系人
+     */
+    private String contactPerson;
 }

+ 15 - 0
car-wash-entity/src/main/java/com/kym/entity/vo/WashStationVo.java

@@ -85,4 +85,19 @@ public class WashStationVo extends BaseEntity {
      * 备注
      */
     private String remark;
+
+    /**
+     * 运营主体
+     */
+    private String operationEntity;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String creditCode;
+
+    /**
+     * 场站联系人
+     */
+    private String contactPerson;
 }