Merge pull request 'lifei' (#15) from lifei into master

Reviewed-on: #15

.env.development

@@ -12,7 +12,7 @@ VUE_APP_UPLOAD_PRIVATE_URL = '/api/xkhl-dict/imageHandler/uploadProtectedImg'
 VUE_APP_DOMAIN = '192.168.0.199:38080'
 
 # 开发环境，不会进行加密，会打印出数据
-VUE_APP_ENV = 'development'
+VUE_APP_ENV = 'production'
 #production
 
 

src/api/AdjustTask/AdjustTask.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 var service_name = 'xkhl-site'
-var group_name = 'xoilDispatchSitePriceAdjustTask'
+var group_name = 'saasDispatchSitePriceAdjustTask'
 export default {
   getByPage(page) { // 站点分页查询
     return request({

src/api/finance/openTicketApi.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 var service_name = 'xkhl-finance'
-var group_name = 'OilCustomerInvoicRecord'
+var group_name = 'saasCustomerInvoicRecord'
 
 export default {
   fuyous(){
@@ -18,14 +18,14 @@ export default {
   },
   getInfo(id) { // 根据id查询
     return request({
-      url: `/${service_name}/${group_name}/getInfo/${id}`,
+      url: `/${service_name}/saasCustomerInvoicRecord/getInfo/${id}`,
       method: 'get'
     })
   },
 
   save(oilCustomerInvoicRecord) { // 保存
     return request({
-      url: `/${service_name}/${group_name}/save`,
+      url: `/${service_name}/saasCustomerInvoicRecord/save`,
       method: 'post',
       data: oilCustomerInvoicRecord
     })

src/api/user/oilVehicleOwner.js

@@ -30,6 +30,13 @@ export default {
       data: oilVehicleOwner
     })
   },
+  saveDispat(oilVehicleOwner) { // 新保存(调度管理)
+    return request({
+      url: `/xkhl-user/saasCustomerPlatenum/save `,
+      method: 'post',
+      data: oilVehicleOwner
+    })
+  },
   saveSite(oilVehicleOwner) { // 保存
     return request({
       url: `/${service_name}/${group_name}/saveSite`,

src/components/generalDetails/README.md

@@ -0,0 +1,34 @@
+组件 参数
+sourceData : 数据源  类型：对象 {}
+mappingData：映射表 类型：数组 []
+isHeader：是否需要标题 默认为false 类型：布尔 
+title：详情标题  默认为 默认详情头 类型：字符串
+
+
+mappingData 示例
+[
+    { //第一层 为卡片
+       carTitle：//卡片标题
+       iconClass://图标名
+       isFold：是否可折叠
+       carItems：[
+        {
+            label:名称
+            value：显示的值 支持 string(相对相应的字段) array( 支持嵌套字段如['a','b'],实际为sourceData.a.b) functoin(接收一个参数为当前数据源，需返回一个字符串类型的值)
+            fieldDefault：默认值 value没有数据的时候现实的值
+            remark：备注 
+            isCopy：：是否可复制
+            field：字段
+        }
+       ]
+    }
+]
+
+插槽模式  slot
+header 整个组件的头部
+field 每个字段都可以使用插槽自定义 插槽名称为相对应的字段
+index card_bottom 每张卡片都有相对应的底部 index为索引
+footer 整个组件的底部
+index_car 整张卡片的插槽名称 index为卡片索引
+#4_car="data" 将返回 当前卡片对象对应的值
+

src/components/generalDetails/index.vue

@@ -9,7 +9,7 @@
       <slot name="title_bottom"></slot>
     </div>
     <div class="generalDetails_card_container">
-      <div  v-for="(item, index) in dataPage" :key="index">
+      <div name v-for="(item, index) in dataPage" :key="index">
         <el-card class="generalDetails_card">
           <div @click="isShow(item)" class="generalDetails_card_header" slot="header">
             <div>
@@ -19,12 +19,17 @@
               <span class="generalDetails-card-header-text">{{ item.title }}</span>
             </div>
             <div class="fold">
-              <i :style="{ transform: `rotate(${item.isFold ? 0 : 180}deg)` }"
+              <i
-                class="el-icon-arrow-down  generalDetails_card_arrow_down"></i>
+                :style="{
+                  transform: `rotate(${item.isFold ? 0 : 180}deg)`
+                }"
+                class="el-icon-arrow-down generalDetails_card_arrow_down"
+              ></i>
             </div>
           </div>
+          <slot :name="`${index}_car`" :item="item">
             <div :style="{ maxHeight: item.isFold ? '100vh' : '0px' }" class="my-cell">
-            <div v-for="(i, x) in item.listData " :key="x" class="cell-item">
+              <div v-for="(i, x) in item.listData" :key="x" class="cell-item">
                 <span :title="i.remark" class="color-999 test-tst">
                   {{ i.label }}
                   <i v-if="i.remark" class="header-icon el-icon-info"></i>
@@ -36,13 +41,15 @@
                 </slot>
               </div>
             </div>
+          </slot>
         </el-card>
-        <div>
+        <div >
           <slot :name="`${index}card_bottom`"></slot>
         </div>
       </div>
     </div>
     <div class="generalDetails_footer">
+
       <slot name="footer">
         <el-button @click="close" type="primary" :size="$store.getters.size">关闭</el-button>
       </slot>
@@ -78,8 +85,10 @@ export default {
       dataPage: []
     }
   },
+
   created() {
-    (this.sourceData !== null) && (this.mappingData.length !== 0) && (this.init())
+    console.log('created')
+    this.sourceData !== null && this.mappingData.length !== 0 && this.init()
   },
   methods: {
     isShow(item) {
@@ -100,14 +109,32 @@ export default {
           listData: item.carItems.map((carItem, index) => {
             return {
               label: carItem.label,
-              value: (typeof carItem.value =='function')&&(carItem.value(this.sourceData)) || this.sourceData[carItem.value] || carItem.fieldDefault || '暂无数据',
+              value:
+                (typeof carItem.value == 'function' && carItem.value(this.sourceData)) ||
+                (Array.isArray(carItem.value) &&
+                  carItem.value.reduce((prev, current, index, _arr) =>
+                    index == 1
+                      ? this.sourceData[prev]
+                        ? this.sourceData[prev][current] !== null && this.sourceData[prev][current] !== undefined
+                          ? this.sourceData[prev][current]
+                          : '暂无数据'
+                        : '暂无数据'
+                      : typeof prev == 'object'
+                      ? prev[current]
+                      : prev
+                  )) ||
+                (this.sourceData[carItem.value] !== null && this.sourceData[carItem.value] !== undefined
+                  ? String(this.sourceData[carItem.value])
+                  : false) ||
+                carItem.fieldDefault ||
+                '暂无数据',
               field: carItem.value,
               remark: carItem.remark,
               isCopy: carItem.isCopy || false
             }
           })
         }
-      });
+      })
       console.log(this.dataPage)
     }
   }
@@ -115,9 +142,10 @@ export default {
 </script>
 
 <style scoped>
-.title_bottom{
+.title_bottom {
   margin-top: 20px;
 }
+
 .fold {
   /* position: absolute;
   bottom: 0px;
@@ -130,7 +158,7 @@ export default {
 }
 
 .generalDetails_card_arrow_down {
-  transition: all .9s;
+  transition: all 0.9s;
 }
 
 .generalDetails_card_header {
@@ -156,7 +184,7 @@ title {
   flex-wrap: wrap;
   max-height: 100vh;
   overflow: hidden;
-  transition: all .9s;
+  transition: all 0.9s;
 }
 
 .color-999 {
@@ -196,6 +224,7 @@ title {
   padding: 15px 20px;
   box-sizing: border-box;
   border-top: solid 1px #e5e5e5;
+  z-index: 999999;
 }
 
 .generalDetails_header {

src/views/driver/user/SysCustomerInfoList.vue

@@ -129,7 +129,7 @@
                   :size="$store.getters.size"
                   type="text"
                   @click="handleDetail(scope.row.id)"
-                  ><svg-icon icon-class="iconxiangqing1" /> 操作</el-button
+                  ><svg-icon icon-class="iconxiangqing1" /> 详情</el-button
                 >
                 <el-dropdown>
                   <el-button type="text">
@@ -258,7 +258,7 @@
         class="table-detail-drawer"
         :visible.sync="showTableDrawer"
         direction="ltr"
-        size="80%"
+        size="55%"
       >
         <SysCustomerInfoInfo
           v-if="showTableDrawer"

src/views/driver/vehicle/OilVehicleOwnerAdd.vue

@@ -202,6 +202,11 @@ export default {
         this.$message.success(res.msg);
         this.$emit("closeDialog");
         this.$emit("getByPage"); 
+      });
+      // 新保存
+      oilVehicleOwnerApi.saveDispat(this.oilVehicleOwner).then((res) => {
+        this.$emit("closeDialog");
+        this.$emit("getByPage");
         this.oilVehicleOwner = {};
       });
     },

src/views/driver/vehicle/OilVehicleOwnerList.vue

@@ -190,25 +190,27 @@
         v-el-drag-dialog
         title="添加"
         :visible.sync="addDialog"
-        size="60%"
+        size="55%"
         direction="ltr"
         destroy-on-close
       >
-        <OilVehicleOwnerAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+        <OilVehicleOwnerAdd v-if="addDialog" @getByPage="getByPage" @closeDialog="closeDialog" />
       </el-drawer>
 
-      <!-- 导出弹窗 -->
+      <!-- 导出抽屉 -->
-      <el-dialog
+      <el-drawer
         v-el-drag-dialog
         title="导出"
         :visible.sync="outPutDialog"
-        width="55%"
+        size="55%"
+        direction="ltr"
+        destroy-on-close
       >
       <OilVehicleOwnerOutput
           @getByPage="getByPage"
           @closeDialog="closeDialog"
         />
-      </el-dialog>
+      </el-drawer>
 
       <!-- 导入弹窗 -->
       <el-dialog
@@ -223,12 +225,12 @@
         />
       </el-dialog>
 
-      <!-- 修改弹窗 -->
+      <!-- 修改抽屉 -->
       <el-drawer
         v-el-drag-dialog
         title="修改"
         :visible.sync="updateDialog"
-        size="60%"
+        size="55%"
         direction="ltr"
         destroy-on-close
       >
@@ -246,7 +248,7 @@
         class="table-detail-drawer"
         :visible.sync="showTableDrawer"
         direction="ltr"
-      size="50%"
+      size="55%"
       :withHeader="false"
       >
       <general-details 

src/views/driver/vehicle/OilVehicleOwnerOutput.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form :model="data" label-width="100px" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">

src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue

@@ -195,7 +195,7 @@
         v-el-drag-dialog
         title="导出"
         :visible.sync="outPutDialog"
-        width="55%"
+        width="60%"
       >
         <OilCompanyMatchOutput
           @getByPage="getByPage"
@@ -208,7 +208,7 @@
         v-el-drag-dialog
         title="导入"
         :visible.sync="importDialog"
-        width="55%"
+        width="60%"
       >
         <OilCompanyMatchImport
           @getByPage="getByPage"
@@ -238,7 +238,7 @@
         title="详情"
         class="table-detail-drawer"
         :visible.sync="showTableDrawer"
-        size="55%"
+        size="60%"
         direction="ltr"
         :withHeader="false"
       >
@@ -575,7 +575,7 @@ export default {
       ],
       addDialog: false, // 添加弹窗
       updateDialog: false, // 修改弹窗
-      oilCompanyMatch: {},
+      oilCompanyMatch: null,
     };
   },
   computed: {
@@ -705,8 +705,8 @@ export default {
       this.getByPage();
     },
     toAdd() {
-      // 跳转到添加
       this.oilCompanyMatch = {};
+      // 跳转到添加
       this.addDialog = true;
     },
     toUpdate(id) {

src/views/finance/openTicket/openTicketInfoUpdate.vue

@@ -116,8 +116,8 @@
 
     <div style="float: right;">
       <el-button @click="$emit('close')">取消</el-button>
-      <el-button @click="update">修改</el-button>
+      <el-button @click="update">提交</el-button>
-      <el-button type="primary" @click="updateAndAudit">修改并审核</el-button>
+      <el-button type="primary" @click="updateAndAudit">提交并审核</el-button>
     </div>
   </div>
 </template>

src/views/finance/openTicket/openTicketList.vue

@@ -96,7 +96,7 @@
               <el-col :span="1">
                 <el-button type="primary" :size="$store.getters.size" icon="el-icon-plus"
                   @click="addRecordDialog = true">
-                  新增</el-button>
+                  添加</el-button>
               </el-col>
               <el-col :span="23">
                 <el-button type="primary" :size="$store.getters.size" icon="el-icon-search" @click="getByPage">查询

src/views/finance/openTicket/openTicketRecordAdd.vue

@@ -103,7 +103,7 @@
       </section>
       <div style="float: right;">
         <el-button @click="$emit('close')">取消</el-button>
-        <el-button type="primary" @click="add()">新增</el-button>
+        <el-button type="primary" @click="add()">提交</el-button>
       </div>
     </div>
 

src/views/finance/order/OrderPersonalInfoList.vue

@@ -694,7 +694,7 @@ export default {
               <div>
                 <div>
                   来源：
-                  {cell}
+                  { this.markData.ORDER_SOURCE[cell] }
                 </div>
                 <div>
                   支付：

src/views/login/index.vue

@@ -14,6 +14,8 @@
                         <el-input
                             v-model="loginForm.username"
                             placeholder="请输入用户名"
+                            
+                            oninput="if(value.length>11)value=value.slice(0,11)" type="Number"  onkeyup="this.value = this.value.replace(/[^\d]/g,'');" 
                         >
                             <img
                                 slot="prefix"

src/views/site/oilCompanySiteDiaodu/adjustStrategyPiliangAdd.vue

@@ -1,14 +1,6 @@
 <template>
-    <el-dialog
+    <el-dialog title="" :visible="true" :show-close="false" top="20vh" width="500px" :close-on-click-modal="false" center
-        title=""
+        custom-class="custom-dialog"><el-form label-width="80px" class="addStyle">
-        :visible="true"
-        :show-close="false"
-        top="20vh"
-        width="500px"
-        :close-on-click-modal="false"
-        center
-        custom-class="custom-dialog"
-        ><el-form label-width="80px" class="addStyle">
             <div class="adjust-frame">
                 <div class="titleStyle">
                     <p style="margin:0;color:#409EFF">新增快速调价任务</p>
@@ -17,48 +9,22 @@
                         <span>{{ multipleSelection.length }}</span>
                     </div>
                 </div>
-                <img
+                <img class="close" @click="
-                    class="close"
-                    @click="
                     controlWindows.dialogAdjustStrategyPiliangAdd = false
-                    "
+                    " src="@/assets/img/close_fill.png" alt="" />
-                    src="@/assets/img/close_fill.png"
-                    alt=""
-                />
                 <div style="margin: 0 35px;">
                     <template>
                         <div style="margin:40px 0 20px;">
-                            <span style="margin: 15px 0; display: block;"
+                            <span style="margin: 15px 0; display: block;">任务名称</span>
-                                >任务名称</span
+                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="taskName"></el-input>
-                            >
-                            <el-input
-                                type="textarea"
-                                :rows="2"
-                                placeholder="请输入内容"
-                                v-model="taskName"
-                            ></el-input>
                         </div>
                         <el-divider></el-divider>
-                        <div
+                        <div style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 20px;">
-                            style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 20px;"
-                        >
                             <div class="mubiaocelue">
-                                <div
+                                <div class="special-exhibition" style="margin: -7px 0 12px;">
-                                    class="special-exhibition"
+                                    <span style="margin-right: 10px">目标策略公式</span>
-                                    style="margin: -7px 0 12px;"
+                                    <input class="strategy-input" type="text" v-model="convertPersonalPriceSyncStrategy
-                                >
+                                        " @keyup="inputHandle" @blur="blurHandle" />
-                                    <span style="margin-right: 10px"
-                                        >目标策略公式</span
-                                    >
-                                    <input
-                                        class="strategy-input"
-                                        type="text"
-                                        v-model="
-                                            convertPersonalPriceSyncStrategy
-                                        "
-                                        @keyup="inputHandle"
-                                        @blur="blurHandle"
-                                    />
                                 </div>
                                 <div style="margin: 0 0 0 auto;">
                                     执行时基础个人价变更
@@ -66,11 +32,7 @@
                             </div>
                             <div class="mubiaocelue">
                                 <el-radio-group v-model="radio">
-                                    <el-radio
+                                    <el-radio :label="1" @click.native.prevent="selectRadio">立即应用到个人价</el-radio>
-                                        :label="1"
-                                        @click.native.prevent="selectRadio"
-                                        >立即应用到个人价</el-radio
-                                    >
                                 </el-radio-group>
                                 <el-radio-group v-model="dijiaRadio">
                                     <el-radio :label="0">忽略</el-radio>
@@ -81,23 +43,13 @@
                         <el-divider></el-divider>
                         <div class="mubiaocelue" style="margin-bottom: 30px;">
                             <span>任务类型</span>
-                            <el-radio-group
+                            <el-radio-group v-model="taskTypeRadio" style="margin:0">
-                                v-model="taskTypeRadio"
-                                style="margin:0"
-                            >
                                 <el-radio :label="1">实时</el-radio>
                                 <el-radio :label="2">预约</el-radio>
-                                <el-date-picker
+                                <el-date-picker popper-class="disableButton" :disabled="taskTypeRadio !== 2"
-                                    popper-class="disableButton"
+                                    v-model="startTime" clearable format="yyyy-MM-dd HH:mm:ss"
-                                    :disabled="taskTypeRadio !== 2"
+                                    value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="预约时间"
-                                    v-model="startTime"
+                                    :picker-options="pickerOptions" />
-                                    clearable
-                                    format="yyyy-MM-dd HH:mm:ss"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    type="datetime"
-                                    placeholder="预约时间"
-                                    :picker-options="pickerOptions"
-                                />
                             </el-radio-group>
                         </div>
                         <!-- <div class="personal-block">
@@ -133,26 +85,12 @@
 
             <span class="dialog-footer">
                 <template>
-                    <el-button
+                    <el-button style="margin-right: 20px;" type="info" @click="
-                        style="margin-right: 20px;"
-                        type="info"
-                        @click="
                         controlWindows.dialogAdjustStrategyPiliangAdd = false
-                        "
+                        ">取 消</el-button>
-                        >取 消</el-button
+                    <el-popconfirm confirm-button-text="确定" cancel-button-text="取消" icon="el-icon-info" icon-color="red"
-                    >
+                        title="一旦提交，将立即生效！是否确认提交？" placement="top" @onConfirm="confirm">
-                    <el-popconfirm
+                        <el-button type="primary" slot="reference">提交</el-button>
-                        confirm-button-text="确定"
-                        cancel-button-text="取消"
-                        icon="el-icon-info"
-                        icon-color="red"
-                        title="一旦提交，将立即生效！是否确认提交？"
-                        placement="top"
-                        @onConfirm="confirm"
-                    >
-                        <el-button type="primary" slot="reference"
-                            >提交</el-button
-                        >
                     </el-popconfirm>
                 </template>
             </span>
@@ -164,6 +102,12 @@
 import AdjustTask from "@/api/AdjustTask/AdjustTask";
 import { parseTime } from "@/utils/disableTime.js";
 import moment from "moment";
+let xxx = () => {
+    let b = new Date();
+    // 获取分钟设置分钟
+    b.setMinutes(b.getMinutes() + 15);
+    return `${b.getHours()}:${b.getMinutes()}:${b.getSeconds()} - 23:59:00`
+};
 export default {
     props: {
         controlWindows: Object,
@@ -181,14 +125,32 @@ export default {
             startTime: "",
             userCompany: this.$store.getters.user.userCompany,
             pickerOptions: { 
-                disabledDate(time) {
+                xxfn(){
-                    return time.getTime() < Date.now() - 8.64e7;
+                    
                 },
-                selectableRange:
+                disabledDate(time) {
-                    parseTime(
+                    // return time.getTime() < Date.now() - 8.64e7;
-                        new Date(moment().format("YYYY-MM-DD HH:mm:ss")),
+
-                        "{hh}:{ii}:{ss}"
+                    // Date对象  获取当前时间+加15分钟和每一个time作比较 如果小于 返回true 禁用 如果大于等于 返回false 启用
-                    ) + "- 23:59:00"
+                    // 获取当前时间 
+                    let b = new Date(); 
+                    // 获取分钟设置分钟
+                    // b.setMinutes(b.getMinutes() + 15);
+                    b.setDate(b.getDate() -1)
+                    // 判断当前时间分钟大不大于设置分钟 
+                    if (time>b) {
+                        // 错误
+                        return false
+                        // 正确
+                    } else {
+                        return true
+                    }
+                },
+                selectableRange: xxx()
+                // parseTime(
+                //     new Date(moment().add(15,'minutes').format("YYYY-MM-DD HH:mm:ss")),
+                //     "{hh}:{ii}:{ss}"
+                // ) + "- 23:59:00"
             }
         };
     },
@@ -334,26 +296,32 @@ export default {
     margin-top: 20px;
     text-align: center;
 }
+
 ::v-deep {
     .el-divider--horizontal {
         margin: 30px 0;
     }
+
     .custom-dialog {
         border-radius: 15px;
+
         // .el-dialog__header {
         //   padding: 10px 20px !important;
         // }
         .el-dialog__body {
             padding: 0 20px 10px;
         }
+
         .adjust-frame {
             position: relative;
-            > p {
+
+            >p {
                 margin: 0;
                 color: #333;
                 font-size: 15px;
             }
-            > .close {
+
+            >.close {
                 position: absolute;
                 width: 35px;
                 height: 35px;
@@ -362,24 +330,30 @@ export default {
             }
         }
     }
+
     .exhibition {
         padding: 0;
+
         li {
             display: flex;
             margin-bottom: 15px;
+
             span {
                 flex: 1;
+
                 &:nth-of-type(1) {
                     color: #a9a9a9;
                     padding-right: 15px;
                     text-align: right;
                 }
+
                 &:nth-of-type(2) {
                     text-align: left;
                 }
             }
         }
     }
+
     .tip {
         display: block;
         width: 150px;
@@ -387,6 +361,7 @@ export default {
         line-height: 25px;
         color: #f00;
     }
+
     .special-exhibition {
         padding-right: 15px;
         box-sizing: border-box;
@@ -395,34 +370,44 @@ export default {
         width: 220px;
         line-height: 30px;
         background: rgba(211, 211, 211, 0.5);
-        > span {
+
+        >span {
             flex: 1;
+
             &:nth-of-type(1) {
                 text-align: right;
             }
+
             &:nth-of-type(2) {
                 text-align: left;
                 padding-left: 20px;
             }
         }
-        > input {
+
+        >input {
             width: 100px;
             height: 20px;
         }
     }
+
     .addStyle .el-form-item--medium .el-form-item__label {
         text-align: start;
     }
+
     .addStyle .el-form-item__content .el-radio-group {
         box-shadow: none !important;
     }
+
     .titleStyle {
         display: flex;
+
         div {
             margin-left: auto;
             margin-right: 45px;
         }
+
         .el-form-item--medium {
+
             .el-form-item__label,
             .el-form-item__content {
                 line-height: 17px;
@@ -430,14 +415,17 @@ export default {
         }
     }
 }
+
 .dialog-footer {
     display: flex;
     justify-content: end;
     margin-bottom: 10px;
 }
+
 .mubiaocelue {
     display: flex;
     flex-direction: column;
+
     div {
         margin: 10px 0;
     }

src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue

@@ -102,6 +102,7 @@
                 <el-date-picker
                   v-model="page.params.createTime"
                   type="datetimerange"
+                  style="width: 105%"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   range-separator="~"
                   start-placeholder="开始时间"
@@ -120,14 +121,15 @@
                   :size="$store.getters.size"
                   icon="el-icon-search"
                   @click="search"
-                  >&nbsp;&nbsp;查询
+                  >查询
                 </el-button>
                 <el-button
+                  type="info"
                   :size="$store.getters.size"
                   icon="el-icon-refresh"
                   @click="page.params = {}"
                 >
-                  &nbsp;&nbsp;重置
+                  重置
                 </el-button>
               </div>
             </el-col>
@@ -431,7 +433,7 @@ export default {
       tableColumns: [
         {
           prop: "taskName",
-          width: 180,
+          width: 160,
           label: "任务名称",
           show: true,
           render: (row, column, cell) => {
@@ -443,7 +445,7 @@ export default {
         },
         {
           prop: "siteName",
-          width: 220,
+          width: 230,
           label: "油站名称",
           show: true,
           render: (row, column, cell) => {
@@ -455,13 +457,13 @@ export default {
         },
         {
           prop: "oilProductCode",
-          width: 150,
+          width: 230,
           label: "基础个人价",
           show: true,
           render: (row, column, cell) => {
             return <div>
               <span class="colorhui">油品：</span><span>{cell}</span><br/>
-              <span class="colorhui">当前基础个人价：</span><span>{row.currentFloorPrice}</span><i v-show={row.floorPriceIgnore==1} class="el-icon-s-check"></i>
+              <span class="colorhui">当前基础个人价：</span><span>{row.floorPriceIgnore}</span><i v-show={row.floorPriceIgnore==1} class="el-icon-s-check"></i>
                   </div>
           },
         },
@@ -515,7 +517,7 @@ export default {
         },
         {
           prop: "preExecuteTime",
-          minWidth: 220,
+          minWidth: 200,
           label: "预约时间/执行时间",
           show: true,
           render: (row, column, cell) => {
@@ -527,7 +529,7 @@ export default {
         },
         {
           prop: "createUserName",
-          minWidth: 220,
+          minWidth: 210,
           label: "创建人/创建时间",
           show: true,
           render: (row, column, cell) => {

src/views/site/oilSiteInfo/OilSiteInfoInfo.vue

@@ -193,10 +193,10 @@
                 class="kg"
                 render="row"
               >
-                <el-tag type="danger" v-if="oilSiteInfo.globalEnable === 0"
+                <el-tag type="danger" v-if="oilSiteInfo.globalEnable === 'DISABLE'"
                   >禁用</el-tag
                 >
-                <el-tag type="success" v-if="oilSiteInfo.globalEnable === 1"
+                <el-tag type="success" v-if="oilSiteInfo.globalEnable === 'ENABLE'"
                   >启用</el-tag
                 >
                 <!-- <el-switch
@@ -384,10 +384,10 @@
             <div class="cell-item">
               <span class="color-999 test-tst">油站性质</span>
               <br />
-              <span v-if="oilSiteInfo.siteNature === 1" class="inner-data"
+              <span v-if="oilSiteInfo.siteNature === 'OIL_OPERATION'" class="inner-data"
                 >自营油站</span
               >
-              <span v-if="oilSiteInfo.siteNature === 0" class="inner-data"
+              <span v-if="oilSiteInfo.siteNature === 'CHANNEL_STATION'" class="inner-data"
                 >渠道油站</span
               >
             </div>
@@ -659,42 +659,46 @@
               <span class="color-999 test-tst">是否为高速 </span>
               <br />
 
-              <span v-if="oilSiteInfo.highSpeedMark === 0" class="inner-data"
+              <span v-if="oilSiteInfo.highSpeedMark === 'NO_SPEED'" class="inner-data"
                 >非高速</span
               >
-              <span v-if="oilSiteInfo.highSpeedMark === 1" class="inner-data"
+              <span v-if="oilSiteInfo.highSpeedMark === 'HIGH_SPEED'" class="inner-data"
                 >高速</span
               >
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">司机二维码支付 </span>
               <br />
-              <span v-if="oilSiteInfo.qrcodePay === 0" class="inner-data"
+              <span>{{oilSiteInfo.qrcodePay== 0 ? '禁用' : oilSiteInfo.qrcodePay== 1 ? '启用' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.qrcodePay === 0" class="inner-data"
                 >禁用</span
               >
               <span v-if="oilSiteInfo.qrcodePay === 1" class="inner-data"
                 >启用</span
-              >
+              > -->
             </div>
           </div>
           <div class="my-cell">
             <div class="cell-item">
               <span class="color-999 test-tst">扫描油站二维码支付</span>
               <br />
-              <span v-if="oilSiteInfo.qrcodeSitePay === 0" class="inner-data"
+              <span>{{oilSiteInfo.qrcodeSitePay== 0 ? '禁用' : oilSiteInfo.qrcodeSitePay== 1 ? '启用' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.qrcodeSitePay === 0" class="inner-data"
                 >禁用</span
               >
               <span v-if="oilSiteInfo.qrcodeSitePay === 1" class="inner-data"
                 >启用</span
-              >
+              > -->
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">司机主动支付</span>
               <br />
-              <span v-if="oilSiteInfo.activePay === 0" class="inner-data"
+              <span v-if="oilSiteInfo.activePay === 'DISABLE'" class="inner-data"
                 >禁用</span
               >
-              <span v-if="oilSiteInfo.activePay === 1" class="inner-data"
+              <span v-if="oilSiteInfo.activePay === 'ENABLE'" class="inner-data"
                 >启用</span
               >
             </div>
@@ -703,17 +707,22 @@
             <div class="cell-item">
               <span class="color-999 test-tst">支付方式</span>
               <br />
-              <span v-if="oilSiteInfo.payMethod === 2" class="inner-data"
+              <span>{{oilSiteInfo.payMethod== 2 ? '联名卡支付' : oilSiteInfo.payMethod== 1 ? '普通支付方式' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.payMethod === 2" class="inner-data"
                 >联名卡支付</span
               >
               <span v-if="oilSiteInfo.payMethod === 1" class="inner-data"
-                >普通支付方式</span
+                >普通支付方式</span -->
-              >
+              
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">油站详情提示文案</span>
               <br />
-              <span class="inner-data">{{ oilSiteInfo.detailContent }}</span>
+              <!-- <span v-if="oilSiteInfo.detailContent !== detailContent" class="inner-data"
+                >暂无数据</span> -->
+              <span class="inner-data">  {{oilSiteInfo.detailContent== detailContent ? '' :  '暂无数据'}}
+              </span>
             </div>
           </div>
 
@@ -722,35 +731,37 @@
               <span class="color-999 test-tst">全局禁用启用</span>
               <br />
 
-              <span v-if="oilSiteInfo.globalEnable === 0" class="inner-data"
+              <span v-if="oilSiteInfo.globalEnable === 'DISABLE'" class="inner-data"
                 >禁用</span
               >
-              <span v-if="oilSiteInfo.globalEnable === 1" class="inner-data"
+              <span v-if="oilSiteInfo.globalEnable === 'ENABLE'" class="inner-data"
                 >启用</span
               >
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">上架标识</span>
               <br />
-              <span v-if="oilSiteInfo.putawayMark === 0" class="inner-data"
+              <span>{{oilSiteInfo.putawayMark== 0 ? '下架' : oilSiteInfo.putawayMark== 1 ? '上架' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.putawayMark === 0" class="inner-data"
                 >下架</span
               >
               <span v-if="oilSiteInfo.putawayMark === 1" class="inner-data"
                 >上架</span
-              >
+              > -->
             </div>
           </div>
           <div class="my-cell">
             <div class="cell-item">
               <span class="color-999 test-tst">审核标识</span>
               <br />
-              <span v-if="oilSiteInfo.auditMark === 0" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === 'WAITING'" class="inner-data"
                 >待审核</span
               >
-              <span v-if="oilSiteInfo.auditMark === 1" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === 'SUCCESS'" class="inner-data"
                 >审核通过</span
               >
-              <span v-if="oilSiteInfo.auditMark === -1" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === '- FAIL'" class="inner-data"
                 >审核不通过</span
               >
             </div>

src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue

@@ -188,11 +188,11 @@
               </div>
               </template>
           </el-table-column>
-          <el-table-column prop="address" label="创建人">
+          <el-table-column prop="address" label="创建人/id">
             <template slot-scope="scope">
               <div>
-                <div>{{ scope.row.createUserName }}</div>
+                <div>创建人: {{ scope.row.createUserName?scope.row.createUserName:'暂无数据' }}</div>
-                <div> {{ scope.row.createUser }}</div>
+                <div>创建人ID： {{ scope.row.createUser?scope.row.createUser:'暂无数据'}}</div>
               </div>
               </template>
           </el-table-column>
@@ -594,12 +594,16 @@ export default {
               return (
                 <div>
                   <div>
-                    <span>更新人</span>
+                    <span>创建人:</span>
-                    <span>{row.createUserName}</span>
+                    <span>{row.createUserName === undefined ? '暂无数据' :row.createUserName}</span>
                   </div>
-                  <div>
+                  {/* <div>
                     <span>更新时间</span>
                     <span>{row.updateTime}</span>
+                  </div> */}
+                  <div>
+                    <span>ID：</span>
+                    <span> {row.createUser?row.createUser:'暂无数据'}</span>
                   </div>
                 </div>
               );

src/views/system/auth/sysUser/SysCustomerInfoList.vue

@@ -218,7 +218,7 @@
         class="table-detail-drawer"
         :visible.sync="updatePwdDialog"
         direction="ltr"
-        size="50%"
+        size="55%"
       >
       <div style="padding: 20px;">
         <el-form
@@ -245,7 +245,7 @@
         class="table-detail-drawer"
         :visible.sync="addDialog"
         direction="ltr"
-        size="50%"
+        size="55%"
       >
       <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
       </el-drawer>
@@ -297,7 +297,7 @@
         class="table-detail-drawer"
         :visible.sync="updateDialog"
         direction="ltr"
-        size="50%"
+        size="55%"
       >
       <SysCustomerInfoUpdate
           v-if="updateDialog"
@@ -314,7 +314,7 @@
         class="table-detail-drawer"
         :visible.sync="showTableDrawer"
         direction="ltr"
-        size="50%"
+        size="55%"
       >
         <SysCustomerInfoInfo
           v-if="showTableDrawer"

vue.config.js

@@ -26,7 +26,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: "http://uat.xingoil.com/adminapi",
         // target: 'https://www.xingoil.com/adminapi',
-        target: `http://192.168.0.22:38080`,
+        target: `http://119.177.60.118:8000/adminapi`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''