瀏覽代碼

8.1项目日志:规范表格

gubai 2 年之前
父節點
當前提交
a7480b6fa2

+ 2 - 2
src/layout/components/Sidebar/index.vue

@@ -1,10 +1,10 @@
 <template>
 <template>
   <div :class="{'has-logo':showLogo}">
   <div :class="{'has-logo':showLogo}">
-    <!-- <div class="flex4 boxtitle">
+    <div class="flex4 boxtitle">
       <el-image :src="logo" style="width: 100px; height: 78px;" fit=" fill"></el-image>
       <el-image :src="logo" style="width: 100px; height: 78px;" fit=" fill"></el-image>
       <span style="color: #1F242A ;">55</span>
       <span style="color: #1F242A ;">55</span>
             <span style="color: #BEBDBB;">2456165645625454151</span>
             <span style="color: #BEBDBB;">2456165645625454151</span>
-    </div> -->
+    </div>
 
 
 
 
     <el-scrollbar wrap-class="scrollbar-wrapper">
     <el-scrollbar wrap-class="scrollbar-wrapper">

+ 277 - 251
src/views/contracts/index.vue

@@ -5,7 +5,7 @@
       <div class="grid-content bg-purple">
       <div class="grid-content bg-purple">
         <el-input
         <el-input
           v-model="formData.name"
           v-model="formData.name"
-          placeholder="合同名称/编号、承兑人名称或出票..."
+          placeholder="合同名称/编号、供应商名称或出票..."
           clearable
           clearable
           style="width: 100%"
           style="width: 100%"
           @change="Search"
           @change="Search"
@@ -54,7 +54,9 @@
       <div class="grid-content bg-purple">
       <div class="grid-content bg-purple">
         <el-dropdown @command="handleCommandAuditstatus">
         <el-dropdown @command="handleCommandAuditstatus">
           <div class="pulldown">
           <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">
             <span v-if="Auditstatus" class="el-dropdown-link">
               {{ Auditstatus }}
               {{ Auditstatus }}
             </span>
             </span>
@@ -106,10 +108,25 @@
         prop="contractNo"
         prop="contractNo"
         width="155"
         width="155"
       />
       />
-      <el-table-column label="供应商" align="center" prop="supplierName" />
+      <el-table-column
+        label="供应商名称"
+        align="center"
+        prop="supplierName"
+        width="100"
+      />
 
 
-      <el-table-column label="承兑人" align="center" prop="acceptorName" />
-      <el-table-column label="出票人" align="center" prop="drawersName" />
+      <el-table-column
+        label="承兑人名称"
+        align="center"
+        prop="acceptorName"
+        width="100"
+      />
+      <el-table-column
+        label="出票人名称"
+        align="center"
+        prop="drawersName"
+        width="100"
+      />
       <el-table-column label="汇票状态" align="center" prop="draftStatusText" />
       <el-table-column label="汇票状态" align="center" prop="draftStatusText" />
       <el-table-column
       <el-table-column
         label="合同状态"
         label="合同状态"
@@ -140,32 +157,33 @@
             type="primary"
             type="primary"
             style="cursor: pointer"
             style="cursor: pointer"
             @click="tapDetail(scope.row.id)"
             @click="tapDetail(scope.row.id)"
-          >查看详情</el-tag>
+            >查看详情</el-tag
+          >
           &nbsp;<el-tag
           &nbsp;<el-tag
-           v-permission="['salesman','admin']"
+            v-permission="['salesman', 'admin']"
             type="success"
             type="success"
-            style="cursor: pointer"
+            style="cursor: pointer"
             v-if="scope.row.status == 0"
             v-if="scope.row.status == 0"
             @click="Ssuccessed(scope.row.id)"
             @click="Ssuccessed(scope.row.id)"
           >
           >
-            审核成功</el-tag>
+            审核成功</el-tag
+          >
           &nbsp;<el-tag
           &nbsp;<el-tag
-           v-permission="['salesman','admin']"
+            v-permission="['salesman', 'admin']"
             type="danger"
             type="danger"
-            style="cursor: pointer"
+            style="cursor: pointer"
             v-if="scope.row.status == 0"
             v-if="scope.row.status == 0"
             @click="Sfailed(scope.row.id)"
             @click="Sfailed(scope.row.id)"
