抽屉按钮

Merge pull request 'caolc' (#12 ) from caolc into master
Reviewed-on: #12
2023-04-27 19:03:05 +08:00 · 2023-04-27 05:16:58 +00:00 · 2023-04-27 13:16:24 +08:00 · 2023-04-27 09:47:12 +08:00 · 2023-04-27 01:46:58 +00:00 · 2023-04-27 09:46:02 +08:00
33 changed files with 574 additions and 223 deletions
--- 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/statisticalReport/companyConsumptionStatistics.js
+++ b/src/api/statisticalReport/companyConsumptionStatistics.js
@@ -4,14 +4,14 @@ var group_name = 'oilOrderInfo'
 export default {
  getStatisticalReportByPage(data) { 
    return request({
-      url: `/${service_name}/${group_name}/getStatisticalReportByPage`,
+      url: `/xkhl-site/saasBOrderInfo/getStatisticalReportByPage`,
      method: 'post',
      data:data
    })
  },
  getAccountTypeByCompanyId(data) { 
    return request({
-      url: `/${service_name}/${group_name}/getAccountTypeByCompanyId`,
+      url: `/xkhl-site/saasBOrderInfo/getAccountTypeByCompanyId`,
      method: 'post',
      data:data
    })
--- a/src/assets/img/login/img.png
+++ b/src/assets/img/login/img.png
--- a/src/assets/img/login/logo.png
+++ b/src/assets/img/login/logo.png
--- 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,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,10 +19,15 @@
              <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>
+          <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">
@@ -36,6 +41,7 @@
                </slot>
              </div>
            </div>
+          </slot>
        </el-card>
        <div >
          <slot :name="`${index}card_bottom`"></slot>
@@ -43,6 +49,7 @@
      </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)
    }
  }
@@ -118,6 +145,7 @@ export default {
 .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 {
--- a/src/views/driver/user/SysCustomerInfoAdd.vue
+++ b/src/views/driver/user/SysCustomerInfoAdd.vue
@@ -1,6 +1,10 @@
 <template>
-  <div>
-    <el-row>
+  <div style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <el-row style="flex:1;padding: 20px;">
      <el-form
        ref="form"
        :rules="rules"
@@ -72,12 +76,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>
@@ -203,3 +207,17 @@ 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,6 +1,10 @@
 <template>
-  <div>
-    <section style="padding: 20px">
+  <div style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <section style="padding: 20px;flex: 1;">
      <el-card shadow="never" class="box-card no-wrap">
        <div slot="header">
          <span class="card-header-icon"
@@ -365,6 +369,12 @@
        </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="添加系统角色"
@@ -947,4 +957,16 @@ 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
@@ -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,40 +171,56 @@
        </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="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
        <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="text-align: right">
+        <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;">
          <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>
+      </el-drawer>
+     

      <!-- 导出弹窗 -->
      <el-dialog
@@ -232,12 +248,13 @@
        />
      </el-dialog>

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

      <!-- 详情抽屉 -->
      <el-drawer
@@ -253,11 +271,12 @@
        class="table-detail-drawer"
        :visible.sync="showTableDrawer"
        direction="ltr"
-        size="80%"
+        size="55%"
      >
        <SysCustomerInfoInfo
          v-if="showTableDrawer"
          :sys-customer-info="sysCustomerInfo"
+          @closeDialog="closeDialog"
          @closedialogs="closeDialogs"
        />
      </el-drawer>
@@ -606,6 +625,7 @@ export default {
      this.updateDialog = false;
      this.updateInfoDialog = false;
      this.addInfoDialog = false;
+      this.showTableDrawer = false;
    },
  },
 };
@@ -623,8 +643,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,6 +1,10 @@
 <template>
-  <div>
-    <el-row>
+  <div style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">>
+    <el-row style="flex:1;padding: 20px;">
      <el-form
        ref="form"
        :rules="rules"
@@ -65,12 +69,15 @@
            </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>
@@ -193,3 +200,17 @@ 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,12 +1,16 @@
 <template>
-  <div>
-    <el-row>
+  <div style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <el-row style="flex:1;padding: 20px;">
      <el-form
        :model="oilVehicleOwner"
        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,12 +140,13 @@
            <el-col />
          </el-row> -->
        </el-card>
