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

src/api/modules/financeInvoice.js

@@ -39,4 +39,7 @@ export default {
   cancelling(params){
     return request.get(`financeInvoice/cancelling/${params}`)
    },
+   refuseCancel(params){
+    return request.get(`financeInvoice/refuse/cancel/${params}`)
+   },
 }

src/components/MoreSearchBar/index.vue

@@ -62,7 +62,7 @@
                     </el-select>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                    <el-button class="filter-item" type="success" @click="searchList" v-loading.fullscreen.lock="loading"
+                    <el-button class="filter-item" type="success" @click="searchList" 
                         round>搜索
                     </el-button>
                     <el-button class="filter-item" round type="info" @click="resetSearch()">重置
@@ -333,6 +333,16 @@ export default {
             require: false,
             default: false
         },
+        defaultStartDate:{
+            type: String,
+            require: true,
+            default:null
+        },
+        defaultEndDate:{
+            type: String,
+            require: true,
+            default:null
+        }
     },
 
 
@@ -340,12 +350,14 @@ export default {
 
     },
     created() {
+        if (this.defaultStartDate && this.defaultEndDate){
+            this.orderDate = [this.defaultStartDate,this.defaultEndDate];
+        }
         if (this.business === 'MAJOR_BUSINESS') {
             this.getMajorTurnDepartment();
             this.getAllotDepartmentUser();
             this.getClientManager();
         }
-
     },
     data() {
         return {
@@ -383,34 +395,36 @@ export default {
             allotDepartment: [],
             clientManagers: [],
             principals: [],
-            loading: false
         }
 
     },
     methods: {
         resetSearch() {
             // 重置分页
-            this.loading = true;
+            // this.loading = true;
             this.orderDate = '';
             this.$emit('resetParams');
-            setTimeout(() => {
-                this.loading = false;
-            }, 500);
+            // setTimeout(() => {
+            //     this.loading = false;
+            // }, 500);
         },
 
         searchList() {
             // 重置分页
-            this.loading = true;
+            // this.loading = true;
             this.listQuery.page = 1
             this.listQuery.size = 20
             if (this.orderDate) {
                 this.listQuery.startDate = this.orderDate[0] + ' 00:00:00';
                 this.listQuery.endDate = this.orderDate[1] + ' 23:59:59';
+            }else {
+                this.listQuery.startDate = null;
+                this.listQuery.endDate = null;
             }
             this.$emit('fliterSearch', this.listQuery);
-            setTimeout(() => {
-                this.loading = false;
-            }, 500);
+            // setTimeout(() => {
+            //     this.loading = false;
+            // }, 500);
         },
 
         moreSearch() {
@@ -451,7 +465,8 @@ export default {
                     this.principals = res.data;
                 }
             })
-        }
+        },
+
     }
 }
 </script>

src/views/finance/invoiceCheck.vue

@@ -535,7 +535,8 @@
         <el-button @click="newInvoiceDialog = false">取 消</el-button>
         <el-button type="primary" @click="makeInvoice()" v-if="this.invoice.state==='审核中'">确认开票</el-button>
         <el-button type="danger" @click="refuseApply()"  v-if="this.invoice.state==='审核中'">拒绝申请</el-button>
-        <el-button type="danger" @click="cancelling()"  v-if="this.invoice.state==='申请作废'">同意作废</el-button>
+        <el-button type="danger" @click="refuseCancel()"  v-if="this.invoice.state==='申请作废'">拒绝作废</el-button>
+        <el-button type="primary" @click="cancelling()"  v-if="this.invoice.state==='申请作废'">同意作废</el-button>
       </span>
     </el-dialog>
   </div>
@@ -970,6 +971,34 @@ export default {
         });
 
         return sums;
+    },
+    refuseCancel(){
+      this.$confirm('确认拒绝作废？','提示',{
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            center: true
+          }).then(()=>{
+            this.$api.financeInvoice.refuseCancel(this.invoice.id).then(res=>{
+              if (res.code === 200 && res.data){
+                this.$notify({
+                  title: '成功',
+                  message: '拒绝成功',
+                  type: 'success',
+                  duration: 2000
+                });
+                this.newInvoiceDialog= false;
+                this.getList1();
+              }else {
+                this.$notify({
+                  title: '失败',
+                  message: '拒绝失败',
+                  type: 'error',
+                  duration: 2000
+                });
+              }
+            })
+          })
     }
   },
   

src/views/major/list.vue

