修改了导出制备记录

pages/soil-sample-manage/SoilSampleManage.vue

@@ -28,14 +28,20 @@
           <!-- 表格 -->
           <Col span="24">
             <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange"  select-data>
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" is-edit select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
                 :field="item.key"
                 :title="item.title"
                 :width="item.width?item.width:200"
-                :fixed="item.fixed?item.fixed:undefined" sortable>
+                :fixed="item.fixed?item.fixed:undefined"
+                :edit-render="item.editCell?{autofocus: 'input'}:null" sortable>
+                <template v-slot:edit="scope">
+                  <div v-if="item.key==='describeDetail'" @click.stop="_handleRow(scope)">
+                    <el-input v-model="scope.row.describeDetail" @change="_inputChange(scope.row)"></el-input>
+                  </div>
+                </template>
               <template slot-scope="scope">
                 <div v-if="item.detail">
                   <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
@@ -46,9 +52,6 @@
                 <div v-else-if="item.date">
                   {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
                 </div>
-                <div v-else-if="item.key==='describeDetail'" @click.stop="_handleRow(scope)">
-                  <el-input v-model="scope.row.describeDetail" @change="_inputChange(scope.row)"></el-input>
-                </div>
                 <div v-else>
                   {{ scope.row[item.key] }}
                 </div>
@@ -125,7 +128,12 @@ export default {
         { title: '现场编号', key: 'siteNo', width: 100 },
         { title: '试验项目', key: 'experimentNames', width: 100 },
         { title: '土质描述', key: 'sampleDescribe', width: 160 },
-        { title: '土质描述详情', key: 'describeDetail', width: 160 },
+        {
+          title: '土质描述详情',
+          key: 'describeDetail',
+          width: 200,
+          editCell: true
+        },
         { title: '样品包装类型', key: 'samplePack', width: 120 }
       ],
       sampleId: '',

pages/soil-sample-manage/sample-preparation/SamplePreparation.vue

@@ -58,6 +58,7 @@ import { soilEntrust } from '../../../api'
 import http from '../../../api/http'
 import Operation from '../../../components/operation/Operation'
 import SoilSampleManage from '../SoilSampleManage'
+import global from '../../../api/config'
 import SamplePreparationEdit from './SamplePreparationEdit'
 import SoilSampleItemManageEdit from './SoilSampleItemManageEdit'
 export default {
@@ -109,6 +110,11 @@ export default {
           id: '',
           name: '试验项目列表'
         },
+        {
+          type: 'ios-download',
+          id: '',
+          name: '导出开土制备记录'
+        },
         // {
         //   type: 'ios-beaker',
         //   id: '',
@@ -197,6 +203,9 @@ export default {
           case '试验项目列表':
             this._itemManage(data.id)
             break
+          case '导出开土制备记录':
+            this._exportPrepare(data.id)
+            break
           case '试样列表':
             this._sampleManage(data.id)
             break
@@ -224,6 +233,20 @@ export default {
           this._page()
       }
     },
+    _exportPrepare(id) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: '确定导出这条记录',
+        onOk: () => {
+          window.open(
+            global.baseURL +
+              '/soil/v1/entrust/export_soil_prepare_record?ids=' +
+              id,
+            '_blank'
+          )
+        }
+      })
+    },
     _sampleManage(data) {
       // 管理样品
       this.currentComponent = 'SoilSampleManage'