更新

src/views/PurchasingCenter/OfflineContractSearch/index.vue

@@ -4,6 +4,18 @@
       <div slot="header">
         <el-row>
           <el-input v-model="supplierName" placeholder="供应商/合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>
+          <el-date-picker
+            v-model="dateRange"
+            :picker-options="pickerOptions"
+            size="small"
+            type="daterange"
+            align="center"
+            style="width: 240px;margin: 3px 0"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            range-separator="～"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"/>
           <!--<el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>-->
           <el-button
             type="primary"
@@ -11,7 +23,7 @@
             icon="el-icon-search"
             plain
             style="margin-left:10px"
-            @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+            @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
           <el-tooltip :open-delay="200" effect="dark" content="打回重新编制" placement="top">
             <div style="display: inline-block">
               <el-button
@@ -27,7 +39,7 @@
       </div>
     </el-card>
     <el-row>
-      <el-card style="width: 40%; float: left">
+      <el-card style="width: 42%; float: left">
         <el-table
           v-loading="loading1"
           id="expandTable"
@@ -38,8 +50,9 @@
           style="width: 100%"
           height="700px"
           highlight-current-row
+          @sort-change="sortChange"
           @row-click="searchTable2">
-          <el-table-column label="供应商" align="center" min-width="200">
+          <el-table-column label="供应商" align="center" prop="供应商名称" min-width="200" sortable="custom" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.供应商名称 }}
             </template>
@@ -49,7 +62,7 @@
           <!--            {{ scope.row.离线合同名称 }}-->
           <!--          </template>-->
           <!--        </el-table-column>-->
-          <el-table-column label="离线合同编号" align="center" min-width="120">
+          <el-table-column label="离线合同编号" align="center" prop="离线合同编号" min-width="120" sortable="custom" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.离线合同编号 }}
             </template>
@@ -59,11 +72,16 @@
           <!--            {{ scope.row.采购员 }}-->
           <!--          </template>-->
           <!--        </el-table-column>-->
-          <el-table-column label="总金额(元)" align="center" min-width="75">
+          <el-table-column label="总金额(元)" align="center" min-width="90">
             <template slot-scope="scope">
               {{ Number(scope.row.合同总额).toFixed(2) }}
             </template>
           </el-table-column>
+          <el-table-column label="创建日期" align="center" min-width="80">
+            <template slot-scope="scope">
+              {{ scope.row.创建日期.split(' ')[0] }}
+            </template>
+          </el-table-column>
         </el-table>
         <div class="block" style="margin-top: 10px;">
           <el-pagination
@@ -129,28 +147,73 @@ export default {
   name: 'OfflineContractSearch',
   data() {
     return {
+      dateRange: '',
       contractNumber: '',
       supplierName: '',
       total1: 0,
       number: '',
       pageCurrent1: 1,
-      pageSize1: 20,
+      pageSize1: 30,
       tableData1: [],
       loading1: false,
-      contractDetail: []
+      contractDetail: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '上季度',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去半年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '过去一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      }
     }
   },
   created() {
-    this.searchTable1()
+    // this.searchTable1()
   },
   methods: {
+    sortChange(column, prop, order) {
+      console.log(column + '-' + column.prop + '-' + column.order, 11111)
+      if (column.prop === '供应商名称') {
+        this.partName = 1
+      } else if (column.prop === '离线合同编号') { this.partName = 2 } else {
+        this.partName = ''
+      }
+      console.log(this.ordername, 9990999)
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable1()
+    },
     // 查合同列表
     searchTable1() {
-      let check1, check2
+      let check1, check2, check3
       this.contractNumber ? check1 = 1 : check1 = 0
       this.supplierName ? check2 = 1 : check2 = 0
+      this.dateRange ? check3 = 1 : (check3 = 0, this.dateRange = '')
       this.loading1 = true
-      searchOfflineContract(this.pageCurrent1, this.pageSize1, check1, this.contractNumber, check2, this.supplierName).then(response => {
+      console.log(this.dateRange, 'dateRange')
+      searchOfflineContract(this.pageCurrent1, this.pageSize1, check1, this.contractNumber, check2, this.supplierName, this.order, this.partName, check3, this.dateRange[0], this.dateRange[1]).then(response => {
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
         this.loading1 = false
@@ -217,7 +280,7 @@ export default {
         document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail[j].物料规格
         document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail[j].物料型号
         document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.contractDetail[j].数量
-        document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.contractDetail[j].单价
+        document.getElementsByClassName('tableData')[j].children[5].innerHTML = Number(this.contractDetail[j].单价).toFixed(2)
         document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.contractDetail[j].数量 * this.contractDetail[j].单价).toFixed(2)
         document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.contractDetail[j].交货期要求
         document.getElementsByClassName('tableData')[j].children[8].innerHTML = this.contractDetail[j].备注