前端

public/static/inspection.html

@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
     <title></title>
+    
     <style>
       table,
       table tr th,

src/views/houseSelfCollect/paymentManagement.vue

@@ -19,15 +19,17 @@
         <el-button @click="typePrintCannelClick">取消</el-button>
       </div>
     </div>
-    <BaseHeaderLayout :leftSpan="16">
+    <BaseHeaderLayout :leftSpan="14">
       <template slot="left">
         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
-        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(1)" >待审核
+        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)" >待审核
         </ws-button>
-        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(7)"
-          v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">待付款</ws-button>
+        <div v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">
+          <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)"
+          >待付款</ws-button>
+          </div>
         <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
         <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
@@ -50,6 +52,9 @@
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
           </el-option>
         </el-select>
+        <el-date-picker 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>
         <div></div>
         <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
         </ws-input>
@@ -84,7 +89,7 @@
       <el-table-column class="table_td" prop="netWeight" width="120" label="净重（公斤）"></el-table-column>
       <el-table-column class="table_td" prop="pureWeight" width="120" label="纯重（公斤）"></el-table-column>
       <el-table-column class="table_td" prop="amountIngPayable" label="应付款(元)"></el-table-column>
-      <el-table-column class="table_td" prop="amountEdPayable" label="已付款(元)">
+      <el-table-column class="table_td" prop="amountEdPayable" width='130' label="已付款(元)">
         <template slot-scope="scope">
           <div @click="showPayImg(scope.row)">{{ scope.row.amountEdPayable }}</div>
         </template>
@@ -336,6 +341,7 @@ import download from '../../components/WsDownload/download'
         imageUrl: '',
         payImg: [],
         rowData: {},
+        value2:[],
         date: {
           year: dayjs().format('YYYY'),
           month: dayjs().format('MM'),
@@ -344,10 +350,48 @@ import download from '../../components/WsDownload/download'
     },
     activated() {
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+      this.getPassYearFormatDate()
       this.getWarehouse()
+      
       // this.getList()
     },
     methods: {
+      datechange(){
+        this.getList()
+      },
+      getPassYearFormatDate () {
+          var nowDate = new Date()
+          nowDate.setTime(nowDate.getTime()-24*60*60*1000*3)
+          var seperator1 = '-'
+          var year = nowDate.getFullYear()
+          var month = nowDate.getMonth() + 1
+          var strDate = nowDate.getDate()
+          if (month >= 1 && month <= 9) {
+            month = '0' + month
+          }
+          if (strDate >= 0 && strDate <= 9) {
+            strDate = '0' + strDate
+          }
+          var formatDate = year + seperator1 + month + seperator1 + strDate
+          this.getNowFormatDate(formatDate)
+        },
+        /* 获取现在时间，并接受过去时间的值 */
+        getNowFormatDate (formatDate) {
+          var date = new Date()
+          date.setTime(date.getTime()+24*60*60*1000)
+          var seperator1 = '-'
+          var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var strDate = date.getDate()
+          if (month >= 1 && month <= 9) {
+            month = '0' + month
+          }
+          if (strDate >= 0 && strDate <= 9) {
+            strDate = '0' + strDate
+          }
+          var nowData = year + seperator1 + month + seperator1 + strDate
+          this.value2= [formatDate, nowData]  // 默认赋值一年时间
+    },
       selectPrint() {
         console.log('批量打印数据', this.modification)
         this.printType = 1
@@ -756,6 +800,8 @@ import download from '../../components/WsDownload/download'
       getpayment({
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+        startDate:this.value2[0],
+        endDate:this.value2[1],
         searchKeyWord: this.searchKeyWord,
         searchType: searchParam,
         warehouseName: this.warehouseName,

src/views/tranManagement/tranManagementDriver.vue

@@ -77,7 +77,9 @@
                     prop="payeeName"
                     class="el-car name"
                   >
-                    <div style="width: 100%">{{ item.payeeName }}</div>
+                    <div style="width: 100%">
+                      {{ item.payeeName }}
+                    </div>
                   </ws-form-item>
                   <ws-form-item
                     :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"