-          >审核失败
-          </el-tag>
-          &nbsp;<el-tag
-           v-permission="['supplier']"
-            type="danger"
-            style="cursor: pointer"
-            v-show="scope.row.status == 2"
-            @click="editNewContract(scope.row)"
-          >重新提交
-          </el-tag>
-
+            >审核失败
+          </el-tag>
+          &nbsp;<el-tag
+            v-permission="['supplier']"
+            type="danger"
+            style="cursor: pointer"
+            v-show="scope.row.status == 2"
+            @click="editNewContract(scope.row)"
+            >重新提交
+          </el-tag>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -176,17 +194,20 @@
             v-permission="['supplier']"
             v-permission="['supplier']"
             type="primary"
             type="primary"
             @click="addNewContract"
             @click="addNewContract"
-          >上传合同</el-button>
-		  <el-button
-		    v-permission="['salesman','admin']"
-		    type="primary"
-		    @click="successed"
-		  >审核成功</el-button>
+            >上传合同</el-button
+          >
+          <el-button
+            v-permission="['salesman', 'admin']"
+            type="primary"
+            @click="successed"
+            >审核成功</el-button
+          >
           <el-button
           <el-button
-            v-permission="['salesman','admin']"
+            v-permission="['salesman', 'admin']"
             type="primary"
             type="primary"
             @click="failed"
             @click="failed"
-          >审核失败</el-button>
+            >审核失败</el-button
+          >
 
 
           <el-button type="primary" @click="Exports">批量导出</el-button>
           <el-button type="primary" @click="Exports">批量导出</el-button>
           <el-button type="success" @click="recover">恢复</el-button>
           <el-button type="success" @click="recover">恢复</el-button>
@@ -203,7 +224,7 @@
             margin: 0 20px;
             margin: 0 20px;
           "
           "
           @click="jumpFirstPage"
           @click="jumpFirstPage"
-        >首页
+          >首页
         </el-button>
         </el-button>
         <el-pagination
         <el-pagination
           ref="pagination"
           ref="pagination"
@@ -225,7 +246,7 @@
             margin: 0 20px;
             margin: 0 20px;
           "
           "
           @click="jumpLastPage"
           @click="jumpLastPage"
-        >尾页
+          >尾页
         </el-button>
         </el-button>
       </div>
       </div>
     </div>
     </div>
