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

src/components/MoreSearchBar/index.vue

@@ -8,9 +8,9 @@
                 </el-col>
 
                 <el-col :xs="24" :sm="12" :lg="3" :span="6">
-                    <el-select v-if="nodeCode" v-model="listQuery.nodeCode" placeholder="流程节点" clearable filterable
+                    <el-select v-if="nodeCode" v-model="listQuery.nodeId" placeholder="流程节点" clearable filterable
                         class="filter-item">
-                        <el-option v-for="(item, index) in nodes" :key="index" :label="item.name" :value="item.code" />
+                        <el-option v-for="(item, index) in nodes" :key="index" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6" :span="6">

src/components/YPageListLayout/index.vue

@@ -62,7 +62,6 @@
       watch:{
         pageList:{
           handler(nv,ov){
-            console.log(nv)
           },
           deep:true
         }

src/views/finance/calculateAssets.vue

@@ -348,6 +348,9 @@ export default {
             if (this.findDate) {
                 this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
                 this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
+            }else{
+                this.listQuery1.startDate = null;
+                this.listQuery1.endDate = null;
             }
             this.assetsEvaluatorAmount()
         },
@@ -368,6 +371,9 @@ export default {
             if (this.findDate1) {
                 this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
                 this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
+            }else {
+                this.listQuery2.startDate = null;
+                this.listQuery2.endDate = null;
             }
             this.assetsMarketAmount()
         },

src/views/finance/calculateMajor.vue

@@ -356,6 +356,9 @@
       if (this.findDate){
         this.listQuery1.startDate = this.findDate[0]+' 00:00:00';
         this.listQuery1.endDate = this.findDate[1]+ ' 23:59:59';
+      }else{
+        this.listQuery1.startDate = null;
+        this.listQuery1.endDate = null;
       }
     
       this.majorEvaluatorAmount()
@@ -379,6 +382,9 @@
       if (this.findDate1){
         this.listQuery2.startDate = this.findDate1[0]+' 00:00:00';
         this.listQuery2.endDate = this.findDate1[1]+ ' 23:59:59';
+      }else {
+        this.listQuery2.startDate = null;
+        this.listQuery2.endDate = null;
       }
     
       this.majorMarketEvaluatorAmount()

src/views/finance/fundList.vue

@@ -147,7 +147,7 @@
             </el-table-column>
             <el-table-column label="未认领(元)" align="center" prop="notClaimAmount">
               <template slot-scope="{row}">
-                <span style="color:red">{{ row.amount-row.claimAmount }}</span>
+                <span style="color:red">{{ row.notClaimAmount}}</span>
               </template>
             </el-table-column>
             <el-table-column label="认领人" align="center" prop="claimUser">
@@ -594,6 +594,9 @@ export default {
       if (this.claimDate2) {
           this.listQuery2.xStartDate = this.claimDate2[0] + ' 00:00:00';
           this.listQuery2.xEndDate = this.claimDate2[1] + ' 23:59:59';
+        }else{
+          this.listQuery2.xStartDate = null;
+          this.listQuery2.xEndDate = null;
         }
       this.$api.financeRealFund.realClaimed(Object.assign({}, this.listQuery2)).then(res => {
         if (res.code === 200) {
@@ -787,7 +790,10 @@ export default {
       if (this.claimDate) {
           this.listQuery1.xStartDate = this.claimDate[0] + ' 00:00:00';
           this.listQuery1.xEndDate = this.claimDate[1] + ' 23:59:59';
-        }
+      }else {
+        this.listQuery1.xStartDate = null;
+          this.listQuery1.xEndDate = null;
+      }
       this.$api.financeClaim.claimPage(Object.assign({}, this.listQuery1)).then(res => {
         if (res.code === 200) {
           loadingInstance.close();

src/views/finance/personalRealFundStat.vue

@@ -217,6 +217,9 @@
       if (this.claimDate){
         this.listQuery1.startTime = this.claimDate[0]+' 00:00:00';
         this.listQuery1.endTime = this.claimDate[1]+ ' 23:59:59';
+      }else{
+        this.listQuery1.startTime = null;
+        this.listQuery1.endTime = null;
       }
       if (this.paymentDate){
         this.listQuery1.payStartTime = this.paymentDate[0]+' 00:00:00';

src/views/finance/realFundStat.vue

@@ -249,6 +249,9 @@
       if (this.claimDate){
         this.listQuery1.startDate = this.claimDate[0]+' 00:00:00';
         this.listQuery1.endDate = this.claimDate[1]+ ' 23:59:59';
+      }else {
+        this.listQuery1.startDate = null;
+        this.listQuery1.endDate = null;
       }
       if (this.paymentDate){
         this.listQuery1.payStartDate = this.paymentDate[0]+' 00:00:00';

src/views/finance/settleAssets.vue

@@ -403,6 +403,9 @@ export default {
             if (this.findDate) {
                 this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
                 this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
+            }else {
+                this.listQuery1.startDate = null;
+                this.listQuery1.endDate = null;
             }
             if (this.paymentDate.length>1){
                 this.listQuery1.payStartDate = this.paymentDate[0]+' 00:00:00';
@@ -432,6 +435,9 @@ export default {
             if (this.findDate) {
                 this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
                 this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
+            }else{
+                this.listQuery2.startDate = null;
+                this.listQuery2.endDate = null;
             }
             if (this.paymentDate1.length>1){
                 this.listQuery2.payStartDate = this.paymentDate1[0]+' 00:00:00';

src/views/finance/settleMajor.vue

@@ -406,6 +406,9 @@ export default {
       if (this.findDate) {
         this.listQuery1.startDate = this.findDate[0] + ' 00:00:00';
         this.listQuery1.endDate = this.findDate[1] + ' 23:59:59';
+      }else{
+        this.listQuery1.startDate = null;
+        this.listQuery1.endDate = null;
       }
       if (this.paymentDate.length>1){
         this.listQuery1.payStartDate = this.paymentDate[0]+' 00:00:00';
@@ -437,6 +440,9 @@ export default {
       if (this.findDate1) {
         this.listQuery2.startDate = this.findDate1[0] + ' 00:00:00';
         this.listQuery2.endDate = this.findDate1[1] + ' 23:59:59';
+      }else {
+        this.listQuery2.startDate = null;
+        this.listQuery2.endDate = null;
       }
       if (this.paymentDate1.length>1){
         this.listQuery2.payStartDate = this.paymentDate1[0]+' 00:00:00';

src/views/major/detail.vue

@@ -97,7 +97,7 @@
                         :class="['postInfo-container-item']"
                       >
                         <el-select v-model="major.principalId" 
-                          placeholder="待定"  style="width: 100%"
+                          placeholder="待定"  style="width: 100%" filterable
                           :readonly = "!pgLeader"
                           :disabled="!pgLeader"
                           >
@@ -114,7 +114,7 @@
                       >
                         <el-select v-model="major.membersId" 
                         placeholder="待定" 
-                          multiple
+                          multiple filterable
                            :readonly = "!pgLeader"
                           :disabled="!pgLeader"
                           style="width: 100%">
@@ -2430,7 +2430,6 @@
       handler(newv) {
         if (newv) {
           const postList = newv.postList.map(item => item.name)
-          console.log(postList)
           const marketPosts = ['评估部经理']
           postList.forEach(element => {
             if (marketPosts.includes(element)) {
@@ -2853,6 +2852,7 @@
         this.$refs.majorForm.validate(valid => {
           if (valid) {
             if (this.major.id) {
+              this.major.members = JSON.stringify(this.major.membersId);
               this.$api.major.edit(this.major).then(res => {
                 if (res.code === 200) {
                   this.$notify({

src/views/major/myOrder.vue

@@ -419,9 +419,9 @@
               <el-button
                 v-if="(r.productionNo === reportNo && r.production != 'STATEMENT' && r.repertoryState != null && !r.repertoryState)"
                 style="float: right; padding: 3px 0;margin-left:10px" type="text" @click="doApplyOut(r)">出库申请</el-button>
-              <el-button v-if="r.productionNo === statementNo && !r.delivery && r.production === 'STATEMENT'"
+              <el-button v-if="r.productionNo === statementNo && r.production === 'STATEMENT'"
                 style="float: right; padding: 3px 0;" type="text" @click="confirmDelivery(r.id)">确认送达</el-button>
-              <el-button v-if="!r.delivery && r.production != 'STATEMENT' && r.repertoryState"
+              <el-button v-if="r.production != 'STATEMENT' && r.repertoryState"
                 style="float: right; padding: 3px 0;" type="text" @click="noTaskConfirmDelivery(r.id)">确认送达</el-button>
             </div>
             <el-form :model="r">

src/views/major/myOrderDetail.vue

@@ -590,7 +590,6 @@
           })
         },
         'major.terminalClienteleType'(nv,ov){
-            console.log(nv)
             if (nv=='企业'){
               this.getCustomerCompany(1);
               let simpleAll = new Object();