-        <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>
@@ -229,4 +234,16 @@ 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
@@ -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" />
      </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 
@@ -652,6 +654,7 @@ export default {
    closeDialog() {
      this.addDialog = false;
      this.updateDialog = false;
+      this.outPutDialog = false;
    },
  },
 };
@@ -669,8 +672,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,6 +1,10 @@
 <template>
-  <div>
-    <el-row>
+  <div  style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <el-row style="flex:1;padding: 20px;">
      <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">
@@ -14,7 +18,9 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-col :span="24" style="text-align: right">
+      </el-form>
+    </el-row>
+    <div class="_footer">
          <el-button @click="close">取消</el-button>

          <el-button
@@ -25,9 +31,7 @@
            type="primary"
            @click="importIf"
          >根据条件导出</el-button>
-        </el-col>
-      </el-form>
-    </el-row>
+    </div>
  </div>
 </template>
 <script>
@@ -63,3 +67,17 @@ 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,12 +1,16 @@
 <template>
-  <div>
-    <el-row>
+  <div style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <el-row style="flex:1;padding: 20px;">
      <el-form
        :model="oilVehicleOwner"
        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,12 +140,12 @@
            <el-col />
          </el-row> -->
        </el-card>
-        <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>
@@ -223,3 +227,17 @@ 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,6 +1,10 @@
 <template>
-  <div>
-    <el-row>
+  <div  style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <el-row style="flex:1;padding: 20px;">
      <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">
@@ -94,15 +98,16 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-col :span="24" style="text-align: right">
+        
+      </el-form>
+    </el-row>
+    <div class="_footer">
          <el-button @click="close">取消</el-button>
          <el-button
            type="primary"
            @click="submit"
          >提交</el-button>
-        </el-col>
-      </el-form>
-    </el-row>
+    </div>
  </div>
 </template>
 <script>
@@ -192,3 +197,17 @@ 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
@@ -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>
+      </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,12 +216,13 @@
        />
      </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
          v-if="updateDialog"
@@ -227,14 +230,15 @@
          @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"
      >
@@ -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,6 +1,10 @@
 <template>
-  <div>
-    <el-row>
+  <div  style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <el-row style="flex:1;padding: 20px;">
      <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">
@@ -97,15 +101,15 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-col :span="24" style="text-align: right">
+      </el-form>
+    </el-row>
+    <div class="_footer">
          <el-button @click="close">取消</el-button>
          <el-button
            type="primary"
            @click="submit"
          >提交</el-button>
-        </el-col>
-      </el-form>
-    </el-row>
+    </div>
  </div>
 </template>
 <script>
@@ -210,3 +214,17 @@ 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/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/OrderTfAdd.vue
+++ b/src/views/finance/order/OrderTfAdd.vue
@@ -1,6 +1,10 @@
 <template>
-  <div v-loading="loading" style="padding:20px">
-    <el-row>
+  <div v-loading="loading"  style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <el-row style="flex:1;padding: 20px;">
      <el-form ref="ruleForm" :rules="ruleForm" :model="oilTfOrder" label-width="120px" :size="$store.getters.size">
        <el-row :span="24">
          <el-col :span="13">
@@ -145,13 +149,22 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <div :span="24"
-          style="background:#fff;margin-top:20px;text-align: right;width:100%;">
+      </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;">
          <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/login/css/index.css
+++ b/src/views/login/css/index.css
@@ -1,6 +1,7 @@
 html {
    font-size: 16px !important;
 }
+
 /* iPhone6的375px尺寸作为16px基准，414px正好18px大小,600 20px */
 /* @media screen and (min-width:375px) {
    html {
@@ -43,29 +44,44 @@ html {
    margin: 0;
    width: 100vw;
    height: 100vh;
-    background-size: calc(100vw - 25.5rem) 100%;
-    background-repeat: no-repeat;
-    background-position: right;
-    background-origin: border-box;
-    background-attachment: fixed;
+    /* background-size: calc(100vw - 25.5rem) 100%; */
+    /* background-repeat: no-repeat; */
+    /* background-position: right; */
+    /* background-origin: border-box; */
+    /* background-attachment: fixed; */
    animation: start .5s;
    overflow: auto;
