报告产品相关开发与修改

src/api/modules/assets.js

@@ -84,7 +84,7 @@ export default {
         return request.post(`assets/takeAssetsProductionNo`, params)
     },
     // 根据业务id与产品号获取资产产品详细信息
-    getAssetsProductionDetail(params) {
+    getAssetsProductionDetailByNo(params) {
         return request.get(`assetsProduction/getAssetsProductionDetail`, { params: params })
     },
     // 资产撰写产品(意见书和报告都是这个接口)

src/views/assets/allList.vue

@@ -44,12 +44,12 @@
                 </el-table-column>
                 <el-table-column label="意见书号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span v-if="row.productionType === 'STATEMENT'">{{ row.productionNo }}</span>
+                        <span>{{ row.statementNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="报告号" align="center" width="250">
                     <template slot-scope="{row}">
-                        <span v-if="row.productionType !== 'STATEMENT'">{{ row.productionNo }}</span>
+                        <span>{{ row.reportNo }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="项目名称" align="center" width="150">

src/views/assets/orderDetail.vue

@@ -284,7 +284,7 @@
         <el-row>
           <el-col>
             <el-col :span="2">
-              <el-button @click="openProductionDialog" v-if="currentNode.nodeCode === 'PRODUCT_CHOICE'" type="danger"
+              <el-button @click="openProductionDialog" v-if="currentNode.nodeCode === 'PRODUCT_CHOICE' || currentNode.nodeCode === 'REPORT_CHOICE'" type="danger"
                 round>选择产品</el-button>
             </el-col>
           </el-col>
@@ -368,9 +368,15 @@
                   @click="openTargetDialog(), changeStatus('add')" round>添加评估对象</el-button>
               </el-col>
               <el-col :span="2"
-                v-if="currentNode.nodeCode === 'GENERATE_STATEMENT' || currentNode.nodeCode === 'RECHECK_REPORT'">
+                v-if="currentNode.nodeCode === 'GENERATE_STATEMENT'">
                 <el-tooltip class="item" effect="dark" content="全选取主号，多次取号(主号-子号)" placement="right">
-                  <el-button type="success" @click="takeAssetsProductionNo" round>产品取号</el-button>
+                  <el-button type="success" @click="takeAssetsProductionNo" round>意见书取号</el-button>
+                </el-tooltip>
+              </el-col>
+              <el-col :span="2"
+                v-if="currentNode.nodeCode === 'ASSET_REPORT_TAKE_NO'">
+                <el-tooltip class="item" effect="dark" content="全选取主号，多次取号(主号-子号)" placement="right">
+                  <el-button type="success" @click="takeAssetsProductionNo" round>报告取号</el-button>
                 </el-tooltip>
               </el-col>
               <el-col :span="2"
@@ -386,7 +392,9 @@
               </el-table-column>
               <el-table-column prop="id" label="id" width="80" align="center">
               </el-table-column>
-              <el-table-column prop="productionNo" label="产品号" align="center" show-overflow-tooltip>
+              <el-table-column width="220" prop="statementNo" label="意见书号" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column width="220" prop="reportNo" label="报告号" align="center" show-overflow-tooltip>
               </el-table-column>
               <el-table-column prop="productionNo" label="产品出具状态" align="center" show-overflow-tooltip>
                 <template slot-scope="{row}">
@@ -792,7 +800,7 @@
             <el-row class="row-style">
               <el-col :xs="24" :sm="12" :lg="12" :span="6" style="width: 800px;">
                 <el-form-item label="产品类型：" prop="productionType" label-width="120px" class="postInfo-container-item">
-                  <el-radio v-model="assetsProductionForm.productionType" :label="1" border size="medium">价值意见书</el-radio>
+                  <el-radio v-if="currentNode.nodeCode === 'PRODUCT_CHOICE'" v-model="assetsProductionForm.productionType" :label="1" border size="medium">价值意见书</el-radio>
                   <el-radio v-model="assetsProductionForm.productionType" :label="2" border size="medium">咨询报告</el-radio>
                   <el-radio v-model="assetsProductionForm.productionType" :label="3" border size="medium">评估报告</el-radio>
                   <el-radio v-model="assetsProductionForm.productionType" :label="4" border size="medium">意见函</el-radio>
@@ -833,10 +841,10 @@
             <el-row class="row-style">
               <el-col>
                 <el-form-item label="评估对象：" prop="productionNo" label-width="120px" class="postInfo-container-item">
-                  <el-select v-model="assetsProductionForm.productionNo" @change="getAssetsProductionDetail()"
+                  <el-select v-model="assetsProductionForm.productionNo" @change="getAssetsProductionDetailByNo()"
                     placeholder="请选择" style="width: 300px;">
-                    <el-option v-for="(target, productionNo) in assetsEvaluationTarget" :label="target.productionNo"
-                      :value="target.productionNo" :key="target.id"></el-option>
+                    <el-option v-for="(target, statementNo) in assetsEvaluationTarget" :label="target.statementNo"
+                      :value="target.statementNo" :key="target.id"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -1549,9 +1557,9 @@ export default {
     // 获取页面参数
     this.pageParams.back = this.$route.query.back;
     this.pageParams.row = JSON.parse(this.$route.query.row);
-    this.nodeBusinessInfo.mainBusiness = 'ASSET_BUSINESS';
-    this.nodeBusinessInfo.businessSubId = this.pageParams.row.productionNo;
     this.getProductionTypes(this.pageParams.row.assetsId);
+    this.nodeBusinessInfo.mainBusiness = 'ASSET_BUSINESS';
+    this.nodeBusinessInfo.businessSubId = this.pageParams.row.statementNo;
     this.getCurrentNodeInfo();
     this.getAllotDepartment();
     this.getCustomerCompany(0);
@@ -1559,7 +1567,7 @@ export default {
     this.getAssetsDetailById(this.pageParams.row.assetsId);
     this.getProductionByBusinessId(this.pageParams.row.assetsId);
     this.getProductionList();
-    this.nodeBusinessInfo.reportNos.push(this.pageParams.row.productionNo);
+    this.nodeBusinessInfo.reportNos.push(this.pageParams.row.statementNo);
   },
 
   methods: {
@@ -1919,7 +1927,7 @@ export default {
     // 获取流程节点信息
     getCurrentNodeInfo() {
       if (this.pageParams.row.assetsId) {
-        this.$api.workNodeInstance.currentNode({ "mainBusiness": "ASSET_BUSINESS", "businessId": this.pageParams.row.assetsId, "businessSubId": this.pageParams.row.productionNo, "businessMinId": this.pageParams.row.businessMinId }).then(res => {
+        this.$api.workNodeInstance.currentNode({ "mainBusiness": "ASSET_BUSINESS", "businessId": this.pageParams.row.assetsId, "businessSubId": this.pageParams.row.statementNo, "businessMinId": this.pageParams.row.reportNo }).then(res => {
           if (res.code === 200) {
             if (res.data) {
               this.currentNode = res.data;
@@ -1972,9 +1980,10 @@ export default {
     },
     // 根据资产业务id获取资产业务评估对象集合
     getAETargetListByAssetsId() {
-      let aETargetListSelectDTO = { businessId: null, productionNo: null }
+      let aETargetListSelectDTO = new Object();
       aETargetListSelectDTO.businessId = this.assetsForm.id;
-      aETargetListSelectDTO.productionNo = this.pageParams.row.productionNo;
+      aETargetListSelectDTO.statementNo = this.pageParams.row.statementNo;
+      aETargetListSelectDTO.reportNo = this.pageParams.row.reportNo;
 
       this.$api.assets.getAETargetListByAssetsId(aETargetListSelectDTO).then(res => {
         if (res.code === 200) {
@@ -2218,6 +2227,7 @@ export default {
       this.$api.assets.getProductionTypes(id).then(res => {
         if (res.code === 200) {
           this.nodeBusinessInfo.production = res.data;
+          console.log(this.nodeBusinessInfo.production);
         }
       })
     },
@@ -2327,10 +2337,11 @@ export default {
 
       // 判断表格中是否还有未选择且未取号的评估对象,返回布尔
       let notTakeNumTargetSelect = this.assetsEvaluationTarget.filter(item => !this.takeAssetsProductionNoDTO.targetIdList.includes(item.id));
-      this.takeAssetsProductionNoDTO.hasNotTakeNumTargetSelect = notTakeNumTargetSelect.some(target => target.productionNo === null || target.productionNo === '');
+      console.log(notTakeNumTargetSelect);
+      this.takeAssetsProductionNoDTO.hasNotTakeNumTargetSelect = notTakeNumTargetSelect.some(target => target.statementNo === null || target.statementNo === '');
 
       this.takeAssetsProductionNoDTO.businessId = this.assetsForm.id;
-      this.takeAssetsProductionNoDTO.productionType = this.nodeBusinessInfo.production[0];
+      this.takeAssetsProductionNoDTO.productionType = this.nodeBusinessInfo.production[this.nodeBusinessInfo.production.length - 1];
       this.getProductionByBusinessId(this.assetsForm.id);
       this.takeAssetsProductionNoDTO.printCount = this.assetsProductionForm.printCount;
 
@@ -2364,7 +2375,7 @@ export default {
     },
     // 判断行数据是否可选
     selectable(row) {
-      if (row.productionNo != null && row.productionNo != '') {
+      if (row.statementNo != null && row.statementNo != '') {
         return false;
       } else {
         return true;
@@ -2376,11 +2387,11 @@ export default {
       this.writeType = type;
     },
     // 根据业务id与产品号获取资产产品详细信息
-    getAssetsProductionDetail(index) {
-      let assetsProductionDetailDTO = { businessId: null, productionNo: null };
+    getAssetsProductionDetailByNo(index) {
+      let assetsProductionDetailDTO = new Object();
       assetsProductionDetailDTO.businessId = this.assetsForm.id;
       assetsProductionDetailDTO.productionNo = this.assetsProductionForm.productionNo;
-      this.$api.assets.getAssetsProductionDetail(assetsProductionDetailDTO).then(res => {
+      this.$api.assets.getAssetsProductionDetailByNo(assetsProductionDetailDTO).then(res => {
         if (res.code == 200 && res.data !== null) {
           this.assetsProductionForm.printCount = res.data.printCount;
           this.assetsProductionForm.clientName = this.assetsForm.bailorContactName;
@@ -2432,9 +2443,10 @@ export default {
     },
     // 根据业务id与产品号查询产品信息
     getProductionList() {
-      let aProListSelectDTO = { businessId: null, productionNo: null }
+      let aProListSelectDTO = new Object();
       aProListSelectDTO.businessId = this.assetsForm.id;
-      aProListSelectDTO.productionNo = this.pageParams.row.productionNo;
+      aProListSelectDTO.statementNo = this.pageParams.row.statementNo;
+      aProListSelectDTO.reportNo = this.pageParams.row.reportNo;
       this.$api.assets.getProductionList(aProListSelectDTO).then(res => {
         if (res.code == 200) {
           this.assetsProductionData = res.data;
@@ -2448,9 +2460,9 @@ export default {
       this.nodeBusinessInfo.businessSubId = this.commitProductionNo;
 
       // 查询该产品是否已有提交的流程
-      let aProListSelectDTO = { businessId: null, productionNo: null }
+      let aProListSelectDTO = new Object();
       aProListSelectDTO.businessId = this.assetsForm.id;
-      aProListSelectDTO.productionNo = this.commitProductionNo;
+      aProListSelectDTO.statementNo = this.commitProductionNo;
       this.$api.assets.getInatanceCount(aProListSelectDTO).then(res => {
         if (res.code == 200) {
           this.proInatanceCount = res.data;