刘恒 2 лет назад
Родитель
Сommit
6a8fa55fbc

+ 1 - 1
src/components/table/StandardTable.vue

@@ -116,7 +116,7 @@ export default {
     },
 
     updateSelect(selectedRowKeys, selectedRows) {
-      console.log(selectedRowKeys, selectedRows);
+      // console.log(selectedRowKeys, selectedRows);
       this.$emit("update:selectedRows", selectedRows);
       this.$emit("selectedRowChange", selectedRowKeys, selectedRows);
     },

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

@@ -288,7 +288,7 @@ export default {
       //
       item;
       this.$router.push({
-        path: "/business/agent/message",
+        path: "/business/channel/message",
         query: {
           user: { ...item },
           time: {

+ 21 - 4
src/pages/business/message.vue

@@ -225,10 +225,7 @@ export default {
       process: process.env.VUE_APP_API_BASE_URL,
     };
   },
-  mounted() {
-    this.getVerification();
-    // setTimeout(() => {
-    // }, 1000);
+  created() {
     this.time = [
       this.$route.query.time.createtimeStart,
       this.$route.query.time.createtimeEnd,
@@ -236,6 +233,19 @@ export default {
     this.formState.createtimeStart = this.$route.query.time.createtimeStart;
     this.formState.createtimeEnd = this.$route.query.time.createtimeEnd;
   },
+  watch: {
+    "formState.createtimeStart"(val) {
+      this.formState.createtimeStart = val;
+    },
+    "formState.createtimeEnd"(val) {
+      this.formState.createtimeEnd = val;
+    },
+  },
+  mounted() {
+    // setTimeout(() => {
+    // }, 1000);
+    // this.getVerification();
+  },
   methods: {
     getList() {
       this.pagination.current = 1;
@@ -284,6 +294,10 @@ export default {
               defaultPageSize: res.data.data.size,
               total: res.data.data.total,
             };
+          } else {
+            this.loading = false;
+            this.tableList = [];
+            this.$message.error(res.data.msg);
           }
         });
       this.$API.business
@@ -293,6 +307,9 @@ export default {
         .then((res) => {
           if (res.data.code === 200) {
             this.amount = { ...res.data.data };
+          } else {
+            this.amount = {};
+            this.$message.error(res.data.msg);
           }
         });
     },

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

@@ -288,7 +288,7 @@ export default {
       //
       item;
       this.$router.push({
-        path: "/business/agent/message",
+        path: "/business/sales/message",
         query: {
           user: { ...item },
           time: {

+ 32 - 0
src/pages/personnelManage/channel/order.vue

@@ -159,6 +159,12 @@
             box-sizing: border-box;
           "
         >
+          <a-button
+            type="primary"
+            @click="exportExcel"
+            style="margin-right: 15px"
+            >导出</a-button
+          >
           <a-button type="primary" @click="getList">查询</a-button>
         </div>
         <standard-table
@@ -207,10 +213,15 @@ import StandardTable from "@/components/table/StandardTable";
 import moment from "moment";
 
 const columns = [
+  // { title: "被保人姓名", dataIndex: "insureinfoName" },
+  // { title: "被保人电话", dataIndex: "insureinfoMobile" },
   {
     title: "车牌号",
     dataIndex: "licenseno",
   },
+  { title: "车型", dataIndex: "modelcname" },
+
+  { title: "发动机号", dataIndex: "modelCode" },
 
   {
     title: "车架号",
@@ -367,6 +378,27 @@ export default {
     // }, 1000);
   },
   methods: {
+    exportExcel() {
+      this.$API.quote
+        .exportList({
+          // pageNum: this.pagination.current,
+          // pageSize: this.pagination.defaultPageSize,
+          ...this.formState,
+          deptId: this.deptId,
+        })
+        .then((res) => {
+          if (res.data.code == 200) {
+            let url = this.process + res.data.data; // 3.创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.download = "导出文件.xlsx";
+            a.click();
+            window.URL.revokeObjectURL(url);
+          } else {
+            this.$message.error(res.msg);
+          }
+        });
+    },
     getList() {
       this.pagination.current = 1;
       this.pagination.defaultPageSize = 10;

+ 61 - 13
src/pages/quote/quote.vue

@@ -47,14 +47,17 @@
           <h2>总报价</h2>
           <div>
             <span>时间筛选</span>
-            <a-range-picker
-              @change="onChangeTime"
-              v-model="formState.time"
-              value-format="YYYY-MM-DD"
+            <a-date-picker
+              v-model="formState.year"
+              value-format="YYYY"
+              format="YYYY"
               style="margin-left: 10px"
+              mode="year"
+              @openChange="openChange"
+              @panelChange="panelChange"
             >
               <a-icon slot="suffixIcon" type="calendar" />
-            </a-range-picker>
+            </a-date-picker>
             <a-radio-group
               default-value="0"
               button-style="solid"
@@ -97,7 +100,6 @@
         </div>
         <a-form
           layout="inline"
-          :class="className"
           :model="formState"
           style="padding: 0 0 0 15px; box-sizing: border-box"
         >
@@ -153,6 +155,13 @@
             box-sizing: border-box;
           "
         >
+          <a-button
+            type="primary"
+            @click="exportExcel"
+            style="margin-right: 15px"
+            >导出</a-button
+          >
+
           <a-button type="primary" @click="getList">查询</a-button>
         </div>
         <standard-table
@@ -183,10 +192,15 @@ import tree from "@/components/tree/tree";
 import moment from "moment";
 
 const columns = [
+  // { title: "被保人姓名", dataIndex: "insureinfoName" },
+  // { title: "被保人电话", dataIndex: "insureinfoMobile" },
   {
     title: "车牌号",
     dataIndex: "licenseno",
   },
+  { title: "车型", dataIndex: "modelcname" },
+
+  { title: "发动机号", dataIndex: "modelCode" },
 
   {
     title: "车架号",
@@ -219,14 +233,15 @@ export default {
     return {
       formState: {
         dateType: undefined,
-        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
-        beginDate: moment().format("YYYY-MM-DD"),
-        endDate: moment().format("YYYY-MM-DD"),
+        // time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")],
+        // beginDate: moment().format("YYYY-MM-DD"),
+        // endDate: moment().format("YYYY-MM-DD"),
         licenseno: "",
         userName: "",
         mobile: "",
         frameno: "",
         userId: "",
+        year: moment().format("YYYY"),
       },
       backLinePersonnel: {},
       columns: columns,
@@ -255,6 +270,8 @@ export default {
       ],
       BigOrder: {},
       deptId: undefined,
+      yearOpen: false,
+      process: process.env.VUE_APP_API_BASE_URL,
     };
   },
   mounted() {
@@ -263,6 +280,17 @@ export default {
     // }, 1000);
   },
   methods: {
+    openChange(status) {
+      if (status) {
+        this.yearOpen = true;
+      }
+    },
+    panelChange(value) {
+      this.formState.year = value;
+      this.yearOpen = false;
+      this.getVerification();
+    },
+
     chooseTree(val) {
       this.deptId = val;
       this.getVerification();
@@ -272,11 +300,31 @@ export default {
       this.pagination.defaultPageSize = 10;
       this.getVerification();
     },
-    onChangeTime(val) {
+    exportExcel() {
+      this.$API.quote
+        .exportList({
+          // pageNum: this.pagination.current,
+          // pageSize: this.pagination.defaultPageSize,
+          ...this.formState,
+          deptId: this.deptId,
+        })
+        .then((res) => {
+          if (res.data.code == 200) {
+            let url = this.process + res.data.data; // 3.创建一个临时的url指向blob对象
+            let a = document.createElement("a");
+            a.href = url;
+            a.download = "导出文件.xlsx";
+            a.click();
+            window.URL.revokeObjectURL(url);
+          } else {
+            this.$message.error(res.msg);
+          }
+        });
+    },
+
+    onChangeTime() {
       // console.log(val);
-      this.formState.beginDate = val[0];
-      this.formState.endDate = val[1];
-      this.formState.dateType = undefined;
+
       this.getVerification();
     },
     handleFinish() {

+ 35 - 27
src/pages/sys/menu.vue

@@ -7,29 +7,26 @@
         >新增</a-button
       >
     </div>
-    <a-table
-      :columns="columns"
-      :dataSource="tableList"
-      :pagination="false"
-      :loading="loading"
-      style="background: #fff"
-      :customRow="customRow"
-    >
-      <div class="operation-list" slot="operation" slot-scope="text, record">
-        <a-button type="danger" @click="delMenu({ text, record })"
-          >删除
-        </a-button>
-        <a-button type="primary" @click="editMenu({ text, record })"
-          >编辑</a-button
-        >
-        <!-- <a-button type="primary" @click="editMenu({ text, record }, 'auth')"
-          >数据权限</a-button
-        >
-        <a-button type="danger" @click="delMenu({ text, record }, 'auth')"
-          >清空</a-button
-        > -->
-      </div>
-    </a-table>
+    <a-spin :spinning="loading">
+      <a-table
+        :columns="columns"
+        :dataSource="tableList"
+        :pagination="false"
+        style="background: #fff"
+        :customRow="customRow"
+        rowKey="id"
+      >
+        <div class="operation-list" slot="operation" slot-scope="text, record">
+          <a-button type="danger" @click="delMenu({ text, record })"
+            >删除
+          </a-button>
+          <a-button type="primary" @click="editMenu({ text, record })"
+            >编辑</a-button
+          >
+        </div>
+      </a-table>
+    </a-spin>
+
     <a-modal
       v-model="visible"
       :title="title"
@@ -47,7 +44,7 @@
           <a-radio-group :default-value="'目录'" v-model="dataForm.type">
             <a-radio
               v-for="(item, index) in menuTypeList"
-              :key="item"
+              :key="index"
               :value="index"
             >
               {{ item }}
@@ -201,7 +198,6 @@ const columns = [
   {
     title: "ID",
     dataIndex: "id",
-    //
   },
 
   {
@@ -241,6 +237,7 @@ const columns = [
 ];
 
 export default {
+  components: {},
   data() {
     return {
       visible: false,
@@ -389,6 +386,7 @@ export default {
               .then((res) => {
                 if (res.data.code === 200) {
                   that.$message.success("操作成功");
+                  that.loading = false;
                   that.getList();
                 }
               });
@@ -398,6 +396,7 @@ export default {
               .then((res) => {
                 if (res.data.code === 200) {
                   that.$message.success("操作成功");
+                  that.loading = false;
                   that.getList();
                 }
               });
@@ -412,6 +411,7 @@ export default {
     editMenu(item, type) {
       this.title = "编辑";
       this.visible = true;
+
       this.$nextTick(() => {
         this.dataForm = { ...item.record };
 
@@ -425,7 +425,6 @@ export default {
         this.$API.sysManage
           .getMenuAuthItem({ menuId: item.record.id })
           .then((res) => {
-            console.log(res);
             if (res.data.code === 200) {
               this.authPermissions = { ...res.data.data };
             }
@@ -440,11 +439,14 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.$API.sysManage.getMenuList().then((res) => {
+      this.$API.sysManage.getMenuList({}).then((res) => {
         if (res.data.code === 200) {
           this.loading = false;
 
           this.tableList = [...res.data.data];
+        } else {
+          this.loading = false;
+          this.$message.error(res.data.msg);
         }
       });
     },
@@ -452,6 +454,8 @@ export default {
       this.title = "新增";
       this.visible = true;
       this.dataForm = { ...this.resetForm };
+      this.form.setFieldsValue({ ["name"]: "" });
+      this.form.setFieldsValue({ ["url"]: "" });
     },
     handleOk() {
       this.form.validateFields((err, values) => {
@@ -477,6 +481,7 @@ export default {
                   this.$message.success("操作成功");
                   this.confirmLoading = false;
                   this.visible = false;
+                  this.loading = false;
                   this.getList();
                 }
               });
@@ -492,6 +497,7 @@ export default {
                   this.$message.success("操作成功");
                   this.confirmLoading = false;
                   this.visible = false;
+                  this.loading = false;
                   this.getList();
                 }
               });
@@ -506,6 +512,8 @@ export default {
   display: flex;
   flex-direction: column;
   background: #fff;
+  padding: 15px;
+  box-sizing: border-box;
   .menu-head {
     display: flex;
     button {

+ 0 - 2
src/pages/task/agent.vue

@@ -469,8 +469,6 @@ export default {
           ...this.formState,
         })
         .then((res) => {
-          console.log(res);
-
           if (res.data.code == 200) {
             let url = this.process + res.data.data; // 3.创建一个临时的url指向blob对象
             let a = document.createElement("a");

+ 7 - 1
src/services/quote.js

@@ -17,6 +17,11 @@ export async function getBigOrderList(data) {
 export async function getBigOrderMount(data) {
     return request("/companyDataReport/querOrdersamountTo", METHOD.POST, data)
 }
+//大订单导出
+export async function exportList(data) {
+    return request("/companyDataReport/largeOrdersExcel", METHOD.POST, data)
+}
+
 
 
 
@@ -24,5 +29,6 @@ export default {
     getQuoteList,
     getAgentTree,
     getBigOrderList,
-    getBigOrderMount
+    getBigOrderMount,
+    exportList
 }