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

Reviewed-on: #13
人车管理星油车辆添加车牌
2023-05-10 06:21:27 +00:00 · 2023-05-10 09:10:07 +08:00 · 2023-05-09 15:27:36 +08:00 · 2023-05-09 09:03:10 +08:00 · 2023-05-08 10:56:51 +08:00 · 2023-05-08 09:25:32 +08:00
30 changed files with 360 additions and 267 deletions
--- a/.env.development
+++ b/.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


--- a/src/api/AdjustTask/AdjustTask.js
+++ b/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({
--- a/src/api/finance/openTicketApi.js
+++ b/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
    })
--- a/src/api/user/oilVehicleOwner.js
+++ b/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`,
--- a/src/components/generalDetails/README.md
+++ b/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" 将返回 当前卡片对象对应的值
+
--- a/src/components/generalDetails/index.vue
+++ b/src/components/generalDetails/index.vue
@@ -9,9 +9,9 @@
      <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 @click="isShow(item)" class="generalDetails_card_header" slot="header">
            <div>
              <span class="generalDetails-card-header-icon">
                <svg-icon style="color: #118dde" :icon-class="item.iconClass" />
@@ -19,30 +19,37 @@
              <span class="generalDetails-card-header-text">{{ item.title }}</span>
            </div>
            <div class="fold">
-              <i :style="{ transform: `rotate(${item.isFold ? 0 : 180}deg)` }"
-                class="el-icon-arrow-down  generalDetails_card_arrow_down"></i>
+              <i
+                :style="{
+                  transform: `rotate(${item.isFold ? 0 : 180}deg)`
+                }"
+                class="el-icon-arrow-down generalDetails_card_arrow_down"
+              ></i>
            </div>
          </div>
-          <div :style="{ maxHeight: item.isFold ? '100vh' : '0px' }" class="my-cell">
-            <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>
-                <i @click="isCopy(i.value, $event)" v-if="i.isCopy" class="el-icon-document-copy"></i>
-              </span>
-              <br />
-              <slot  class="inner-data" :name="`${i.field}`">
-                <span class="inner-data">{{ i.value }}</span>
-              </slot>
+          <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">
+                <span :title="i.remark" class="color-999 test-tst">
+                  {{ i.label }}
+                  <i v-if="i.remark" class="header-icon el-icon-info"></i>
+                  <i @click="isCopy(i.value, $event)" v-if="i.isCopy" class="el-icon-document-copy"></i>
+                </span>
+                <br />
+                <slot class="inner-data" :name="`${i.field}`">
+                  <span class="inner-data">{{ i.value }}</span>
+                </slot>
+              </div>
            </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 {
@@ -223,4 +252,4 @@ title {
  flex-direction: column;
  position: relative;
 }
-</style>
+</style>
--- a/src/views/driver/user/SysCustomerInfoAdd.vue
+++ b/src/views/driver/user/SysCustomerInfoAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
    <el-row>
      <el-form
        ref="form"
--- a/src/views/driver/user/SysCustomerInfoList.vue
+++ b/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">
@@ -171,14 +171,15 @@
        </div>
      </ListLayout>

-      <!-- 修改密码弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      <!-- 修改密码抽屉 -->
+      <el-drawer
        title="修改密码"
+        class="table-detail-drawer"
        :visible.sync="updatePwdDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
      >
+      <div style="padding: 20px;">
        <el-form
          ref="form"
          :model="updatePwd"
@@ -193,18 +194,20 @@
          <el-button @click="updatePwdDialog = false;">取消</el-button>
          <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
        </div>
-      </el-dialog>
+      </div>>
+      </el-drawer>

-      <!-- 添加弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      <!-- 添加抽屉 -->
+      <el-drawer
        title="添加"
+        class="table-detail-drawer"
        :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
      >
-        <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      </el-drawer>
+     

      <!-- 导出弹窗 -->
      <el-dialog
@@ -232,20 +235,22 @@
        />
      </el-dialog>

-      <!-- 修改弹窗 -->
-      <el-dialog
-        destroy-on-close
+      <!-- 修改抽屉 -->
+      <el-drawer
        title="修改"
+        class="table-detail-drawer"
        :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
      >
-        <SysCustomerInfoUpdate
+      <SysCustomerInfoUpdate
          v-if="updateDialog"
          :sys-customer-info="sysCustomerInfo"
          @getByPage="getByPage"
          @closeDialog="closeDialog"
        />
-      </el-dialog>
+      </el-drawer>
+   

      <!-- 详情抽屉 -->
      <el-drawer
@@ -253,7 +258,7 @@
        class="table-detail-drawer"
        :visible.sync="showTableDrawer"
        direction="ltr"
-        size="80%"
+        size="55%"
      >
        <SysCustomerInfoInfo
          v-if="showTableDrawer"
@@ -623,8 +628,8 @@ export default {
  margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
  min-height: 152px;
  z-index: 4;
  background: #fff;
--- a/src/views/driver/user/SysCustomerInfoUpdate.vue
+++ b/src/views/driver/user/SysCustomerInfoUpdate.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
    <el-row>
      <el-form
        ref="form"
--- a/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
@@ -6,7 +6,7 @@
        label-width="100px"
        :size="$store.getters.size"
      >
-        <el-card class="box-card">
+        <el-card class="box-card" style="margin:  0 20px;">
          <div slot="header" class="clearfix">
            <span>车辆基础信息</span>
          </div>
@@ -136,7 +136,7 @@
            <el-col />
          </el-row> -->
        </el-card>
-        <el-col :span="24" style="text-align: right">
+        <el-col :span="24" style="text-align: right;padding: 20px;">
          <el-button @click="close">取消</el-button>
          <el-button type="primary" @click="submit">提交</el-button>
        </el-col>
@@ -197,9 +197,14 @@ export default {
      }
    },
    save() {
-      // 保存
+      // 保存 
      oilVehicleOwnerApi.saveDispatch(this.oilVehicleOwner).then((res) => {
        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 = {};
--- a/src/views/driver/vehicle/OilVehicleOwnerList.vue
+++ b/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
+      <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 
@@ -669,8 +671,8 @@ export default {
  margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
  min-height: 152px;
  z-index: 4;
  background: #fff;
--- a/src/views/driver/vehicle/OilVehicleOwnerOutput.vue
+++ b/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">
--- a/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
@@ -6,7 +6,7 @@
        label-width="100px"
        :size="$store.getters.size"
      >
-        <el-card class="box-card">
+        <el-card class="box-card" style="margin: 0 20px;">
          <div slot="header" class="clearfix">
            <span>车辆基础信息</span>
          </div>
@@ -136,7 +136,7 @@
            <el-col />
          </el-row> -->
        </el-card>
-        <el-col :span="24" style="text-align: right">
+        <el-col :span="24" style="text-align: right;padding: 20px;;">
          <el-button @click="close">取消</el-button>
          <el-button type="primary" @click="submit">提交</el-button>
        </el-col>
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
    <el-row>
      <el-form :model="oilCompanyMatch" label-width="140px" :rules="ruleForm" ref="ruleForm" :size="$store.getters.size">
        <el-row :gutter="gridNum.row.gutter">
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
@@ -178,22 +178,24 @@
        </div>
      </ListLayout>

-      <!-- 添加弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
+      <!-- 添加抽屉 -->
+      <el-drawer
        title="添加"
+        class="table-detail-drawer"
        :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="60%"
      >
-        <OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      <OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      </el-drawer>
+    

      <!-- 导出弹窗 -->
      <el-dialog
        v-el-drag-dialog
        title="导出"
        :visible.sync="outPutDialog"
-        width="55%"
+        width="60%"
      >
        <OilCompanyMatchOutput
          @getByPage="getByPage"
@@ -206,7 +208,7 @@
        v-el-drag-dialog
        title="导入"
        :visible.sync="importDialog"
-        width="55%"
+        width="60%"
      >
        <OilCompanyMatchImport
          @getByPage="getByPage"
@@ -214,27 +216,29 @@
        />
      </el-dialog>

-      <!-- 修改弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
+      <!-- 修改抽屉 -->
+      <el-drawer
        title="修改"
+        class="table-detail-drawer"
        :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="60%"
      >
-        <OilCompanyMatchUpdate
+      <OilCompanyMatchUpdate
          v-if="updateDialog"
          :oil-company-match="oilCompanyMatch"
          @getByPage="getByPage"
          @closeDialog="closeDialog"
        />
-      </el-dialog>
+      </el-drawer>
+

      <!-- 详情抽屉 -->
      <el-drawer
        title="详情"
        class="table-detail-drawer"
        :visible.sync="showTableDrawer"
-        size="55%"
+        size="60%"
        direction="ltr"
        :withHeader="false"
      >
@@ -571,7 +575,7 @@ export default {
      ],
      addDialog: false, // 添加弹窗
      updateDialog: false, // 修改弹窗
-      oilCompanyMatch: {},
+      oilCompanyMatch: null,
    };
  },
  computed: {
@@ -701,8 +705,8 @@ export default {
      this.getByPage();
    },
    toAdd() {
-      // 跳转到添加
      this.oilCompanyMatch = {};
+      // 跳转到添加
      this.addDialog = true;
    },
    toUpdate(id) {
@@ -750,8 +754,8 @@ export default {
  margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
  min-height: 152px;
  z-index: 4;
  background: #fff;
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
    <el-row>
      <el-form :model="oilCompanyMatch" :rules="ruleForm" ref="ruleForm" label-width="140px" :size="$store.getters.size">
        <el-row :gutter="gridNum.row.gutter">
--- a/src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue
+++ b/src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue
@@ -588,8 +588,8 @@ export default {
 }

 .table-div>>>.header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
  min-height: 152px;
  z-index: 4;
  background: #fff;
--- a/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue
+++ b/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue
@@ -772,8 +772,8 @@ export default {
 }

 .table-div>>>.header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
  min-height: 152px;
  z-index: 4;
  background: #fff;
--- a/src/views/finance/openTicket/openTicketInfoUpdate.vue
+++ b/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 type="primary" @click="updateAndAudit">修改并审核</el-button>
+      <el-button @click="update">提交</el-button>
+      <el-button type="primary" @click="updateAndAudit">提交并审核</el-button>
    </div>
  </div>
 </template>
--- a/src/views/finance/openTicket/openTicketList.vue
+++ b/src/views/finance/openTicket/openTicketList.vue
@@ -80,7 +80,7 @@

                  <el-col :span="9">
                    <el-form-item>
-                      <gl-date-time-picker v-model="page.params.createTime" style="width: 131%" msg="创建时间"
+                      <gl-date-time-picker v-model="page.params.createTime" style="width: 134%" msg="创建时间"
                        @keyup.enter.native="getByPage" />
                    </el-form-item>
                  </el-col>
@@ -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">查询
--- a/src/views/finance/openTicket/openTicketRecordAdd.vue
+++ b/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>

--- a/src/views/finance/order/OrderPersonalInfoList.vue
+++ b/src/views/finance/order/OrderPersonalInfoList.vue
@@ -694,7 +694,7 @@ export default {
              <div>
                <div>
                  来源：
-                  {cell}
+                  { this.markData.ORDER_SOURCE[cell] }
                </div>
                <div>
                  支付：
--- a/src/views/site/oilCompanySiteDiaodu/adjustStrategyPiliangAdd.vue
+++ b/src/views/site/oilCompanySiteDiaodu/adjustStrategyPiliangAdd.vue
@@ -1,14 +1,6 @@
 <template>
-    <el-dialog
-        title=""
-        :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">
+    <el-dialog title="" :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
-                    class="close"
-                    @click="
-                        controlWindows.dialogAdjustStrategyPiliangAdd = false
-                    "
-                    src="@/assets/img/close_fill.png"
-                    alt=""
-                />
+                <img class="close" @click="
+                    controlWindows.dialogAdjustStrategyPiliangAdd = false
+                    " 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
-                            >
-                            <el-input
-                                type="textarea"
-                                :rows="2"
-                                placeholder="请输入内容"
-                                v-model="taskName"
-                            ></el-input>
+                            <span style="margin: 15px 0; display: block;">任务名称</span>
+                            <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="taskName"></el-input>
                        </div>
                        <el-divider></el-divider>
-                        <div
-                            style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 20px;"
-                        >
+                        <div style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 20px;">
                            <div class="mubiaocelue">
-                                <div
-                                    class="special-exhibition"
-                                    style="margin: -7px 0 12px;"
-                                >
-                                    <span style="margin-right: 10px"
-                                        >目标策略公式</span
-                                    >
-                                    <input
-                                        class="strategy-input"
-                                        type="text"
-                                        v-model="
-                                            convertPersonalPriceSyncStrategy
-                                        "
-                                        @keyup="inputHandle"
-                                        @blur="blurHandle"
-                                    />
+                                <div class="special-exhibition" style="margin: -7px 0 12px;">
+                                    <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
-                                        :label="1"
-                                        @click.native.prevent="selectRadio"
-                                        >立即应用到个人价</el-radio
-                                    >
+                                    <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
-                                v-model="taskTypeRadio"
-                                style="margin:0"
-                            >
+                            <el-radio-group v-model="taskTypeRadio" style="margin:0">
                                <el-radio :label="1">实时</el-radio>
                                <el-radio :label="2">预约</el-radio>
-                                <el-date-picker
-                                    popper-class="disableButton"
-                                    :disabled="taskTypeRadio !== 2"
-                                    v-model="startTime"
-                                    clearable
-                                    format="yyyy-MM-dd HH:mm:ss"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    type="datetime"
-                                    placeholder="预约时间"
-                                    :picker-options="pickerOptions"
-                                />
+                                <el-date-picker popper-class="disableButton" :disabled="taskTypeRadio !== 2"
+                                    v-model="startTime" 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
-                        style="margin-right: 20px;"
-                        type="info"
-                        @click="
-                            controlWindows.dialogAdjustStrategyPiliangAdd = false
-                        "
-                        >取 消</el-button
-                    >
-                    <el-popconfirm
-                        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-button style="margin-right: 20px;" type="info" @click="
+                        controlWindows.dialogAdjustStrategyPiliangAdd = false
+                        ">取 消</el-button>
+                    <el-popconfirm 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,
@@ -180,15 +124,33 @@ export default {
            taskName: "",
            startTime: "",
            userCompany: this.$store.getters.user.userCompany,
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() < Date.now() - 8.64e7;
+            pickerOptions: { 
+                xxfn(){
+                    
                },
-                selectableRange:
-                    parseTime(
-                        new Date(moment().format("YYYY-MM-DD HH:mm:ss")),
-                        "{hh}:{ii}:{ss}"
-                    ) + "- 23:59:00"
+                disabledDate(time) {
+                    // return time.getTime() < Date.now() - 8.64e7;
+
+                    // Date对象  获取当前时间+加15分钟和每一个time作比较 如果小于 返回true 禁用 如果大于等于 返回false 启用
+                    // 获取当前时间 
+                    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"
            }
        };
    },
@@ -285,9 +247,9 @@ export default {
                        data,
                        this.radio
                            ? {
-                                  convertPersonalPrice:
-                                      item.convertPersonalPrice
-                              }
+                                convertPersonalPrice:
+                                    item.convertPersonalPrice
+                            }
                            : {}
                    )
                );
@@ -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;
    }
--- a/src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue
+++ b/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>
--- a/src/views/site/oilSiteInfo/OilSiteInfoInfo.vue
+++ b/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>
--- a/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
+++ b/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
@@ -37,7 +37,7 @@
              </el-select>
            </el-form-item> -->
            <!-- <el-form-item>
-            <el-input v-model="page.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage" /> 
+            <el-input v-model="page.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage" />
              <el-select v-model="page.params.enableMark" filterable clearable placeholder="油品启用标识">
                <el-option value="1" label="油品启用" />
                <el-option value="0" label="油品禁用" />
@@ -91,7 +91,7 @@
            <el-button class="group-item" :size="$store.getters.size" type="success" @click="piliangAdd"><svg-icon
                icon-class="iconiconfonticon02" /> 快速调价任务</el-button>
          </el-col>
-          <el-col :span="24">
+          <el-col :span="8">
            <el-button type="primary" :size="$store.getters.size" icon="el-icon-search" @click="search">查询</el-button>
            <el-button :size="$store.getters.size" icon="el-icon-refresh" type="info" @click="
              page.params = {}
@@ -158,11 +158,12 @@
          <!-- 分页组件结束 -->
        </div>
      </ListLayout>
-      <!-- 历史记录弹窗 -->
-      <el-dialog v-el-drag-dialog title="变更历史" :visible.sync="showHistory" width="55%">
-        <el-table :data="historyData" style="width: 100%">
+      <!-- 历史记录抽屉 -->
+      <el-drawer :withHeader="false" title="变更历史" :visible.sync="showHistory" direction="ltr" size="55%">
+       <div style="padding: 20px;">
+        <el-table :data="historyData" style="width: 100%" border>
          <el-table-column prop="createTime" label="创建时间" />
-          
+
          <el-table-column prop="name" label="基础个人价">
            <template slot-scope="scope">
              <div>
@@ -191,12 +192,14 @@
            <template slot-scope="scope">
              <div>
                <div>{{ scope.row.createUserName }}</div>
-                <div> {{ scope.row.createUser }}</div>
+                <div> {{ scope.row.createUser?'暂无数据':scope.row.createUser}}</div>
              </div>
              </template>
          </el-table-column>
        </el-table>
-      </el-dialog>
+       </div>
+      </el-drawer>
+
      <!-- 导出弹窗 -->
      <el-dialog v-el-drag-dialog title="导出" :visible.sync="outPutDialog" width="20%">
        <OilSiteOilsPriceOutput :page="page" :dataPage="dataPage" v-if="outPutDialog"
@@ -292,7 +295,7 @@ export default {
                return ('禁用');
               }
            }
-          }, 
+          },
            {
              label: '基础个人价',
              value: 'personalPriceBase'
@@ -592,7 +595,7 @@ export default {
                <div>
                  <div>
                    <span>更新人</span>
-                    <span>{row.createUserName}</span>
+                    <span>{row.createUserName === undefined ?  ':'+'暂无数据' :row.createUserName}</span>
                  </div>
                  <div>
                    <span>更新时间</span>
--- a/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
    <el-row>
      <el-form ref="form" :rules="rules" :model="sysCustomerInfo" label-width="100px" :size="$store.getters.size">
        <el-row :gutter="gridNum.row.gutter">
--- a/src/views/system/auth/sysUser/SysCustomerInfoList.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoList.vue
@@ -212,16 +212,15 @@
        </div>
      </ListLayout>

-      <!-- 修改密码弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      <!-- 修改密码抽屉 -->
+      <el-drawer
        title="修改密码"
+        class="table-detail-drawer"
        :visible.sync="updatePwdDialog"
-        @closeDialog="closeDialog"
-        width="55%"
-        :before-close="handleClose"
+        direction="ltr"
+        size="55%"
      >
+      <div style="padding: 20px;">
        <el-form
          ref="form"
          :model="updatePwd"
@@ -236,18 +235,20 @@
          <el-button @click="handleClose">取消</el-button>
          <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
        </div>
-      </el-dialog>
-
-      <!-- 添加弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      </div>
+      
+      </el-drawer>
+     
+      <!-- 添加抽屉 -->
+      <el-drawer
        title="添加"
+        class="table-detail-drawer"
        :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
      >
-        <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      </el-drawer>

      <!-- 登录授权弹窗 -->
      <el-dialog
@@ -290,20 +291,22 @@
        />
      </el-dialog>

-      <!-- 修改弹窗 -->
-      <el-dialog
-        destroy-on-close
+      <!-- 修改抽屉 -->
+      <el-drawer
        title="修改"
+        class="table-detail-drawer"
        :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
      >
-        <SysCustomerInfoUpdate
+      <SysCustomerInfoUpdate
          v-if="updateDialog"
          :sys-customer-info="sysCustomerInfo"
          @getByPage="getByPage"
          @closeDialog="closeDialog"
        />
-      </el-dialog>
+      </el-drawer>
+    

      <!-- 详情抽屉 -->
      <el-drawer
@@ -311,7 +314,7 @@
        class="table-detail-drawer"
        :visible.sync="showTableDrawer"
        direction="ltr"
-        size="50%"
+        size="55%"
      >
        <SysCustomerInfoInfo
          v-if="showTableDrawer"
@@ -703,8 +706,8 @@ export default {
  margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
-  top: 0rem;
+ /* position: sticky;
+  top: 0rem; */
  min-height: 152px;
  z-index: 4;
  background: #fff;
--- a/src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
    <el-row>
      <el-form ref="form" :rules="rules" :model="sysCustomerInfo" label-width="100px" :size="$store.getters.size">
        <el-row :gutter="gridNum.row.gutter">
--- a/vue.config.js
+++ b/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]: ''
Author	SHA1	Message	Date
曹连存	b083229d5e	Merge pull request 'lifei' (#13 ) from lifei into master Reviewed-on: #13	2023-05-10 06:21:27 +00:00
李飞	27459621fa	人车管理星油车辆添加车牌	2023-05-10 09:10:07 +08:00
李飞	cf8ebd30fe	调度油价管理详情和列表姓名没有显示暂无数据	2023-05-09 15:27:36 +08:00
李飞	4e03e358d6	调度油价管理预约时间只能选设置当前15分钟后的时间	2023-05-09 09:03:10 +08:00
李飞	eae2515834	修改调度系统调度任务撤回404情况	2023-05-08 10:56:51 +08:00
李飞	6c11e4a4d7	Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into lifei	2023-05-08 09:25:32 +08:00
曹连存	e7fca62c03	Merge pull request 'caolc' (#12 ) from caolc into master Reviewed-on: #12	2023-04-27 05:16:58 +00:00
caolc	8e02a1240e	12	2023-04-27 13:16:24 +08:00
caolc	b3991ebba0	Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into caolc	2023-04-27 09:47:12 +08:00
曹连存	1c9d822b2a	Merge pull request '样式-按钮' (#11 ) from zyj into master Reviewed-on: #11	2023-04-27 01:46:58 +00:00
caolc	0752af5887	111	2023-04-27 09:46:02 +08:00
zhangyouji	f4d26f411c	样式-按钮	2023-04-26 18:12:25 +08:00
曹连存	d7cd8533c1	Merge pull request 'zyj' (#10 ) from zyj into master Reviewed-on: #10	2023-04-26 01:17:22 +00:00
zhangyouji	08890f25ac	样式修改	2023-04-25 17:32:04 +08:00
gitea_admin	c2be494202	Merge pull request '消费统计' (#9 ) from it_s into master Reviewed-on: #9	2023-04-25 02:33:29 +00:00
zhangyouji	37932ba640	样式修改	2023-04-24 17:22:32 +08:00
李飞	1a61692803	修改上次推送多打的一个字	2023-04-20 17:11:18 +08:00
李飞	1b98e15389	处理渠道订单管理，待确认企业订单配置添加数据返回不清空	2023-04-20 17:04:58 +08:00
李飞	49b394a6ae	支付来源显示汉字	2023-04-20 14:35:48 +08:00
李飞	fd9192562c	Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into lifei	2023-04-20 14:29:44 +08:00
李飞	08c13be954	油站管理详情页面优化	2023-04-20 13:11:26 +08:00