XF--LRQYEJOKYDS\Administrator 4 anni fa
parent
commit
9c6acc042e

+ 1 - 1
Yijia-SaaS/yijia-ui/src/views/station/info/index.vue

@@ -141,7 +141,7 @@
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column v-if="getHiddenColumns" label="自增主键id" align="center"  prop="stationId" />
+      <el-table-column v-if="false" label="自增主键id" align="center"  prop="stationId" />
       <el-table-column label="油站名称" align="center" prop="stationName" />
       <el-table-column label="油站地址" align="center" prop="stationAddress" />
       <el-table-column label="油枪数量" align="center" prop="oilGunNum" />

+ 1 - 1
Yijia-SaaS/yijia-ui/src/views/station/manage/index.vue

@@ -135,7 +135,7 @@
 
     <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键自增id" v-if="getHiddenColumns" align="center" prop="deviceId" />
+      <el-table-column label="主键自增id" v-if="false" align="center" prop="deviceId" />
       <el-table-column label="设备编号" align="center" prop="deviceNo" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备名称" align="center" prop="stationId" />

+ 3 - 3
Yijia-SaaS/yijia-ui/src/views/station/order/index.vue

@@ -187,10 +187,10 @@
       <el-table-column label="订单号" align="center" prop="orderNo" />
       <el-table-column label="加油枪号" align="center" prop="oilGun" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
-      <el-table-column v-if="getHiddenColumns" label="用户id(消费者)" align="center" prop="consumerId" />
+      <el-table-column v-if="false" label="用户id(消费者)" align="center" prop="consumerId" />
       <el-table-column label="消费者" align="center" prop="consumer" />
       <el-table-column label="金额" align="center" prop="amt" />
-      <el-table-column v-if="getHiddenColumns" label="油站id" align="center" prop="stationId" />
+      <el-table-column v-if="false" label="油站id" align="center" prop="stationId" />
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="加油升数" align="center" prop="orderLiters" />
       <el-table-column label="支付类型" align="center" prop="payType" />
