Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into lifei

修改上次推送多打的一个字
处理渠道订单管理，待确认企业订单配置添加数据返回不清空
2023-05-08 09:25:32 +08:00 · 2023-04-20 17:11:18 +08:00 · 2023-04-20 17:04:58 +08:00 · 2023-04-20 14:35:48 +08:00 · 2023-04-20 14:29:44 +08:00 · 2023-04-20 13:11:26 +08:00
18 changed files with 105 additions and 347 deletions
--- a/src/views/driver/user/SysCustomerInfoAdd.vue
+++ b/src/views/driver/user/SysCustomerInfoAdd.vue
@@ -1,10 +1,6 @@
 <template>
-  <div style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <el-row style="flex:1;padding: 20px;">
+  <div style="padding: 20px;">
+    <el-row>
      <el-form
        ref="form"
        :rules="rules"
@@ -76,12 +72,12 @@
            </el-form-item>
          </el-col>
        </el-row>
-      </el-form>
-    </el-row>
-    <div class="_footer">
+        <el-col :span="24" style="text-align: right">
          <el-button @click="close">取消</el-button>
          <el-button type="primary" @click="submit">提交</el-button>
-    </div>
+        </el-col>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
@@ -207,17 +203,3 @@ export default {
  },
 };
 </script>
-<style scoped>
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
-</style>
--- a/src/views/driver/user/SysCustomerInfoInfo.vue
+++ b/src/views/driver/user/SysCustomerInfoInfo.vue
@@ -1,10 +1,6 @@
 <template>
-  <div style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <section style="padding: 20px;flex: 1;">
+  <div>
+    <section style="padding: 20px">
      <el-card shadow="never" class="box-card no-wrap">
        <div slot="header">
          <span class="card-header-icon"
@@ -369,12 +365,6 @@
        </el-tabs>
      </el-card> -->
    </section>
-    <div class="generalDetails_footer">
-      <slot name="footer">
-        <el-button @click="close" type="primary">关闭</el-button>
-      </slot>
-    </div>
-    
    <el-dialog
      v-el-drag-dialog
      title="添加系统角色"
@@ -957,16 +947,4 @@ export default {
  padding-top: 5px;
  font-size: 14px;
 }
-.generalDetails_footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
 </style>
--- a/src/views/driver/user/SysCustomerInfoList.vue
+++ b/src/views/driver/user/SysCustomerInfoList.vue
@@ -179,31 +179,18 @@
        direction="ltr"
        size="55%"
      >
-      <div style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
+      <div style="padding: 20px;">
        <el-form
          ref="form"
          :model="updatePwd"
          :rules="rules"
          label-width="100px"
-          style="flex:1;padding: 20px;"
        >
          <el-form-item label="新密码" prop="encryptPsw">
            <el-input v-model="updatePwd.encryptPsw" style="width: 50%" />
          </el-form-item>
        </el-form>
-        <div  style="min-height: 50px;
-                    position: sticky;
-                    bottom: 0px;
-                    width: 100%;
-                    display: flex;
-                    justify-content: right;
-                    padding: 15px 20px;
-                    box-sizing: border-box;
-                    border-top: solid 1px #e5e5e5;">
+        <div style="text-align: right">
          <el-button @click="updatePwdDialog = false;">取消</el-button>
          <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
        </div>
@@ -276,7 +263,6 @@
        <SysCustomerInfoInfo
          v-if="showTableDrawer"
          :sys-customer-info="sysCustomerInfo"
-          @closeDialog="closeDialog"
          @closedialogs="closeDialogs"
        />
      </el-drawer>
@@ -625,7 +611,6 @@ export default {
      this.updateDialog = false;
      this.updateInfoDialog = false;
      this.addInfoDialog = false;
-      this.showTableDrawer = false;
    },
  },
 };
--- a/src/views/driver/user/SysCustomerInfoUpdate.vue
+++ b/src/views/driver/user/SysCustomerInfoUpdate.vue
@@ -1,10 +1,6 @@
 <template>
-  <div style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">>
-    <el-row style="flex:1;padding: 20px;">
+  <div style="padding: 20px;">
+    <el-row>
      <el-form
        ref="form"
        :rules="rules"
@@ -69,15 +65,12 @@
            </el-form-item>
          </el-col>
        </el-row>
+        <el-col :span="24" style="text-align: right">
+          <el-button @click="close">取消</el-button>
+          <el-button type="primary" @click="submit">提交</el-button>
+        </el-col>
      </el-form>
    </el-row>
-    <div class="_footer">
-          <el-button @click="close">取消</el-button>
-          <el-button
-            type="primary"
-            @click="submit"
-          >提交</el-button>
-    </div>
  </div>
 </template>
 <script>
@@ -200,17 +193,3 @@ export default {
  },
 };
 </script>
-<style scoped>
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
-</style>
--- a/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
@@ -1,10 +1,6 @@
 <template>
-  <div style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <el-row style="flex:1;padding: 20px;">
+  <div>
+    <el-row>
      <el-form
        :model="oilVehicleOwner"
        label-width="100px"