@@ -233,32 +254,32 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { dataConversionUtil } from '../../utils/Excel.js'
-import { contractsPageApi, contractsExportApi } from '@/api/contracts'
+import { dataConversionUtil } from "../../utils/Excel.js";
+import { contractsPageApi, contractsExportApi } from "@/api/contracts";
 export default {
 export default {
   filters: {
   filters: {
     statusFilter(status) {
     statusFilter(status) {
       const statusMap = {
       const statusMap = {
-        published: 'success',
-        draft: 'gray',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
+        published: "success",
+        draft: "gray",
+        deleted: "danger",
+      };
+      return statusMap[status];
+    },
   },
   },
   data() {
   data() {
     return {
     return {
       // 表单数据
       // 表单数据
       formData: {
       formData: {
-        startTime: '',
-        endTime: '',
-        name: '', // 合同名称
-        contractNo: '', // 合同编码
-        supplierName: '', // 供应商
-        acceptorName: '', // 承兑人
-        contractStatusText: '', // 合同状态
-        contractStatus: '',
-        draftStatus: ''
+        startTime: "",
+        endTime: "",
+        name: "", // 合同名称
+        contractNo: "", // 合同编码
+        supplierName: "", // 供应商
+        acceptorName: "", // 承兑人
+        contractStatusText: "", // 合同状态
+        contractStatus: "",
+        draftStatus: "",
       },
       },
       srcList: [],
       srcList: [],
       list: [],
       list: [],
@@ -267,347 +288,355 @@ export default {
       /* 总条数 */
       /* 总条数 */
       total: 20,
       total: 20,
       listLoading: false,
       listLoading: false,
-      status: '',
-      hpstatus: '',
-      Auditstatus: '',
-      search: '',
+      status: "",
+      hpstatus: "",
+      Auditstatus: "",
+      search: "",
       /* 当前页数 */
       /* 当前页数 */
       currentPage: 1,
       currentPage: 1,
       /* 每页显示个数 */
       /* 每页显示个数 */
       pagesize: 10,
       pagesize: 10,
-      checked: '',
+      checked: "",
       pickerOptions: {
       pickerOptions: {
         shortcuts: [
         shortcuts: [
           {
           {
-            text: '最近一周',
+            text: "最近一周",
             onClick(picker) {
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', [start, end])
-            }
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
           },
           },
           {
           {
-            text: '最近一个月',
+            text: "最近一个月",
             onClick(picker) {
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-              picker.$emit('pick', [start, end])
-            }
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
           },
           },
           {
           {
-            text: '最近三个月',
+            text: "最近三个月",
             onClick(picker) {
             onClick(picker) {
-              const end = new Date()
-              const start = new Date()
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-              picker.$emit('pick', [start, end])
-            }
-          }
-        ]
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
       },
       },
-      value2: ''
-    }
+      value2: "",
+    };
   },
   },
   mounted() {
   mounted() {
-    this.checked = this.$store.state.user.checked
-    this.getData()
+    this.checked = this.$store.state.user.checked;
+    this.getData();
   },
   },
   methods: {
   methods: {
     /* ajax发请求获取列表数据 */
     /* ajax发请求获取列表数据 */
     getData(searchForm = {}) {
     getData(searchForm = {}) {
       const params = {
       const params = {
         pageIndex: this.currentPage,
         pageIndex: this.currentPage,
-        pageSize: this.pagesize
-      }
+        pageSize: this.pagesize,
+      };
       contractsPageApi({ ...params, ...searchForm }).then((res) => {
       contractsPageApi({ ...params, ...searchForm }).then((res) => {
-        const { data } = res
-        this.filter = params
-        this.temporaryList = data.result
-        this.srcList = data.result
-        this.total = res.data.total
-      })
+        const { data } = res;
+        this.filter = params;
+        this.temporaryList = data.result;
+        this.srcList = data.result;
+        this.total = res.data.total;
+      });
     },
     },
 
 
     addNewContract() {
     addNewContract() {
       this.$router.push({
       this.$router.push({
-        path: 'contracts/addcontract'
-      })
-    },
-    editNewContract(row) {
-      this.$router.push({
-        path: 'contracts/addcontract?id=' + row.id
-      })
+        path: "contracts/addcontract",
+      });
+    },
+    editNewContract(row) {
+      this.$router.push({
+        path: "contracts/addcontract?id=" + row.id,
+      });
     },
     },
     tapDetail(id) {
     tapDetail(id) {
-      console.log(id)
+      console.log(id);
       this.$router.push({
       this.$router.push({
-        path: '/detail',
+        path: "/detail",
         query: {
         query: {
-          id: id
-        }
-      })
+          id: id,
+        },
+      });
     },
     },
     successed() {
     successed() {
       // let successed = this.list.filter(item => item.id === id)
       // let successed = this.list.filter(item => item.id === id)
-      const ids = Array.from(this.multipleSelection, ({ id }) => id)
+      const ids = Array.from(this.multipleSelection, ({ id }) => id);
       this.$request({
       this.$request({
-        url: '/api/Contract/manage',
-        method: 'post',
+        url: "/api/Contract/manage",
+        method: "post",
         data: {
         data: {
           ids: ids,
           ids: ids,
-          operateType: 3
-        }
+          operateType: 3,
+        },
       }).then((res) => {
       }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.$message({
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-		  this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
         } else {
           this.$message({
           this.$message({
-            type: 'danger',
-            message: res.msg
-          })
-		  this.getData()
+            type: "danger",
+            message: res.msg,
+          });
+          this.getData();
         }
         }
-      })
+      });
     },
     },
     Ssuccessed(id) {
     Ssuccessed(id) {
       this.$request({
       this.$request({
-        url: '/api/Contract/manage',
-        method: 'post',
+        url: "/api/Contract/manage",
+        method: "post",
         data: {
         data: {
           ids: [id],
           ids: [id],
-          operateType: 3
-        }
+          operateType: 3,
+        },
       }).then((res) => {
       }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.$message({
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-		  this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
         } else {
           this.$message({
           this.$message({
-            type: 'danger',
-            message: res.msg
-          })
-		  this.getData()
+            type: "danger",
+            message: res.msg,
+          });
+          this.getData();
         }
         }
-      })
+      });
     },
     },
     failed() {
     failed() {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id)
+      const ids = Array.from(this.multipleSelection, ({ id }) => id);
       this.$request({
       this.$request({
-        url: '/api/Contract/manage',
-        method: 'post',
+        url: "/api/Contract/manage",
+        method: "post",
         data: {
         data: {
           ids: ids,
           ids: ids,
-          operateType: 4
-        }
+          operateType: 4,
+        },
       }).then((res) => {
       }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.$message({
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-		  this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
         } else {
           this.$message({
           this.$message({
-            type: 'danger',
-            message: res.msg
-          })
-		  this.getData()
+            type: "danger",
+            message: res.msg,
+          });
+          this.getData();
         }
         }
-      })
+      });
     },
     },
     Sfailed(id) {
     Sfailed(id) {
       this.$request({
       this.$request({
-        url: '/api/Contract/manage',
-        method: 'post',
+        url: "/api/Contract/manage",
+        method: "post",
         data: {
         data: {
           ids: [id],
           ids: [id],
-          operateType: 4
-        }
+          operateType: 4,
+        },
       }).then((res) => {
       }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.$message({
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-		  this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
         } else {
           this.$message({
           this.$message({
-            type: 'danger',
-            message: res.msg
-          })
-		  this.getData()
+            type: "danger",
+            message: res.msg,
+          });
+          this.getData();
         }
         }
-      })
+      });
     },
     },
     recover(id) {
     recover(id) {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id)
+      const ids = Array.from(this.multipleSelection, ({ id }) => id);
       this.$request({
       this.$request({
-        url: '/api/Contract/manage',
-        method: 'post',
+        url: "/api/Contract/manage",
+        method: "post",
         data: {
         data: {
           ids: ids,
           ids: ids,
-          operateType: 2
-        }
+          operateType: 2,
+        },
       }).then((res) => {
       }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.$message({
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-		  this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
         } else {
           this.$message({
           this.$message({
-            type: 'danger',
-            message: res.msg
-          })
-		  this.getData()
+            type: "danger",
+            message: res.msg,
+          });
+          this.getData();
         }
         }
-      })
+      });
     },
     },
     deleted() {
     deleted() {
-      const ids = Array.from(this.multipleSelection, ({ id }) => id)
+      const ids = Array.from(this.multipleSelection, ({ id }) => id);
       this.$request({
       this.$request({
-        url: '/api/Contract/manage',
-        method: 'post',
+        url: "/api/Contract/manage",
+        method: "post",
         data: {
         data: {
           ids: ids,
           ids: ids,
-          operateType: 1
-        }
+          operateType: 1,
+        },
       }).then((res) => {
       }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.$message({
           this.$message({
-            type: 'success',
-            message: res.msg
-          })
-		  this.getData()
+            type: "success",
+            message: res.msg,
+          });
+          this.getData();
         } else {
         } else {
           this.$message({
           this.$message({
-            type: 'danger',
-            message: res.msg
-          })
-		  this.getData()
+            type: "danger",
+            message: res.msg,
+          });
+          this.getData();
         }
         }
-      })
+      });
     },
     },
     // 合同状态查询
     // 合同状态查询
     handleCommand(command) {
     handleCommand(command) {
-      this.status = command
-      if (command === '正常') {
-        this.formData.contractStatus = 2
+      this.status = command;
+      if (command === "正常") {
+        this.formData.contractStatus = 2;
       }
       }
-      if (command === '删除') {
-        this.formData.contractStatus = 1
+      if (command === "删除") {
+        this.formData.contractStatus = 1;
       }
       }
-      if (command === '全部') {
-        this.formData.contractStatus = 0
+      if (command === "全部") {
+        this.formData.contractStatus = 0;
       }
       }
-      this.currentPage = 1
-      this.searchForm = { ...this.formData }
-      this.getData(this.searchForm)
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getData(this.searchForm);
     },
     },
 
 
     // 汇票状态查询
     // 汇票状态查询
     handlehpCommand(command) {
     handlehpCommand(command) {
-      this.hpstatus = command
-      if (command === '全部') {
-        this.formData.draftStatus = 0
+      this.hpstatus = command;
+      if (command === "全部") {
+        this.formData.draftStatus = 0;
       }
       }
-      if (command === '待审核') {
-        this.formData.draftStatus = 1
+      if (command === "待审核") {
+        this.formData.draftStatus = 1;
       }
       }
-      if (command === '成功') {
-        this.formData.draftStatus = 2
+      if (command === "成功") {
+        this.formData.draftStatus = 2;
       }
       }
-      if (command === '失败') {
-        this.formData.draftStatus = 3
+      if (command === "失败") {
+        this.formData.draftStatus = 3;
       }
       }
-      if (command === '删除') {
-        this.formData.draftStatus = 4
+      if (command === "删除") {
+        this.formData.draftStatus = 4;
       }
       }
-      this.currentPage = 1
-      this.searchForm = { ...this.formData }
-      this.getData(this.searchForm)
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getData(this.searchForm);
     },
     },
 
 
     // 合同审核状态查询
     // 合同审核状态查询
     handleCommandAuditstatus(command) {
     handleCommandAuditstatus(command) {
-      this.Auditstatus = command
-      if (command === '全部') {
-        this.formData.approveStatus = 0
+      this.Auditstatus = command;
+      if (command === "全部") {
+        this.formData.approveStatus = 0;
       }
       }
-      if (command === '待审核') {
-        this.formData.approveStatus = 1
+      if (command === "待审核") {
+        this.formData.approveStatus = 1;
       }
       }
-      if (command === '成功') {
-        this.formData.approveStatus = 2
+      if (command === "成功") {
+        this.formData.approveStatus = 2;
       }
       }
-      if (command === '失败') {
-        this.formData.approveStatus = 3
+      if (command === "失败") {
+        this.formData.approveStatus = 3;
       }
       }
-      this.currentPage = 1
-      this.searchForm = { ...this.formData }
-      this.getData(this.searchForm)
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getData(this.searchForm);
     },
     },
 
 
     // 日期审核状态查询
     // 日期审核状态查询
