Merge branch 'dev'

api/soil/soil-test.js

@@ -217,7 +217,8 @@ export default {
     http
       .post('soil/v1/experiment/senior_test_report?id=' + data)
       .then(res => res),
-
+  orderExpReport: data =>
+    http.put('soil/v1/exp_report/' + data.id, data).then(res => res),
   pageExperimentReport: data =>
     http.post('soil/v1/exp_report/page', data).then(res => res),
   deleteReport: data =>

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManage.vue

@@ -13,7 +13,6 @@
               </Form-item>
               <Form-item class="search-item" label="库房号:">
                 <Input @on-enter="_formSearch" v-model="formObj.warehouse" name="warehouse" placeholder="请输入库房号" clearable/>
-                {{currentTime}}
               </Form-item>
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>

pages/soil-alone-sample-manage/storehouse-sample-manage/AddressManageHis.vue

@@ -38,8 +38,8 @@
           </Col>
           <!--表格 -->
           <Col span="24">
-            <PTVXETable ref="pageTable" :tableHeight="tableHeight"
-                        @on-result-change="_tableResultChange" :getPage="getPage">
+            <PTVXETable id="sampleTable" ref="pageTable"
+                        :tableHeight="tableHeight" @on-result-change="_tableResultChange" :getPage="getPage" select-data>
               <vxe-table-column
                 :field="item.key"
                 :title="item.title"
@@ -107,7 +107,13 @@ export default {
         entrustCode: undefined,
         sampleCode: undefined
       },
-      btn: [],
+      btn: [
+        {
+          type: 'success',
+          id: '',
+          name: '导出'
+        }
+      ],
       // 表格
       pageColumns: [
         { title: '委托商', key: 'client', width: 170 },
@@ -119,7 +125,7 @@ export default {
         { title: '项目名称', key: 'projectName' },
         { title: '库房号', key: 'warehouse' },
         { title: '架位号', key: 'receiveLocation' },
-        { title: '进度', key: 'progress' }
+        { title: '进度', key: 'progress', status: true }
       ],
       // 操作
       iconMsg: [
@@ -144,7 +150,8 @@ export default {
       searchOpen: false,
       getPage: {},
       // 选中的内容
-      selectIds: []
+      selectIds: [],
+      selectData: []
     }
   },
   computed: {
@@ -182,7 +189,7 @@ export default {
           })
           break
         case '导出':
-          // this._export()
+          this._export()
           break
         //  收起搜索
         case 'search':
@@ -190,6 +197,27 @@ export default {
           break
       }
     },
+    _export() {
+      let result = []
+      if (this.selectData.length === 0) {
+        this.$Message.warning('至少选择一条数据')
+      } else {
+        // 只导出选中的数据
+        result = this.selectData
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定导出这' + result.length + ' 条数据？',
+          onOk: () => {
+            this.$exportExcelNew(
+              'sampleTable',
+              '样品信息',
+              this.pageColumns,
+              result
+            )
+          }
+        })
+      }
+    },
     _outstock() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据')