@@ -140,13 +136,12 @@
            <el-col />
          </el-row> -->
        </el-card>
-        
-      </el-form>
-    </el-row>
-    <div class="_footer">
+        <el-col :span="24" style="text-align: right;padding: 20px;">
          <el-button @click="close">取消</el-button>
          <el-button type="primary" @click="submit">提交</el-button>
-    </div>
+        </el-col>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
@@ -234,16 +229,4 @@ export default {
 .clearfix:after {
  clear: both;
 }
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
 </style>
--- a/src/views/driver/vehicle/OilVehicleOwnerList.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerList.vue
@@ -654,7 +654,6 @@ export default {
    closeDialog() {
      this.addDialog = false;
      this.updateDialog = false;
-      this.outPutDialog = false;
    },
  },
 };
--- a/src/views/driver/vehicle/OilVehicleOwnerOutput.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerOutput.vue
@@ -1,10 +1,6 @@
 <template>
-  <div  style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <el-row style="flex:1;padding: 20px;">
+  <div style="padding: 20px;">
+    <el-row>
      <el-form :model="data" label-width="100px" :size="$store.getters.size">
        <el-row :gutter="gridNum.row.gutter">
          <el-col :xs="gridNum.cols.xs" :sm="gridNum.cols.sm" :md="gridNum.cols.md" :lg="gridNum.cols.lg" :xl="gridNum.cols.xl">
@@ -18,9 +14,7 @@
            </el-form-item>
          </el-col>
        </el-row>
-      </el-form>
-    </el-row>
-    <div class="_footer">
+        <el-col :span="24" style="text-align: right">
          <el-button @click="close">取消</el-button>

          <el-button
@@ -31,7 +25,9 @@
            type="primary"
            @click="importIf"
          >根据条件导出</el-button>
-    </div>
+        </el-col>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
@@ -67,17 +63,3 @@ export default {
  }
 }
 </script>
-<style scoped>
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
-</style>
--- a/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
@@ -1,10 +1,6 @@
 <template>
-  <div style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <el-row style="flex:1;padding: 20px;">
+  <div>
+    <el-row>
      <el-form
        :model="oilVehicleOwner"
        label-width="100px"
@@ -140,12 +136,12 @@
            <el-col />
          </el-row> -->
        </el-card>
-      </el-form>
-    </el-row>
-    <div class="_footer">
+        <el-col :span="24" style="text-align: right;padding: 20px;;">
          <el-button @click="close">取消</el-button>
          <el-button type="primary" @click="submit">提交</el-button>
-    </div>
+        </el-col>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
@@ -227,17 +223,3 @@ export default {
  },
 };
 </script>
-<style scoped>
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
-</style>
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
@@ -1,10 +1,6 @@
 <template>
-  <div  style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <el-row style="flex:1;padding: 20px;">
+  <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">
          <el-col :xs="gridNum.cols.xs" :sm="gridNum.cols.sm" :md="gridNum.cols.md" :lg="gridNum.cols.lg" :xl="gridNum.cols.xl">
@@ -98,16 +94,15 @@
            </el-form-item>
          </el-col>
        </el-row>
-        
-      </el-form>
-    </el-row>
-    <div class="_footer">
+        <el-col :span="24" style="text-align: right">
          <el-button @click="close">取消</el-button>
          <el-button
            type="primary"
            @click="submit"
          >提交</el-button>
-    </div>
+        </el-col>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
@@ -197,17 +192,3 @@ export default {
  }
 }
 </script>
-<style scoped>
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
-</style>
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
@@ -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) {
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
@@ -1,10 +1,6 @@
 <template>
-  <div  style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <el-row style="flex:1;padding: 20px;">
+  <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">
          <el-col :xs="gridNum.cols.xs" :sm="gridNum.cols.sm" :md="gridNum.cols.md" :lg="gridNum.cols.lg" :xl="gridNum.cols.xl">
@@ -101,15 +97,15 @@
            </el-form-item>
          </el-col>
        </el-row>
-      </el-form>
-    </el-row>
-    <div class="_footer">
+        <el-col :span="24" style="text-align: right">
          <el-button @click="close">取消</el-button>
          <el-button
            type="primary"
            @click="submit"
          >提交</el-button>
-    </div>
+        </el-col>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
@@ -214,17 +210,3 @@ export default {
  }
 }
 </script>
-<style scoped>
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
-</style>
--- 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/finance/order/OrderTfAdd.vue
+++ b/src/views/finance/order/OrderTfAdd.vue
@@ -1,10 +1,6 @@
 <template>
-  <div v-loading="loading"  style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <el-row style="flex:1;padding: 20px;">
+  <div v-loading="loading" style="padding:20px">
+    <el-row>
      <el-form ref="ruleForm" :rules="ruleForm" :model="oilTfOrder" label-width="120px" :size="$store.getters.size">
        <el-row :span="24">
          <el-col :span="13">
@@ -149,22 +145,13 @@
            </el-form-item>
          </el-col>
        </el-row>
