项目日志：7.28 第2次

src/api/report.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getReportSearch(params) {
+  return request({
+    url:'/api/Report/acceptorClassification',
+    method: 'get',
+    params
+  })
+}

src/views/contracts/index.vue

@@ -8,7 +8,7 @@
       // //       item.acceptorName === this.search ||
       // //       item.drawersName === this.search -->
         <el-input
-          v-model="formData.name"
+          v-model="formData.name.name"
           placeholder="合同名称/编号、承兑人名称或出票..."
           clearable
           style="width: 100%"
@@ -161,16 +161,6 @@
             @click="Sfailed(scope.row.id)"
           >审核失败
           </el-tag>
-         <!-- <el-tag
-            v-permission="['salesman','admin']"
-            style="cursor: pointer"
-          >恢复
-          </el-tag>
-          <el-tag
-            v-permission="['salesman','admin']"
-            type="danger"
-            style="cursor: pointer"
-          >删除</el-tag> -->
         </template>
       </el-table-column>
     </el-table>

src/views/delivery/index.vue

@@ -16,7 +16,7 @@
         <el-dropdown @command="handleCommand">
           <div class="pulldown">
             <span class="el-dropdown-link" v-if="!providerStatus">
-              供应商状态
+              审核状态
             </span>
             <span class="el-dropdown-link" v-if="providerStatus">
               {{ providerStatus }}
@@ -24,7 +24,7 @@
             <i class="el-icon-arrow-down el-icon--right"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="供应商状态">供应商状态</el-dropdown-item>
+            <el-dropdown-item command="审核状态">审核状态</el-dropdown-item>
             <el-dropdown-item command="正常">正常</el-dropdown-item>
             <el-dropdown-item command="删除">删除</el-dropdown-item>
           </el-dropdown-menu>
@@ -33,14 +33,14 @@
       <div class="grid-content bg-purple">
         <el-dropdown @command="AhandleCommand">
           <div class="pulldown">
-            <span v-if="!Auditstatus" class="el-dropdown-link"> 审核状态 </span>
+            <span v-if="!Auditstatus" class="el-dropdown-link"> 供应商状态 </span>
             <span v-if="Auditstatus" class="el-dropdown-link">
               {{ Auditstatus }}
             </span>
             <i class="el-icon-arrow-down el-icon--right" />
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="审核状态">审核状态</el-dropdown-item>
+            <el-dropdown-item command="供应商状态">供应商状态</el-dropdown-item>
             <el-dropdown-item command="已认证">已认证</el-dropdown-item>
             <el-dropdown-item command="未认证">未认证</el-dropdown-item>
           </el-dropdown-menu>
