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

src/components/MoreSearchBar/index.vue

@@ -37,7 +37,19 @@
                         </el-select>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
-                        <el-input v-if="clientName" v-model="listQuery.clientName" placeholder="客户名称" clearable >
+                        <el-input v-if="orderId" v-model="listQuery.orderId" placeholder="订单号" clearable >
+                        </el-input>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
+                        <el-input v-if="productionNo" v-model="listQuery.productionNo" placeholder="产品号" clearable >
+                        </el-input>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
+                        <el-input v-if="clientName" v-model="listQuery.clienteleName" placeholder="客户名称" clearable >
+                        </el-input>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :lg="3" :span="6" style="margin-right: 8px;">
+                        <el-input v-if="clientSubName" v-model="listQuery.clienteleSubName" placeholder="业务来源" clearable >
                         </el-input>
                     </el-col>
                     <el-col :xs="24" :sm="12" :lg="3" :span="6">
@@ -138,6 +150,16 @@ export default {
             require:false,
             default:true
         },
+        orderId:{
+            type: Boolean,
+            require:false,
+            default:false
+        },
+        productionNo:{
+            type: Boolean,
+            require:false,
+            default:false
+        },
         clientManager:{
             type: Boolean,
             require:false,

src/views/finance/fundClaim.vue

@@ -35,11 +35,6 @@
             <span>{{ row.payerBank }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="付款账号" align="center" width='200'>
-          <template slot-scope="{row}">
-            <span>{{ row.payerAccount }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="付款金额(元)" align="center">
           <template slot-scope="{row}">
             <span>{{ row.amount }}</span>
@@ -70,12 +65,17 @@
             <span>{{ row.created }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="全部认领" align="center" show-overflow-tooltip>
+        <el-table-column label="全部认领" align="center">
           <template slot-scope="{row}">
             <i v-if="row.notClaimAmount <= 0" style="font-size:20px; color:green" class="el-icon-success"></i>
             <i v-else style="font-size:20px; color:RGB(255,106,106)" class="el-icon-warning"></i>
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" width='170'>
+          <template slot-scope="{row}">
+            <span>{{ row.remark }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="{row}">
             <el-button type="text" @click="claimMajor(row)">大中型</el-button>

src/views/finance/fundList.vue

@@ -78,17 +78,17 @@
             <span>{{ row.created}}</span> 
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" width='170'>
-          <template slot-scope="{row}">
-            <span>{{ row.remark}}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="全部认领" align="center" >
           <template slot-scope="{row}">
             <i v-if="row.notClaimAmount<=0" style="font-size:20px; color:green" class="el-icon-success"></i>
             <i v-else style="font-size:20px; color:RGB(255,106,106)" class="el-icon-warning"></i>
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" width='170'>
+          <template slot-scope="{row}">
+            <span>{{ row.remark}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="150" >
           <template slot-scope="{row}">
               <PermissionButton menu-code="_views_claim_list" class-name="filter-item" type="text"

src/views/major/list.vue

@@ -12,7 +12,7 @@
         </MoreSearchBar>
       </template>
       <parentTable ref="table" v-loading="listLoading" :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable" @headerClick="switchHeader">
-        <el-table-column label="项目名称" align="center" width="300" v-if="!hiddenLabels.includes('productionName')" prop="productionName">
+        <el-table-column label="项目名称" align="center" width="250" v-if="!hiddenLabels.includes('productionName')" prop="productionName" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span class = "enableClick" @click="orderDetail(row)">{{ row.productionName==null?row.name: row.productionName }}</span>
           </template>
@@ -22,17 +22,17 @@
             <span class = "enableClick" @click="orderDetail(row)">{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="价值意见书号" align="center" width="280" v-if="!hiddenLabels.includes('statementNo')" prop="statementNo" sortable >
+        <el-table-column label="价值意见书号" align="center" width="200" v-if="!hiddenLabels.includes('statementNo')" prop="statementNo" sortable >
           <template slot-scope="{row}">
             <span>{{ row.statementNo==null?'-': row.statementNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="报告号/复评函号" align="center" width="280" v-if="!hiddenLabels.includes('reportNo')" prop="reportNo" sortable>
+        <el-table-column label="报告号/复评函号" align="center" width="200" v-if="!hiddenLabels.includes('reportNo')" prop="reportNo" sortable>
           <template slot-scope="{row}">
             <span>{{ row.reportNo==null?'-': row.reportNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="130" v-if="!hiddenLabels.includes('nodeName')" prop="nodeName">
+        <el-table-column label="当前节点" align="center" width="130" v-if="!hiddenLabels.includes('nodeName')" prop="nodeName" sortable>
           <template slot-scope="{row}">
             <span>{{ row.nodeName }}</span>
           </template>

src/views/major/myOrder.vue

@@ -5,14 +5,17 @@
     </div>
     <y-page-list-layout :page-list="pageData" :page-para="listQuery" :get-page-list="getList">
       <template slot="left">
-        <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
-          icon="el-icon-circle-plus-outline" :page-jump="true" round style="position: absolute;left:1100px;z-index:9"
-          :page-query="{ 'couldEdit': true, 'couldBack': true }" />
         <MoreSearchBar business="MAJOR_BUSINESS" @fliterSearch="fliterSearch" @resetParams="resetParams"
           :listQuery="listQuery" :nodeCode="false" :financial="false" :clientManager="false" :businessObjectType="false"
-          :department="false" :clientName="false"></MoreSearchBar>
+          :department="false" :orderId="true" :productionNo="true">
+          <template v-slot:otherButton>
+            <PermissionButton menu-code="_views_major_order" class-name="filter-item" type="danger"
+              icon="el-icon-circle-plus-outline" :page-jump="true" round 
+              :page-query="{ 'couldEdit': true, 'couldBack': true }" />
+          </template>
+        </MoreSearchBar>
       </template>
-      <parentTable :data="pageData.records" slot="table" style="width: 100%;">
+      <parentTable :data="pageData.records" slot="table" style="width: 100%;" >
         <el-table-column label="订单名称" align="center" show-overflow-tooltip width='300'>
           <template slot-scope="{row}">
             <span>{{ row.orderName }}</span>
@@ -23,6 +26,16 @@
             <span>{{ row.orderId }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="产品号" align="center" width='200'>
+          <template slot-scope="{row}">
+            <span>{{ row.productionNo }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前节点" align="center" width='200'>
+          <template slot-scope="{row}">
+            <span>{{ row.currentNodeName==null?(row.ifSaveFile===true?'已归档':'撰写节点'):row.currentNodeName}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="负责人" align="center" width='120'>
           <template slot-scope="{row}">
             <span>{{ row.principal }}</span>
@@ -83,13 +96,13 @@
             <div>
               <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
                 size="mini"
-                :page-query="{ 'couldEdit': false, 'id': row.id, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
+                :page-query="{ 'couldEdit': false, 'id': row.businessId, 'back': '/major/my/order', 'recall': true, 'couldBack': true }" />
               <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
               <!-- <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button> -->
             </div>
             <div>
               <el-button type="text" size="small" @click="openFinanceInvoiceDialog(row.orderFundId,row.realAmount,row.clienteleName,row.clienteleSubName)">申请开票</el-button>
-              <el-button type="text" size="small" @click="productionList(row.id)">产品包</el-button>
+              <el-button type="text" size="small" @click="productionList(row.businessId)">产品包</el-button>
             </div>
           </template>
         </el-table-column>
@@ -752,7 +765,6 @@ export default {
     if (this.todoBusinessId) {
       this.productionListDialog = true;
       this.productionList(this.todoBusinessId, this.reportNo == null ? this.statementNo : this.reportNo)
-      console.log(this.reportNo)
       this.activeName = this.reportNo == null ? this.statementNo : this.reportNo
     }
   },
@@ -800,7 +812,7 @@ export default {
       this.shouldAmountDialog = true;
       this.fund.id = row.orderFundId;
       this.fund.businessType = 'MAJOR_BUSINESS';
-      this.fund.businessId = row.id;
+      this.fund.businessId = row.businessId;
       this.fund.orderFundId = row.orderFundId;
       this.fund.shouldAmount = row.shouldAmount;
       this.fund.remark = row.remark;

src/views/major/todoList.vue

@@ -35,7 +35,7 @@
         <el-button class="filter-item" style="float: left;" round @click="showAllLabel()">显示全部列</el-button>
       </template>
       <parentTable  :data="pageData.records" slot="table" style="width: 100%;" @sortTable="sortTable" @headerClick="switchHeader">
-        <el-table-column label="项目名称" align="center" width="300" v-if="!hiddenLabels.includes('productionName')" prop="productionName">
+        <el-table-column label="项目名称" align="center" width="250" v-if="!hiddenLabels.includes('productionName')" prop="productionName" show-overflow-tooltip>
           <template slot-scope="{row}">
             <span class="enableClick" @click="toDetail(row)">{{ row.productionName==null?row.orderName: row.productionName }}</span>
           </template>
@@ -45,12 +45,12 @@
             <span class="enableClick" @click="toDetail(row)">{{ row.orderId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="价值意见书号" align="center" width="280" v-if="!hiddenLabels.includes('statementNo')" prop="statementNo" sortable>
+        <el-table-column label="价值意见书号" align="center" width="200" v-if="!hiddenLabels.includes('statementNo')" prop="statementNo" sortable>
           <template slot-scope="{row}">
             <span>{{ row.statementNo==null?'-': row.statementNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="报告号/复评函号" align="center" width="280" v-if="!hiddenLabels.includes('reportNo')" prop="reportNo" sortable>
+        <el-table-column label="报告号/复评函号" align="center" width="200" v-if="!hiddenLabels.includes('reportNo')" prop="reportNo" sortable>
           <template slot-scope="{row}">
             <span>{{ row.reportNo==null?'-': row.reportNo }}</span>
           </template>
@@ -65,7 +65,7 @@
             <span>{{ row.handler }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="当前节点" align="center" width="140" v-if="!hiddenLabels.includes('nodeName')" prop="nodeName">
+        <el-table-column label="当前节点" align="center" width="140" v-if="!hiddenLabels.includes('nodeName')" prop="nodeName" sortable>
           <template slot-scope="{row}">
             <span>{{ row.nodeName }}</span>
           </template>