项目日志：“7.31 规范表格信息”

src/views/contracts/billDetail.vue

@@ -1,11 +1,11 @@
 <template>
-  <div>
+  <div class="bill-detail">
 
     <el-descriptions title="汇票详情" :column="3" border>
-      <el-descriptions-item label="汇票名">{{
+      <el-descriptions-item label="汇票名称">{{
         list[0].name
       }}</el-descriptions-item>
-      <el-descriptions-item label="汇票编号">{{
+      <el-descriptions-item label="汇票号码">{{
         list[0].draftNo
       }}</el-descriptions-item>
       <el-descriptions-item label="汇票状态">{{
@@ -44,11 +44,11 @@
       <el-descriptions-item label="预计贴现日">{{
         list[0].expectDiscountDate
       }}</el-descriptions-item>
-      <el-descriptions-item label="到期日期">{{
+      <el-descriptions-item label="汇票到期日">{{
         list[0].issueDate
       }}</el-descriptions-item>
 
-      <el-descriptions-item label="附件">
+      <el-descriptions-item label="发票附件">
         <el-image
           style="width: 100px; height: 100px"
           :src="list[0].picList"
@@ -217,4 +217,7 @@ export default {
   display: flex;
   // justify-content: space-around;
 }
+.bill-detail{
+  padding: 20px;
+}
 </style>

src/views/contracts/index.vue

@@ -3,10 +3,6 @@
     <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
       <!-- 查询表单 -->
       <div class="grid-content bg-purple">
-        <!-- 合同名称/编号、承兑人名称或出票 -->
-        <!-- item.contractNo === this.search ||
-      // //       item.acceptorName === this.search ||
-      // //       item.drawersName === this.search -->
         <el-input
           v-model="formData.name"
           placeholder="合同名称/编号、承兑人名称或出票..."
@@ -28,7 +24,7 @@
             <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>
@@ -46,7 +42,7 @@
             <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-item command="失败">失败</el-dropdown-item>
@@ -54,18 +50,18 @@
         </el-dropdown>
       </div>
 
-      <!-- 审核状态 -->
+      <!-- 合同审核状态 -->
       <div class="grid-content bg-purple">
         <el-dropdown @command="handleCommandAuditstatus">
           <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-item command="失败">失败</el-dropdown-item>
@@ -122,13 +118,14 @@
       />
       <el-table-column
         class-name="status-col"
-        label="审核状态"
+        label="合同审核状态"
         align="center"
         prop="statusText"
+        width="120"
       />
       <el-table-column
         align="center"
-        label="时间"
+        label="上传日期"
         prop="createdAt"
         width="155"
       />
@@ -387,7 +384,6 @@ export default {
       })
     },
     failed() {
-      // let failed = this.list.filter(item => item.id === id)
       const ids = Array.from(this.multipleSelection, ({ id }) => id)
       this.$request({
         url: '/api/Contract/manage',
@@ -495,7 +491,7 @@ export default {
       if (command === '删除') {
         this.formData.contractStatus = 1
       }
-      if (command === '合同状态') {
+      if (command === '全部') {
         this.formData.contractStatus = 0
       }
       this.currentPage = 1
@@ -506,7 +502,7 @@ export default {
     // 汇票状态查询
     handlehpCommand(command) {
       this.hpstatus = command
-      if (command === '汇票状态') {
+      if (command === '全部') {
         this.formData.draftStatus = 0
       }
       if (command === '待审核') {
@@ -529,7 +525,7 @@ export default {
     // 合同审核状态查询
     handleCommandAuditstatus(command) {
       this.Auditstatus = command
-      if (command === '审核状态') {
+      if (command === '全部') {
         this.formData.approveStatus = 0
       }
       if (command === '待审核') {

src/views/databackup/index.vue

@@ -4,7 +4,7 @@
       <div class="grid-content bg-purple">
         <div class="grid-content bg-purple" style="margin-left: 30px">
           <el-input
-            placeholder="请输入查询内容"
+            placeholder="请输入文件名称"
             v-model="formData.fileName"
             @change="Search"
             style="width: 80%"
@@ -13,10 +13,10 @@
           </el-input>
         </div>
       </div>
-      <div class="grid-content bg-purple">
+      <!-- <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"> 存储对象 </span>
             <span class="el-dropdown-link" v-if="status">
               {{ status }}
             </span>
@@ -27,7 +27,7 @@
             
           </el-dropdown-menu>
         </el-dropdown>
-      </div>
+      </div> -->
       <div class="grid-content bg-purple">
         <div class="block">
           <el-date-picker
@@ -65,7 +65,7 @@
     >
       <el-table-column align="center" label="" width="55" type="selection">
       </el-table-column>
-      <el-table-column label="文件名称" align="center" prop="fileName">
+      <el-table-column label="文件名称" align="center" prop="fileName" width="200">
       </el-table-column>
       <el-table-column label="存储对象" align="center" prop="storeType">
       </el-table-column>
@@ -225,9 +225,22 @@ export default {
       });
 	},
 
-
+     /* 存储对象查询 */
     handleCommand(command) {
       this.status = command;
+       if(command === '全部'){
+          this.formData.isDeleted=''
+        }
+            if (command === '正常') {
+            this.formData.isDeleted = 0
+          }
+          if (command === '删除') {
+            this.formData.isDeleted = 1
+          }
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+
     },
 	  /* 请输入查询内容 */
     Search() {

src/views/delivery/edit.vue

@@ -3,13 +3,13 @@
 		<el-descriptions title="供应商详情" :column="3" :size="size" border style="margin: 20px;">
 			<el-descriptions-item label="供应商名称">{{ list.name }}</el-descriptions-item>
 			<el-descriptions-item label="id">{{ list.id }}</el-descriptions-item>
-			<el-descriptions-item label="社会统一信用代码">{{ list.socialCode }}</el-descriptions-item>
+			<el-descriptions-item label="统一社会信用代码">{{ list.socialCode }}</el-descriptions-item>
 			<el-descriptions-item label="账号">{{ list.account }}</el-descriptions-item>
 			<el-descriptions-item label="创建时间">{{ list.createdAt }}</el-descriptions-item>
-			<el-descriptions-item label="法人名称">{{ list.legalPerson }}</el-descriptions-item>
+			<el-descriptions-item label="法人姓名">{{ list.legalPerson }}</el-descriptions-item>
 			<el-descriptions-item label="联系人">{{ list.contacts }}</el-descriptions-item>
-			<el-descriptions-item label="电话">{{ list.contactsMobile }}</el-descriptions-item>
-			<el-descriptions-item label="审核状态">{{ list.statusText }}</el-descriptions-item>
+			<el-descriptions-item label="联系电话">{{ list.contactsMobile }}</el-descriptions-item>
+			<el-descriptions-item label="认证状态">{{ list.statusText }}</el-descriptions-item>
 			<el-descriptions-item label="认证照片">
 				<el-image v-for="(item,index) in list.proxyFileList" :key="index" style="width: 100px; height: 100px"
 					:src="item" />

src/views/delivery/index.vue

@@ -25,7 +25,7 @@
             <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>
@@ -44,7 +44,7 @@
             <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>
@@ -88,7 +88,7 @@
       >
       </el-table-column>
       <el-table-column
-        label="社会统一信用代码"
+        label="统一社会信用代码"
         width="200"
         align="center"
         prop="socialCode"
@@ -97,7 +97,7 @@
       <el-table-column label="账号" width="150" align="center" prop="account">
       </el-table-column>
       <el-table-column
-        label="法人名称"
+        label="法人姓名"
         width="180"
         align="center"
         prop="legalPerson"
@@ -112,7 +112,7 @@
       </el-table-column>
 
       <el-table-column
-        label="电话"
+        label="联系电话"
         width="180"
         align="center"
         prop="contactsMobile"
@@ -125,7 +125,7 @@
         prop="statusText"
       >
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="isDeletedText">
+      <el-table-column label="审核状态" align="center" prop="isDeletedText">
       </el-table-column>
       <el-table-column align="center" prop="createdAt" label="时间" width="180">
       </el-table-column>
@@ -341,7 +341,7 @@ export default {
     /* 审核状态查询 */
     handleCommand(command) {
       this.providerStatus = command;
-        if(command === '审核状态'){
+        if(command === '全部'){
           this.formData.isDeleted=''
         }
             if (command === '正常') {
@@ -358,7 +358,7 @@ export default {
     // 输入供应商状态查询
     AhandleCommand(command) {
       this.Auditstatus = command;
-      if (command === "供应商状态") {
+      if (command === "全部") {
         this.formData.status = "";
       }
       if (command === "已认证") {

src/views/form/detail.vue

@@ -3,10 +3,10 @@
 		<el-descriptions title="出票人详情" :column="3" :size="size" border style="margin: 20px;">
 			<el-descriptions-item label="id">{{ tableData.id }}</el-descriptions-item>
 			<el-descriptions-item label="起始时间">{{ tableData.createdAt }}</el-descriptions-item>
-			<el-descriptions-item label="状态">{{ tableData.statusText }}</el-descriptions-item>
-			<el-descriptions-item label="姓名">{{ tableData.name }}</el-descriptions-item>
-			<el-descriptions-item label="银行账户">{{ tableData.bankAccount }}</el-descriptions-item>
-			<el-descriptions-item label="银行名称">{{ tableData.bankName }}</el-descriptions-item>
+			<el-descriptions-item label="出票人状态">{{ tableData.statusText }}</el-descriptions-item>
+			<el-descriptions-item label="出票人">{{ tableData.name }}</el-descriptions-item>
+			<el-descriptions-item label="账户">{{ tableData.bankAccount }}</el-descriptions-item>
+			<el-descriptions-item label="开户行名称">{{ tableData.bankName }}</el-descriptions-item>
 		</el-descriptions>
 		<el-dialog title="修改出票人" :visible.sync="dialogVisible" width="30%">
 		<el-form ref="form" :model="tableData" label-width="80px">

src/views/form/index.vue

@@ -25,7 +25,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>
@@ -59,7 +59,7 @@
       </el-table-column>
       <el-table-column align="center" prop="bankName" label="开户行名称">
       </el-table-column>
-      <el-table-column align="center" prop="statusText" label="状态">
+      <el-table-column align="center" prop="statusText" label="出票人状态">
       </el-table-column>
       <el-table-column align="center" prop="createdAt" label="时间">
       </el-table-column>
@@ -302,6 +302,9 @@ export default {
         if (command === '删除') {
           this.formData.status = 4
         }
+        if (command === '全部') {
+          this.formData.status = ''
+        }
       this.currentPage = 1;
       this.searchForm = { ...this.formData };
       this.getAllList(this.searchForm);

src/views/management/index.vue

@@ -5,7 +5,7 @@
         <el-input
           v-model="formData.name"
           @change="Search"
-          placeholder="业务管理员名称搜索"
+          placeholder="请输入业务管理员名称"
           style="width: 100%"
         >
           <i slot="prefix" class="el-input__icon el-icon-search" />
@@ -15,7 +15,7 @@
         <el-dropdown @command="handleCommand">
           <div class="pulldown">
             <span v-if="!status" class="el-dropdown-link">
-              业务员状态筛选
+              业务管理员状态
             </span>
             <span v-if="status" class="el-dropdown-link">
               {{ status }}
@@ -33,7 +33,7 @@
         <el-dropdown @command="handlehpCommand">
           <div class="pulldown">
             <span v-if="!Auditstatus" class="el-dropdown-link">
-              审核状态筛选
+              审核状态
             </span>
             <span v-if="Auditstatus" class="el-dropdown-link">
               {{ Auditstatus }}
@@ -41,6 +41,7 @@
             <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>
@@ -71,7 +72,7 @@
       <el-table-column align="center" label="" width="55" type="selection" />
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column
-        label="业务管理员姓名"
+        label="业务管理员名称"
         align="center"
         width="180"
         prop="realName"
@@ -87,6 +88,7 @@
         label="业务管理员状态"
         align="center"
         prop="statusText"
+        width="180"
       />
       <el-table-column
         label="审核状态"
@@ -435,6 +437,9 @@ export default {
     /* 审核状态筛选 */
     handlehpCommand(command) {
       this.Auditstatus = command;
+       if (command === "全部") {
+        this.formData.status = "";
+      }
       if (command === "待审核") {
         this.formData.status = 1;
       }

src/views/shipments/index.vue

@@ -55,7 +55,7 @@
     >
       <el-table-column align="center" label="" width="55" type="selection">
       </el-table-column>
-      <el-table-column label="承兑人姓名" align="center" prop="acceptorName">
+      <el-table-column label="承兑人名称" align="center" prop="acceptorName">
       </el-table-column>
       <el-table-column
         label="统计周期(按照承兑日)"
@@ -219,7 +219,7 @@ export default {
         this.formData.frequency = 3;
       }
       this.number = this.formData.frequency
-      this.getReportList(this.formData.frequency);
+      this.getReportList(this.formData.frequency,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage);
     },
 
      // 日期审核状态查询

src/views/shipments/shipments1.vue

@@ -56,7 +56,7 @@
     >
       <el-table-column align="center" label="" width="55" type="selection">
       </el-table-column>
-      <el-table-column label="出票人" align="center" prop="drawerName">
+      <el-table-column label="出票人名称" align="center" prop="drawerName">
       </el-table-column>
       <el-table-column
         label="统计周期(按照出票日)"
@@ -235,7 +235,10 @@ export default {
         this.formData.frequency = 3;
       }
       this.number = this.formData.frequency;
-      this.getReportList(this.formData.frequency);
+      this.getReportList(this.formData.frequency, this.formData.startTime,
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage);
     },
     // 日期审核状态查询
     startEndTime() {

src/views/shipments/shipments2.vue

@@ -3,7 +3,7 @@
     <el-row type="flex" justify="space-between" style="margin-bottom: 20px">
       <div class="grid-content bg-purple">
         <el-input
-          placeholder="请输入查询内容"
+          placeholder="请输入合同名称"
           v-model="string"
           @change="Search"
           style="width: 100%"
@@ -223,7 +223,9 @@ export default {
       this.getReportList(
         this.string,
         this.formData.startTime,
-        this.formData.endTime
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage
       );
     },
 

src/views/shipments/shipments3.vue

@@ -4,7 +4,7 @@
       <div class="grid-content bg-purple">
         <div class="grid-content bg-purple">
           <el-input
-            placeholder="请输入查询内容"
+            placeholder="请输入供应商名称"
             v-model="string"
             @change="Search"
             style="width: 100%"
@@ -225,7 +225,7 @@ export default {
     
     // 供应商查询
     Search() {
-      this.getReportList(this.string,this.formData.startTime,this.formData.endTime);
+      this.getReportList(this.string,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage);
     },
 
     // 日期审核状态查询

src/views/sucuirtyaudit/annexList.vue

@@ -4,7 +4,7 @@
       <div class="grid-content bg-purple">
         <div class="grid-content bg-purple" style="margin-left: 30px">
           <el-input
-            placeholder="请输入查询内容"
+            placeholder="请输入合同名称"
             v-model="formData.content"
             @change="Search"
             style="width: 80%"
@@ -15,7 +15,7 @@
       </div>
       <div class="grid-content bg-purple">
          <el-input
-          placeholder="操作人员查询"
+          placeholder="请输入供应商名称"
           v-model="formData.operateUser"
           @change="SearchOperateUser"
           style="width: 100%"
@@ -67,7 +67,7 @@
       </el-table-column>
 
       <el-table-column
-        label="供应商"
+        label="供应商名称"
         align="center"
         width="340"
         prop="supplierName"

src/views/sucuirtyaudit/detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<div>
+	<div class="sucuirtyaudit-deatil">
 		<el-descriptions title="详情信息" :column="2" border>
 			<el-descriptions-item label="姓名">{{tableData.userName}}</el-descriptions-item>
 			<el-descriptions-item label="状态">{{tableData.status}}</el-descriptions-item>
@@ -69,5 +69,8 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+.sucuirtyaudit-deatil{
+	padding: 20px;
+}
 </style>

src/views/sucuirtyaudit/index.vue

@@ -4,7 +4,7 @@
       <div class="grid-content bg-purple">
         <div class="grid-content bg-purple">
           <el-input
-            placeholder="请输入查询内容"
+            placeholder="请输入操作事件"
             v-model="formData.content"
             @change="Search"
             style="width: 100%"
@@ -15,7 +15,7 @@
       </div>
       <div class="grid-content bg-purple">
         <el-input
-          placeholder="操作人员查询"
+          placeholder="请输入操作人员名称"
           v-model="formData.operateUser"
           @change="SearchOperateUser"
           style="width: 100%"
@@ -63,15 +63,15 @@
     >
       <el-table-column align="center" label="" width="55" type="selection">
       </el-table-column>
-      <el-table-column align="center" prop="created_at" label="操作日">
+      <el-table-column align="center" prop="created_at" label="操作日" width="200">
         <template slot-scope="scope">
           <i class="el-icon-time" />
           <span>{{ scope.row.createdAt }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="事件" align="center" width="340" prop="event">
+      <el-table-column label="操作事件名称" align="center" width="340" prop="event">
       </el-table-column>
-      <el-table-column label="操作人员" align="center" prop="userName">
+      <el-table-column label="操作人员名称" align="center" prop="userName" width="120">
       </el-table-column>
       <el-table-column label="操作状态" align="center" prop="status">
       </el-table-column>

src/views/table/detail.vue

@@ -1,11 +1,11 @@
 <template>
 	<div  >
 		<el-descriptions title="承兑人详情" :column="3" :size="size" border style="margin: 20px;">
-			<el-descriptions-item label="姓名">{{ tableData.name }}</el-descriptions-item>
+			<el-descriptions-item label="承兑人名称">{{ tableData.name }}</el-descriptions-item>
 			<el-descriptions-item label="服务费率">{{ tableData.serviceRate }}</el-descriptions-item>
 			<el-descriptions-item label="利率">{{ tableData.interest }}</el-descriptions-item>
-			<el-descriptions-item label="银行账户">{{ tableData.bankAccount }}</el-descriptions-item>
-			<el-descriptions-item label="银行名称">{{ tableData.bankName }}</el-descriptions-item>
+			<el-descriptions-item label="账号">{{ tableData.bankAccount }}</el-descriptions-item>
+			<el-descriptions-item label="开户行名称">{{ tableData.bankName }}</el-descriptions-item>
 		</el-descriptions>
 		<el-dialog title="修改供应商" :visible.sync="dialogVisible" width="40%">
 		<el-form ref="form" :model="tableData" label-width="80px" >

src/views/table/index.vue

@@ -20,7 +20,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>
@@ -47,9 +47,9 @@
 			<el-table-column align="center" label="利率" prop="interest">
 				<template slot-scope="scope"> {{ scope.row.interest }}% </template>
 			</el-table-column>
-			<el-table-column align="center" label="状态" prop="statusText">
+			<el-table-column align="center" label="承兑人状态" prop="statusText">
 			</el-table-column>
-			<el-table-column align="center" label="时间" prop="createdAt">
+			<el-table-column align="center" label="时间" prop="createdAt" width='200'>
 			</el-table-column>
 			<el-table-column align="center" prop="created_at" label="操作" width="300">
 				<template slot-scope="scope">
@@ -264,6 +264,10 @@
 				  if (command === '删除') {
 				    this.formData.status = 4
 				  }
+				  if (command === '全部') {
+				    this.formData.status =''
+				  }
+				  
 				this.currentPage = 1;
 				this.searchForm = {
 					...this.formData