@@ -353,6 +381,13 @@ export default {
         case 'selectIds':
           this.selectIds = data
           break
+        case 'selectData':
+          this.selectData = data
+          this.selectIds = []
+          for (let i = 0; i < this.selectData.length; i++) {
+            this.selectIds.push(this.selectData[i].id)
+          }
+          break
         case 'iconClick':
           this._iconClick(data.name, data.rowData, data.componentName)
           break

pages/soil-report-manage/report-make/ItemReportView.vue

@@ -7,36 +7,44 @@
     <Row>
       <!--查询-->
       <Col span="24">
-        <Form :label-width="80" v-show="searchOpen" inline onsubmit="return false">
+        <Form v-show="searchOpen" :label-width="80" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="项目名称:">
-            <Input v-model="formObj.expName" @on-enter="_formSearch" placeholder="请输入项目名称" clearable></Input>
+            <Input v-model="formObj.expName" 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  :open="searchOpen" :msg="btn" :showSearchBtn="true" @on-result-change="_btnClick"
-                 class="contHide"></btn-list>
+        <btn-list  :open="searchOpen" :msg="btn" :show-search-btn="true" class="contHide"
+                 @on-result-change="_btnClick"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
-        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage">
+        <PTVXETable ref="pageTable" :table-height="tableHeight"
+                    :icon-msg="iconMsg" :get-page="getPage" @on-result-change="_tableResultChange">
           <vxe-table-column
+            v-for="item in pageColumns"
+            :key="item.key"
             :field="item.key"
             :title="item.title"
             :min-width="item.width?item.width:200"
-            :fixed="item.fixed?item.fixed:undefined"
-            v-for="item in pageColumns"
-            :key="item.key" sortable>
+            :fixed="item.fixed?item.fixed:undefined" sortable>
             <template slot-scope="scope">
               <div v-if="item.dateTime">
                 {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM'):''}}
               </div>
+              <div v-else-if="item.version">
+                <el-input
+                  v-model="scope.row.version"
+                  placeholder="请输入检测结果"
+                  size="medium"
+                  @blur="_handleVersionEdit(scope.row.id,scope.row.version)"
+                />
+              </div>
               <div v-else>{{scope.row[item.key]}}</div>
             </template>
           </vxe-table-column>
@@ -99,11 +107,12 @@ export default {
         { type: 'md-trash', id: '', name: '删除' }
       ],
       pageColumns: [
-        { title: '项目名称', key: 'expName' },
-        { title: '试验科室', key: 'groupName' },
-        { title: '备注', key: 'remark' },
-        { title: '创建人', key: 'uname' },
-        { title: '创建时间', key: 'ctime', dateTime: true }
+        { title: '项目名称', key: 'expName', width: 100 },
+        { title: '试验科室', key: 'groupName', width: 100 },
+        { title: '报告顺序', key: 'version', width: 100, version: true },
+        { title: '备注', key: 'remark', width: 100 },
+        { title: '创建人', key: 'uname', width: 100 },
+        { title: '创建时间', key: 'ctime', dateTime: true, width: 100 }
       ],
       formObj: {
         entrustId: '',
@@ -144,6 +153,23 @@ export default {
         }
       })
     },
+
+    // 单个填写检测值
+    _handleVersionEdit: async function(id, version) {
+      if (version !== '' && undefined !== version) {
+        const data = {}
+        data.id = id
+        data.version = version
+        const result = await soilTest.orderExpReport(data)
+        if (result) {
+          this.$Message.success('保存成功')
+          await this._page()
+        } else {
+          this.$Message.error('保存失败')
+        }
+      }
+    },
+
     _reportMake(data) {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据')

pages/soil-report-manage/report-make/ReportMakeIndex.vue

@@ -2,20 +2,11 @@
   <div>
     <div class="layout-content-padding">
       <div class="layout-content-main">
-<!--        <el-tabs v-model="activeName" @tab-click="_changeTabs">-->
-<!--          <el-tab-pane label="按委托编制" name="check">-->
-<!--            <ReportMakeByEntrust ref="checkTabs"></ReportMakeByEntrust>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="历史报告" name="checkHis">-->
-<!--            <ReportMakeHis ref="checkHisTabs"></ReportMakeHis>-->
-<!--          </el-tab-pane>-->
-<!--        </el-tabs>-->
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
           <el-tab-pane label="报告编制" name="check"></el-tab-pane>
           <el-tab-pane label="历史任务" name="checkHis"></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-report-manage/report-manage/sample-report-manage/ReportMakeByEntrust.vue

@@ -104,7 +104,6 @@ export default {
   },
   data() {
     return {
-      typeList: [{ name: '企业', value: 0 }, { name: '政府', value: 1 }],
       currentComponent: '',
       getPage: {},
       formObj: {},