-    startEndTime() {
-      this.formData.startTime = this.value2[0]
-      this.formData.endTime = this.value2[1]
-      this.currentPage = 1
-      this.searchForm = { ...this.formData }
-      this.getData(this.searchForm)
+    startEndTime(item) {
+      if (item == null) {
+        item = [];
+         this.formData.startTime = ''
+        this.formData.endTime = '';
+         this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getData(this.searchForm);
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getData(this.searchForm);
+      }
     },
     },
     // 合同名称/编号/承兑人名称/出票查询
     // 合同名称/编号/承兑人名称/出票查询
     Search() {
     Search() {
-      this.currentPage = 1
-      this.searchForm = { ...this.formData }
-      this.getData(this.searchForm)
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getData(this.searchForm);
     },
     },
 
 
     handleSelectionChange(data) {
     handleSelectionChange(data) {
-      this.multipleSelection = data
-      console.log(this.multipleSelection)
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
     },
     },
     handleAll(data) {
     handleAll(data) {
-      this.multipleSelection = data
-      console.log(this.multipleSelection)
+      this.multipleSelection = data;
+      console.log(this.multipleSelection);
     },
     },
 
 
     /* 分页功能,改变当前页 */
     /* 分页功能,改变当前页 */
     handleCurrentChange(val) {
     handleCurrentChange(val) {
-      this.currentPage = val
-      this.getData(this.searchForm)
+      this.currentPage = val;
+      this.getData(this.searchForm);
     },
     },
 
 
     /* 分页功能:去首页 */
     /* 分页功能:去首页 */
     jumpFirstPage() {
     jumpFirstPage() {
-      this.$refs.pagination.handleCurrentChange(1)
-      this.$emit('handleCurrentChange', 1)
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
     },
     },
 
 
     /* 分页功能:去尾页 */
     /* 分页功能:去尾页 */
     jumpLastPage() {
     jumpLastPage() {
-      const font = this.$refs.pagination
-      const cpage = Math.ceil(font.total / font.pageSize)
-      font.handleCurrentChange(cpage)
+      const font = this.$refs.pagination;
+      const cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
     },
     },
 
 
