优化大中型实收款认领

src/api/modules/businessProduction.js

@@ -29,5 +29,8 @@ export default {
    },
    getValidateInfo(params1,params2){
       return request.get(`businessProduction/validate/${params1}/${params2}`)
-   }
+   },
+   allotRealAmountToOrder(params){
+      return request.post(`businessProduction/allotRealAmountOrder/major`,params)
+   },
 }

src/views/complex/index.vue

@@ -535,17 +535,17 @@
                   </el-table-column>
                   <el-table-column label="订单号" width="120" align="center">
                     <template slot-scope="{row}">
-                      <span>{{ row.orderId }}</span>
+                      <span>{{ row.majorSimple.orderId }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="项目名称" width="200" align="center" show-overflow-tooltip>
                     <template slot-scope="{row}">
-                      <span>{{ row.name ? row.name : row.orderName }}</span>
+                      <span>{{ row.majorSimple.name ? row.majorSimple.name : row.majorSimple.orderName }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="报告号" width="180" align="center">
                     <template slot-scope="{row}">
-                      <span>{{ row.reportNo ? row.reportNo : '--' }}</span>
+                      <span>{{ row.majorSimple.reportNo ? row.majorSimple.reportNo : '--' }}</span>
                     </template>
                   </el-table-column>
                   <el-table-column label="申报人" align="center">
@@ -705,15 +705,6 @@ export default {
     jumpDir(path) {
       this.$router.push({ path: path, query: {} });
     },
-    showProdNo(m) {
-      if (m.reportNo) {
-        return m.reportNo;
-      }
-      if (m.statementNo) {
-        return m.reportNo;
-      }
-      return m.orderId;
-    },
     getMajorTodoList() {
       this.$api.workNodeTaskRecord.majorTaskTodoList().then(res => {
         if (res.code === 200) {

src/views/finance/fundClaim.vue

@@ -91,7 +91,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="{row}">
-             <el-button type="text" @click="claimMajor()">大中型</el-button>
+             <el-button type="text" @click="claimMajor(row)">大中型</el-button>
              <el-button type="text"  @click="claimPersonal()">个贷</el-button>
              <el-button type="text">资产</el-button>
           </template>
@@ -108,14 +108,14 @@
               </div>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="3" :span="6">
-              <el-button style="float:right" type="success" @click="claim()">确认认领</el-button>
+              <el-button style="float:right" type="success" @click="doClaimMajorToOrder()">确认认领</el-button>
             </el-col>
         </el-row>
         <el-card style="margin-top:20px" v-for="(p,id) in claimOrders" shadow="hover">
           <div slot="header" class="clearfix">
             <el-row>
               <el-col :xs="24" :sm="12" :lg="24" :span="6">
-                <el-form-item :label="labelName" prop="orderName"   label-width="140px" class="postInfo-container-item">
+                <el-form-item label="订单名称" prop="orderName"   label-width="140px" class="postInfo-container-item">
                   <el-input :value="p.orderName" type="text" class="filter-item" disabled readonly />
                 </el-form-item >
               </el-col>
@@ -129,7 +129,7 @@
                 </el-form-item >
               </el-col>
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item :label="labelNum" prop="orderId"   label-width="140px" class="postInfo-container-item">
+                <el-form-item label="订单号" prop="orderId"   label-width="140px" class="postInfo-container-item">
                   <el-input :value="p.orderId" type="text" class="filter-item" disabled readonly />
                 </el-form-item >
               </el-col>
@@ -151,7 +151,61 @@
               </el-col>
             </el-row>
           </div>
-       
+        </el-card>
+      </el-form>
+    </el-dialog>
+    <el-dialog :visible.sync="allotProdDialog" width="45%"  center  custom-class="doWarehouseClass"  @closed="cleanClaimDTO">
+      <el-form v-model="claimOrders" ref="claimOrdersForm">
+        <el-row>
+            <el-col :xs="24" :sm="12" :lg="21" :span="6">
+              <div style="font-size:20px;">
+                <span>此笔实收款剩余：</span><span style="color:red;font-weight:bold">{{notClaimAmount}}￥</span>
+              </div>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="3" :span="6">
+              <el-button style="float:right" type="success" @click="doClaimMajor()">确认认领</el-button>
+            </el-col>
+        </el-row>
+        <el-card style="margin-top:20px" v-for="(p,id) in claimOrders" shadow="hover">
+          <div slot="header" class="clearfix">
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="24" :span="6">
+                <el-form-item label="项目名称" prop="name"   label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.name" type="text" class="filter-item" disabled readonly />
+                </el-form-item >
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <span class="redPoint">*</span>
+                <el-form-item label="本次认领金额：" prop="thisTimeAmount"  label-width="140px" class="postInfo-container-item">
+                  <el-input-number  :precision="2" :min="0" :value-on-clear="0" v-model.number="p.thisTimeAmount"
+                        style="width:100%" class="filter-item" />
+                </el-form-item >
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="报告号" prop="reportNo"   label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.reportNo" type="text" class="filter-item" disabled readonly />
+                </el-form-item >
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="已认领金额："  prop="realAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.realAmount" type="text" class="filter-item" disabled readonly>
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item >
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                <el-form-item label="订单应收金额："  prop="shouldAmount" label-width="140px" class="postInfo-container-item">
+                  <el-input :value="p.shouldAmount" type="text" class="filter-item" disabled readonly>
+                    <template slot="append">元</template>
+                  </el-input>
+                </el-form-item >
+              </el-col>
+            </el-row>
+          </div>
         </el-card>
       </el-form>
     </el-dialog>
@@ -471,6 +525,7 @@ export default {
       myPersonalOrderDialog: false,
       myAssetsOrderDialog:false,
       allotAmountDialog:false,
+      allotProdDialog:false,
       realFund:{
         id:null,
         payer:null,
@@ -502,8 +557,6 @@ export default {
       orderDate:'',
       payDate:'',
       myPersonalPageData:{ records: [] },
-      labelName:'订单名称：',
-      labelNum:'项目编号：',
       pickerOptions: {
           shortcuts: [{
             text: '最近一周',
@@ -607,33 +660,20 @@ export default {
     cleanClaimDTO(){
       this.notInfo = "此笔实收款剩余：";
     },
-    claim(){
-      const orders = this.claimOrders;
-      for (let i in orders){
-        if (!orders[i].thisTimeAmount){
-            this.$message.error("编号:["+orders[i].orderId+"],本次认领金额不能为空。");
-            return;
-         }
-      }
-      if (this.activeName === 'MAJOR_BUSINESS' ){
-          this.doClaimMajor();
-      }
-      if (this.activeName === 'PERSONAL_BUSINESS'){
-          this.doClaimPersonal();
-      }
-    },
-  
     handleSelectionChange(val){
         let pickeds = [];
         for (let i in val){
           let picked = new Object();
           picked.id = val[i].id;
           picked.orderName = val[i].orderName;
+          picked.name = val[i].name;
+          picked.reportNo = val[i].reportNo;
           picked.orderId = val[i].orderId;
           picked.shouldAmount = val[i].shouldAmount;
           picked.orderFundId = val[i].orderFundId;
           picked.realAmount = val[i].realAmount;
           picked.financeFundId = this.financeFundId;
+          picked.productionFundId = val[i].productionFundId;
           pickeds.push(picked);
         }
         this.claimOrders = pickeds;
@@ -648,15 +688,13 @@ export default {
               });
               return ;
       }
-      this.allotAmountDialog = true;
+      if (this.toProd){
+        this.allotProdDialog = true;
+      }else{
+        this.allotAmountDialog = true;
+      }
+     
       this.notInfo = this.notInfo + this.notClaimAmount + '￥'
-        if (this.activeName === 'MAJOR_BUSINESS'){
-            this.$api.businessProduction.orderReports(this.claimOrders).then(res=>{
-              if (res.code ===200){
-                  this.claimOrders = res.data;
-              }
-            })
-        }
     },
 
     getMyPersonalOrder(){
@@ -670,6 +708,13 @@ export default {
       window.location.href  = "/api/financeClaim/personal/claim/template"
     },
     doClaimMajor(){
+      const orders = this.claimOrders;
+      for (let i in orders){
+        if (!orders[i].thisTimeAmount){
+            this.$message.error("报告号:["+orders[i].reportNo+"],本次认领金额不能为空。");
+            return;
+         }
+      }
       this.$api.businessProduction.allotRealAmount(this.claimOrders).then(res=>{
         if (res.code === 200 && res.data){
           this.$notify({
@@ -678,8 +723,9 @@ export default {
             type: 'success',
             duration: 2000
           });
-          this.getMyMajorOrder();
+          this.getMajorOrderOrProd();
           this.allotAmountDialog = false;
+          this.allotProdDialog = false;
         }else {
           this.$notify({
             title: '失败',
@@ -690,6 +736,35 @@ export default {
         }
       })
     },
+    doClaimMajorToOrder(){
+      const orders = this.claimOrders;
+      for (let i in orders){
+        if (!orders[i].thisTimeAmount){
+            this.$message.error("订单号:["+orders[i].orderId+"],本次认领金额不能为空。");
+            return;
+         }
+      }
+        this.$api.businessProduction.allotRealAmountToOrder(this.claimOrders).then(res=>{
+          if (res.code === 200 && res.data){
+            this.$notify({
+              title: '成功',
+              message: '实收款认领成功',
+              type: 'success',
+              duration: 2000
+            });
+            this.getMajorOrderOrProd();
+            this.allotAmountDialog = false;
+            this.allotProdDialog = false;
+          }else {
+            this.$notify({
+              title: '失败',
+              message: '实收款认领失败',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        })
+    },
     doClaimPersonal(){
       this.$api.businessProduction.personalAllotRealAmount(this.claimOrders).then(res=>{
         if (res.code === 200 && res.data){
@@ -718,8 +793,10 @@ export default {
           return false;
        }
     },
-    claimMajor(){
+    claimMajor(row){
         this.myMajorOrderDialog = true;
+        this.notClaimAmount = row.notClaimAmount;
+        this.financeFundId = row.id;
     },
     claimPersonal(){
       this.getMyPersonalOrder();

src/views/finance/fundList.vue

@@ -91,8 +91,6 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="300" fixed="right">
           <template slot-scope="{row}">
-              <PermissionButton :disabled="row.notClaimAmount<=0" menu-code="_views_claim_real_fund" class-name="filter-item" type="success"
-              :page-jump="false" round size="mini" @click="openMyOrderDialog(row)" />
               <PermissionButton menu-code="_views_claim_list" class-name="filter-item" type="primary"
               :page-jump="false" round size="mini" @click="clamiList(row.id,row.notClaimAmount,row.payer,row.amount)" />
               <PermissionButton menu-code="_views_real_fund_edit" class-name="filter-item" type="warning"
@@ -241,281 +239,6 @@
         </el-table-column> -->
       </el-table>
     </el-dialog>
-    <el-dialog :visible.sync="myOrderDialog" width="90%" center  custom-class="doWarehouseClass" @closed="getList">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="我的大中型订单" name="MAJOR_BUSINESS">
-          <y-page-list-layout :page-list="myMajorPageData" :page-para="orderListQuery" :get-page-list="getMyMajorOrder">
-            <template slot="left">
-              <el-input v-model="orderListQuery.orderName" placeholder="订单名称" clearable
-                style="margin-left: 20px;width: 270px;float: left;">
-              </el-input>
-              <el-input v-model="orderListQuery.orderId" placeholder="订单号" clearable
-                style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-select v-model="orderListQuery.eDeclareResult" placeholder="评估人员申报" clearable style="margin-left: 20px;width: 200px;float: left;">
-                 <el-option value="审核通过">审核通过</el-option>
-                 <el-option value="审核中">审核中</el-option>
-                 <el-option value="未申报">未申报</el-option>
-                 <el-option value="审核拒绝">审核拒绝</el-option>
-              </el-select>
-              <el-select v-model="orderListQuery.mDeclareResult" placeholder="市场人员申报" clearable style="margin-left: 20px;width: 200px;float: left;">
-                <el-option value="审核通过">审核通过</el-option>
-                 <el-option value="审核中">审核中</el-option>
-                 <el-option value="未申报">未申报</el-option>
-                 <el-option value="审核拒绝">审核拒绝</el-option>
-              </el-select>
-              <el-button class="filter-item" style="margin-left: 10px;float: left;" type="primary" @click="getMyMajorOrder" round>搜索
-              </el-button>
-              <el-button class="filter-item" style="float: left;" round type="success" @click="getMyMajorOrderResetSearch()">重置
-              </el-button>
-            </template>
-            <parentTable ref="table" :data="myMajorPageData.records" slot="table" style="width: 100%;" :selectionChange="handleSelectionChange">
-              <el-table-column
-                align="center"
-                type="selection"
-                claimOrders
-                width="100" border="true" :selectable="checkSelectable">
-              </el-table-column>
-              <el-table-column label="订单名称" align="center" show-overflow-tooltip  >
-                <template slot-scope="{row}">
-                  <span>{{ row.orderName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="订单号" align="center" show-overflow-tooltip width='200'  >
-                <template slot-scope="{row}">
-                  <span>{{row.orderId }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="委托人" align="center" show-overflow-tooltip width='100'>
-                <template slot-scope="{row}">
-                  <span>{{ row.bailor }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="产权人" align="center" show-overflow-tooltip width='100'>
-                <template slot-scope="{row}">
-                  <span>{{ row.owner }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="客户名称" align="center" width='120' show-overflow-tooltip>
-                <template slot-scope="{row}">
-                  <span>{{ row.clienteleName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="业务来源" align="center" width='120' show-overflow-tooltip>
-                <template slot-scope="{row}">
-                  <span>{{ row.clienteleSubName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="客户联系人" align="center" width='120' show-overflow-tooltip>
-                <template slot-scope="{row}">
-                  <span>{{ row.clienteleContactName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="应收款(元)" align="center" width='120'>
-                <template slot-scope="{row}">
-                  <span>{{ row.shouldAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="实收款(元)" align="center" width='120'>
-                <template slot-scope="{row}">
-                  <span>{{ row.realAmount }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                align = "center" width='140' label="市场人员申报提成">
-                  <template slot-scope="{row}">
-                  <el-tag :type="row.mdeclareResult?(row.mdeclareResult==='审核通过'?'success':'info'):'danger'">{{ row.mdeclareResult?row.mdeclareResult:'未申报' }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column
-                align = "center" width='140' label="评估人员申报提成">
-                  <template slot-scope="{row}">
-                    <el-tag :type="row.edeclareResult?(row.edeclareResult==='审核通过'?'success':'info'):'danger'">{{ row.edeclareResult?row.edeclareResult:'未申报' }}</el-tag>
-                </template>
-              </el-table-column>
-            </parentTable>
-          </y-page-list-layout>
-        </el-tab-pane>
-        <el-tab-pane label="我的个贷订单" name="PERSONAL_BUSINESS">
-          <y-page-list-layout :page-list="myPersonalPageData" :page-para="orderListQuery" :get-page-list="getMyPersonalOrder">
-            <template slot="left">
-              <el-input v-model="listQuery.name" placeholder="坐落" clearable
-                style="margin-left: 20px;width: 270px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery.orderId" placeholder="订单号" clearable
-                style="margin-left: 20px;width: 200px;float: left;">
-              </el-input>
-              <el-input v-model="listQuery.clientManager" placeholder="客户经理" clearable
-                style="margin-left: 20px;width: 100px;float: left;">
-              </el-input>
-              <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 type="info" @click="downloadTemp()">下载模板
-              </el-button>
-                <excelImport
-                style="float: left; margin-left: 10px; "
-                  ref="uploadControl" buttonType="danger"
-                  :limit="1"
-                  :flag="'financeClaim/personal/temp/upload/'+financeFundId"
-                  :style-type="2"
-                  title="模板认领"
-                  @fath="getMyPersonalOrder"
-                />
-              <!-- <input type="file" ref="fileInput" style="display: none" @change="handleFileChange" /> -->
-            </template>
-            <parentTable ref="table" :data="myPersonalPageData.records" slot="table" style="width: 100%;" :selectionChange="handleSelectionChange" >
-              <el-table-column
-                align="center"
-                type="selection"
-                claimOrders
-                width="100" border="true">
-              </el-table-column>
-              <el-table-column label="坐落" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.orderName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="项目编号" align="center">
-                <template slot-scope="{row}">
-                  <span>{{row.orderId }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="委托人" align="center" width='100'>
-                <template slot-scope="{row}">
-                  <span>{{ row.bailorA}} {{ row.bailorB}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="客户名称" align="center" width='200' >
-                <template slot-scope="{row}">
-                  <span>{{ row.clientName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="业务来源" align="center" >
-                <template slot-scope="{row}">
-                  <span>{{ row.clientSubName }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="中介" align="center" >
-                <template slot-scope="{row}">
-                  <span>{{ row.agent==null?'-': row.agent }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="联系人" align="center">
-                <template slot-scope="{row}">
-                  <span>{{ row.contactName}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="已认领(元)" align="center" >
-                <template slot-scope="{row}">
-                  <span style="color:red;font-weight: bold;">{{ row.realAmount?row.realAmount:0 }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                align = "center" show-overflow-tooltip width='120' label="备注">
-                  <template slot-scope="{row}">
-                  <span>{{ row.remark }}</span>
-                </template>
-              </el-table-column>
-            </parentTable>
-          </y-page-list-layout>
-        </el-tab-pane>
-        <el-tab-pane label="我的资产订单" name="third">资产业务</el-tab-pane>
-      </el-tabs>
-      <el-button  style="display:flex; position:absolute;right:50px;top:50px" round type="danger" @click="openClaimDialog()">选择认领</el-button>
-    </el-dialog>
-    <el-dialog :visible.sync="allotAmountDialog" width="45%"  center  custom-class="doWarehouseClass"  @closed="cleanClaimDTO">
-      <el-form v-model="claimOrders" ref="claimOrdersForm">
-        <el-row>
-            <el-col :xs="24" :sm="12" :lg="21" :span="6">
-              <div style="font-size:20px;">
-                <span>此笔实收款剩余：</span><span style="color:red;font-weight:bold">{{notClaimAmount}}￥</span>
-              </div>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="3" :span="6">
-              <el-button style="float:right" type="success" @click="claim()">确认认领</el-button>
-            </el-col>
-        </el-row>
-        <el-card style="margin-top:20px" v-for="(p,id) in claimOrders" shadow="hover">
-          <div slot="header" class="clearfix">
-            <el-row>
-              <el-col :xs="24" :sm="12" :lg="24" :span="6">
-                <el-form-item :label="labelName" prop="orderName"   label-width="140px" class="postInfo-container-item">
-                  <el-input :value="p.orderName" type="text" class="filter-item" disabled readonly />
-                </el-form-item >
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <span class="redPoint">*</span>
-                <el-form-item label="本次认领金额：" prop="thisTimeAmount"  label-width="140px" class="postInfo-container-item">
-                  <el-input-number  :precision="2" :min="0" :value-on-clear="0" v-model.number="p.thisTimeAmount"
-                        style="width:100%" class="filter-item" />
-                </el-form-item >
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item :label="labelNum" prop="orderId"   label-width="140px" class="postInfo-container-item">
-                  <el-input :value="p.orderId" type="text" class="filter-item" disabled readonly />
-                </el-form-item >
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item label="已认领金额："  prop="realAmount" label-width="140px" class="postInfo-container-item">
-                  <el-input :value="p.realAmount" type="text" class="filter-item" disabled readonly>
-                    <template slot="append">元</template>
-                  </el-input>
-                </el-form-item >
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item label="订单应收金额："  prop="shouldAmount" label-width="140px" class="postInfo-container-item">
-                  <el-input :value="p.shouldAmount" type="text" class="filter-item" disabled readonly>
-                    <template slot="append">元</template>
-                  </el-input>
-                </el-form-item >
-              </el-col>
-            </el-row>
-          </div>
-          <!-- <div v-if="activeName==='MAJOR_BUSINESS'">
-            <el-row>
-              <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item label="产品列表：" prop="orderName"   label-width="140px" class="postInfo-container-item" />
-              </el-col>
-            </el-row>
-            <div v-if="p.reports!=null && p.reports.length>0">
-            <el-row v-for="(r,index) in p.reports">
-              <div >
-                <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                  <el-form-item :label="productionLabel+(index+1)+':'" prop="productionType"   label-width="120px" class="postInfo-container-item">
-                    <el-input :value="r.productionType" type="text" class="filter-item" disabled readonly />
-                  </el-form-item >
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="8" :span="6">
-                  <el-form-item label="报告号：" prop="businessSubId"   label-width="120px" class="postInfo-container-item">
-                    <el-input :value="r.businessSubId" type="text" class="filter-item" disabled readonly  />
-                  </el-form-item >
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="5" :span="6">
-                  <el-form-item label="已认领金额：" prop="claimedAmount"   label-width="120px" class="postInfo-container-item">
-                  <el-input-number  :precision="2" :min="0" :value-on-clear="0" v-model.number="r.claimedAmount" type="number" 
-                        style="width:100%" class="filter-item" readonly disabled/>
-                  </el-form-item >
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="5" :span="6">
-                  <el-form-item label="本次认领：" prop="productionRealAmount"   label-width="120px" class="postInfo-container-item">
-                  <el-input-number  :precision="2" :min="0"  v-model.number="r.realAmount" type="number" 
-                        style="width:100%" class="filter-item" />
-                  </el-form-item >
-                </el-col>
-              </div>
-             </el-row>
-          </div>
-          <span v-else style="margin-left:140px;color:RGB(153,153,153)">暂无产品</span>
-          </div> -->
-        </el-card>
-      </el-form>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -533,16 +256,7 @@ export default {
   },
 
   watch:{
-    activeName:function(){
-        if (this.activeName==='MAJOR_BUSINESS'){
-            this.labelName='订单名称：';
-            this.labelNum='订单号：';
-        }
-        if (this.activeName==='PERSONAL_BUSINESS'){
-            this.labelName='坐落：';
-            this.labelNum='项目编号：';
-        }
-    }
+
   },
 
   computed:{
@@ -563,8 +277,6 @@ export default {
       },
       createdRealFundDialog: false,
       claimListDialog:false,
-      myOrderDialog:false,
-      allotAmountDialog:false,
       realFund:{
         id:null,
         payer:null,
@@ -578,26 +290,9 @@ export default {
         created:null,
         creator:null
       },
-      claimListData:[],
-      activeName:"MAJOR_BUSINESS",
-      orderListQuery: {
-        page: 1,
-        size: 10,
-        descs: 'id',
-      },
-      myMajorPageData: { records: [] },
-      notClaimAmount:0,
-      notInfo:"此笔实收款剩余：",
-      claimOrders:[],
-      financeFundId:null,
       payer:null,
       amount:null,
-      productionLabel:"产品",
       orderDate:'',
-      payDate:'',
-      myPersonalPageData:{ records: [] },
-      labelName:'订单名称：',
-      labelNum:'项目编号：',
       pickerOptions: {
           shortcuts: [{
             text: '最近一周',
@@ -625,7 +320,6 @@ export default {
             }
           }]
       },
-      amountError:false
     }
   },
   created() {
@@ -644,16 +338,6 @@ export default {
       }
       this.getList()
     },
-   
-    getMyMajorOrderResetSearch() {
-      this.$router.push({ query: {} });
-      this.orderListQuery = {
-        current: 1,
-        size: 10,
-        descs: 'id',
-      }
-      this.getMyMajorOrder()
-    },
     searchList() {
       // 重置分页
       this.listQuery.page = 1
@@ -675,9 +359,6 @@ export default {
         }
       })
     },
-    openCreatedRealFund(){
-
-    },
     saveRealFund(){
       this.$refs.realFund.validate(valid=>{
         if (valid){
@@ -771,45 +452,8 @@ export default {
           })
       })
     },
-    handleClick(tab, event) {
-        if (tab.name === 'MAJOR_BUSINESS'){
-            this.getMyMajorOrder();
-        }
-        if (tab.name === 'PERSONAL_BUSINESS'){
-            this.getMyPersonalOrder();
-        }
-    },
-    openMyOrderDialog(row){
-      this.myOrderDialog = true;
-      this.notClaimAmount = row.notClaimAmount;
-      this.financeFundId = row.id;
-      this.getMyMajorOrder();
-    },
-    getMyMajorOrder(){
-      this.$api.majorProduction.waitingClaim(Object.assign({}, this.orderListQuery)).then(res=>{
-          if (res.code ===200){
-              this.myMajorPageData = res.data;
-          }
-      })
-    },
-    cleanClaimDTO(){
-      this.notInfo = "此笔实收款剩余：";
-    },
-    claim(){
-      const orders = this.claimOrders;
-      for (let i in orders){
-        if (!orders[i].thisTimeAmount){
-            this.$message.error("编号:["+orders[i].orderId+"],本次认领金额不能为空。");
-            return;
-         }
-      }
-      if (this.activeName === 'MAJOR_BUSINESS' ){
-          this.doClaimMajor();
-      }
-      if (this.activeName === 'PERSONAL_BUSINESS'){
-          this.doClaimPersonal();
-      }
-    },
+
+
     updateClaim(row){
       this.doClaimDialog = true;
       this.claimDTO = row;
@@ -870,41 +514,7 @@ export default {
     //   })
       
     // },
-    handleSelectionChange(val){
-        let pickeds = [];
-        for (let i in val){
-          let picked = new Object();
-          picked.id = val[i].id;
-          picked.orderName = val[i].orderName;
-          picked.orderId = val[i].orderId;
-          picked.shouldAmount = val[i].shouldAmount;
-          picked.orderFundId = val[i].orderFundId;
-          picked.realAmount = val[i].realAmount;
-          picked.financeFundId = this.financeFundId;
-          pickeds.push(picked);
-        }
-        this.claimOrders = pickeds;
-    },
-    openClaimDialog(){
-      if (this.claimOrders.length===0){
-        this.$notify({
-                  title: '提示',
-                  message: '请先选择订单，然后认领。',
-                  type: 'info',
-                  duration: 2000
-              });
-              return ;
-      }
-      this.allotAmountDialog = true;
-      this.notInfo = this.notInfo + this.notClaimAmount + '￥'
-        if (this.activeName === 'MAJOR_BUSINESS'){
-            this.$api.businessProduction.orderReports(this.claimOrders).then(res=>{
-              if (res.code ===200){
-                  this.claimOrders = res.data;
-              }
-            })
-        }
-    },
+   
     cleanFund(){
       this.realFund.id=null;
       this.realFund.payer=null;
@@ -918,37 +528,11 @@ export default {
       this.realFund.creator=null;
     },
 
-    getMyPersonalOrder(){
-      this.$api.personal.waitingClamOrder(this.listQuery).then(res=>{
-        if (res.code ===200){
-            this.myPersonalPageData = res.data;
-        }
-      })
-    },
+
     downloadTemp(){
       window.location.href  = "/api/financeClaim/personal/claim/template"
     },
-    doClaimMajor(){
-      this.$api.businessProduction.allotRealAmount(this.claimOrders).then(res=>{
-        if (res.code === 200 && res.data){
-          this.$notify({
-            title: '成功',
-            message: '实收款认领成功',
-            type: 'success',
-            duration: 2000
-          });
-          this.getMyMajorOrder();
-          this.allotAmountDialog = false;
-        }else {
-          this.$notify({
-            title: '失败',
-            message: '实收款认领失败',
-            type: 'error',
-            duration: 2000
-          });
-        }
-      })
-    },
+
     doClaimPersonal(){
       this.$api.businessProduction.personalAllotRealAmount(this.claimOrders).then(res=>{
         if (res.code === 200 && res.data){
@@ -970,13 +554,7 @@ export default {
         }
       })
     },
-    checkSelectable(row){
-       if (row.mdeclareResult==='审核通过' && row.edeclareResult==='审核通过'){
-          return true;
-       }else{
-          return false;
-       }
-    }
+
   },
   
 }

src/views/income/major/checkList.vue

@@ -26,17 +26,17 @@
       <parentTable  :data="pageData.records" slot="table" style="width: 100%;">
         <el-table-column label="订单号"  width="150" align="center"  >
           <template slot-scope="{row}">
-            <span>{{ row.orderId }}</span>
+            <span>{{ row.majorSimple.orderId }}</span>
           </template>
         </el-table-column>
         <el-table-column label="项目名称" width="150" align="center"  >
           <template slot-scope="{row}">
-            <span>{{ row.name?row.name:row.orderName }}</span>
+            <span>{{ row.majorSimple.name?row.majorSimple.name:row.majorSimple.orderName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="报告号"  width="200" align="center"   >
           <template slot-scope="{row}">
-            <span>{{ row.reportNo?row.reportNo:'--' }}</span>
+            <span>{{ row.majorSimple.reportNo?row.majorSimple.reportNo:'--' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="申报人" align="center">

src/views/income/major/evaluate.vue

@@ -243,7 +243,7 @@ export default {
     openDeclareDialog(row){
         this.declareDialog = true;
         this.declareForm.orderId = row.orderId;
-        this.declareForm.name = row.name;
+        this.declareForm.name = row.name==null?row.orderName:row.name;
         this.declareForm.reportNo = row.reportNo;
         this.declareForm.businessId = row.businessId;
         this.declareForm.productionId= row.productionId;

src/views/income/major/market.vue

@@ -258,7 +258,7 @@ export default {
       this.getSimpleAllUser();
       this.declareDialog = true;
       this.declareForm.orderId = row.orderId;
-      this.declareForm.name = row.name;
+      this.declareForm.name = row.name==null?row.orderName:row.name;
       this.declareForm.reportNo = row.reportNo;
       this.declareForm.businessId = row.businessId;
       this.declareForm.productionId = row.productionId;