@@ -175,9 +175,11 @@ export default {
   methods: {
     
     getPage() {
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.major.page(this.listQuery).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
           }
       })
     },
@@ -191,9 +193,11 @@ export default {
         },
 
     fliterSearch(params){
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.major.page(params).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
         }
       })
     },

src/views/major/myOrder.vue

@@ -858,9 +858,11 @@ export default {
       this.getList()
     },
     getList() {
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.majorProduction.myOrder(Object.assign({}, this.listQuery)).then(res => {
         if (res.code === 200) {
           this.pageData = res.data;
+          loadingInstance.close();
         }
       })
     },
@@ -1471,9 +1473,11 @@ export default {
       })
     },
     fliterSearch(params) {
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.majorProduction.myOrder(Object.assign({}, params)).then(res => {
         if (res.code === 200) {
           this.pageData = res.data;
+          loadingInstance.close();
         }
       })
     },

src/views/major/terminateList.vue

@@ -98,9 +98,11 @@ export default {
   methods: {
     // 获取终止项目(流程)
     getTerminatedPage() {
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.major.getTerminatedPage(this.listQuery).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
           }
       })
     },
@@ -114,9 +116,11 @@ export default {
         },
 
     fliterSearch(params){
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.major.getTerminatedPage(params).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
         }
       })
     },

src/views/major/todoDetail.vue

@@ -4487,7 +4487,9 @@ export default {
           }).catch(()=>{
             this.productions[0].isRecord = true;
           })
-        })
+        }).catch(() => {
+          this.productions[0].isRecord = true;
+        });
       }else {
         this.$confirm('该产品已取不备案报告号，若修改为备案。为保证备案报告号连续性，系统将重新分配备案报告号。', '重要提示', {
           confirmButtonText: '确定',
@@ -4505,7 +4507,9 @@ export default {
           }).catch(()=>{
             this.productions[0].isRecord = false;
           })
-        })
+        }).catch(() => {
+          this.productions[0].isRecord = false;
+        });
       }
     }
   },

src/views/major/todoList.vue

@@ -403,10 +403,11 @@ export default {
       this.getPage()
     },
     getPage() {
-
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.workNodeTaskRecord.majorTaskTodoList(this.listQuery).then(res => {
         if (res.code === 200) {
           this.pageData = res.data;
+          loadingInstance.close();
         }
       })
     },
@@ -550,9 +551,11 @@ export default {
       location.reload();
     },
     fliterSearch(params) {
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.workNodeTaskRecord.majorTaskTodoList(this.listQuery).then(res => {
         if (res.code === 200) {
           this.pageData = res.data;
+          loadingInstance.close();
         }
       })
     },

src/views/personal/facePrice.vue

@@ -13,7 +13,7 @@
             </el-input>
             </el-tooltip>
 
-            <el-tooltip v-if="dyData.length>0" content="点击放大镜前往贝壳查询该小区成交信息（请提前登录贝壳官网）" placement="top-end" effect="light">
+            <el-tooltip content="点击放大镜前往贝壳查询该小区成交信息（请提前登录贝壳官网）" placement="top-end" effect="light">
             <el-input id="community" style="margin-left: 20px; width: 300px;" v-model="communityName" >
                 <template slot="prepend">贝壳查询</template>
                 <el-button slot="append" icon="el-icon-search"  @click="toke()"></el-button>
@@ -39,16 +39,16 @@
             <el-button style="margin-left: 20px;" type="danger" @click="openFacePrice()" :disabled="dyData.length==0 && queryParam.queryTarget==null || queryParam.queryTarget==''">执行口估</el-button>
 
             <el-button style="margin-left: 20px;" type="primary" @click="downloadFaceTemp()">下载模版</el-button>
-            <div style="margin-right: 395px; float: right;">
+            <div style="position: relative; top: -31px; left:90.5%">
                 <el-upload
-                :action="uploadFileApiUrl+'personalFacePrice/upload/temp'"
+                :action="uploadFileApiUrl+'personalFacePrice/upload/temp?limit='+queryParam.limit"
                 :show-file-list="false"
                 :on-success="handleSuccess"
                 title="批量执行"
                 ref="uploadCtl"
                 accept=".xlsx"
                 >
-                <el-button type="warning">批量执行</el-button>
+                <el-button type="warning" >批量执行</el-button>
                 </el-upload>
             </div>
         </div>
