归档逻辑修改

src/views/major/saveFileTodoList.vue

@@ -8,11 +8,6 @@
         <el-input v-model="listQuery.keyword" placeholder="关键字搜索..." clearable
           style="margin-left: 20px;width: 500px;float: left;">
         </el-input>
-        <el-select style="margin-left: 20px;width: 170px;float: left;" v-model="listQuery.production" clearable placeholder="产品类型">
-          <el-option value="STATEMENT" label="价值意见书">价值意见书</el-option>
-          <el-option value="REPORT" label="报告">报告</el-option>
-          <el-option value="LETTER" label="复评函">复评函</el-option>
-        </el-select>
         <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()">重置
@@ -41,27 +36,17 @@
         </el-table-column>
         <el-table-column label="项目名称" align="center"  width="300" show-overflow-tooltip>
           <template slot-scope="{row}">
-            <span>{{ row.name }}</span>
+            <span>{{ row.name?row.name:row.name1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="产品号" align="center" width="280">
+        <el-table-column label="意见书号" align="center" width="280">
           <template slot-scope="{row}">
-            <span>{{ row.reportNo }}</span>
+            <span>{{ row.businessSubId }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="产品类型" align="center" width="100">
+        <el-table-column label="报告号/复评函号" align="center" width="280">
           <template slot-scope="{row}">
-            <span>{{ aliasProductionType(row.production)}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="库存状态" align="center">
-          <template slot-scope="{row}">
-            <span>{{ row.repertoryState===null?'未入库':(row.repertoryState?'已出库':'已入库') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="是否归档" align="center">
-          <template slot-scope="{row}">
-            <span>{{ row.ifSaveFile?'是':'否' }}</span>
+            <span>{{ row.businessMinId }}</span>
           </template>
         </el-table-column>
         <el-table-column label="实收款(￥)" align="center" width=100>
@@ -172,19 +157,36 @@ export default {
     selectionProductionChange(val){
       let pickeds = [];
         for (let i in val){
-          let picked = new Object();
-          picked.taskId = val[i].taskId;
-          picked.currentNodeId = val[i].currentNodeId;
-          picked.businessId = val[i].businessId;
-          picked.reportNo = val[i].reportNo;
-          picked.state = "PASS";
-          picked.productionId = val[i].productionId;
-          picked.orderId = val[i].orderId;
-          picked.name = val[i].name;
-          picked.taskCreated = val[i].taskCreated;
-          picked.businessSubId = val[i].businessSubId;
-          picked.businessMinId = val[i].businessMinId;
-          pickeds.push(picked);
+          if (val[i].productionId){
+            let picked = new Object();
+            picked.taskId = val[i].taskId;
+            picked.currentNodeId = val[i].currentNodeId;
+            picked.businessId = val[i].businessId;
+            picked.reportNo = val[i].businessSubId;
+            picked.state = "PASS";
+            picked.productionId = val[i].productionId;
+            picked.orderId = val[i].orderId;
+            picked.name = val[i].name;
+            picked.taskCreated = val[i].taskCreated;
+            picked.businessSubId = val[i].businessSubId;
+            picked.businessMinId = val[i].businessMinId;
+            pickeds.push(picked);
+          }
+          if (val[i].productionId1){
+            let picked = new Object();
+            picked.taskId = val[i].taskId;
+            picked.currentNodeId = val[i].currentNodeId;
+            picked.businessId = val[i].businessId;
+            picked.reportNo = val[i].businessMinId;
+            picked.state = "PASS";
+            picked.productionId = val[i].productionId1;
+            picked.orderId = val[i].orderId;
+            picked.name = val[i].name;
+            picked.taskCreated = val[i].taskCreated;
+            picked.businessSubId = val[i].businessSubId;
+            picked.businessMinId = val[i].businessMinId;
+            pickeds.push(picked);
+          }
         }
         this.saveFileProduction = pickeds;