1

src/views/houseSelfCollect/weighingManagement.vue

@@ -475,10 +475,15 @@
         this.getList()
       },
       datechange() {
+        if(this.value2){
         this.startDate = this.value2[0]
         this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
         this.getList()
-
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-scrollbar style="height: 100%">
       <el-row>
-        <el-col style="padding-left: 15px" :span="16">
+        <el-col style="padding-left: 15px; width:48%" :span="16">
           <ws-button
             :type="searchType == 1 ? 'primary' : ''"
             @click="handlestatus(1)"
@@ -55,6 +55,11 @@
             >定金</ws-button
           >
         </el-col>
+        <el-col style="text-align: right; line-height: 60px;  width:300px" :span="8">
+        <el-date-picker style="margin: 0 10px 0 0" value-format='yyyy-MM-dd' v-model="value2" @change='datechange'
+          type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="起始时间"
+          end-placeholder="截止时间">
+        </el-date-picker></el-col>
         <el-col
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="8"
@@ -485,7 +490,9 @@ export default {
       year: '',
       option: [],
       pickerOptions: {},
-      value2: '',
+      value2: [],
+      startDate: '',
+      endDate: '',
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -867,6 +874,17 @@ export default {
         })
       }
     },
+     datechange() {
+        if(this.value2){
+        this.startDate = this.value2[0]
+        this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.getList()
+      },
     //审核
     handleAudit() {
       var that = this
@@ -982,7 +1000,7 @@ export default {
         } else if (
           index === 12 ||
           index === 11 ||
-          index === 10 ||
+          index === 13 ||
           index === 9
         ) {
           const values = data.map((item) => Number(item[column.property]))
@@ -1002,10 +1020,10 @@ export default {
           sums[index] = '--'
         }
       })
-      sums[sums.length-3]=sums[sums.length-3].toFixed(2)
-      sums[sums.length-4]=sums[sums.length-4].toFixed(2)
-			sums[sums.length-5]=sums[sums.length-5].toFixed(2)
-      sums[sums.length-6]=sums[sums.length-6].toFixed(2)
+      // sums[sums.length-3]=sums[sums.length-3].toFixed(2)
+      // sums[sums.length-4]=sums[sums.length-4].toFixed(2)
+			// sums[sums.length-5]=sums[sums.length-5].toFixed(2)
+      // sums[sums.length-6]=sums[sums.length-6].toFixed(2)
       return sums
     },
     getList() {
@@ -1025,6 +1043,8 @@ export default {
         compId: localStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+        startDate: this.startDate,
+        endDate: this.endDate,
         searchType: this.searchType,
         contractNo: this.contractNo,
         // roleFlag: this.roleFlag,

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -3,7 +3,7 @@
   <div class="">
     <div style="height: 100%" class="content">
       <el-row class="content1">
-        <el-col style="padding-left: 15px" :span="16">
+        <el-col style="padding-left: 15px; width:40%" :span="16">
           <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.carry`" @click="adopt()">备注
           </ws-button>
           <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.draw`" @click="depositbutton()">定金
@@ -13,6 +13,11 @@
           <ws-button type="primary" @click="handleinvoice()">开发票
           </ws-button>
         </el-col>
+        <el-col style="text-align: right; line-height: 60px;  width:400px" :span="8">
+        <el-date-picker style="margin: 0 10px 0 0" value-format='yyyy-MM-dd' v-model="value2" @change='datechange'
+          type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="起始时间"
+          end-placeholder="截止时间">
+        </el-date-picker></el-col>
         <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
             maxlength="500" type="input" class="findValue">
@@ -451,6 +456,9 @@
           id: '',
           invoiceType: '',
         },
+        value2: [],
+        startDate: '',
+        endDate: '',
         orderList: {},
         options: [],
         contractNoList: [],
@@ -534,6 +542,18 @@
                 })
               })
       },
+      datechange() {
+        if(this.value2){
+        this.startDate = this.value2[0]
+        this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.getList()
+      },
+
       handleinvoice(){
         if(this.modification.length==0){
           this.$message({
@@ -607,7 +627,6 @@
       },
       handleRowClick() {},
       handleClick(tab, event) {
-        console.log(tab);
         this.activeName = tab.name
         if (this.activeName == '退库') {
           this.tranType = '退库'
@@ -642,9 +661,8 @@
                 })
               }
             }
-            console.log(this.orderList.tranTaskInfoList)
-            this.activeName = this.tranProcessInfo[0].name
-            this.tranType = this.tranProcessInfo[0].tranType
+            this.activeName = this.tranProcessInfo.name
+            this.tranType = this.tranProcessInfo.tranType
             if (this.contractNoList[i].depositUrl) {
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
             } else {
@@ -1094,6 +1112,8 @@
           currentPage: this.currentPage,
           pageSize: this.pageSize,
           searchType: this.searchType,
+          startDate: this.startDate,
+          endDate: this.endDate,
           contractNo: this.contractNo,
         }
         if (type == 1) {