-      </el-form>
-    </el-row>
-    <div
-          style="min-height: 50px;
-                position: sticky;
-                bottom: 0px;
-                width: 100%;
-                display: flex;
-                justify-content: right;
-                padding: 15px 20px;
-                box-sizing: border-box;
-                border-top: solid 1px #e5e5e5;
-                z-index: 999999;">
+        <div :span="24"
+          style="background:#fff;margin-top:20px;text-align: right;width:100%;">
          <el-button @click="close">取消</el-button>
          <el-button type="primary" @click="submit" style="margin-right:10px">提交</el-button>
        </div>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
--- 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/system/auth/sysUser/SysCustomerInfoAdd.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
@@ -1,10 +1,6 @@
 <template>
-  <div style="width: 100%;
-              height: 100%;
-              display: flex;
-              flex-direction: column;
-              position: relative;">
-    <el-row style="flex:1;padding: 20px;">
+  <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">
          <el-col :span="12">
@@ -67,15 +63,15 @@
            </el-form-item>
          </el-col>
        </el-row>
-      </el-form>
-    </el-row>
-    <div  class="_footer">
+        <el-col :span="24" style="text-align: right">
          <el-button @click="close">取消</el-button>
          <el-button
            type="primary"
            @click="submit"
          >提交</el-button>
-    </div>
+        </el-col>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
@@ -187,17 +183,3 @@ export default {
  }
 }
 </script>
-<style scoped>
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
-</style>
--- a/src/views/system/auth/sysUser/SysCustomerInfoInfo.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoInfo.vue
@@ -1,10 +1,6 @@
 <template>
-  <div style="width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  position: relative;">
-    <section style="padding:20px;flex: 1;">
+  <div>
+    <section style="padding:20px;">

      <el-card class="box-card no-wrap" style="margin-bottom:10px">
        <div class="my-cell">
@@ -326,12 +322,6 @@
      </el-card>
      <!-- 登录授权 -->
    </section>
-    <div class="generalDetails_footer">
-      <slot name="footer">
-        <el-button @click="close" type="primary">关闭</el-button>
-      </slot>
-    </div>
-    
    <el-dialog
      v-el-drag-dialog
      title="添加系统角色"
@@ -680,16 +670,4 @@ export default {
  margin-right: 20px;
  text-align: center;
 }
-.generalDetails_footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
 </style>
--- a/src/views/system/auth/sysUser/SysCustomerInfoList.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoList.vue
@@ -220,31 +220,18 @@
        direction="ltr"
        size="55%"
      >
-      <div style="width: 100%;
-                  height: 100%;
-                  display: flex;
-                  flex-direction: column;
-                  position: relative;">
+      <div style="padding: 20px;">
        <el-form
          ref="form"
          :model="updatePwd"
          :rules="rules"
          label-width="100px"
-          style="flex:1;padding: 20px;"
        >
          <el-form-item label="新密码" prop="encryptPsw">
            <el-input v-model="updatePwd.encryptPsw" style="width: 50%" />
          </el-form-item>
        </el-form>
-        <div style="min-height: 50px;
-                    position: sticky;
-                    bottom: 0px;
-                    width: 100%;
-                    display: flex;
-                    justify-content: right;
-                    padding: 15px 20px;
-                    box-sizing: border-box;
-                    border-top: solid 1px #e5e5e5;">
+        <div style="text-align: right">
          <el-button @click="handleClose">取消</el-button>
          <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
        </div>
@@ -331,7 +318,6 @@
      >
        <SysCustomerInfoInfo
          v-if="showTableDrawer"
-          @closeDialog="closeDialog"
          :sys-customer-info="sysCustomerInfo"
        />
      </el-drawer>
@@ -703,7 +689,6 @@ export default {
      this.addDialog = false;
      this.updateDialog = false;
      this.updatePwdDialog = false;
-      this.showTableDrawer = false;
    },
  },
 };
--- a/src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue
@@ -1,10 +1,6 @@
 <template>
-  <div style="width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  position: relative;">
-    <el-row style="padding: 20px;flex: 1;">
+  <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">
          <el-col :span="12">
@@ -59,15 +55,15 @@
            </el-form-item>
          </el-col>
        </el-row>
-      </el-form>
-    </el-row>
-    <div class="_footer">
+        <el-col :span="24" style="text-align: right">
          <el-button @click="close">取消</el-button>
          <el-button
            type="primary"
            @click="submit"
          >提交</el-button>
-    </div>
+        </el-col>
+      </el-form>
+    </el-row>
  </div>
 </template>
 <script>
@@ -182,17 +178,3 @@ export default {
  }
 }
 </script>
-<style scoped>
-._footer {
-  min-height: 50px;
-  position: sticky;
-  bottom: 0px;
-  width: 100%;
-  display: flex;
-  justify-content: right;
-  padding: 15px 20px;
-  box-sizing: border-box;
-  border-top: solid 1px #e5e5e5;
-  z-index: 999999;
-}
-</style>
Author	SHA1	Message	Date
李飞	6c11e4a4d7	Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into lifei	2023-05-08 09:25: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