@@ -296,7 +296,6 @@ export default {
       };
       getSupplierSearch({ ...params, ...searchForm }).then((res) => {
         const { data } = res;
-		console.log(data);
         this.temporaryList = data.result;
         this.srcList = data.result;
         this.total = res.data.total;
@@ -329,9 +328,13 @@ export default {
       this.searchForm = { ...this.formData }
       this.getAllList(this.searchForm)
     },
-	/* 输入供应商状态查询 */
+	/* 审核状态查询 */
     handleCommand(command) {
-      this.status = command;
+      this.providerStatus = command;
+      if(command === '审核状态'){
+        this.formData.status=''
+
+      }
           if (command === '正常') {
           this.formData.status = 5
         }
@@ -343,9 +346,13 @@ export default {
       this.getAllList(this.searchForm);
     },
 
-    /* 审核状态查询 */
+    // 输入供应商状态查询
     AhandleCommand(command){
       this.Auditstatus=command
+      if(command === '供应商状态'){
+        this.formData.status=''
+
+      }
        if (command === '已认证') {
           this.formData.status = 5
         }

src/views/shipments/index.vue

@@ -1,280 +1,326 @@
 <template>
-	<div class="app-container">
-		<el-row type="flex" justify="space-between" style="margin-bottom:20px">
-			<div class="grid-content bg-purple">
-				<el-dropdown @command="handleCommand">
-					<div class="pulldown">
-						<span class="el-dropdown-link" v-if="!status">
-							月份
-						</span>
-						<span class="el-dropdown-link" v-if="status">
-							{{status}}月
-						</span>
-						<i class="el-icon-arrow-down el-icon--right"></i>
-					</div>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item command="1">1月</el-dropdown-item>
-						<el-dropdown-item command="2">2月</el-dropdown-item>
-						<el-dropdown-item command="3">3月</el-dropdown-item>
-						<el-dropdown-item command="4">4月</el-dropdown-item>
-						<el-dropdown-item command="5">5月</el-dropdown-item>
-						<el-dropdown-item command="6">6月</el-dropdown-item>
-						<el-dropdown-item command="7">7月</el-dropdown-item>
-						<el-dropdown-item command="8">8月</el-dropdown-item>
-						<el-dropdown-item command="9">9月</el-dropdown-item>
-						<el-dropdown-item command="10">10月</el-dropdown-item>
-						<el-dropdown-item command="11">11月</el-dropdown-item>
-						<el-dropdown-item command="12">12月</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-			</div>
+  <div class="app-container">
+    <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
+      <div class="grid-content bg-purple">
+        <el-dropdown @command="handleCommand">
+          <div class="pulldown">
+            <span class="el-dropdown-link" v-if="!status"> 报表频率 </span>
+            <span class="el-dropdown-link" v-if="status"> {{ status }} </span>
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="月度">月度</el-dropdown-item>
+            <el-dropdown-item command="季度">季度</el-dropdown-item>
+            <el-dropdown-item command="年度">年度</el-dropdown-item>
+        
+          </el-dropdown-menu>
+        </el-dropdown>
 
+      </div>
+      <div class="grid-content bg-purple">
+        <div class="block">
+          <el-date-picker
+            v-model="value2"
+            type="daterange"
+            align="right"
+            unlink-panels
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :picker-options="pickerOptions"
+          >
+          </el-date-picker>
+        </div>
+      </div>
+      <div
+        class="grid-content bg-purple"
+        style="display: flex; justify-content: flex-end"
+      >
+        <el-button type="primary" disabled>承兑人分类报表</el-button>
+        <el-button type="primary" @click="shipments1">出票人分类报表</el-button>
+        <el-button type="primary" @click="shipments2">合同统计列表</el-button>
+        <el-button type="primary" @click="shipments3">供应商统计列表</el-button>
+        <el-button type="primary" @click="Export">导出</el-button>
+      </div>
+    </el-row>
+    <el-table
+      v-loading="listLoading"
+      :data="srcList"
+      element-loading-text="Loading"
+      border
+      fit
+      @select="handleSelectionChange"
+      highlight-current-row
+      @select-all="handleAll"
+    >
+      <el-table-column align="center" label="" width="55" type="selection">
+      </el-table-column>
+      <el-table-column label="承兑人姓名" align="center" prop="acceptorName">
+      </el-table-column>
+      <el-table-column
+        label="统计周期(按照承兑日)"
+        width="180"
+        align="center"
+        prop="period"
+      >
+      </el-table-column>
+      <el-table-column label="汇票笔数" align="center" prop="count">
+      </el-table-column>
+      <el-table-column label="汇票金额" align="center" prop="money">
+      </el-table-column>
+      <el-table-column label="服务费" align="center" prop="serviceMoney">
+      </el-table-column>
+      <el-table-column label="利息" align="center" prop="interest">
+      </el-table-column>
+    </el-table>
+    <div class="pagesip">
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpFirstPage"
+        >首页
+      </el-button>
+      <el-pagination
+        ref="pagination"
+        background
+        layout="total,prev, pager, next"
+        :total="srcList.length"
+        :page-size="pagesize"
+        :current-page="currentPage"
+        prev-text="上一页"
+        next-text="下一页"
+        @current-change="handleCurrentChange"
+      />
+      <el-button
+        type="primary"
+        size="small"
+        style="background-color: #d8ab5a; border-color: #d8ab5a; margin: 0 20px"
+        @click="jumpLastPage"
+        >尾页
+      </el-button>
+    </div>
+  </div>
+</template>
 
-			<div class="grid-content bg-purple">
-				<div class="block">
-					<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-						start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
-					</el-date-picker>
-				</div>
-
-			</div>
-			<!-- <el-col :xs="24" :sm="10" :md="8" :lg="5" :xl="5">
-     <div class="grid-content bg-purple">
-       <div class="grid-content bg-purple" style="margin-left: 30px;">
-         <el-input
-             placeholder="请输入查询内容"
-             v-model="input4" style="width: 80%;">
-             <i slot="prefix" class="el-input__icon el-icon-search"></i>
-           </el-input>
-       </div>
-     </div>
-     </el-col> -->
-			<div class="grid-content bg-purple" style="display: flex;justify-content: flex-end;">
-				<el-button type="primary" disabled>承兑人分类报表</el-button>
-				<el-button type="primary" @click="shipments1">出票人分类报表</el-button>
-				<el-button type="primary" @click="shipments2">合同统计列表</el-button>
-				<el-button type="primary" @click="shipments3">供应商统计列表</el-button>
-				<el-button type="primary" @click="Export">导出</el-button>
-			</div>
-
-		</el-row>
-		<el-table v-loading="listLoading" :data="srcList" element-loading-text="Loading" border fit
-			@select="handleSelectionChange" highlight-current-row @select-all="handleAll">
-			<el-table-column align="center" label="" width="55" type="selection">
-
-			</el-table-column>
-			<el-table-column label="承兑人姓名" align="center" prop="acceptorName">
-
-			</el-table-column>
-			<el-table-column label="统计周期(按照承兑日)" width="180" align="center" prop="period">
-
-			</el-table-column>
-			<el-table-column label="汇票笔数" align="center" prop="count">
+<script>
+import { getReportSearch } from "@/api/report";
+import { dataConversionUtil } from "../../utils/Excel.js";
+export default {
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: "success",
+        draft: "gray",
+        deleted: "danger",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    return {
+      // 表单数据
+      formData: {
+        startTime: "",
+        endTime: "",
+        frequency: "",
+      },
+      /* 当前页数 */
+      currentPage: 1,
+      /* 每页显示个数 */
+      pagesize: 10,
+      /* 总条数 */
+      total: 20,
+      /* 列表数据 */
+      srcList: [],
+      list: [],
+      listLoading: false,
+      status: "",
+      hpstatus: "",
+      multipleSelection: [],
 
-			</el-table-column>
-			<el-table-column label="汇票金额" align="center" prop="money">
+      input4: "",
+      checked: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      value1: "",
+      value2: "",
+    };
+  },
+  mounted() {
+    this.getReportList();
+  },
+  methods: {
+    /* 获取承兑人分类报表 */
+    getReportList(number) {
+      let params = {
+        frequency: number||1,
+      };
+      getReportSearch({ ...params }).then((res) => {
+        const { data } = res;
+        this.srcList = data;
+      });
+    },
 
-			</el-table-column>
-			<el-table-column label="服务费" align="center" prop="serviceMoney">
+    handleSelectionChange(data) {
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
+    },
+    handleAll(data) {
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
+    },
 
-			</el-table-column>
-			<el-table-column label="利息" align="center" prop="interest">
+	/*  报表频率查询*/
+    handleCommand(command) {
+      this.status = command;
+		if(command === "月度"){
+			this.formData.frequency =1
+		}
+		if(command === "季度"){
+			this.formData.frequency =2
+		}
+		if(command === "年度"){
+			this.formData.frequency =3
+		}
+		 this.getReportList(this.formData.frequency);
 
-			</el-table-column>
+    },
 
-			<!-- <el-table-column align="center" prop="created_at" label="操作" width="250">
-        <template slot-scope="scope">
-          <el-tag type="success" style="cursor: pointer;margin-right: 15px;">恢复</el-tag>
-         <el-tag type="warning" style="margin-right: 15px;cursor: pointer;">下载</el-tag>
-          <el-tag type="danger" style="cursor: pointer;">删除</el-tag>
-        </template>
-      </el-table-column> -->
-		</el-table>
-		<div class="pagesip">
-			<el-button type="primary" size="small"
-				style="background-color:#D8AB5A ;border-color:#D8AB5A ; margin: 0 20px;" @click="jumpFirstPage">首页
-			</el-button>
-			<el-pagination background @current-change="handleCurrentChange" layout="prev, pager, next"
-				:total="list.length" :page-size="10" prev-text="上一页" next-text="下一页" :hide-on-single-page="false"
-				ref="pagination">
-			</el-pagination>
-			<el-button type="primary" size="small"
-				style="background-color:#D8AB5A ;border-color:#D8AB5A ;margin: 0 20px;" @click="jumpLastPage">尾页
-			</el-button>
-		</div>
-	</div>
-</template>
 
-<script>
-	import {
-		dataConversionUtil
-	} from '../../utils/Excel.js'
-	export default {
-		filters: {
-			statusFilter(status) {
-				const statusMap = {
-					published: 'success',
-					draft: 'gray',
-					deleted: 'danger'
-				}
-				return statusMap[status]
-			}
-		},
-		data() {
-			return {
-				list: [],
-				listLoading: false,
-				status: '',
-				hpstatus: '',
-				multipleSelection:[],
-				srcList: [],
-				currentPage: 1,
-				pagesize: 11,
-				input4: '',
-				checked: false,
-				pickerOptions: {
-					shortcuts: [{
-						text: '最近一周',
-						onClick(picker) {
-							const end = new Date();
-							const start = new Date();
-							start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-							picker.$emit('pick', [start, end]);
-						}
-					}, {
-						text: '最近一个月',
-						onClick(picker) {
-							const end = new Date();
-							const start = new Date();
-							start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-							picker.$emit('pick', [start, end]);
-						}
-					}, {
-						text: '最近三个月',
-						onClick(picker) {
-							const end = new Date();
-							const start = new Date();
-							start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-							picker.$emit('pick', [start, end]);
-						}
-					}]
-				},
-				value1: '',
-				value2: ''
-			}
-		},
-		mounted() {
-			this.$request({
-				url: '/api/Report/acceptorClassification?frequency=1&startDate=2020-10-12&endDate=2023-12-23',
-				method: 'get',
-			}).then((res) => {
-				this.list = res.data
-				this.getPageData()
-			})
-		},
-		methods: {
-			handleSelectionChange(data) {
-			  this.multipleSelection = data;
-			  console.log(this.multipleSelection);
-			},
-			handleAll(data) {
-				this.multipleSelection = data
-				console.log(this.multipleSelection)
-			},
-			handleCommand(command) {
-				this.status = command
 
-			},
-			handlehpCommand(command) {
-				this.hpstatus = command
 
-			},
-			shipments1() {
-				this.$router.push({
-					path: "/shipments1"
-				})
-			},
-			shipments2() {
-				this.$router.push({
-					path: "/shipments2"
-				})
-			},
-			shipments3() {
-				this.$router.push({
-					path: "/shipments3"
-				})
-			},
-			/* 导出 */
-			Export() {
-				// window.open('https://ht.9026.com/api/Report/export/acceptorClassification?frequency=1&startDate=&endDate=')
-				if(this.multipleSelection==""){
-					this.$message({
-						type:'warning',
-						message:'请选择数据!'
-					})
-				}else{
-					var tableHeader = [
-						['序号', '承兑人姓名', '统计周期(按照承兑日)', '汇票笔数', '汇票金额', '服务费','利息'],
-					]
-					var dataList = []
-					this.multipleSelection.forEach((item, index) => {
-						dataList.push([index + 1, item.acceptorName, item.period, item.count, item.money, item
-							.serviceMoney,item.interest
-						]);
-					})
-					dataConversionUtil.dataToExcel('承兑人分类报表', tableHeader, dataList)
-					this.$message.success('导出成功!');
-			}
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val;
-				this.getPageData();
-			},
-			jumpFirstPage() {
-				this.$refs.pagination.handleCurrentChange(1);
-				this.$emit('handleCurrentChange', 1);
-			},
-			jumpLastPage() {
-				let font = this.$refs.pagination
-				let cpage = Math.ceil(font.total / font.pageSize);
-				font.handleCurrentChange(cpage);
-			},
-			getPageData() {
-				let start = (this.currentPage - 1) * this.pagesize;
-				let end = start + this.pagesize;
-				this.srcList = this.list.slice(start, end);
-			},
-		}
-	}
+    handlehpCommand(command) {
+      this.hpstatus = command;
+    },
+    shipments1() {
+      this.$router.push({
+        path: "/shipments1",
+      });
+    },
+    shipments2() {
+      this.$router.push({
+        path: "/shipments2",
+      });
+    },
+    shipments3() {
+      this.$router.push({
+        path: "/shipments3",
+      });
+    },
+    /* 导出 */
+    Export() {
+      // window.open('https://ht.9026.com/api/Report/export/acceptorClassification?frequency=1&startDate=&endDate=')
+      if (this.multipleSelection == "") {
+        this.$message({
+          type: "warning",
+          message: "请选择数据!",
+        });
+      } else {
+        var tableHeader = [
+          [
+            "序号",
+            "承兑人姓名",
+            "统计周期(按照承兑日)",
+            "汇票笔数",
+            "汇票金额",
+            "服务费",
+            "利息",
+          ],
+        ];
+        var dataList = [];
+        this.multipleSelection.forEach((item, index) => {
+          dataList.push([
+            index + 1,
+            item.acceptorName,
+            item.period,
+            item.count,
+            item.money,
+            item.serviceMoney,
+            item.interest,
+          ]);
+        });
+        dataConversionUtil.dataToExcel("承兑人分类报表", tableHeader, dataList);
+        this.$message.success("导出成功!");
+      }
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getPageData();
+    },
+    jumpFirstPage() {
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
+    },
+    jumpLastPage() {
+      let font = this.$refs.pagination;
+      let cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
+    },
+    getPageData() {
+      let start = (this.currentPage - 1) * this.pagesize;
+      let end = start + this.pagesize;
+      this.srcList = this.list.slice(start, end);
+    },
+  },
+};
 </script>
 <style lang="scss">
-	.pulldown {
-		width: 185px;
-		height: 40px;
-		border: 1px solid #E8E8E8;
-		border-radius: 10px;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 20px;
-		color: #999999;
-	}
-
-	.pagesip {
+.pulldown {
+  width: 185px;
+  height: 40px;
+  border: 1px solid #e8e8e8;
+  border-radius: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 20px;
+  color: #999999;
+}
 
-		width: 100%;
-		margin: 20px auto;
-		display: flex;
-		// align-items: center;
-		justify-content: flex-end;
-	}
+.pagesip {
+  width: 100%;
+  margin: 20px auto;
+  display: flex;
+  // align-items: center;
+  justify-content: flex-end;
+}
 
-	.el-pagination.is-background .el-pager li:not(.disabled).active {
-		background-color: #D8AB5A;
-	}
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #d8ab5a;
+}
 
-	.el-col {
-		margin-bottom: 20px;
-	}
+.el-col {
+  margin-bottom: 20px;
+}
 </style>

src/views/sucuirtyaudit/index.vue

@@ -14,7 +14,7 @@
         </div>
       </div>
       <div class="grid-content bg-purple">
-        <el-dropdown @command="handleCommand">
+        <!-- <el-dropdown @command="handleCommand">
           <div class="pulldown">
             <span class="el-dropdown-link" v-if="!status"> 操作人员 </span>
             <span class="el-dropdown-link" v-if="status">
@@ -26,7 +26,17 @@
             <el-dropdown-item command="供应商">供应商</el-dropdown-item>
             <el-dropdown-item command="业务管理员">业务管理员</el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
+        </el-dropdown> -->
+        <el-input
+            placeholder="操作人员查询"
+            v-model="formData.operateUser"
+            @change="SearchOperateUser"
+            style="width: 100%"
+          >
+            <i slot="prefix" class="el-input__icon el-icon-search"></i>
+          </el-input>
+
+
       </div>
 
       <div class="grid-content bg-purple">
@@ -39,7 +49,9 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
+			value-format="yyyy-MM-dd"
             :picker-options="pickerOptions"
+			@change="startEndTime"
           >
           </el-date-picker>
         </div>
@@ -205,7 +217,7 @@ export default {
       };
       getAuditLogSearch({ ...params, ...searchForm }).then((res) => {
         const { data } = res;
-		console.log(data);
+		    console.log(data);
         this.temporaryList = data.result;
         this.srcList = data.result;
         this.total = res.data.total;
@@ -221,24 +233,30 @@ export default {
       });
     },
 
-	/* 查询功能 */
-    handleCommand(command) {
-      this.status = command;
+     /* 请输入查询内容 */
+    Search() {
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getAllList(this.searchForm);
+    },  
+     /* 操作人员查询*/
+    SearchOperateUser(){
+      console.log("我是操作人员");
     },
-    handlehpCommand(command) {
-      this.hpstatus = command;
+
+     // 日期审核状态查询
+    startEndTime() {
+      this.formData.startTime = this.value2[0]
+      this.formData.endTime = this.value2[1]
+      this.currentPage = 1
+      this.searchForm = { ...this.formData }
+     this.getAllList(this.searchForm);
     },
 
 
-	
 
 
-     /* 输入出票人名称查询 */
-    Search() {
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
-    },
+
 	 /* 分页功能，改变当前页 */
     handleCurrentChange(val) {
       this.currentPage = val;