土工试验Lims

api/soil/soil-sample.js

@@ -226,6 +226,10 @@ export default {
     http
       .post('soil/v1/experiment/save_excel_original_record', data)
       .then(res => res),
+  saveSeniorExcelOriginalRecord: data =>
+    http
+      .post('soil/v1/experiment/save_senior_excel_original_record', data)
+      .then(res => res),
   saveExcelOpenSoilRecord: data =>
     http
       .post('soil/v1/experiment/save_excel_open_soil_record', data)

pages/soil-alone-sample/SampleItemEdit.vue

@@ -147,7 +147,6 @@ export default {
       }
     },
     _page: async function() {
-      // this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       const result = await soilEntrust.pageItem(
         this.$serializeForm(this.formObj)

pages/soil-alone-sample/SampleItemRemove.vue

@@ -150,7 +150,6 @@ export default {
       }
     },
     _page: async function() {
-      // this.$refs.pageTable._page('search-form-package', 'FoodJudgeBasis/page')
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       const result = await soilAptitude.page(this.$serializeForm(this.formObj))
       if (result) {

pages/soil-alone-sample/in-out-template-manage/ConfigTemplateEdit.vue

@@ -153,15 +153,7 @@ export default {
       formId: ''
     }
   },
-  mounted() {
-    // 检测科室
-    // this._getUserGroup()
-    // 检测依据
-    // this._getTestBasisList()
-    // 资质
-    // this._getAptitudeList()
-    // this._getType()
-  },
+  mounted() {},
   methods: {
     channelInputLimit(e) {
       const key = e.key

pages/soil-test-manage/test-data-audit/ItemReportView.vue

@@ -182,7 +182,7 @@ export default {
             if (data.appendixKey) {
               this._viewAppendix(data)
             } else {
-              this.$Message.warning('未生成附录')
+              this._generateAppendix(data.id)
             }
             break
           case '删除':
@@ -191,6 +191,20 @@ export default {
         }
       })
     },
+    _generateAppendix: async function(id) {
+      this.$Message.warning('正在生成，请稍后')
+      this.$refs.pageTable._showLoading()
+      const result = await soilReport.generateAppendix({ id: id })
+      if (result) {
+        this.$Message.success('生成成功')
+        this.$refs.pageTable._hideLoading()
+        await this._page()
+        this._viewAppendix(result)
+      } else {
+        this.$Message.warning('生成失败，请重试')
+        this.$refs.pageTable._hideLoading()
+      }
+    },
     // 查看试验项目
     _itemView(id) {
       this.$refs.itemViewModal._open(id)

pages/soil-test-manage/test-data-check/ItemReportView.vue

@@ -175,7 +175,7 @@ export default {
             if (data.appendixKey) {
               this._viewAppendix(data)
             } else {
-              this.$Message.warning('未生成附录')
+              this._generateAppendix(data.id)
             }
             break
           case '查看项目报告':
@@ -191,6 +191,20 @@ export default {
         }
       })
     },
+    _generateAppendix: async function(id) {
+      this.$Message.warning('正在生成，请稍后')
+      this.$refs.pageTable._showLoading()
+      const result = await soilReport.generateAppendix({ id: id })
+      if (result) {
+        this.$Message.success('生成成功')
+        this.$refs.pageTable._hideLoading()
+        await this._page()
+        this._viewAppendix(result)
+      } else {
+        this.$Message.warning('生成失败，请重试')
+        this.$refs.pageTable._hideLoading()
+      }
+    },
     _viewAppendix(data) {
       if (data) {
         this.$openWindowModeless({

pages/soil-test-manage/test-input/TestInputIndex.vue

@@ -7,7 +7,6 @@
           <el-tab-pane label="录入历史" name="queryTabs"></el-tab-pane>
         </el-tabs>
         <keep-alive>
-          <!-- eslint-disable-next-line vue/require-component-is -->
           <component ref="refModal" :is="currentComponent"></component>
         </keep-alive>
       </div>

pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue

@@ -6,21 +6,21 @@
         <Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="试样编号:">
-            <Input v-model="formObj.sampleCode" @on-enter="_formSearch" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
+            <Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable @on-enter="_formSearch"></Input>
           </Form-item>
           <Form-item class="search-btn">
-            <Button @click="_formSearch" type="primary">搜索</Button>
+            <Button type="primary" @click="_formSearch">搜索</Button>
           </Form-item>
         </Form>
       </Col>
       <!--操作-->
       <Col span="24">
-        <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide"></btn-list>
+        <btn-list :msg="btn" class="contHide" @on-result-change="_btnClick"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
         <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-height="tableHeight"
-                    :get-page="getPage" :icon-msg="iconMsg" :table-name="tableName" @on-result-change="_tableResultChange"  is-task select-data>
+                    :get-page="getPage" :icon-msg="iconMsg" :table-name="tableName" is-task  select-data @on-result-change="_tableResultChange">
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
             :key="item.key"
@@ -56,6 +56,7 @@
     <CollectFileManage ref="collectFileModal" @on-result-change="_page"></CollectFileManage>
     <SelEquip ref="selEquip" @on-result-change="_equipResult"></SelEquip>
     <CreateReport ref="createModal" @on-result-change="_certificateSelectExcelBack"></CreateReport>
+    <CreateReport ref="createSeniorModal" @on-result-change="_certificateSelectExcelBackSenior"></CreateReport>
     <Reason ref="reasonModal" @on-result-change="_reasonResult" />
     <Operation ref="Operation"></Operation>
     <importModal ref="importModal"></importModal>
@@ -153,6 +154,11 @@ export default {
         },
         {
           type: 'success',
+          id: '',
+          name: '高级试验原始记录填写'
+        },
+        {
+          type: 'success',
           id: 'do-test-sample-item-right-file',
           name: '力学文件上传采集'
         },
@@ -363,10 +369,50 @@ export default {
         }
       }
     },
+    _certificateSelectExcelBackSenior(data) {
+      if (data) {
+        this.$refs.pageTable._showLoading()
+        this._makeSeniorCodeExcel(data)
+      } else {
+        const ids = this.selectIds
+        if (ids.length === 0) {
+          this.$Message.warning('请至少选择一条数据!')
+        } else {
+          // this._appendOriginalRecord()
+        }
+      }
+    },
+
     _makeCertificateExcelByTemp(data) {
-      // this.$refs.SelectOriTempRecordExcel._open(data.id, data)
       this.$refs.createModal._open()
     },
+
+    _makeCertificateExcelSenior(data) {
+      if (this.selectIds.length !== 1) {
+        this.$Message.warning('高级试验原始记录请选择单条填写！')
+        return false
+      }
+      this.$refs.createSeniorModal._open()
+    },
+    _makeSeniorCodeExcel: async function(data) {
+      this.$refs.pageTable._showLoading()
+      const result = await soilSample.saveSeniorExcelOriginalRecord({
+        ids: this.selectIds.join(','),
+        templateId: data.id
+      })
+      this.$refs.pageTable._hideLoading()
+      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)
+        }
+      }
+    },
     _makeCodeExcel: async function(data) {
       this.$refs.pageTable._showLoading()
       const result = await soilSample.saveExcelOriginalRecord({
@@ -508,6 +554,9 @@ export default {
         case '原始记录填写':
           this._makeCertificateExcelByTemp()
           break
+        case '高级试验原始记录填写':
+          this._makeCertificateExcelSenior()
+          break
         case '完成提交':
           this._submitItem(this.selectData)
           break