-    Exports() {
-
-      contractsExportApi({
-        supplierId:1
-      }).then((res) => {
-        console.log(res)
-      })
+    Exports() {
+      contractsExportApi({
+        supplierId: 1,
+      }).then((res) => {
+        console.log(res);
+      });
 
 
       /*var tableHeader = [
       /*var tableHeader = [
         [
         [
@@ -637,14 +666,11 @@ export default {
         ])
         ])
       })
       })
       dataConversionUtil.dataToExcel('合同列表', tableHeader, dataList)
       dataConversionUtil.dataToExcel('合同列表', tableHeader, dataList)
-      this.$message.success('导出成功!')
-      */
-
-    }
-
-  }
-}
-
+      this.$message.success('导出成功!')
+      */
+    },
+  },
+};
 </script>
 </script>
 <style lang="scss">
 <style lang="scss">
 .pulldown {
 .pulldown {

+ 15 - 6
src/views/databackup/index.vue

@@ -251,12 +251,21 @@ export default {
 	
 	
 
 
 	 // 日期审核状态查询
 	 // 日期审核状态查询
-    startEndTime(val) {
-      this.formData.startTime = this.value2[0];
-      this.formData.endTime = this.value2[1];
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
+    startEndTime(item) {
+       if (item == null) {
+        item = [];
+        this.formData.startTime ='';
+        this.formData.endTime = '';
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+      }
       
       
     },
     },
 
 

+ 37 - 38
src/views/delivery/index.vue

@@ -61,11 +61,10 @@
             range-separator="至"
             range-separator="至"
             start-placeholder="开始日期"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
             :picker-options="pickerOptions"
             :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd"
             @change="startEndTime"
             @change="startEndTime"
-          >
-          </el-date-picker>
+          />
         </div>
         </div>
       </div>
       </div>
     </el-row>
     </el-row>
@@ -331,28 +330,38 @@ export default {
     },
     },
 
 
     // 日期审核状态查询
     // 日期审核状态查询
-    startEndTime() {
-      this.formData.startTime = this.value2[0];
-      this.formData.endTime = this.value2[1];
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
+    startEndTime(item) {
+      if (item == null) {
+        item = [];
+        this.formData.startTime ='';
+        this.formData.endTime = '';
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+      }
+     
     },
     },
     /* 审核状态查询 */
     /* 审核状态查询 */
     handleCommand(command) {
     handleCommand(command) {
       this.providerStatus = command;
       this.providerStatus = 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);
+      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);
     },
     },
 
 
     // 输入供应商状态查询
     // 输入供应商状态查询
