1.产品撰写与产品信息列表页面开发调整

src/views/assets/orderDetail.vue

@@ -388,6 +388,12 @@
               </el-table-column>
               <el-table-column prop="productionNo" label="产品号" align="center" show-overflow-tooltip>
               </el-table-column>
+              <el-table-column prop="productionNo" label="产品出具状态" align="center" show-overflow-tooltip>
+                <template slot-scope="{row}">
+                  <span v-if="row.createProductionDate !== null">已出具</span>
+                  <span v-if="row.createProductionDate == null">未出具</span>
+                </template>
+              </el-table-column>
               <el-table-column prop="purposeName" label="评估目的" align="center" show-overflow-tooltip>
               </el-table-column>
               <el-table-column label="评估对象" align="center" show-overflow-tooltip>
@@ -442,6 +448,61 @@
                 </h3>
               </el-divider>
             </div>
+            <el-table ref="multipleTable" stripe @selection-change=""
+              :header-row-style="{ color: '#333333' }" border takeNumberItems style="width: 100%; margin-top:20px">
+              <el-table-column type="selection" width="55" :selectable="selectable">
+              </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>
+              <el-table-column prop="productionNo" label="产品类型" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="purposeName" label="委托方名称" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="theHolder" label="委托方电话" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="valueTypeName" label="评估基准日" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="totalAssetCarryingAmount" label="评估面积" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="totalLiabilitiesCarryingAmount" label="评估单价" align="center"
+                show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="carryingAmountOfNetAssets" label="评估总价" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="estimatedValue" label="产权人" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="checkValue" label="产品打印数量" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="checkValue" label="产品出具日期" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="checkValue" label="特殊情况说明" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="checkValue" label="库存状态" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="checkValue" label="入库时间" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="checkValue" label="出库时间" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="checkValue" label="归档日期" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column prop="checkValue" label="送达状态" align="center" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="130" fixed="right">
+                <template slot-scope="scope">
+                  <el-button type="text" size="small">
+                    查看
+                  </el-button>
+                  <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE_DETERMINE_PRICE'" type="text"
+                    size="small">
+                    编辑
+                  </el-button>
+                  <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE_DETERMINE_PRICE'" type="text"
+                    size="small">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </div>
       </el-tab-pane>
@@ -730,6 +791,16 @@
             </div>
             <el-row class="row-style">
               <el-col>
+                <el-form-item label="评估对象：" prop="productionNo" label-width="120px" class="postInfo-container-item">
+                  <el-select v-model="assetsProductionFrom.productionNo" @change="getAssetsProductionDetail()" placeholder="请选择" style="width: 300px;">
+                    <el-option v-for="(target, productionNo) in assetsEvaluationTarget" :label="target.productionNo"
+                      :value="target.productionNo" :key="target.id"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row class="row-style">
+              <el-col>
                 <el-form-item label="项目名称：" prop="assetsName" label-width="120px" class="postInfo-container-item">
                   <el-input v-model.number="assetsProductionFrom.assetsName" class="filter-item" />
                 </el-form-item>
@@ -949,7 +1020,7 @@ export default {
         currentNodeInstanceId: null,
         currentNodeInstanceCode: null,
         production: [],
-        reportNos: ["川友预报字（2024）第0106-1号","川友预报字（2024）第0106-2号"],
+        reportNos: [],
         businessSubId: null,
         ifFeedback: null
       },
@@ -1269,6 +1340,9 @@ export default {
         ],
         assetsName: [
           { required: true, message: '请填写项目名称', trigger: 'change' }
+        ],
+        productionNo: [
+          { required: true, message: '请选择评估对象', trigger: 'change' }
         ]
       },
       // 资产业务取号dto
@@ -1291,7 +1365,7 @@ export default {
     // 获取页面参数
     this.pageParams.back = this.$route.query.back;
     this.pageParams.row = JSON.parse(this.$route.query.row);
-    this.nodeBusinessInfo.businessSubId=this.pageParams.row.productionNo;
+    this.nodeBusinessInfo.businessSubId = this.pageParams.row.productionNo;
     this.getProductionTypes(this.pageParams.row.assetsId);
     this.getCurrentNodeInfo();
     this.getAllotDepartment();
@@ -1708,9 +1782,9 @@ export default {
       this.$api.assets.getAETargetListByAssetsId(aETargetListSelectDTO).then(res => {
         if (res.code === 200) {
           this.assetsEvaluationTarget = res.data;
-          for (let i = 0; i < res.data.length; i++) {
-            // this.nodeBusinessInfo.reportNos.push(res.data[i].productionNo);
-          }
+          // for (let i = 0; i < res.data.length; i++) {
+          //   this.nodeBusinessInfo.reportNos.push(res.data[i].productionNo);
+          // }
         }
       })
     },
@@ -2072,7 +2146,7 @@ export default {
               type: 'success',
               duration: 2000
             });
