土工试验Lims

api/soil/soil-statistics.js

@@ -9,6 +9,12 @@ export default {
   // 检测依据管理
   pageReportMake: data =>
     http.post('soil/v1/entrust/page_report_make', data).then(res => res),
+
+  pageReportMakeByExpReport: data =>
+    http
+      .post('soil/v1/entrust/page_report_make_by_exp_report', data)
+      .then(res => res),
+
   pageReportCheck: data =>
     http.post('soil/v1/entrust/page_report_check', data).then(res => res),
   pageReportIssue: data =>
@@ -54,7 +60,6 @@ export default {
       .then(res => res),
   listSampleProgress: data =>
     http.post('soil/v1/sample/list_sample_progress', data).then(res => res),
-
   pageExpReportMake: data =>
     http.post('soil/v1/entrust/page_exp_report_make', data).then(res => res),
   pageExpReportCheck: data =>

pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue

@@ -22,16 +22,6 @@
           <Col span="24">
             <btn-list :open="searchOpen" @on-result-change="_btnClick" :showSearchBtn="true"
                      :msg="btn" class="contHide">
-<!--              <template slot="processTask">-->
-<!--                <div class="fr process-task">-->
-<!--                  <el-checkbox v-model="personal" @change="_page" :true-label="1" :false-label="0" size="medium">-->
-<!--                    个人任务-->
-<!--                  </el-checkbox>-->
-<!--                  <el-checkbox v-model="onlyReportMake" @change="_page" :true-label="1"-->
-<!--                               :false-label="0" size="medium">只显示待编报告-->
-<!--                  </el-checkbox>-->
-<!--                </div>-->
-<!--              </template>-->
             </btn-list>
           </Col>
           <!-- 表格 -->
@@ -206,22 +196,6 @@ export default {
       $('input[name="reportDueDateBegin"]').val(data[0])
       $('input[name="reportDueDateEnd"]').val(data[1])
     },
-    // 从字典查预警期
-    _dicSearch() {
-      // 食品报告编制个人任务是否勾选
-      const data = ['食品报告编制个人任务是否勾选']
-      this.$store.dispatch('LmsBaseDict/listDict', data).then(() => {
-        const result = this.$store.state.LmsBaseDict.list
-        const personalList = result[0]
-        // 食品报告编制个人任务是否勾选
-        if (personalList.length && personalList[0].name === '是') {
-          this.personal = 1
-        } else {
-          this.personal = 0
-        }
-        this._page()
-      })
-    },
     _btnClick(msg) {
       switch (msg) {
         case '信息维护':
@@ -386,7 +360,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await soilStatistics.pageReportMake(
+      const result = await soilStatistics.pageReportMakeByExpReport(
         this.$serializeForm(this.formObj)
       )
       if (result) {