1.意见书出入库

2.优化产品列表展示
3.修复资产详情流程图有时不能正常渲染的问题

src/api/modules/assets.js

@@ -110,5 +110,8 @@ export default {
     // 资产产品更新
     productionUpdate(params){
         return request.put(`assetsProduction/update`,params);
+    },
+    assetsProRepertory(params){
+        return request.put(`assetsProduction/assetsProRepertory`,params);
     }
 }

src/views/assets/orderDetail.vue

@@ -501,8 +501,9 @@
               </el-table-column>
               <el-table-column prop="repertoryState" label="库存状态" align="center" show-overflow-tooltip>
                 <template slot-scope="{row}">
-                  <span v-if="row.productionType === 0">已入库</span>
-                  <span v-if="row.productionType === 1">已出库</span>
+                  <span v-if="row.repertoryState === null">未入库</span>
+                  <span v-if="row.repertoryState === true">已出库</span>
+                  <span v-if="row.repertoryState === false">已入库</span>
                 </template>
               </el-table-column>
               <el-table-column prop="repertoryInTime" label="入库时间" align="center" show-overflow-tooltip>
@@ -512,6 +513,10 @@
               <el-table-column prop="saveFileDate" label="归档日期" align="center" show-overflow-tooltip>
               </el-table-column>
               <el-table-column prop="delivery" label="送达状态" align="center" show-overflow-tooltip>
+                <template slot-scope="{row}">
+                  <span v-if="!row.delivery">未送达</span>
+                  <span v-if="row.delivery">已送达</span>
+                </template>
               </el-table-column>
               <el-table-column label="操作" align="center" width="180" fixed="right">
                 <template slot-scope="scope">
@@ -1528,7 +1533,10 @@ export default {
         checkId: null
       },
       // 产品入库弹窗
-      warehouseDialog: false
+      warehouseDialog: false,
+      scanEntryData: null,
+      wareHouseProductionType: null,
+      wareHouseproductionId: null
     }
   },
   watch: {
@@ -1541,6 +1549,7 @@ 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.getCurrentNodeInfo();
@@ -1550,6 +1559,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);
   },
 
   methods: {
@@ -2592,7 +2602,7 @@ export default {
     // 打开产品出入库弹窗
     openWareHouseDialog(row) {
       this.warehouseDialog = true;
-      this.wareHouseProductionType = row.production;
+      this.wareHouseProductionType = row.productionType;
       this.wareHouseproductionId = row.id
     },
     handleScanEntry(scanData) {
@@ -2601,6 +2611,42 @@ export default {
     cleanWareHouseProductionType() {
       this.wareHouseProductionType = null;
       this.wareHouseproductionId = null;
+    },
+    doWareHouse() {
+      let productionNo = this.scanEntryData
+      let wareHoaseDto = new Object();
+      if (productionNo) {
+        wareHoaseDto.productionNo = reportNo;
+      } else {
+        wareHoaseDto.productionNo = this.$refs.scanEntry.scanEntryData;
+      }
+      if (this.currentNode.nodeName.includes("入库")) {
+        wareHoaseDto.repertoryState = 0;
+      } else {
+        wareHoaseDto.repertoryState = 1;
+      }
+      wareHoaseDto.productionType = this.wareHouseProductionType;
+      wareHoaseDto.productionId = this.wareHouseproductionId;
+      this.taskRecordDTO.recordId = this.currentNode.tasks[0].recordId;
+      this.taskRecordDTO.taskData = wareHoaseDto;
+      this.$api.assets.assetsProRepertory(this.taskRecordDTO).then(res => {
+        if (res.code === 200 && res.data) {
+          this.$notify({
+            title: '成功',
+            message: '库存操作成功',
+            type: 'success',
+            duration: 2000
+          });
+          this.warehouseDialog = false;
+          this.getProductionList();
+        }
+        else {
+          this.$message({
+            type: 'info',
+            message: '取消操作'
+          });
+        }
+      })
     }
   }