优化需求

.env.staging

@@ -10,7 +10,10 @@ ENV = 'staging'
 # 测试
 VUE_APP_BASE_API = 'http://192.168.1.222:7077/'
 # 预发布
+# 内网
 VUE_APP_BASE_API1 = 'http://192.168.1.222:8077/'
+# 外网
+VUE_APP_BASE_API2 = 'http://120.79.166.78:19087/'
 #图片
 VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'
 

src/api/financed/index.js

@@ -189,6 +189,7 @@ export function countOrderNum(query) {
     url: "/system/top/order/countOrderNum",
     method: "get",
     params: query,
+    isProce:true
   });
 }
 

src/components/BaseDialog.vue

@@ -6,10 +6,12 @@
     :close-on-click-modal="false"
     :append-to-body="appendToBody"
     @closed="close"
+    :fullscreen="fullscreen"
   >
     <div slot="title" class="hearders">
       <div class="leftTitle">{{ title }}</div>
       <div class="rightBoxs">
+        <i class="el-icon-full-screen full_style" @click="fullscreen = !fullscreen"></i>
         <img
           src="@/assets/images/Close@2x.png"
           alt=""
@@ -76,7 +78,9 @@ export default {
     },
   },
   data() {
-    return {};
+    return {
+      fullscreen:false,
+    };
   },
   methods: {
     confirmBtn() {
@@ -101,6 +105,7 @@ export default {
     visible(val) {
       // 在此做显示与隐藏的交互
       if (val === false) {
+        this.fullscreen = false
         // 重置操作
       } else {
         // 展示时操作
@@ -154,4 +159,8 @@ export default {
 /deep/.el-button {
   border-radius: 8px;
 }
+.full_style {
+  cursor: pointer;
+  color:#6e6e6e;
+}
 </style>

src/components/Comon/pictureList.vue

@@ -22,25 +22,18 @@ export default {
         return [];
       },
     },
-    fn: {
-      type: Function,
+    info: {
+      type: Object,
       default: () => {
-        return Promise.resolve({ data: {} });
+        return {};
       },
     },
   },
   data() {
     return {
-      info: {},
     };
   },
 
-  mounted() {
-    this.fn().then((res) => {
-      this.info = res.data;
-    });
-  },
-
   methods: {
     backFullSrc(name) {
       return require(`@/assets/images/${name}@2x.png`);

src/components/searchBoxNew.vue

@@ -566,7 +566,7 @@
             :style="item.prop === 'searchKey' ? 'width:260px;' : ''"
             v-else-if="!item.scope"
             clearable
-            v-model="formData[item.prop]"
+            v-model.trim="formData[item.prop]"
             :placeholder="item.placeholder"
             :size="size"
             @keyup.enter.native="search"
@@ -1103,6 +1103,11 @@ export default {
 </script>
 
 <style lang="less" scoped>
+::v-deep .el-input__inner{
+  &::placeholder{
+    color:#a4a4a4;
+  }
+}
 .fon_s {
   font-size: 14px;
   color: #6b6b6b;

src/components/tableList.vue

@@ -2,8 +2,11 @@
   <div id="tableList">
     <div class="headerNavTool" v-if="navText.headShow !== false">
       <div class="leftIndexText">
-        {{ navText.title }} <strong>{{ navText.index }}</strong>
-        {{ navText.ch }}
+        {{ navText.title }} <strong>{{ navText.index }}</strong> {{ navText.ch
+        }}<span style="color: red; font-weight: bold;font-size:16px;margin-left:10px;"
+          ><i class="el-icon-warning-outline" style="font-weight: bold;"></i>
+          鼠标点击数据表数据，再按键盘左右键可以左右滑动数据表数据。</span
+        >
       </div>
       <div class="rightBtnBox">
         <slot name="customize"></slot>
@@ -1937,7 +1940,7 @@ export default {
     },
     select(selection, row) {
       this.allCheckData = selection;
-      this.$emit("select", selection,row);
+      this.$emit("select", selection, row);
     },
     load(tree, treeNode, resolve) {
       this.$emit("load", tree, treeNode, resolve);

src/fxApi/orderManageList.js

@@ -4,8 +4,9 @@ export default {
     systemtoporderstatistics(data) {
         return request({
             url: '/system/top/order/statistics',
-            method: 'post',
-            data
+            method: 'get',
+            params: data,
+            isProce: true,
         })
     },
     //查询订单列表
@@ -13,7 +14,8 @@ export default {
         return request({
             url: '/system/top/order/list',
             method: 'get',
-            params: data
+            params: data,
+            isProce: true,
         })
     },
     //批量修改订单备注
@@ -123,9 +125,19 @@ export default {
         return request({
             url: '/system/top/order/export',
             method: 'get',
+            params: data,
+            isProce: true,
+        })
+    },
+    //订单学员信息导出
+    systemtoporderstudentexport(data) {
+        return request({
+            url: '/system/top/order/student/export',
+            method: 'get',
             params: data
         })
     },
+    
     //订单操作记录
     systemtoporderlog(data) {
         return request({

src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'Admin-Token-All'
 
 export function getToken() {
   return Cookies.get(TokenKey)

src/utils/request.js

@@ -9,7 +9,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
 export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-// export const baseURL = "http://192.168.1.24:7077/";
+// export const baseURL = "http://192.168.1.7:7077/";
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/financed/arap/index.vue

@@ -18,8 +18,9 @@
       @init="init"
     />
     <picture-list
+    ref="pictureList"
       :key="type + 'a'"
-      :fn="getCountOrderNum"
+      :info="info"
       :list="showTabList[type]"
     ></picture-list>
     <table-list
@@ -231,6 +232,7 @@ export default {
   data() {
     return {
       value5: [],
+      info:{},
       showTabList: [
         [
           {
@@ -859,6 +861,31 @@ export default {
           this.loading = false;
         });
     },
+    getReplaceData() {
+      return new Promise((resolve) => {
+        const fn = [
+          orderList,
+          companyList,
+          sellerPercentageList,
+          commissionList,
+        ][this.type];
+        fn(this.formData)
+          .then((res) => {
+            res.rows.forEach((i) => {
+              this.$set(
+                this.tableData[this.tableData.findIndex((k) => k.id === i.id)],
+                "payStatus",
+                i.payStatus
+              );
+            });
+            this.total = res.total;
+            this.navText.index = res.total;
+          })
+          .finally(() => {
+            this.loading = false;
+          });
+      });
+    },
     load(tree, treeNode, resolve, type) {
       monthOrderList({
         divideLogId: tree.id,
@@ -1007,7 +1034,7 @@ export default {
       });
       return arr;
     },
-    search(v) {
+    async search(v) {
       this.loading = true;
       if (v === 2) {
         this.tableData = [];
@@ -1026,7 +1053,9 @@ export default {
         this.activeList = [];
         this.$refs.tableList.clearMoreActive();
       });
+      this.getCountOrderNum()
       if (v === 4 && this.type !== 0) {
+        await this.getReplaceData();
         this.maps.forEach((value, id) => {
           this.update(id, 2);
         });
@@ -1045,8 +1074,11 @@ export default {
       });
     },
     getCountOrderNum() {
-      return countOrderNum({ totalType: this.type + 1 }).then((res) => {
-        return Promise.resolve(res);
+      var data = JSON.parse(JSON.stringify(this.formData))
+      delete data.pageNum
+      delete data.pageSize
+      countOrderNum({ totalType: this.type + 1,...data }).then((res) => {
+        this.info = res.data
       });
     },
   },

src/views/financed/components/dislogOrderDetails.vue

@@ -50,13 +50,16 @@
                 target="_blank"
                 >资料下载</el-link
               >
-              <el-image
-                v-if="desc.type === 'image'"
-                style="width: 40px; height: 20px"
+              <div v-if="desc.type === 'image'">
+                <el-image
+                v-if="detailInfo[desc.key] && detailInfo[desc.key].length > 0"
+                style="width: 40px; height: 20px;margin-right:10px;"
                 :src="detailInfo[desc.key][0]"
                 :preview-src-list="detailInfo[desc.key]"
               >
               </el-image>
+              <span>{{ detailInfo[desc.key] && detailInfo[desc.key].length > 0 ? '共'+detailInfo[desc.key].length+'张':'暂无转账凭证' }}</span>
+              </div>
               <div v-if="desc.type === 'pretax'">
                 <span style="margin-right: 20px"
                   >税前佣金：{{
@@ -160,7 +163,7 @@ export default {
           label: "实际订单金额(元)",
           type: "reduce",
         },
-        { label: "下单企业", key: "tenantName" },
+        { label: "下单企业", key: "purchaseOrg" },
         { label: "转账开户名", key: "openingName" },
         { label: "转账凭证", key: "attachmentList", type: "image" },
         {

src/views/financed/components/studentDetails.vue

@@ -39,19 +39,21 @@
           <el-input
             style="width: 230px; margin-right: 10px"
             size="small"
-            v-model="formData.userName"
+            v-model.trim="formData.userName"
             placeholder="姓名"
           ></el-input>
           <el-input
             style="width: 230px; margin-right: 10px"
             size="small"
-            v-model="formData.userCard"
+            v-model.trim="formData.userCard"
             placeholder="身份证号"
           ></el-input>
           <el-button size="small" type="primary" @click="search"
             >查询</el-button
           >
           <el-button size="small" @click="search('init')">重置</el-button>
+          <el-button size="small" type="success" @click="exportData">导出</el-button>
+
           <el-button
             v-if="ShowStatus && isShow"
             type="success"
@@ -107,6 +109,7 @@
 </template>
 
 <script>
+import { exportFn } from "@/utils/index.js";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
@@ -364,11 +367,16 @@ export default {
   created() {
     this.search("init");
   },
-  mounted() {
-    console.log(this.checkStatus, "--checkStatus");
-  },
-
   methods: {
+    exportData() {
+      this.$api.systemtoporderstudentexport(this.formData).then((res) => {
+        if (res.msg) {
+          exportFn(res.msg, `导出数据`);
+        } else {
+          this.$message.error("导出失败");
+        }
+      });
+    },
     orderCheck(e, ch) {
       if (this.$refs.tableList.allCheckData.length === 0) {
         this.$message.error("请勾选数据");
@@ -391,7 +399,7 @@ export default {
             .then((res) => {
               this.search("init");
               this.$message.success("操作成功");
-              this.$emit('parentsSearch')
+              this.$emit("parentsSearch");
             });
         })
         .catch(() => {});

src/views/financed/orderManageList/index.vue

@@ -20,7 +20,7 @@
       <el-button type="primary" size="small" @click="editRemarks(1)"
         >修改备注</el-button
       >
-      <el-button size="small" @click="exportExcel()">导出excel</el-button>
+      <el-button size="small" @click="exportData">导出excel</el-button>
     </div>
     <div class="dis_flex_order_li">
       <div class="list" v-for="(item, index) in ShowTabList" :key="index">
@@ -193,7 +193,7 @@
           :disabled="
             !(
               // props.scope.row.finishSign === 1 &&
-              props.scope.row.finishStatus === 0
+              (props.scope.row.finishStatus === 0)
             ) || disabledStatus(props.scope.row.commercialTenant)
           "
           @click="completeOrder(props.scope.row.orderSn, 1)"
@@ -354,7 +354,7 @@ export default {
         choice: true,
         addHide: true,
         openCheckMore: true,
-        changeWidth: "100px",
+        changeWidth: "160px",
         custom: false,
         backFatherBtn: {
           status: false,
@@ -381,6 +381,11 @@ export default {
             { label: "出纳", value: 2 },
           ],
         },
+        {
+          prop: "orderOrg",
+          placeholder: "订单来源",
+        },
+
         // {
         //   prop: "businessFullName",
         //   placeholder: "业务分类",
@@ -463,8 +468,17 @@ export default {
           placeholder: "时间",
           prop1: "startTime",
           prop2: "endTime",
-          placeholder1: "开始日期",
-          placeholder2: "结束日期",
+          placeholder1: "订单开始日期",
+          placeholder2: "订单结束日期",
+          scope: "moreDataPicker",
+          Diszing: true,
+        },
+        {
+          placeholder: "审核时间",
+          prop1: "checkStartTime",
+          prop2: "checkEndTime",
+          placeholder1: "审核开始日期",
+          placeholder2: "审核结束日期",
           scope: "moreDataPicker",
           Diszing: true,
         },
@@ -476,13 +490,25 @@ export default {
           prop: "userCard",
           placeholder: "身份号",
         },
+        {
+          prop: "userName",
+          placeholder: "学员姓名",
+        },
       ],
       formData: {
         pageSize: 10,
         pageNum: 1,
+        checkStatus: 0,
       },
       // 表单
       tableSet: [
+        {
+          label: "业务类型",
+          prop: "businessNames",
+          hidden: true,
+          scope: "solt",
+          soltName: "type",
+        },
         {
           label: "订单信息",
           prop: "name",
@@ -567,13 +593,6 @@ export default {
           prop: "purchaseOrg",
           hidden: true,
         },
-        {
-          label: "业务类型",
-          prop: "businessNames",
-          hidden: true,
-          scope: "solt",
-          soltName: "type",
-        },
         {
           label: "发票状态",
           prop: "invoiceStatus",
@@ -591,10 +610,15 @@ export default {
           ],
         },
         {
-          label: "备注",
+          label: "业务员备注",
           prop: "remark",
           hidden: true,
         },
+        {
+          label: "财务备注",
+          prop: "financeRemark",
+          hidden: true,
+        },
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条
@@ -615,7 +639,7 @@ export default {
   },
   created() {
     this.search();
-    this.getStatistics();
+    this.getStatistics(this.formData);
   },
   methods: {
     getRoles(roleId) {
@@ -676,20 +700,22 @@ export default {
       }
       return str;
     },
-    exportExcel() {
-      var b = 1;
-      var a = "0,1";
-      if (this.$refs.tableList.allCheckData.length === 0) {
-        this.$message.error("请勾选数据");
-        return;
+
+    exportData() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      if (data.roleId === 0 || data.roleId === 1) {
+        data.refundStatusList = "0,3,4";
       }
-      this.$api
-        .systemtoporderexport({
-          orderSnList: this.$refs.tableList.allCheckData.map((i) => i.orderSn),
-        })
-        .then((res) => {
+      if (data.roleId === 2) {
+        data.refundStatusList = "2,3";
+      }
+      this.$api.systemtoporderexport(data).then((res) => {
+        if (res.msg) {
           exportFn(res.msg, `导出数据`);
-        });
+        } else {
+          this.$message.error("导出失败");
+        }
+      });
     },
 
     editCost() {
@@ -717,7 +743,7 @@ export default {
               type: "success",
               message: "操作成功!",
             });
-            this.search(3)
+            this.search(3);
           });
       };
       if (!orderSn && this.$refs.tableList.allCheckData.length === 0) {
@@ -779,8 +805,11 @@ export default {
         return;
       }
     },
-    getStatistics() {
-      this.$api.systemtoporderstatistics().then((res) => {
+    getStatistics(datas) {
+      var data = JSON.parse(JSON.stringify(datas));
+      delete data.pageNum;
+      delete data.pageSize;
+      this.$api.systemtoporderstatistics(data).then((res) => {
         this.statisticsData = res.data || {};
       });
     },
@@ -842,6 +871,7 @@ export default {
         this.formData = {
           pageSize: 10,
           pageNum: 1,
+          checkStatus: 0,
         };
         this.$nextTick(() => {
           this.$refs.tableList.clearMoreActive();
@@ -859,12 +889,7 @@ export default {
       if (data.roleId === 2) {
         data.refundStatusList = "2,3";
       }
-      if (this.formData.startTime) {
-        data.startTime = parseInt(data.startTime / 1000);
-      }
-      if (this.formData.endTime) {
-        data.endTime = parseInt(data.endTime / 1000);
-      }
+      this.getStatistics(data);
       this.$api
         .systemtoporderlist(data)
         .then((res) => {
@@ -885,7 +910,7 @@ export default {
 
 <style lang="scss" scoped>
 .cell > .el-button + .el-button {
-  margin-left: 0px;
+  // margin-left: 0px;
 }
 .dis_flex_order_li {
   display: flex;

src/views/integralManagement/exchangeRules/record.vue

@@ -7,7 +7,7 @@
       @close="close"
       :confirmStatus="false"
     >
-      <el-timeline style="max-height: 600px;overflow: auto;">
+      <el-timeline style="max-height: 600px; overflow: auto">
         <el-timeline-item
           v-for="(item, index) in checkLogVos"
           :timestamp="$methodsTools.onlyForma(item.createTime)"
@@ -54,6 +54,21 @@ export default {
         case 3:
           a = "删除";
           break;
+        case 4:
+          a = "开通";
+          break;
+        case 5:
+          a = "恢复";
+          break;
+        case 6:
+          a = "注销";
+          break;
+        case 7:
+          a = "退款";
+          break;
+        case 8:
+          a = "充值";
+          break;
 
         default:
           break;
@@ -62,7 +77,7 @@ export default {
     },
     close() {},
     init() {
-      this.$api.systemloglist().then((res) => {
+      this.$api.systemloglist({ logType: 1 }).then((res) => {
         this.checkLogVos = res.rows;
       });
     },

src/views/integralManagement/giftGoods/index.vue

@@ -68,6 +68,7 @@
         <el-button type="text" @click="addClick(props.scope.row)"
           >编辑</el-button
         ><el-button type="text" @click="del(props.scope.row)">删除</el-button>
+        <el-button type="text" @click="record(props.scope.row)">记录</el-button>
       </template>
     </table-list>
     <pagination
@@ -82,6 +83,10 @@
       :goodsId="goodsId"
       :getRules="getRules"
     ></dislog>
+    <record
+      :dialogVisible.sync="dialogRecordVisible"
+      :goodsId="goodsId"
+    ></record>
   </div>
 </template>
 
@@ -90,9 +95,10 @@ import dislog from "./dislog.vue";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
+import record from "./record.vue";
 export default {
   name: "GiftGoods",
-  components: { searchBoxNew, tableList, pagination, dislog },
+  components: { record, searchBoxNew, tableList, pagination, dislog },
   data() {
     return {
       loading: false,
@@ -196,6 +202,7 @@ export default {
       tableData: [],
       total: 0,
       dialogVisible: false,
+      dialogRecordVisible: false,
       goodsId: null,
       getRules: 0,
     };
@@ -219,6 +226,10 @@ export default {
     this.search(2);
   },
   methods: {
+    record(row) {
+      this.goodsId = row.goodsId;
+      this.dialogRecordVisible = true;
+    },
     statusChange(e, row) {
       this.$api
         .editgoodspoints({

src/views/integralManagement/giftGoods/record.vue

@@ -0,0 +1,107 @@
+<template>
+  <div>
+    <BaseDialog
+      width="580px"
+      :isShow.sync="isShow"
+      title="操作记录"
+      @close="close"
+      :confirmStatus="false"
+    >
+      <el-timeline style="max-height: 600px; overflow: auto">
+        <el-timeline-item
+          v-for="(item, index) in checkLogVos"
+          :timestamp="$methodsTools.onlyForma(item.createTime)"
+          placement="top"
+        >
+          <el-card>
+            <h4>动作：{{ getlogAction(item.logAction) }}</h4>
+            <p>操作人：{{ item.operName }}</p>
+            <p>操作前：{{ item.oldContent }}</p>
+            <p>操作后：{{ item.newContent }}</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </BaseDialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "",
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      default: false,
+    },
+    goodsId: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      checkLogVos: [],
+    };
+  },
+  mounted() {},
+
+  methods: {
+    getlogAction(i) {
+      var a = "";
+      switch (i) {
+        case 1:
+          a = "新增";
+          break;
+        case 2:
+          a = "修改";
+          break;
+        case 3:
+          a = "删除";
+          break;
+        case 4:
+          a = "开通";
+          break;
+        case 5:
+          a = "恢复";
+          break;
+        case 6:
+          a = "注销";
+          break;
+        case 7:
+          a = "退款";
+          break;
+        case 8:
+          a = "充值";
+          break;
+
+        default:
+          break;
+      }
+      return a;
+    },
+    close() {},
+    init() {
+      this.$api
+        .systemloglist({ logType: 3, majorId: this.goodsId })
+        .then((res) => {
+          this.checkLogVos = res.rows;
+        });
+    },
+  },
+  computed: {
+    isShow: {
+      get() {
+        if (this.dialogVisible) {
+          this.init();
+        }
+        return this.dialogVisible;
+      },
+      set(val) {
+        this.$emit("update:dialogVisible", false);
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/integralManagement/membershipCard/index.vue

@@ -60,7 +60,7 @@
     <record
       :dialogVisible.sync="dialogRecordVisible"
       @search="search"
-      :activeData="activeData"
+      :userId="activeData.userId"
     ></record>
   </div>
 </template>

src/views/integralManagement/membershipCard/record.vue

@@ -7,17 +7,17 @@
       @close="close"
       :confirmStatus="false"
     >
-      <el-timeline>
+      <el-timeline style="max-height: 600px; overflow: auto">
         <el-timeline-item
           v-for="(item, index) in checkLogVos"
-          :timestamp="$methodsTools.onlyForma(item.checkTime)"
+          :timestamp="$methodsTools.onlyForma(item.createTime)"
           placement="top"
         >
           <el-card>
-            <h4>动作：{{ item.b }}</h4>
-            <p>操作人：{{ item.name }}</p>
-            <p>操作前：{{ item.c }}</p>
-            <p>操作后：{{ item.d }}</p>
+            <h4>动作：{{ getlogAction(item.logAction) }}</h4>
+            <p>操作人：{{ item.operName }}</p>
+            <p>操作前：{{ item.oldContent }}</p>
+            <p>操作后：{{ item.newContent }}</p>
           </el-card>
         </el-timeline-item>
       </el-timeline>
@@ -33,40 +33,59 @@ export default {
       type: Boolean,
       default: false,
     },
-    activeData: {
-      type: Object,
-      default: () => {
-        return {};
-      },
+    userId: {
+      type: Number,
+      default: 0,
     },
   },
   data() {
     return {
-      formData: {},
-      checkLogVos: [
-        {
-          checkTime: 1234567891,
-          name: "操作人",
-          b: "充值", //动作,
-          c: "积分500", //操作前
-          d: "积分1000", //操作后
-        },
-        {
-          checkTime: 1234567891,
-          name: "操作人",
-          b: "充值", //动作,
-          c: "积分500", //操作前
-          d: "积分1000", //操作后
-        },
-      ],
+      checkLogVos: [],
     };
   },
   mounted() {},
 
   methods: {
+    getlogAction(i) {
+      var a = "";
+      switch (i) {
+        case 1:
+          a = "新增";
+          break;
+        case 2:
+          a = "修改";
+          break;
+        case 3:
+          a = "删除";
+          break;
+        case 4:
+          a = "开通";
+          break;
+        case 5:
+          a = "恢复";
+          break;
+        case 6:
+          a = "注销";
+          break;
+        case 7:
+          a = "退款";
+          break;
+        case 8:
+          a = "充值";
+          break;
+
+        default:
+          break;
+      }
+      return a;
+    },
     close() {},
     init() {
-      this.formData = JSON.parse(JSON.stringify(this.activeData));
+      this.$api
+        .systemloglist({ logType: 2, majorId: this.userId })
+        .then((res) => {
+          this.checkLogVos = res.rows;
+        });
     },
   },
   computed: {