@@ -372,16 +381,7 @@ export default {
       this.getAllList(this.searchForm);
       this.getAllList(this.searchForm);
     },
     },
 
 
-    // 日期审核状态查询
-    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() {
     Search() {
@@ -412,13 +412,12 @@ export default {
 
 
     /* 导出 */
     /* 导出 */
     Exports() {
     Exports() {
-      supplierExportApi({
-      }).then((data) => {
-        console.log(data)
-        if(!data){
-          return
+      supplierExportApi({}).then((data) => {
+        console.log(data);
+        if (!data) {
+          return;
         }
         }
-        var blob = new Blob([data])
+        var blob = new Blob([data]);
         var url = window.URL.createObjectURL(blob);
         var url = window.URL.createObjectURL(blob);
         var aLink = document.createElement("a");
         var aLink = document.createElement("a");
         aLink.style.display = "none";
         aLink.style.display = "none";
@@ -428,7 +427,7 @@ export default {
         aLink.click();
         aLink.click();
         document.body.removeChild(aLink); //下载完成移除元素
         document.body.removeChild(aLink); //下载完成移除元素
         window.URL.revokeObjectURL(url); //释放掉blob对象
         window.URL.revokeObjectURL(url); //释放掉blob对象
-      })
+      });
 
 
       if (this.multipleSelection == "") {
       if (this.multipleSelection == "") {
         this.$message({
         this.$message({

+ 53 - 25
src/views/shipments/index.vue

@@ -133,7 +133,7 @@ export default {
       total: 20,
       total: 20,
       /* 列表数据 */
       /* 列表数据 */
       srcList: [],
       srcList: [],
-      number:'',//区分是月季年度
+      number: "", //区分是月季年度
       list: [],
       list: [],
       listLoading: false,
       listLoading: false,
       status: "",
       status: "",
@@ -181,19 +181,18 @@ export default {
   },
   },
   methods: {
   methods: {
     /* 获取承兑人分类报表 */
     /* 获取承兑人分类报表 */
-    getReportList(number,startDate,endDate,pageSize,
-        pageIndex) {
+    getReportList(number, startDate, endDate, pageSize, pageIndex) {
       let params = {
       let params = {
         frequency: number || 1,
         frequency: number || 1,
         startDate,
         startDate,
         endDate,
         endDate,
-        pageSize,//页大小
-        pageIndex//页面
+        pageSize, //页大小
+        pageIndex, //页面
       };
       };
       getReportSearch({ ...params }).then((res) => {
       getReportSearch({ ...params }).then((res) => {
         const { data } = res;
         const { data } = res;
         this.srcList = data.result;
         this.srcList = data.result;
-        this.total = data.total
+        this.total = data.total;
       });
       });
     },
     },
 
 
@@ -218,39 +217,68 @@ export default {
       if (command === "年度") {
       if (command === "年度") {
         this.formData.frequency = 3;
         this.formData.frequency = 3;
       }
       }
-      this.number = this.formData.frequency
-      this.getReportList(this.formData.frequency,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage);
+      this.number = this.formData.frequency;
+      this.getReportList(
+        this.formData.frequency,
+        this.formData.startTime,
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage
+      );
     },
     },
 
 
-     // 日期审核状态查询
-    startEndTime() {
-      this.formData.startTime = this.value2[0]
-      this.formData.endTime = this.value2[1]
-      this.currentPage = 1
-       this.getReportList(this.number,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage);
+    // 日期审核状态查询
+    startEndTime(item) {
+      if (item == null) {
+        item = [];
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+        this.currentPage = 1;
+        this.getReportList(
+          this.number,
+          this.formData.startTime,
+          this.formData.endTime,
+          this.pagesize,
+          this.currentPage
+        );
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.getReportList(
+          this.number,
+          this.formData.startTime,
+          this.formData.endTime,
+          this.pagesize,
+          this.currentPage
+        );
+      }
     },
     },
-      /* 分页功能,改变当前页 */
+    /* 分页功能,改变当前页 */
     handleCurrentChange(val) {
     handleCurrentChange(val) {
-      this.currentPage = val
-      this.getReportList(this.number,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage)
+      this.currentPage = val;
+      this.getReportList(
+        this.number,
+        this.formData.startTime,
+        this.formData.endTime,
+        this.pagesize,
+        this.currentPage
+      );
     },
     },
 
 
     /* 分页功能:去首页 */
     /* 分页功能:去首页 */
     jumpFirstPage() {
     jumpFirstPage() {
-      this.$refs.pagination.handleCurrentChange(1)
-      this.$emit('handleCurrentChange', 1)
+      this.$refs.pagination.handleCurrentChange(1);
+      this.$emit("handleCurrentChange", 1);
     },
     },
 
 
     /* 分页功能:去尾页 */
     /* 分页功能:去尾页 */
     jumpLastPage() {
     jumpLastPage() {
-      const font = this.$refs.pagination
-      const cpage = Math.ceil(font.total / font.pageSize)
-      font.handleCurrentChange(cpage)
+      const font = this.$refs.pagination;
+      const cpage = Math.ceil(font.total / font.pageSize);
+      font.handleCurrentChange(cpage);
     },
     },
 
 
-
-
-
     shipments1() {
     shipments1() {
       this.$router.push({
       this.$router.push({
         path: "/shipments1",
         path: "/shipments1",

+ 25 - 11
src/views/shipments/shipments1.vue

@@ -241,17 +241,31 @@ export default {
         this.currentPage);
         this.currentPage);
     },
     },
     // 日期审核状态查询
     // 日期审核状态查询
-    startEndTime() {
-      this.formData.startTime = this.value2[0];
-      this.formData.endTime = this.value2[1];
-      this.currentPage = 1;
-      this.getReportList(
-        this.number,
-        this.formData.startTime,
-        this.formData.endTime,
-        this.pagesize,
-        this.currentPage
-      );
+    startEndTime(item) {
+     if (item == null) {
+        item = [];
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+        this.currentPage = 1;
+        this.getReportList(
+          this.number,
+          this.formData.startTime,
+          this.formData.endTime,
+          this.pagesize,
+          this.currentPage
+        );
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.getReportList(
+          this.number,
+          this.formData.startTime,
+          this.formData.endTime,
+          this.pagesize,
+          this.currentPage
+        );
+      }
     },
     },
     /* 分页功能,改变当前页 */
     /* 分页功能,改变当前页 */
     handleCurrentChange(val) {
     handleCurrentChange(val) {

+ 25 - 11
src/views/shipments/shipments2.vue

@@ -230,17 +230,31 @@ export default {
     },
     },
 
 
     // 日期审核状态查询
     // 日期审核状态查询
-    startEndTime() {
-      this.formData.startTime = this.value2[0];
-      this.formData.endTime = this.value2[1];
-      this.currentPage = 1;
-      this.getReportList(
-        this.string,
-        this.formData.startTime,
-        this.formData.endTime,
-        this.pagesize,
-        this.currentPage
-      );
+    startEndTime(item) {
+      if (item == null) {
+        item = [];
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+        this.currentPage = 1;
+        this.getReportList(
+          this.number,
+          this.formData.startTime,
+          this.formData.endTime,
+          this.pagesize,
+          this.currentPage
+        );
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.getReportList(
+          this.number,
+          this.formData.startTime,
+          this.formData.endTime,
+          this.pagesize,
+          this.currentPage
+        );
+      }
     },
     },
 
 
     /* 分页功能,改变当前页 */
     /* 分页功能,改变当前页 */

+ 25 - 5
src/views/shipments/shipments3.vue

@@ -229,11 +229,31 @@ export default {
     },
     },
 
 
     // 日期审核状态查询
     // 日期审核状态查询
-    startEndTime() {
-      this.formData.startTime = this.value2[0]
-      this.formData.endTime = this.value2[1]
-       this.currentPage = 1
-      this.getReportList(this.string,this.formData.startTime,this.formData.endTime,this.pagesize,this.currentPage);
+    startEndTime(item) {
+     if (item == null) {
+        item = [];
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+        this.currentPage = 1;
+        this.getReportList(
+          this.number,
+          this.formData.startTime,
+          this.formData.endTime,
+          this.pagesize,
+          this.currentPage
+        );
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.getReportList(
+          this.number,
+          this.formData.startTime,
+          this.formData.endTime,
+          this.pagesize,
+          this.currentPage
+        );
+      }
     },
     },
         /* 分页功能,改变当前页 */
         /* 分页功能,改变当前页 */
     handleCurrentChange(val) {
     handleCurrentChange(val) {

+ 15 - 6
src/views/sucuirtyaudit/annexList.vue

@@ -260,12 +260,21 @@ export default {
     },
     },
 
 
     // 日期审核状态查询
     // 日期审核状态查询
-    startEndTime() {
-      this.formData.startTime = this.value2[0];
-      this.formData.endTime = this.value2[1];
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
+    startEndTime(item) {
+      if (item == null) {
+        item = [];
+        this.formData.startTime ='';
+        this.formData.endTime = '';
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+      }
     },
     },
 
 
     /* 分页功能,改变当前页 */
     /* 分页功能,改变当前页 */

+ 16 - 6
src/views/sucuirtyaudit/index.vue

@@ -237,12 +237,22 @@ export default {
     },
     },
 
 
     // 日期审核状态查询
     // 日期审核状态查询
-    startEndTime() {
-      this.formData.startTime = this.value2[0];
-      this.formData.endTime = this.value2[1];
-      this.currentPage = 1;
-      this.searchForm = { ...this.formData };
-      this.getAllList(this.searchForm);
+    startEndTime(item) {
+       if (item == null) {
+        item = [];
+        this.formData.startTime ='';
+        this.formData.endTime = '';
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+      } else {
+        this.formData.startTime = this.value2[0];
+        this.formData.endTime = this.value2[1];
+        this.currentPage = 1;
+        this.searchForm = { ...this.formData };
+        this.getAllList(this.searchForm);
+      }
+
     },
     },
 
 
     /* 分页功能,改变当前页 */
     /* 分页功能,改变当前页 */