Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/finance/fundClaim.vue

@@ -1054,7 +1054,7 @@ export default {
       pageData1: { records: [] },
       listQuery: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         keyword: null,
         startDate: null,
@@ -1063,7 +1063,7 @@ export default {
       },
       listQuery1: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         keyword: null,
         startDate: null,
@@ -1180,7 +1180,7 @@ export default {
       this.payDate = ''
       this.listQuery = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
       }
       this.getList()
@@ -1217,7 +1217,7 @@ export default {
     searchList() {
       // 重置分页
       this.listQuery.page = 1
-      this.listQuery.size = 1000
+      this.listQuery.size = 200
       if (this.payDate) {
         this.listQuery.startDate = this.payDate[0]
         this.listQuery.endDate = this.payDate[1]
@@ -1628,7 +1628,7 @@ export default {
     searchList1() {
       // 重置分页
       this.listQuery1.page = 1
-      this.listQuery1.size = 1000
+      this.listQuery1.size = 200
       if (this.payDate1) {
         this.listQuery1.startDate = this.payDate1[0]
         this.listQuery1.endDate = this.payDate1[1]
@@ -1646,7 +1646,7 @@ export default {
       this.claimDate = ''
       this.listQuery1 = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
       }
       this.getList1()

src/views/finance/fundList.vue

@@ -405,7 +405,7 @@ export default {
       pageData2: { records: [] },
       listQuery: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         keyword: null,
         startDate: null,
@@ -414,7 +414,7 @@ export default {
       },
       listQuery2: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         keyword: null,
         startDate: null,
@@ -422,7 +422,7 @@ export default {
       },
       listQuery1: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         keyword: null,
         startDate: null,
@@ -528,7 +528,7 @@ export default {
       this.payDate = '';
       this.listQuery = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         notFinished: true
       }
@@ -540,7 +540,7 @@ export default {
       this.payDate2 = '';
       this.listQuery2 = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
       }
       this.getList2()
@@ -549,7 +549,7 @@ export default {
       // 重置分页
 
       this.listQuery.page = 1
-      this.listQuery.size = 1000
+      this.listQuery.size = 200
       if (this.payDate) {
         this.listQuery.startDate = this.payDate[0];
         this.listQuery.endDate = this.payDate[1];
@@ -562,7 +562,7 @@ export default {
       // 重置分页
 
       this.listQuery2.page = 1
-      this.listQuery2.size = 1000
+      this.listQuery2.size = 200
       if (this.payDate2) {
         this.listQuery2.startDate = this.payDate2[0];
         this.listQuery2.endDate = this.payDate2[1];
@@ -804,7 +804,7 @@ export default {
     searchList1() {
       // 重置分页
       this.listQuery1.page = 1
-      this.listQuery1.size = 1000
+      this.listQuery1.size = 200
      
       if (this.payDate1) {
         this.listQuery1.startDate = this.payDate1[0];
@@ -824,7 +824,7 @@ export default {
       this.payDate1 = '';
       this.listQuery1 = {
         current: 1,
-        size: 500,
+        size: 200,
         descs: 'id',
       }
       this.getList1()

src/views/finance/fundWarning.vue

@@ -342,19 +342,19 @@ export default {
       activeName: 'major',
       listQuery1: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         overdueMin: 90
       },
       listQuery2: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         overdueMin: 90
       },
       listQuery3: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         overdueMin: 90
       },
@@ -391,7 +391,7 @@ export default {
       this.$router.push({ query: {} });
       this.listQuery1 = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         overdueMin: 90
       }
@@ -401,7 +401,7 @@ export default {
     searchList1() {
       // 重置分页
       this.listQuery1.page = 1
-      this.listQuery1.size = 1000
+      this.listQuery1.size = 200
       this.getOverdueMajor()
     },
 
@@ -425,7 +425,7 @@ export default {
       this.$router.push({ query: {} });
       this.listQuery2 = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         overdueMin: 90
       }
@@ -434,14 +434,14 @@ export default {
     searchList2() {
       // 重置分页
       this.listQuery2.page = 1
-      this.listQuery2.size = 1000
+      this.listQuery2.size = 200
       this.getOverdueAssets();
     },
     resetSearch3() {
       this.$router.push({ query: {} });
       this.listQuery3 = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         overdueMin: 90
       }
@@ -450,7 +450,7 @@ export default {
     searchList3() {
       // 重置分页
       this.listQuery3.page = 1
-      this.listQuery3.size = 1000
+      this.listQuery3.size = 200
       this.getOverduePersonal();
     },
     getOverdueAssets() {

src/views/finance/invoiceCheck.vue

@@ -561,21 +561,21 @@ export default {
       pageData3: { records: [] },
       listQuery1: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         keyword:null,
         state:'审核中'
       },
       listQuery2: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         keyword:null,
         state:'已开票'
       },
       listQuery3: {
         page: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         keyword:null,
         state:'已作废'
@@ -714,7 +714,7 @@ export default {
       this.applyDate1 = '';
       this.listQuery1 = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         state:'审核中'
       }
@@ -724,7 +724,7 @@ export default {
     searchList1() {
       // 重置分页
       this.listQuery1.page = 1
-      this.listQuery1.size = 1000
+      this.listQuery1.size = 200
       if (this.planDate1){
         this.listQuery1.pStartDate = this.planDate1[0];
         this.listQuery1.pEndDate = this.planDate1[1];
@@ -741,7 +741,7 @@ export default {
       this.applyDate2 = '';
       this.listQuery2 = {
         current: 1,
-        size: 1000,
+        size: 200,
         descs: 'id',
         state:'已开票'
       }
@@ -751,7 +751,7 @@ export default {
     searchList2() {
       // 重置分页
       this.listQuery2.page = 1
-      this.listQuery2.size = 1000
+      this.listQuery2.size = 200
       if (this.realDate1){
         this.listQuery2.rStartDate = this.realDate1[0];
         this.listQuery2.rEndDate = this.realDate1[1];
@@ -778,7 +778,7 @@ export default {
     searchList3() {
       // 重置分页
       this.listQuery3.page = 1
-      this.listQuery3.size = 1000
+      this.listQuery3.size = 200
       if (this.destroyDate1){
         this.listQuery3.dStartDate = this.destroyDate1[0];
         this.listQuery3.dEndDate = this.destroyDate1[1];

src/views/finance/realFundStat.vue

@@ -6,25 +6,30 @@
       <y-page-list-layout :get-page-list="getMajorStat" :page-list="majorStat" :page-para="listQuery1" :pageSizes="[10, 20, 30, 50, 100, 200, 500, 1000]">
         <template slot="left">
           <el-input v-model="listQuery1.keyword" placeholder="项目编号、产品号、人员、金额" clearable
-          style="width: 300px;float: left;">
+          style="width: 250px;float: left;">
         </el-input>
-        <el-select  clearable  v-model="listQuery1.ifSaveFile" placeholder="归档状态" style="margin-left: 20px;width: 150px;float: left;">
+        <el-select  clearable  v-model="listQuery1.ifSaveFile" placeholder="归档状态" style="margin-left: 10px;width: 100px;float: left;">
                   <el-option :value="false" label="未归档">未归档</el-option>
                   <el-option :value="true" label="已归档">已归档</el-option>
-              </el-select>
-              <el-select  clearable  v-model="listQuery1.financial" placeholder="分类" style="width: 150px;float: left;margin-left:20px;">
-                  <el-option :value="true" label="金融">金融</el-option>
-                  <el-option :value="false" label="非金融">非金融</el-option>
-              </el-select>
-          <el-date-picker  clearable v-model="claimDate" type="daterange" align="center" unlink-panels
+        </el-select>
+        <el-select  clearable  v-model="listQuery1.financial" placeholder="分类" style="width: 100px;float: left;margin-left:10px;">
+            <el-option :value="true" label="金融">金融</el-option>
+            <el-option :value="false" label="非金融">非金融</el-option>
+        </el-select>
+        <el-select  clearable  v-model="listQuery1.evaluateDepartmentName" placeholder="评估部" style="width: 100px;float: left;margin-left:10px;">
+            <el-option value="评估一部" label="评估一部">评估一部</el-option>
+            <el-option value="评估二部" label="评估二部">评估二部</el-option>
+            <el-option value="评估三部" label="评估三部">评估三部</el-option>
+        </el-select>
+        <el-date-picker  clearable v-model="claimDate" type="daterange" align="center" unlink-panels
                         range-separator="至" start-placeholder="认领日期（开始）" end-placeholder="认领日期（结束）" :picker-options="pickerOptions"
-                        value-format="yyyy-MM-dd" style="margin-left: 20px;float: left;">
-          </el-date-picker>
-          <el-date-picker  clearable v-model="paymentDate" type="daterange" align="center" unlink-panels
+                        value-format="yyyy-MM-dd" style="margin-left: 10px;float: left;">
+        </el-date-picker>
+        <el-date-picker  clearable v-model="paymentDate" type="daterange" align="center" unlink-panels
                         range-separator="至" start-placeholder="到账日期（开始）" end-placeholder="到账日期（结束）" :picker-options="pickerOptions"
-                        value-format="yyyy-MM-dd" style="margin-left: 20px;float: left;">
+                        value-format="yyyy-MM-dd" style="margin-left: 10px;float: left;">
           </el-date-picker>
-          <el-button class="filter-item" style="margin-left:20px;float: left;" type="primary" @click="searchList1" round>搜索
+          <el-button class="filter-item" style="margin-left:10px;float: left;" type="primary" @click="searchList1" round>搜索
           </el-button>
           <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch1()">重置
           </el-button>
@@ -189,6 +194,7 @@
           keyword:null,
           startDate: '',
           endDate: '',
+          evaluateDepartmentName:null
         },
         majorStat:{
           records:[]

src/views/finance/settleMajor.vue

@@ -10,6 +10,11 @@
             <el-input v-model="listQuery1.keyword" placeholder="项目编号、产品号、负责人、客户经理、结算金额" clearable
               style="width: 300px;float: left;">
             </el-input>
+            <el-select  clearable  v-model="listQuery1.evaluateDepartmentName" placeholder="评估部" style="width: 150px;float: left;margin-left:20px;">
+            <el-option value="评估一部" label="评估一部">评估一部</el-option>
+            <el-option value="评估二部" label="评估二部">评估二部</el-option>
+            <el-option value="评估三部" label="评估三部">评估三部</el-option>
+        </el-select>
             <el-date-picker clearable v-model="findDate" type="daterange" align="center" unlink-panels range-separator="至"
               start-placeholder="统计日期（开始）" end-placeholder="统计日期（结束）" :picker-options="pickerOptions"
               value-format="yyyy-MM-dd" style="margin-left: 20px;float: left;">
@@ -295,7 +300,8 @@ export default {
         endDate: '2024-06-01 00:00:00',
         payStartDate:'',
         payEndDate:'',
-        keyword:null
+        keyword:null,
+        evaluateDepartmentName:null
       },
       listQuery2: {
         page: 1,

src/views/mobile/prodValidate/index.vue

@@ -7,6 +7,10 @@
           <span style="color:red;">未获取到报告信息，请联系客服人员。</span>
       </div>
       <div class="base">
+          <div>评估机构</div>
+          <div class="value">四川大友房地产土地资产有限公司</div>
+      </div>
+      <div class="base">
           <div>报告号</div>
           <div class="value">{{validateTarget.productionNo}}</div>
       </div>
@@ -26,6 +30,14 @@
         <div>评估总价</div>
           <div class="value">{{validateTarget.amount?validateTarget.amount+ ' 万元':''}}</div>
       </div>
+      <div class="base" v-if=validateTarget.valueTiming>
+        <div>评估基准日</div>
+          <div class="value">{{validateTarget.valueTiming}}</div>
+      </div>
+      <div class="base" v-if=validateTarget.productionTime>
+        <div>报告出具日</div>
+          <div class="value">{{validateTarget.productionTime}}</div>
+      </div>
   </div>
 </template>
   <script>
@@ -40,7 +52,9 @@
             bailor:null,
             productionName:null,
             acreage:null,
-            amount:null
+            amount:null,
+            valueTiming:null,
+            productionTime:null
           }
         }
       },