fix

.env.pre

@@ -6,7 +6,7 @@ NODE_ENV = 'pre'
 
 # 中正云教育管理后台/预发布环境
 # 预发布
-VUE_APP_BASE_API = 'http://120.79.166.78:19007/'
+VUE_APP_BASE_API = 'https://devapi.gdzzkj.net/'
 VUE_APP_BASE_API_QP = 'https://attach.xyyxt.net'
 VUE_APP_IMG_API = 'https://file.xyyxt.net'
 

src/views/Marketing/clientSetup/banner/diabox.vue

@@ -66,6 +66,9 @@
                   style="width: 100%"
                 ></el-input-number>
               </div>
+              <span v-else-if="item.scope === 'jumpUrl'">
+                {{ scope.row['jumpType'] == 1 ? '': scope.row[item.prop] }}
+              </span>
               <span v-else-if="item.scope === 'status'">
                 {{
                   scope.row[item.prop] === 1
@@ -124,6 +127,7 @@ export default {
         {
           label: "跳转位置",
           prop: "jumpUrl",
+          scope:"jumpUrl"
         },
         {
           label: "发布状态",

src/views/Marketing/order/offlineOrder/orderDetailsT/refundDocument/index.vue

@@ -249,6 +249,7 @@ export default {
           applyReason: item.applyReason,
           goodsId: item.goodsId,
           orderSn: item.orderSn,
+          orderGoodsId:item.orderGoodsId
         };
         if (item.applyImgs.length) {
           data.applyImgs = item.applyImgs.toString();

src/views/education/archives/index.vue

@@ -7,7 +7,55 @@
       @search="search"
       @init="init"
       :remarkStatus="true"
-    ></search-box-new>
+    >
+      <template slot="month">
+        <el-select
+          size="small"
+          v-model="month"
+          placeholder="月份"
+          @change="getCanActiveApplyMonth"
+        >
+          <el-option
+            v-for="item in monthList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          style="margin-left: 10px"
+          size="small"
+          v-model="day"
+          v-if="month"
+          placeholder="日期"
+          @change="getCanActiveApply"
+        >
+          <el-option
+            v-for="item in dayList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+
+        <el-select
+          style="margin-left: 10px"
+          v-if="month || day"
+          size="small"
+          v-model="monthApplyIndex"
+          placeholder="考试场次"
+        >
+          <el-option
+            v-for="(item, index) in monthApplyList"
+            :key="index"
+            :label="item.examSession"
+            :value="index"
+          >
+          </el-option>
+        </el-select>
+      </template></search-box-new>
     <table-list
       ref="tableList"
       :tableSets="tableSet"
@@ -113,6 +161,25 @@ export default {
           title: "未定义",
         },
       },
+      month: "",
+      monthList: [
+        { label: "一月", value: "01" },
+        { label: "二月", value: "02" },
+        { label: "三月", value: "03" },
+        { label: "四月", value: "04" },
+        { label: "五月", value: "05" },
+        { label: "六月", value: "06" },
+        { label: "七月", value: "07" },
+        { label: "八月", value: "08" },
+        { label: "九月", value: "09" },
+        { label: "十月", value: "10" },
+        { label: "十一月", value: "11" },
+        { label: "十二月", value: "12" },
+      ],
+      day: "",
+      dayList: [],
+      monthApplyIndex: "",
+      monthApplyList: [],
       //搜索
       formList: [
         // {
@@ -295,6 +362,12 @@ export default {
         //   prop: "",
         //   placeholder: "输入订单编号",
         // },
+        {
+          prop: "month",
+          placeholder: "月份",
+          scope: "slot",
+          slotName: "month",
+        },
       ],
       formData: {
         status: "0,1",
@@ -385,6 +458,43 @@ export default {
         this.$refs.fileDownload.openBoxs([i]);
       }
     },
+    getMonthDays(target) {
+      let date = new Date(target + "-01"); // 移动端使用格式要转成： "2018/10/01"
+      date.setMonth(date.getMonth() + 1); // 先设置为下个月
+      date.setDate(0); // 再置0，变成当前月最后一天
+      return date.getDate(); // 当前月最后一天即当前月拥有的天数
+    },
+    getCanActiveApplyMonth() {
+      this.day = "";
+      var year = new Date().getFullYear();
+      var num = this.getMonthDays(year + "-" + this.month);
+      var list = [];
+      for (let i = 0; i < num; i++) {
+        list.push({
+          label: i + 1 + "号",
+          value: i < 10 ? "0" + (i + 1) : i + 1,
+        });
+      }
+      this.dayList = list || [];
+      var a = year + this.month + this.day;
+      this.getSearchApply(a);
+    },
+    getCanActiveApply() {
+      var year = new Date().getFullYear();
+      var a = year + "" + this.month + "" + this.day;
+      this.getSearchApply(a);
+    },
+    getSearchApply(i) {
+      this.monthApplyIndex = "";
+      this.$api
+        .obtainsystemsubscribesessiondata(i)
+        .then((res) => {
+          this.monthApplyList = res.data;
+        })
+        .catch(() => {
+          this.monthApplyList = [];
+        });
+    },
     //详情
     details(v) {
       const jump = () => {
@@ -427,8 +537,25 @@ export default {
         };
         this.$refs.tableList.clearMoreActive()
       }
+      var data = JSON.parse(JSON.stringify(this.formData));
+      if (this.month) {
+        var year = new Date().getFullYear();
+        var a = year + "" + this.month;
+        if (this.day) {
+          a = year + "" + this.month + "" + this.day;
+        }
+        data.ApplyDateTime = a;
+      }
+      if (this.monthApplyIndex === 0 || this.monthApplyIndex > 0) {
+        data.applySiteExamTime =
+          this.monthApplyList[this.monthApplyIndex].examTime;
+        data.applySiteStartTime =
+          this.monthApplyList[this.monthApplyIndex].examStartTime;
+        data.applySiteEndTime =
+          this.monthApplyList[this.monthApplyIndex].examEndTime;
+      }
       this.$api
-        .appuserdangAnList(this.formData)
+        .appuserdangAnList(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -439,6 +566,8 @@ export default {
         });
     },
     init() {
+      this.month = "";
+      this.monthApplyIndex = "";
       this.search(2);
     },
     handleSizeChange(v) {

src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -215,6 +215,16 @@ export default {
           prop: "realName",
           hidden: true,
         },
+        {
+          label: "手机号码",
+          prop: "telPhone",
+          hidden: true,
+        },
+        {
+          label: "所属公司",
+          prop: "companyName",
+          hidden: true,
+        },
         {
           label: "学员身份证",
           prop: "idCard",

src/views/education/examManagement/applicationData/asPlanned.vue

@@ -1254,7 +1254,7 @@ export default {
         }
         data.ApplyDateTime = a;
       }
-      if (this.monthApplyIndex) {
+      if (this.monthApplyIndex === 0 || this.monthApplyIndex > 0) {
         data.applySiteExamTime =
           this.monthApplyList[this.monthApplyIndex].examTime;
         data.applySiteStartTime =

src/views/finance/invoiceManage/index.vue

@@ -33,6 +33,12 @@
           开票时间：{{ $methodsTools.onlyForma(props.scope.row.invoiceTime) }}
         </p>
         <p>订单编号：{{ props.scope.row.orderSn }}</p>
+        <p>经办姓名：{{ props.scope.row.createUsername }}</p>
+        <p>经办身份：{{ props.scope.row.idCard }}</p>
+        <p>经办手机：{{ props.scope.row.telphone }}</p>
+        <!-- <p>申请金额：{{ props.scope.row.invoicePrice | formatPrice }}</p> -->
+      </template>
+      <template slot="goods" slot-scope="props">
         <p>
           商品类型：{{
             props.scope.row.goodsType == 1
@@ -48,7 +54,6 @@
             props.scope.row.projectName + " - " + props.scope.row.businessName
           }}
         </p>
-        <p>申请金额：{{ props.scope.row.invoicePrice | formatPrice }}</p>
       </template>
       <template slot="invoice" slot-scope="props">
         <p>
@@ -285,6 +290,13 @@ export default {
           slotName: "applyFor",
           dontCenter: true,
         },
+        {
+          label: "商品信息",
+          hidden: true,
+          scope: "slot",
+          slotName: "goods",
+          dontCenter: true,
+        },
         {
           label: "开票信息",
           hidden: true,

src/views/finance/orderManage/index.vue

@@ -29,6 +29,9 @@
         </p>
         <p>通过时间：{{ $methodsTools.onlyForma(props.scope.row.payTime) }}</p>
         <p>订单编号：{{ props.scope.row.handleOrderSn }}</p>
+        <p>经办姓名：{{ props.scope.row.createUsername }}</p>
+        <p>经办身份：{{ props.scope.row.idCard }}</p>
+        <p>经办手机：{{ props.scope.row.telphone }}</p>
       </template>
       <template slot="invoice" slot-scope="props">
         <p>

src/views/systemManagement/accountManagement/index.vue

@@ -256,7 +256,7 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^1[34578]\d{9}$/,
+            pattern: /^1[345789]\d{9}$/,
             message: "请输入正确手机号",
             trigger: "blur",
           },