@@ -664,6 +664,7 @@ export default {
 <style lang="scss" scoped>
 .query-class {
     margin-top: 20px;
+    height: 30px;
 }
 
 .input-with-select {

src/views/personal/myOrder.vue

@@ -775,17 +775,21 @@ export default {
   },
   methods: {
     getPage() {
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.personal.myOrder(this.listQuery).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
         }
       })
     },
 
     fliterSearch(params){
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.personal.myOrder(params).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
         }
       })
     },

src/views/personal/pendingList.vue

@@ -5,7 +5,7 @@
     </div>
     <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getPage" >
       <template slot="left">
-        <MoreSearchBar business="PERSONAL_BUSINESS" :cancellation="true" :nodes="personalNodes"  @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery">
+        <MoreSearchBar business="PERSONAL_BUSINESS" :cancellation="true" :nodes="personalNodes"  @fliterSearch="fliterSearch" @resetParams="resetParams" :listQuery="listQuery" :defaultStartDate="defaultStartDate" :defaultEndDate="defaultEndDate">
           <template v-slot:otherButton>
             <el-button class="filter-item" round @click="showAllLabel()">显示全部列</el-button>
           </template>
@@ -159,6 +159,8 @@ export default {
       },
       personalNodes:[],
       hiddenLabels:[],
+      defaultStartDate:null,
+      defaultEndDate:null
     }
   },
 
@@ -167,7 +169,11 @@ export default {
     if (getCookie("PersonalPendingList-hiddenLabels")!=undefined){
       this.hiddenLabels = JSON.parse(getCookie("PersonalPendingList-hiddenLabels"))
     }
+    this.defaultStartDate = this.getDefaultStartDate();
+    this.defaultEndDate = this.getDefaultEndDate();
     this.listQuery.keyword = this.$route.query.keyword;
+    this.listQuery.startDate = this.defaultStartDate;
+    this.listQuery.endDate = this.defaultEndDate;
     this.getPage();
     this.getNodeEnum();
     
@@ -194,9 +200,11 @@ export default {
             })
         },
     fliterSearch(params){
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.personal.list(params).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
         }
       })
     },
@@ -269,6 +277,31 @@ export default {
           })
         })
     },
+    getDefaultStartDate() {
+            const now = new Date();
+            const previousYear = new Date(now);
+            previousYear.setFullYear(now.getFullYear() - 1); // 获取前一年
+            
+            const year = previousYear.getFullYear();
+            const month = String(previousYear.getMonth() + 1).padStart(2, '0');
+            const day = String(previousYear.getDate()).padStart(2, '0');
+            const hours = String(previousYear.getHours()).padStart(2, '0');
+            const minutes = String(previousYear.getMinutes()).padStart(2, '0');
+            const seconds = String(previousYear.getSeconds()).padStart(2, '0');
+            
+            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        },
+
+        getDefaultEndDate() {
+            const now = new Date();
+            const year = now.getFullYear();
+            const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份从0开始
+            const day = String(now.getDate()).padStart(2, '0');
+            const hours = String(now.getHours()).padStart(2, '0');
+            const minutes = String(now.getMinutes()).padStart(2, '0');
+            const seconds = String(now.getSeconds()).padStart(2, '0');
+            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        },
   },
   
 }

src/views/personal/saveFileDoneList.vue

@@ -159,9 +159,11 @@ export default {
       this.getList()
     },
     getList() {
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.personal.saveFileDone(this.listQuery).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
         }
       })
     },
@@ -179,9 +181,11 @@ export default {
     },
 
     fliterSearch(params){
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.personal.saveFileDone(params).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
         }
       })
     },

src/views/personal/terminateList.vue

@@ -189,9 +189,11 @@ export default {
             })
         },
     fliterSearch(params){
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.personal.getTerminatedPage(params).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
+            loadingInstance.close();
         }
       })
     },

src/views/personal/todoList.vue

@@ -474,9 +474,11 @@ export default {
       if (getCookie('personalTodoList') != undefined) {
         this.listQuery.size = parseInt(getCookie('personalTodoList'));
       }
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.workNodeTaskRecord.personalTaskTodoList(this.listQuery).then(res => {
         if (res.code === 200) {
           this.pageData = res.data;
+          loadingInstance.close();
         }
       })
     },
@@ -510,9 +512,11 @@ export default {
     },
 
     fliterSearch(params) {
+      let loadingInstance =  this.$loading({ fullscreen: true });
       this.$api.workNodeTaskRecord.personalTaskTodoList(params).then(res => {
         if (res.code === 200) {
           this.pageData = res.data;
+          loadingInstance.close();
         }
       })
     },