修改了开土制备查看原始记录

pages/soil-sample-manage/sample-preparation/sample-preparation-record/RecordRightList.vue

@@ -55,11 +55,12 @@
     <CollectManage ref="collectModal" @on-result-change="_page"></CollectManage>
     <CollectFileManage ref="collectFileModal" @on-result-change="_page"></CollectFileManage>
     <SelEquip ref="selEquip" @on-result-change="_equipResult"></SelEquip>
+    <CreateReport ref="createModal" @on-result-change="_certificateSelectExcelBack"></CreateReport>
   </div>
 </template>
 <script>
 import Global from '../../../../api/config'
-import { soilTest } from '../../../../api'
+import { soilReport, soilSample, soilTest } from '../../../../api'
 import AssignPerson from '../../../../components/user-info-single/assignPerson'
 import SelectOriTempRecord from '../SelectOriTempRecord'
 import OriginalRecordEdit from '../OriginalRecordEdit'
@@ -68,6 +69,7 @@ import SelEquip from '../../../../components/select-equip/SelEquip'
 import EquipManage from '../EquipManage'
 import CollectManage from '../CollectManage'
 import CollectFileManage from '../CollectFileManage'
+import CreateReport from '../../../soil-test-manage/test-input/item-tabs/CreateReport'
 export default {
   components: {
     AssignPerson,
@@ -77,7 +79,8 @@ export default {
     SelEquip,
     EquipManage,
     CollectManage,
-    CollectFileManage
+    CollectFileManage,
+    CreateReport
   },
   data() {
     return {
@@ -117,6 +120,7 @@ export default {
       ],
       btn: [
         { type: 'success', id: '', name: '填写原始记录' },
+        { type: 'success', id: '', name: '原始记录填写' },
         { type: 'success', id: '', name: '完成提交' },
         { type: 'success', id: '', name: '设备' }
       ],
@@ -182,14 +186,15 @@ export default {
         switch (res) {
           case '查看原始记录':
             console.log(data)
-            if (data.recordId) {
-              this.$refs.editModal._openWithType(
-                data.recordId,
-                'ENVTESTMAKEEDIT'
-              )
-            } else {
-              this.$Message.warning('未填写原始记录')
-            }
+            this._reportView(data)
+            // if (data.recordId) {
+            //   this.$refs.editModal._openWithType(
+            //     data.recordId,
+            //     'ENVTESTMAKEEDIT'
+            //   )
+            // } else {
+            //   this.$Message.warning('未填写原始记录')
+            // }
             break
           case '查看指标':
             this._indexManage(data)
@@ -206,6 +211,17 @@ export default {
         }
       })
     },
+    _reportView(data) {
+      if (data.recorded === '是') {
+        if (data.objectKey) {
+          this._reportMakeLook(data)
+        } else {
+          this.$refs.editModal._openWithType(data.recordId, 'ENVTESTMAKEEDIT')
+        }
+      } else {
+        this.$Message.warning('未填写原始记录')
+      }
+    },
     _collectManage(data) {
       this.$refs.collectModal._open(data)
     },
@@ -401,6 +417,9 @@ export default {
         case '填写原始记录':
           this._addRecord()
           break
+        case '原始记录填写':
+          this._makeCertificateExcelByTemp()
+          break
         case '完成提交':
           this._submitItem(this.selectData)
           break
@@ -432,6 +451,57 @@ export default {
           break
       }
     },
+    _makeCertificateExcelByTemp(data) {
+      // this.$refs.SelectOriTempRecordExcel._open(data.id, data)
+      this.$refs.createModal._open()
+    },
+    _certificateSelectExcelBack(data) {
+      if (data) {
+        this.$refs.pageTable._showLoading()
+        this._makeCodeExcel(data)
+      } else {
+        const ids = this.selectIds
+        if (ids.length === 0) {
+          this.$Message.warning('请至少选择一条数据!')
+        } else {
+          // this._appendOriginalRecord()
+        }
+      }
+    },
+    _makeCodeExcel: async function(data) {
+      console.log(this.selectIds)
+      console.log('----dddd---', data)
+      this.$refs.pageTable._hideLoading()
+      const result = await soilSample.generateExcelReport(data)
+      if (result) {
+        await this._page()
+        if (result === null || result === undefined) {
+          this.$Message.warning('证书编制失败，请联系管理员！')
+          this.$refs.pageTable._hideLoading()
+          return false
+        } else {
+          this.$emit('on-result-change')
+          this._viewReport(result)
+        }
+      }
+    },
+    _reportMakeLook: async function(data) {
+      console.log(data)
+      const result = await soilReport.getExcelOriginalRecord(data.id)
+      if (result) {
+        this._viewReport(result)
+      }
+    },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
     _selectEquipment() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据！')

pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue

@@ -56,17 +56,19 @@
     <IndexManage ref="indexModal" @on-result-change="_page"></IndexManage>
     <EquipManage ref="equipModal" @on-result-change="_page"></EquipManage>
     <OriginalRecordEdit ref="editModal"></OriginalRecordEdit>
+    <CreateReport ref="createModal" @on-result-change="_certificateSelectExcelBack"></CreateReport>
   </div>
 </template>
 <script>
 import Global from '../../../../api/config'
-import { soilTest } from '../../../../api'
+import { soilReport, soilSample, soilTest } from '../../../../api'
 import AssignPerson from '../../../../components/user-info-single/assignPerson'
 import SelectOriTempRecord from '../SelectOriTempRecord'
 import SelEquip from '../../../../components/select-equip/SelEquip'
 import IndexManage from '../IndexManage'
 import EquipManage from '../EquipManage'
 import OriginalRecordEdit from '../OriginalRecordEdit'
+import CreateReport from '../item-tabs/CreateReport'
 export default {
   components: {
     AssignPerson,
@@ -74,7 +76,8 @@ export default {
     SelEquip,
     IndexManage,
     EquipManage,
-    OriginalRecordEdit
+    OriginalRecordEdit,
+    CreateReport
   },
   data() {
     return {
@@ -107,15 +110,9 @@ export default {
       ],
       btn: [
         { type: 'success', id: '', name: '填写原始记录' },
+        { type: 'success', id: '', name: '原始记录填写' },
         { type: 'success', id: '', name: '完成提交' },
-        { type: 'success', id: '', name: '设备' },
-        { type: '', id: 'food-task-assign-adjust-group', name: '调整分组' },
-        {
-          type: '',
-          id: 'food-task-assign-plan-date',
-          name: '设置计划完成时间'
-        },
-        { type: '', id: 'food-task-assign-maintain-info', name: '信息维护' }
+        { type: 'success', id: '', name: '设备' }
       ],
       iconMsg: [
         { type: 'ios-book', id: '', name: '查看原始记录' },
@@ -318,6 +315,9 @@ export default {
         case '填写原始记录':
           this._addRecord()
           break
+        case '原始记录填写':
+          this._makeCertificateExcelByTemp()
+          break
         case '完成提交':
           this._submitItem(this.selectData)
           break
@@ -349,6 +349,40 @@ export default {
           break
       }
     },
+    _makeCertificateExcelByTemp(data) {
+      // this.$refs.SelectOriTempRecordExcel._open(data.id, data)
+      this.$refs.createModal._open()
+    },
+    _certificateSelectExcelBack(data) {
+      if (data) {
+        this.$refs.pageTable._showLoading()
+        this._makeCodeExcel(data)
+      } else {
+        const ids = this.selectIds
+        if (ids.length === 0) {
+          this.$Message.warning('请至少选择一条数据!')
+        } else {
+          // this._appendOriginalRecord()
+        }
+      }
+    },
+    _makeCodeExcel: async function(data) {
+      console.log(this.selectIds)
+      console.log('----dddd---', data)
+      this.$refs.pageTable._hideLoading()
+      const result = await soilSample.generateExcelReport(data)
+      if (result) {
+        await this._page()
+        if (result === null || result === undefined) {
+          this.$Message.warning('证书编制失败，请联系管理员！')
+          this.$refs.pageTable._hideLoading()
+          return false
+        } else {
+          this.$emit('on-result-change')
+          this._viewReport(result)
+        }
+      }
+    },
     _selectEquipment() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据！')
@@ -488,14 +522,15 @@ export default {
         switch (res) {
           case '查看原始记录':
             console.log(data)
-            if (data.recordId) {
-              this.$refs.editModal._openWithType(
-                data.recordId,
-                'ENVTESTMAKEEDIT'
-              )
-            } else {
-              this.$Message.warning('未填写原始记录')
-            }
+            this._reportView(data)
+            // if (data.recordId) {
+            //   this.$refs.editModal._openWithType(
+            //     data.recordId,
+            //     'ENVTESTMAKEEDIT'
+            //   )
+            // } else {
+            //   this.$Message.warning('未填写原始记录')
+            // }
             break
           case '查看指标':
             this._indexManage(data)
@@ -506,6 +541,34 @@ export default {
         }
       })
     },
+    _reportView(data) {
+      if (data.recorded === '是') {
+        if (data.objectKey) {
+          this._reportMakeLook(data)
+        } else {
+          this.$refs.editModal._openWithType(data.recordId, 'ENVTESTMAKEEDIT')
+        }
+      } else {
+        this.$Message.warning('未填写原始记录')
+      }
+    },
+    _reportMakeLook: async function(data) {
+      console.log(data)
+      const result = await soilReport.getExcelOriginalRecord(data.id)
+      if (result) {
+        this._viewReport(result)
+      }
+    },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
     _indexManage(data) {
       this.$refs.indexModal._open(data)
     },