-    background-image: url('../../../assets/img/login/bg@2x.png') !important;
+    /* background-image: url('../../../assets/img/login/bg@2x.png') !important; */
+    background: linear-gradient(to right, #D3DFFB, #FFFFFF, #F0FBFE);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.newlogin_container_tb img {
+    width: 554px;
+    height: 554px;
+    margin-right: 234px;
 }

 .newlogin_login_container {
-    height: 100%;
-    width: 100%;
-    padding: 5.7rem 0 0 5.7rem;
+    /* height: 100%;
+    width: 100%; */
+    /* padding: 5.7rem 0 0 5.7rem; */
    animation: move 1s;
    /* animation-delay:1s;
    -webkit-animation-delay:1s;  */
+    box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.1);
+    border-radius: 8px 8px 8px 8px;
+    opacity: 1;
+    padding: 52px 80px 94px 80px;
+    /* width: 460px; */

 }

 .newlogin_login_logo {
-    width: 10.8rem;
-    height: 3.672rem;
+    width: 147px;
+    height: 46px;
 }

 .newlogin_login_logo img {
@@ -74,7 +90,7 @@ html {
 }

 .newlogin_login_title {
-    color: #1767F9;
+    color: #000000;
    font-size: 1.45rem;
    margin-top: 2rem;
 }
@@ -85,14 +101,14 @@ html {
 }

 .newlogin_container .el-input {
-    box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
-    border-radius: 36px;
+    /* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */
+    /* border-radius: 36px; */
 }

 .newlogin_container .el-input__inner {
    border: 0px !important;
    padding-left: 50px !important;
-    border-radius: 36px;
+    /* border-radius: 36px; */
    height: 2.6rem !important;
    font-size: .8rem !important;
    padding-right: 50px !important;
@@ -100,7 +116,7 @@ html {
 }

 .newlogin_container .el-form-item__content .el-input {
-    box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
+    /* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */

 }

@@ -112,8 +128,9 @@ html {

 .newlogin_login_from_butten {
    width: 100%;
-    border-radius: 36px;
-    font-size: 1.16rem;
+    /* border-radius: 36px; */
+    font-size: 14px;
+    background-color: #409EFF !important;
 }

 .newlogin_container .el-form-item {
@@ -133,12 +150,14 @@ html {
 }

 .newlogin_container .el-button--primary {
-    background: linear-gradient(to right, #1767F9, #4883ED);
+    background-color: #409EFF !important;
+
 }

 .newlogin_container .el-button--primary:hover,
 .newlogin_container .el-button--primary:focus {
-    background: linear-gradient(to right, #1767F9, #4883ED);
+    background-color: #409EFF !important;
+

 }

--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,10 +1,13 @@
 <template>
    <div v-loading="this.$store.getters.loading" class="newlogin_container">
+        <div class="newlogin_container_tb">
+            <img style="" src="../../assets/img/login/img.png" alt="" />
+        </div>
        <div class="newlogin_login_container">
            <div class="newlogin_login_logo">
                <img style="" src="../../assets/img/login/logo.png" alt="" />
            </div>
-            <div class="newlogin_login_title">星油能源调度管理平台</div>
+            <div class="newlogin_login_title">欢迎使用中品调度管理平台</div>
            <div class="newlogin_login_from_container">
                <el-form ref="form" :model="loginForm">
                    <el-form-item>
--- 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/oilSiteOilsPrice/OilSiteOilsPriceList.vue
+++ b/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
@@ -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,9 +158,10 @@
          <!-- 分页组件结束 -->
        </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="基础个人价">
@@ -196,7 +197,9 @@
              </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"
--- a/src/views/statisticalReport/companyConsumptionStatistics.vue
+++ b/src/views/statisticalReport/companyConsumptionStatistics.vue
@@ -178,9 +178,6 @@
                <el-form-item label="赊销金额">
                  <span> {{scope.row.chargeRechargeBalance|balanceType}}</span>
                </el-form-item>
-                <el-form-item label="充返金额">
-                  <span>{{scope.row.rechargeRebateBalance|balanceType}}</span>
-                </el-form-item>
                <el-form-item label="消返金额">
                  <span>{{scope.row.consumeRebateBalance|balanceType}}</span>
                </el-form-item>
@@ -192,9 +189,6 @@
                <el-form-item label="累计赊销金额">
                  <span> {{dataListChild.sxje?dataListChild.sxje:'0.00'}}</span>
                </el-form-item>
-                <el-form-item label="累计充返金额">
-                  <span>{{dataListChild.cfje?dataListChild.cfje:'0.00'}}</span>
-                </el-form-item>
                <el-form-item label="累计消返金额">
                  <span>{{dataListChild.xfje?dataListChild.xfje:'0.00'}}</span>
                </el-form-item>
--- a/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
@@ -1,6 +1,10 @@
 <template>
-  <div>
-    <el-row>
+  <div style="width: 100%;
+              height: 100%;
+              display: flex;
+              flex-direction: column;
+              position: relative;">
+    <el-row style="flex:1;padding: 20px;">
      <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">
@@ -63,15 +67,15 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-col :span="24" style="text-align: right">
+      </el-form>
+    </el-row>
+    <div  class="_footer">
          <el-button @click="close">取消</el-button>
          <el-button
            type="primary"
            @click="submit"
          >提交</el-button>
-        </el-col>
-      </el-form>
-    </el-row>
+    </div>
  </div>
 </template>
 <script>
@@ -183,3 +187,17 @@ 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,6 +1,10 @@
 <template>
-  <div>
-    <section style="padding:20px;">
+  <div style="width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  position: relative;">
+    <section style="padding:20px;flex: 1;">

      <el-card class="box-card no-wrap" style="margin-bottom:10px">
        <div class="my-cell">
@@ -322,6 +326,12 @@
      </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="添加系统角色"
@@ -670,4 +680,16 @@ 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
@@ -212,42 +212,56 @@
        </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="width: 100%;
+                  height: 100%;
+                  display: flex;
+                  flex-direction: column;
+                  position: relative;">
        <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="text-align: right">
+        <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;">
          <el-button @click="handleClose">取消</el-button>
          <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
        </div>
-      </el-dialog>
+      </div>
      
-      <!-- 添加弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      </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>
+      </el-drawer>

      <!-- 登录授权弹窗 -->
      <el-dialog
@@ -290,12 +304,13 @@
        />
      </el-dialog>

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

      <!-- 详情抽屉 -->
      <el-drawer
@@ -311,10 +327,11 @@
        class="table-detail-drawer"
        :visible.sync="showTableDrawer"
        direction="ltr"
-        size="50%"
+        size="55%"
      >
        <SysCustomerInfoInfo
          v-if="showTableDrawer"
+          @closeDialog="closeDialog"
          :sys-customer-info="sysCustomerInfo"
        />
      </el-drawer>
@@ -686,6 +703,7 @@ export default {
      this.addDialog = false;
      this.updateDialog = false;
      this.updatePwdDialog = false;
+      this.showTableDrawer = false;
    },
  },
 };
@@ -703,8 +721,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,6 +1,10 @@
 <template>
-  <div>
-    <el-row>
+  <div style="width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  position: relative;">
+    <el-row style="padding: 20px;flex: 1;">
      <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">
@@ -55,15 +59,15 @@
            </el-form-item>
          </el-col>
        </el-row>
-        <el-col :span="24" style="text-align: right">
+      </el-form>
+    </el-row>
+    <div class="_footer">
          <el-button @click="close">取消</el-button>
          <el-button
            type="primary"
            @click="submit"
          >提交</el-button>
-        </el-col>
-      </el-form>
-    </el-row>
+    </div>
  </div>
 </template>
 <script>
@@ -178,3 +182,17 @@ 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/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://192.168.0.27:38080`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''
Author	SHA1	Message	Date
zhangyouji	e8ea1610f3	抽屉按钮	2023-04-27 19:03:05 +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
xk_jiangfeng	1ac4ace5c7	消费统计	2023-04-25 10:30:21 +08:00
曹连存	380c07fd79	Merge pull request 'caolc' (#8 ) from caolc into master Reviewed-on: #8	2023-04-25 01:28:29 +00:00
zhangyouji	37932ba640	样式修改	2023-04-24 17:22:32 +08:00
caolc	641559b0b1	123	2023-04-21 13:14:30 +08:00
caolc	c1221ce4c9	Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into caolc	2023-04-20 09:27:46 +08:00