@@ -206,7 +206,7 @@
           <span>{{ parseTime(scope.row.createdDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="订单类型" align="center" prop="orderType" v-if="getHiddenColumns" />
+      <el-table-column label="订单类型" align="center" prop="orderType" v-if="false" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

+ 42 - 56
Yijia-SaaS/yijia-ui/src/views/station/pay/index.vue

@@ -1,23 +1,26 @@
 <template>
   <div class="app-container">
-      <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="90px">
-        <el-row v-for="(item,index) in ruleForm.formList" :key="index"  style="border-bottom: 1px solid #f0f0f0;padding: 10px;">
-          <el-form-item label="支付模板" style="width: 110px;" :prop="'formList.' + index + '.payMode'">
+      <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="110px">
+          <el-form-item label="支付模板"  prop="payMode">
             <el-upload
-              action="上传地址"
+              action="http://localhost:8080/img"
+              ref="upload"
+              multiple
               list-type="picture-card"
+              :auto-upload="false"
+              accept=".jpeg,.jpg,.png,"
               :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove">
-              <i class="el-icon-plus"></i>
+              :limit="5"
+              :on-remove="handleRemove"
+              >
+              <i slot="default"  class="el-icon-plus"></i>
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img width="100%" :src="dialogImageUrl" alt="">
             </el-dialog>
           </el-form-item>
-        </el-row>
-        <el-row v-for="(item,index) in ruleForm.formList" :key="index" style="border-bottom: 1px solid #f0f0f0;padding: 10px;">
-          <el-form-item label="支付页面形象照" style="width: 110px;" prop="'formList.' + index + '.imagePhotosFlag'">
-            <el-radio-group v-model="item.imagePhotosFlag">
+          <el-form-item label="支付页面形象照" >
+            <el-radio-group v-model="ruleForm.imagePhotosFlag">
               <el-radio
                 v-for="dict in imagePhotosFlagOptions"
                 :key="dict.dictValue"
@@ -25,10 +28,8 @@
               >{{dict.dictLabel}}</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-row>
-        <el-row v-for="(item,index) in ruleForm.formList" :key="index" style="border-bottom: 1px solid #f0f0f0;padding: 10px;">
-          <el-form-item label="电子会员卡" style="width: 110px;" prop="'formList.' + index + '.cardEnabledFlag'">
-            <el-radio-group v-model="item.cardEnabledFlag">
+          <el-form-item label="电子会员卡">
+            <el-radio-group v-model="ruleForm.cardEnabledFlag">
               <el-radio
                 v-for="dict in cardEnabledFlagOptions"
                 :key="dict.dictValue"
@@ -36,20 +37,16 @@
               >{{dict.dictLabel}}</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-row>
-        <el-row v-for="(item,index) in ruleForm.formList" :key="index" style="border-bottom: 1px solid #f0f0f0;padding: 10px;" >
-          <el-form-item label="支付回调页面" style="width: 110px;"  :prop="'formList.' + index + '.payCallbackPage'">
-            <el-input v-model="item.payCallbackPage" placeholder="请输入支付回调页面配置" />
+          <el-form-item label="支付回调"  prop="payCallbackPage">
+            <el-input v-model="ruleForm.payCallbackPage" placeholder="请输入支付回调页面配置" style="width: 200px"/>
+            <el-button>前往配置</el-button>
           </el-form-item>
-        </el-row>
-        <el-row v-for="(item,index) in ruleForm.formList" :key="index" style="border-bottom: 1px solid #f0f0f0;padding: 10px;">
-          <el-form-item label="打印张数" style="width: 110px;" :prop="'formList.' + index + '.payPrintNum'">
-            <el-input v-model="item.payPrintNum" placeholder="请输入支付小票打印张数" />
+          <el-form-item label="打印张数"  prop="payPrintNum">
+            <el-input-number size="small" :min="0" v-model="ruleForm.payPrintNum" />
+            <span> 张 </span>
           </el-form-item>
-        </el-row>
-        <el-row v-for="(item,index) in ruleForm.formList" :key="index" style="border-bottom: 1px solid #f0f0f0;padding: 10px;">
-          <el-form-item label="班结是否打印" style="width: 110px;" :prop="'formList.' + index + '.wsPrintFlag'">
-            <el-radio-group v-model="item.wsPrintFlag">
+          <el-form-item label="班结是否打印" >
+            <el-radio-group v-model="ruleForm.wsPrintFlag">
               <el-radio
                 v-for="dict in wsPrintFlagOptions"
                 :key="dict.dictValue"
@@ -57,46 +54,36 @@
               >{{dict.dictLabel}}</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-
   </div>
 </template>
 
 <script>
 import {addPay, updatePay,getStationPay} from "@/api/station/pay";
-
 export default {
   name: "Pay",
   data() {
     return {
       // 遮罩层
-      loading: true,
       imagePhotosFlagOptions:[],
       wsPrintFlagOptions:[],
       cardEnabledFlagOptions:[],
       dialogImageUrl: '',
       dialogVisible: false,
-      ruleForm: {
-        formList: [
-          {
-            payMode: "",
-            imagePhotosFlag: "",
-            cardEnabledFlag: "",
-            payPrintNum: "",
-            payCallbackPage: "",
-            wsPrintFlag: ""
-          }
-        ]
+      ruleForm:{
+
       },
+      // 表单校验
+      rules: {
+      }
     };
   },
   created() {
-    this.handleUpdate();
+    this.look();
     this.getDicts("image_photos_flag").then(response => {
       this.imagePhotosFlagOptions = response.data;
     });
@@ -106,7 +93,6 @@ export default {
     this.getDicts("card_enabled_flag").then(response => {
       this.cardEnabledFlagOptions = response.data;
     });
-
   },
   methods: {
     handleRemove(file, fileList) {
@@ -116,29 +102,29 @@ export default {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
-    /** 修改按钮操作 */
-    handleUpdate() {
+    /** 进入信息 */
+    look() {
       getStationPay().then(response => {
-        this.ruleForm.formList = response.data;
-        this.open = true;
-        this.title = "油站支付设置";
+        this.ruleForm = response.data;
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["ruleForm"].validate(valid => {
         if (valid) {
-          if (this.form.payId != null) {
-            updatePay(this.form).then(response => {
+          if (this.ruleForm.payId != null) {
+            updatePay(this.ruleForm).then(response => {
               this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
+              getStationPay().then(response => {
+                this.ruleForm = response.data;
+              });
             });
           } else {
-            addPay(this.form).then(response => {
+            addPay(this.ruleForm).then(response => {
               this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+              getStationPay().then(response => {
+                this.ruleForm = response.data;
+              });
             });
           }
         }

+ 1 - 1
Yijia-SaaS/yijia-ui/src/views/station/personnel/index.vue

@@ -105,7 +105,7 @@
 
     <el-table v-loading="loading" :data="personnelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="油站员工主键id" v-if="getHiddenColumns" align="center" prop="personnelId" />
+      <el-table-column label="油站员工主键id" v-if="false" align="center" prop="personnelId" />
       <el-table-column label="姓名" align="center" prop="personnelName" />
       <el-table-column label="负责枪号" align="center" prop="gunNo" />
       <el-table-column label="加油站id" align="center" prop="stationId" />

+ 2 - 2
Yijia-SaaS/yijia-ui/src/views/station/price/index.vue

@@ -86,10 +86,10 @@
 
     <el-table v-loading="loading" :data="priceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="油品价格id" v-if="getHiddenColumns" align="center" prop="oilPriceId" />
+      <el-table-column label="油品价格id" v-if="false" align="center" prop="oilPriceId" />
       <el-table-column label="油品名称" align="center" prop="oilName" />
       <el-table-column label="油品价格" align="center" prop="oilPrice" />
-      <el-table-column label="油站id" v-if="getHiddenColumns" align="center" prop="stationId" />
+      <el-table-column label="油站id" v-if="false" align="center" prop="stationId" />
       <el-table-column label="油站名称" align="center" prop="stationNanme" />
       <el-table-column label="操作时间" align="center" prop="date" width="180">
         <template slot-scope="scope">