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

src/components/MoreSearchBar/index.vue

@@ -19,7 +19,7 @@
                         </el-date-picker>
                     </el-col>
                 <el-col :xs="24" :sm="12" :lg="9" :span="6">
-                    <el-button class="filter-item"  type="success" @click="searchList" round>搜索
+                    <el-button class="filter-item"  type="success" @click="searchList" v-loading.fullscreen.lock="loading" round>搜索
                     </el-button>
                     <el-button class="filter-item" round type="info" @click="resetSearch()">重置
                     </el-button>
@@ -242,6 +242,7 @@ export default {
         },
     },
 
+
     computed: {
 
     },
@@ -289,17 +290,24 @@ export default {
             allotDepartment:[],
             clientManagers:[],
             principals:[],
+            loading:false
         }
 
     },
     methods: {
         resetSearch() {
+            // 重置分页
+            this.loading = true;
             this.orderDate = '';
             this.$emit('resetParams');
+            setTimeout(() => {
+                this.loading = false;
+            }, 500);
         },
 
         searchList() {
             // 重置分页
+            this.loading = true;
             this.listQuery.page = 1
             this.listQuery.size = 10
             if (this.orderDate) {
@@ -307,6 +315,9 @@ export default {
                 this.listQuery.endDate = this.orderDate[1] + ' 23:59:59';
             }
             this.$emit('fliterSearch',this.listQuery);
+            setTimeout(() => {
+                this.loading = false;
+            }, 500);
         },
 
         moreSearch() {

src/layout/components/TagsView/index.vue

@@ -151,7 +151,6 @@ export default {
       })
     },
     closeSelectedTag(view) {
-      console.log(view)
       if (view.path === '/home/index'){
         return;
       }

src/main.js

@@ -77,7 +77,8 @@ Vue.prototype.$doCopy=function(context){
           window.getSelection().addRange(range);
         }
         document.execCommand('copy'); 
-        this.$message({'type':'success','message': context+'已复制!'})
+        this.$message({'type':'success','message': context+' 已复制!'})
+        document.body.removeChild(element);
       }
 }
 

src/views/income/myIncome.vue

@@ -188,8 +188,8 @@ export default {
         page: 1,
         size: 10,
         descs: 'id',
-        startDate: '2024-05-01 00:00:00',
-        endDate: '2024-06-01 00:00:00',
+        startDate: null,
+        endDate: null
       },
       listQuery2: {
         page: 1,
@@ -306,6 +306,10 @@ export default {
       this.getMyAssetsIncome();
     },
     getMyMajorIncome() {
+      if (this.findDate) {
+        this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
+        this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
+      }
       this.$api.businessIncome.myMajorIncome(this.listQuery1).then(res => {
         if (res.code === 200) {
           this.majorIncome = res.data;

src/views/major/list.vue

@@ -157,7 +157,8 @@ export default {
         endDate:null
       },
       majorNodes:[],
-      hiddenLabels:[]
+      hiddenLabels:[],
+      loading:false
     }
   },
   created() {
@@ -170,11 +171,12 @@ export default {
     this.getNodeEnum();
   },
   methods: {
+    
     getPage() {
       this.$api.major.page(this.listQuery).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
-        }
+          }
       })
     },
 

src/views/major/todoList.vue

@@ -5,34 +5,11 @@
     </div>
     <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getPage">
       <template slot="left">
-        <el-input v-model="listQuery.keyword" placeholder="关键字搜索..." clearable
-          style="margin-left: 20px;width: 500px;float: left;">
-        </el-input>
-        <el-select v-model="listQuery.nodeName" placeholder="当前节点" style="margin-left: 20px;width: 200px;float: left;" clearable
-            filterable>
-          <el-option
-            v-for="item in majorNodes"
-            :key="item.code"
-            :label="item.name"
-            :value="item.name">
-          </el-option>
-        </el-select>
-        <el-date-picker
-          style="margin-left: 20px;float: left;"
-          v-model="orderDate"
-          type="daterange"
-          align="center"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="下单日期（开始）"
-          end-placeholder="下单日期（结束）"
-          :picker-options="pickerOptions" value-format="yyyy-MM-dd">
-        </el-date-picker>
-        <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="searchList" round>搜索
-        </el-button>
-        <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置
-        </el-button>
-        <el-button class="filter-item" style="float: left;" round @click="showAllLabel()">显示全部列</el-button>
+        <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery" :nodes="majorNodes">
+          <template v-slot:otherButton>
+            <el-button class="filter-item" round @click="showAllLabel()">显示全部列</el-button>
+          </template>
+        </MoreSearchBar>
       </template>
       <parentTable  :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable" @headerClick="switchHeader">
         <el-table-column label="项目名称" align="center" width="250" v-if="!hiddenLabels.includes('productionName')" prop="productionName" show-overflow-tooltip>
@@ -47,12 +24,12 @@
         </el-table-column>
         <el-table-column label="价值意见书号" align="center" width="200" v-if="!hiddenLabels.includes('statementNo')" prop="statementNo" sortable>
           <template slot-scope="{row}">
-            <span @contextmenu.prevent="$doCopy(row.orderId)">{{ row.statementNo==null?'-': row.statementNo }}</span>
+            <span @contextmenu.prevent="$doCopy(row.statementNo)">{{ row.statementNo==null?'-': row.statementNo }}</span>
           </template>
         </el-table-column>
         <el-table-column label="报告号/复评函号" align="center" width="200" v-if="!hiddenLabels.includes('reportNo')" prop="reportNo" sortable>
           <template slot-scope="{row}">
-            <span @contextmenu.prevent="$doCopy(row.orderId)">{{ row.reportNo==null?'-': row.reportNo }}</span>
+            <span @contextmenu.prevent="$doCopy(row.reportNo)">{{ row.reportNo==null?'-': row.reportNo }}</span>
           </template>
         </el-table-column>
         <el-table-column label="评估对象类型" align="center" width="120" v-if="!hiddenLabels.includes('businessObjectType')" prop="businessObjectType">
@@ -131,14 +108,15 @@ import YPageListLayout from '@/components/YPageListLayout'
 import Breadcrumb from '@/components/Breadcrumb'
 import TransferDialog from '@/components/TaskTransferDialog'
 import { getCookie,setCookie,removeCookie } from '@/utils/auth'
-
+import MoreSearchBar from '@/components/MoreSearchBar'
 
 export default {
   name: 'MajorTaskTodoList',
   components: {
     Breadcrumb,
     YPageListLayout,
-    TransferDialog
+    TransferDialog,
+    MoreSearchBar
   },
 
   data() {
@@ -333,7 +311,23 @@ export default {
     showAllLabel(){
       removeCookie("MajorTodoList-hiddenLabels");
       location.reload();
-    }
+    },
+    fliterSearch(params){
+      this.$api.workNodeTaskRecord.majorTaskTodoList(this.listQuery).then(res=>{
+        if (res.code ===200){
+            this.pageData = res.data;
+        }
+      })
+    },
+    resetParams(){
+      this.$router.push({ query: {} });
+      this.listQuery = {
+          current: 1,
+          size: 10,
+          descs: 'created',
+      }
+      this.getPage();
+    },
   },
   
 }