刘恒 1 жил өмнө
parent
commit
52a5242ec8

BIN
dist.zip


+ 0 - 1
src/components/datePicker/index.vue

@@ -4,7 +4,6 @@
       v-model="timeType"
       placeholder="请选择时间类型"
       @change="timeTypeChange"
-      allowClear
     >
       <a-select-option
         v-for="item in timeList"

+ 1 - 1
src/pages/business/agent.vue

@@ -318,7 +318,7 @@ export default {
     };
   },
   mounted() {
-    this.getVerification();
+    // this.getVerification();
     // setTimeout(() => {
     // }, 1000);
   },

+ 1 - 1
src/pages/business/channel.vue

@@ -338,7 +338,7 @@ export default {
   mounted() {
     // setTimeout(() => {
     // }, 1000);
-    this.getVerification();
+    // this.getVerification();
   },
   methods: {
     timeChange(val) {

+ 1 - 1
src/pages/business/message.vue

@@ -236,7 +236,7 @@ export default {
 
     this.formState.createtimeStart = this.$route.query.time.createtimeStart;
     this.formState.createtimeEnd = this.$route.query.time.createtimeEnd;
-    this.getList();
+    // this.getList();
   },
   watch: {
     "formState.createtimeStart"(val) {

+ 44 - 14
src/pages/business/sales.vue

@@ -98,7 +98,7 @@
         <div class="table-title">
           <h2>电销</h2>
           <div>
-            <!-- <span>时间筛选</span>
+            <span>时间筛选</span>
             <a-range-picker
               @change="onChangeTime"
               v-model="formState.time"
@@ -106,8 +106,45 @@
               style="margin-left: 10px"
             >
               <a-icon slot="suffixIcon" type="calendar" />
-            </a-range-picker> -->
-            <datePicker @getList="timeChange"></datePicker>
+            </a-range-picker>
+            <a-radio-group
+              default-value="0"
+              button-style="solid"
+              v-model="formState.dateType"
+              @change="getVerification()"
+              style="margin-left: 10px"
+            >
+              <a-radio-button
+                value="1"
+                @click="
+                  (formState.time = []),
+                    (formState.createtimeStart = ''),
+                    (formState.createtimeEnd = '')
+                "
+              >
+                当天
+              </a-radio-button>
+              <a-radio-button
+                value="2"
+                @click="
+                  (formState.time = []),
+                    (formState.createtimeStart = ''),
+                    (formState.createtimeEnd = '')
+                "
+              >
+                近7天
+              </a-radio-button>
+              <a-radio-button
+                value="3"
+                @click="
+                  (formState.time = []),
+                    (formState.createtimeStart = ''),
+                    (formState.createtimeEnd = '')
+                "
+              >
+                近30天
+              </a-radio-button>
+            </a-radio-group>
           </div>
         </div>
         <a-form
@@ -169,8 +206,7 @@
 import StandardTable from "@/components/table/StandardTable";
 // import mixin from "../../minins/mixin";
 import tree from "@/components/tree/userTree";
-// import moment from "moment";
-import datePicker from "@/components/datePicker";
+import moment from "moment";
 
 const columns = [
   {
@@ -224,16 +260,15 @@ export default {
   components: {
     StandardTable,
     tree,
-    datePicker,
   },
   //   mixins: [mixin],
   data() {
     return {
       formState: {
         dateType: undefined,
-        // time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
-        // createtimeStart: moment().format("YYYY-MM-DD"),
-        // createtimeEnd: moment().format("YYYY-MM-DD"),
+        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
+        createtimeStart: moment().format("YYYY-MM-DD"),
+        createtimeEnd: moment().format("YYYY-MM-DD"),
         userName: "",
         userId: "",
         treeUserId: "",
@@ -272,11 +307,6 @@ export default {
     // }, 1000);
   },
   methods: {
-    timeChange(val) {
-      // console.log(val);
-      this.formState = { ...val };
-      this.getList();
-    },
     chooseUser(val) {
       this.formState.treeUserId = val;
       this.getVerification();

+ 2 - 1
vue.config.js

@@ -120,8 +120,9 @@ module.exports = {
       }
     }
   },
+  // https://test.baoxianzhanggui.com/console-api
 
-  publicPath: isProd ? 'https://sxzgkj.baoxianzhanggui.com/console-api' : 'https://test.baoxianzhanggui.com/console-api',
+  publicPath: isProd ? 'https://sxzgkj.baoxianzhanggui.com/console-api' : '/',
 
   // publicPath: '/',
   outputDir: process.env.outputDir,