-            this.pageParams.row.productionNo = res.data;
+            // this.pageParams.row.productionNo = res.data;
             this.getAETargetListByAssetsId();
           }
         })
@@ -2101,24 +2175,22 @@ export default {
     },
     openWriteProductionDialog() {
       this.productionWriteDialogVisible = true;
-      this.getAssetsProductionDetail();
     },
     // 根据业务id与产品号获取资产产品详细信息
-    getAssetsProductionDetail() {
+    getAssetsProductionDetail(index) {
       let assetsProductionDetailDTO = { businessId: null, productionNo: null };
       assetsProductionDetailDTO.businessId = this.assetsForm.id;
-      assetsProductionDetailDTO.productionNo = this.pageParams.row.productionNo;
+      assetsProductionDetailDTO.productionNo = this.assetsProductionFrom.productionNo;
       this.$api.assets.getAssetsProductionDetail(assetsProductionDetailDTO).then(res => {
         if (res.code == 200 && res.data !== null) {
           this.assetsProductionFrom.printCount = res.data.printCount;
           this.assetsProductionFrom.clientName = this.assetsForm.bailorContactName;
           this.assetsProductionFrom.clientTel = this.assetsForm.bailorContactTel;
           this.assetsProductionFrom.assetsName = this.assetsForm.name;
-          this.assetsProductionFrom.owner = this.assetsEvaluationTarget[0].theHolder;
+          this.assetsProductionFrom.owner = this.assetsEvaluationTarget.find(obj => obj.productionNo === assetsProductionDetailDTO.productionNo)?.theHolder;
           this.assetsProductionFrom.valuationBasisDate = this.assetsEvaluationTarget[0].valuationBasisDate;
           this.assetsProductionFrom.filePath = [];
           this.assetsProductionFrom.signatory = [];
-          console.log(this.assetsProductionFrom);
         }
       })
     },
@@ -2128,26 +2200,32 @@ export default {
     },
     // 资产撰写产品(意见书和报告都是这个接口)
     writeAssetsProduction() {
-      this.assetsProductionFrom.filePath = JSON.stringify(this.assetsProductionFrom.filePath);
-      if (this.assetsProductionFrom.signatory.length > 0) {
-        this.assetsProductionFrom.signatory = JSON.stringify(this.assetsProductionFrom.signatory);
-      } else {
-        this.assetsProductionFrom.signatory = null;
-      }
-      this.assetsProductionFrom.businessId = this.assetsForm.id;
-      this.assetsProductionFrom.productionNo = this.assetsEvaluationTarget[0].productionNo;
-      this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
-      this.taskRecordDTO.taskData = this.assetsProductionFrom;
-      this.$api.assets.writeAssetsProduction(this.taskRecordDTO).then(res => {
-        if (res.code == 200) {
-          this.$notify({
-            title: '成功',
-            message: '产品撰写成功！请继续提交流程节点！',
-            type: 'success',
-            duration: 2000
-          });
+      this.$refs.assetsProductionFrom.validate(valid => {
+        if (valid) {
+          this.assetsProductionFrom.filePath = JSON.stringify(this.assetsProductionFrom.filePath);
+          if (this.assetsProductionFrom.signatory !== null) {
+            this.assetsProductionFrom.signatory = JSON.stringify(this.assetsProductionFrom.signatory);
+          } else {
+            this.assetsProductionFrom.signatory = null;
+          }
+          this.assetsProductionFrom.businessId = this.assetsForm.id;
+          this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
+          this.taskRecordDTO.taskData = this.assetsProductionFrom;
+          this.$api.assets.writeAssetsProduction(this.taskRecordDTO).then(res => {
+            if (res.code == 200) {
+              this.$notify({
+                title: '成功',
+                message: '产品撰写成功！请继续提交流程节点！',
+                type: 'success',
+                duration: 2000
+              });
+            }
+            this.getAETargetListByAssetsId();
+            this.productionWriteDialogVisible = false;
+          })
         }
       })
+
     },
     resetProductionForm() {
       this.fileList = [];