Merge remote-tracking branch 'origin/dev' into dev

pages/meter-entrust/SoilSampleManage.vue

 <template>
   <div>
-    <Modal v-model="showModal" v-drag width="1030">
+    <Modal v-model="showModal" v-drag width="1130">
       <p slot="header">
         {{ modalTitle }}
       </p>
@@ -9,7 +9,7 @@
         <Row>
           <!--查询-->
           <Col span="24">
-          <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
+          <Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="试样编号:" class="search-item">
               <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入试样编号" clearable />
@@ -17,7 +17,10 @@
             <Form-item label="现场编号:" class="search-item">
               <Input v-model="formObj.siteNo" @on-enter="_formSearch" placeholder="请输入现场编号" clearable />
             </Form-item>
-            <Form-item class="search-btn">
+            <Form-item :label-width="150" label="试验项目/试验项目简写:" class="search-item">
+              <Input v-model="formObj.experimentNames" @on-enter="_formSearch" style="width: 150px;" placeholder="请输入试验项目或试验项目简写" clearable />
+            </Form-item>
+            <Form-item class="search-btn" style="margin-left: 50px;">
               <Button @click="_page" type="primary">
                 搜索
               </Button>
@@ -99,6 +102,7 @@ export default {
         { title: '试样深度', key: 'sampleDepth', width: 100 },
         { title: '现场编号', key: 'siteNo', width: 100 },
         { title: '试验项目', key: 'experimentNames' },
+        { title: '试验项目简写', key: 'experimentShortNames' },
         { title: '土质描述', key: 'sampleDescribe', width: 150 },
         { title: '样品包装类型', key: 'samplePack', width: 120 }
       ],
@@ -106,7 +110,8 @@ export default {
       dateList: [],
       formObj: {
         siteNo: undefined,
-        sampleCode: undefined
+        sampleCode: undefined,
+        experimentNames: undefined
       }
     }
   },

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -90,12 +90,12 @@ export default {
         {
           type: 'success',
           id: '',
-          name: '添加'
+          name: '手动添加'
         },
         {
           type: 'success',
           id: '',
-          name: '试验委托单导入'
+          name: '自动导入'
         },
         {
           type: 'success',
@@ -188,10 +188,10 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (msg) {
-          case '试验委托单导入':
+          case '自动导入':
             this._import()
             break
-          case '添加':
+          case '手动添加':
             this._editModal(false)
             break
           case '提交至评审':

pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue

@@ -6,21 +6,21 @@
         <Form id="MeterSendTestEdit" ref="formObj" :model="formObj" :label-width="90" inline>
           <Form-item  label="委托商" prop="client" class="width-48">
             <AutoComplete ref="autoInput" v-model="formObj.client" :down-data="customerData"
-                          name="client" placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
+                          @on-result-change="_cusNameChange" name="client" placeholder="请输入或选择委托单位"
             ></AutoComplete>
           </Form-item>
           <Form-item label="委托日期：" prop="entrustDate" class="width-48">
-            <Date-picker v-model="formObj.entrustDate" type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
-                         name="entrustDate" @on-change="_ctimeChange"></Date-picker>
+            <Date-picker v-model="formObj.entrustDate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择委托日期" name="entrustDate"></Date-picker>
           </Form-item>
           <Form-item label="项目名称" prop="projectName" class="width-48">
             <AutoComplete ref="autoInput" v-model="formObj.projectName" :down-data="projectData"
-                          name="projectName" placeholder="请输入或选择项目名称" @on-result-change="_projectChange"
+                          @on-result-change="_projectChange" name="projectName" placeholder="请输入或选择项目名称"
             ></AutoComplete>
           </Form-item>
           <Form-item label="项目负责人" prop="projectLeader" class="width-48">
             <AutoComplete ref="autoInput" v-model="formObj.projectLeader" :down-data="projectLeaderData"
-                          show-key="realname" name="projectLeader" placeholder="请输入或选择项目负责人" @on-result-change="_projectLeaderChange"
+                          @on-result-change="_projectLeaderChange" show-key="realname" name="projectLeader" placeholder="请输入或选择项目负责人"
             ></AutoComplete>
           </Form-item>
           <Form-item label="钻孔位置" prop="boreholeLocation" class="width-48">
@@ -36,23 +36,23 @@
             <Input v-model="formObj.latitude" name="latitude" placeholder="请输入纬度"/>
           </Form-item>
           <Form-item label="水深（米）" prop="waterDepth" class="width-48">
-            <Input v-model="formObj.waterDepth" type="number"  name="waterDepth" placeholder="请输入深度" @keydown.native="channelInputLimit"/>
+            <Input v-model="formObj.waterDepth" @keydown.native="channelInputLimit"  type="number" name="waterDepth" placeholder="请输入深度"/>
           </Form-item>
           <Form-item label="平均容重" prop="projectNo" class="width-48">
             <Input v-model="formObj.projectNo" name="projectNo" placeholder="请输入平均容重"/>
           </Form-item>
-          <Form-item label="制表人" prop="tabulater" class="width-48" @click.native="_selectPerson">
+          <Form-item @click.native="_selectPerson" label="制表人" prop="tabulater" class="width-48">
             <Input v-model="formObj.tabulater" name="tabulater" placeholder="请输入名称"/>
           </Form-item>
           <Form-item label="制单日期：" prop="tabulateDate" class="width-48">
-            <Date-picker v-model="formObj.tabulateDate" name="tabulateDate" type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
-                         @on-change="_tabulateChange"></Date-picker>
+            <Date-picker v-model="formObj.tabulateDate" @on-change="_tabulateChange" name="tabulateDate" type="date" split-panels style="width:100%;"
+                         placeholder="请选择委托日期"></Date-picker>
           </Form-item>
           <Form-item label="检验类别：" prop="testType" class="width-48">
-            <el-select v-model="formObj.testType" name="testType" placeholder="请选择" size="small"
+            <el-select v-model="formObj.testType" @change="typeChange" name="testType" placeholder="请选择"
+                       size="small"
                        style="width:100%"
-                       clearable
-                       @change="typeChange">
+                       clearable>
               <el-option
                 v-for="item in typeoptions"
                 :key="item.name"
@@ -64,8 +64,8 @@
         </Form>
       </div>
       <div style="margin-bottom: 10px;">
-        <btn-list :msg="edit?btnEdit:btn" :open="searchOpen" class="contHide"
-                  @on-result-change="_btnClick"></btn-list>
+        <btn-list :msg="edit?btnEdit:btn" :open="searchOpen" @on-result-change="_btnClick"
+                  class="contHide"></btn-list>
       </div>
       <div>
         <PTVXETable
@@ -97,12 +97,12 @@
               </div>
               <div v-if="item.key==='samplePack'"  @click.stop="_handleRow(scope)">
                 <AutoComplete v-model="scope.row.samplePack" :down-data="packList"
-                              name="samplePack" placeholder="请输入或选择包装类型"  @on-result-change="_packChange"
+                              @on-result-change="_packChange" name="samplePack"  placeholder="请输入或选择包装类型"
                 ></AutoComplete>
               </div>
               <div v-if="item.key==='sampleDescribe'" @click.stop="_handleRow(scope)">
                 <AutoComplete v-model="scope.row.sampleDescribe" :down-data="soilList"
-                              name="sampleDescribe" placeholder="请输入或选择土质描述" @on-result-change="_soilChange"
+                              @on-result-change="_soilChange" name="sampleDescribe" placeholder="请输入或选择土质描述"
                 ></AutoComplete>
               </div>
               <div v-else-if="item.key==='experiments'" @click.stop="_handleRow(scope)">
@@ -117,8 +117,8 @@
         <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
       </div>
     </Modal>
-    <importModal ref="importModal" aptitude-item   @on-result-change="_inputBack"></importModal>
-    <SampleItemSelect ref="sampleItemSelectModal" is-change @on-result-change="_itemImportBack" />
+    <importModal ref="importModal" @on-result-change="_inputBack"   aptitude-item></importModal>
+    <SampleItemSelect ref="sampleItemSelectModal" @on-result-change="_itemImportBack" is-change />
     <assignPerson ref="userModal" @on-result-change="_userResult"></assignPerson>
     <SampleItemRemove ref="sampleItemRemove" @on-result-change = '_removeItemBack'></SampleItemRemove>
     <SampleItemEdit ref="sampleItemEdit" @on-result-change = '_removeItemBack'></SampleItemEdit>

pages/soil-alone-sample-instock/EntrustRegister.vue

@@ -125,6 +125,7 @@ export default {
       pageColumns: [
         { title: '项目名称', key: 'projectName', width: 120 },
         { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
+        { title: '入库单号', key: 'instockCode', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '箱数', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }

pages/soil-alone-sample-instock/EntrustRegisterEdit.vue

@@ -38,6 +38,9 @@
             <Date-picker v-model="formObj.registTime" @on-change="_tabulateChange" name="registTime" type="date" split-panels style="width:100%;"
                          placeholder="请选择登记日期"></Date-picker>
           </Form-item>
+          <Form-item label="入库单号：" prop="instockCode" class="width-48">
+            <Input v-model="formObj.instockCode" name="instockCode" placeholder="请输入入库单号"/>
+          </Form-item>
 <!--          <Form-item label="检验类别" prop="testType" class="width-48">-->
 <!--            <Input v-model="formObj.testType" name="testType" placeholder="请输入名称"/>-->
 <!--          </Form-item>-->

pages/soil-alone-sample-instock/EntrustRegisterHis.vue

@@ -6,21 +6,21 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="项目名称:">
-                <Input v-model="formObj.projectName" name="projectName" placeholder="请输入项目名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.projectName" @on-enter="_formSearch" name="projectName" placeholder="请输入项目名称" clearable/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_formSearch">搜索</Button>
+                <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                     @on-result-change="_btnClick"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -45,7 +45,8 @@
       </div>
     </div>
     <keep-alive>
-      <component :is="currentComponent" ref="refModal" @on-result-change="_componentResult"></component>
+      <!-- eslint-disable-next-line vue/require-component-is -->
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
     </keep-alive>
   </div>
 </template>
@@ -55,6 +56,7 @@ import MeterEntrustRecord from '../../components/operation/Operation'
 import ViewDetail from './ViewDetail'
 import CreateReport from './CreateReport'
 export default {
+  // eslint-disable-next-line vue/no-unused-components
   components: { MeterEntrustRecord, ViewDetail, CreateReport },
   data() {
     return {

pages/soil-alone-sample-instock/Instock.vue

@@ -21,8 +21,12 @@
                          placeholder="请选择入库时间" name="instockTime"></Date-picker>
           </Form-item>
           <Form-item label="留存有效期：" prop="keepLimitTime" style="width: 100%;">
-            <Date-picker v-model="formObj.keepLimitTime" @on-change="_keepLimitTimeChange" type="date" split-panels style="width:100%;"
-                         placeholder="请选择入库时间" name="keepLimitTime"></Date-picker>
+
+<!--            <Date-picker v-model="formObj.keepLimitTime" @on-change="_keepLimitTimeChange" type="date" split-panels style="width:100%;"-->
+<!--                         placeholder="请选择入库时间" name="keepLimitTime"></Date-picker>-->
+            <Select v-model="formObj.keepLimit" clearable name="keepLimit" style="width:150px" placeholder="请选择期限">
+              <Option v-for="(item,index) in itemData" :value="item.value" :key="index">{{item.name}}</Option>
+            </Select>
           </Form-item>
         </Form>
       </div>
@@ -90,6 +94,24 @@ export default {
           name: '企业标准'
         }
       ],
+      itemData: [
+        {
+          name: '三个月',
+          value: 3
+        },
+        {
+          name: '六个月',
+          value: 6
+        },
+        {
+          name: '十二个月',
+          value: 12
+        },
+        {
+          name: '十八个月',
+          value: 18
+        }
+      ],
       typeData: [
         {
           name: '待检',

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegister.vue

@@ -123,6 +123,7 @@ export default {
       pageColumns: [
         { title: '项目名称', key: 'projectName', width: 120 },
         { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
+        { title: '出库单号', key: 'outstockCode', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '箱数', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterEdit.vue

@@ -38,6 +38,9 @@
             <Date-picker v-model="formObj.registTime" @on-change="_tabulateChange" name="registTime" type="date" split-panels style="width:100%;"
                          placeholder="请选择登记日期"></Date-picker>
           </Form-item>
+          <Form-item label="出库单号：" prop="outstockCode" class="width-48">
+            <Input v-model="formObj.outstockCode" name="outstockCode" placeholder="请输入出库单号"/>
+          </Form-item>
 <!--          <Form-item label="检验类别" prop="testType" class="width-48">-->
 <!--            <Input v-model="formObj.testType" name="testType" placeholder="请输入名称"/>-->
 <!--          </Form-item>-->

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

@@ -13,6 +13,7 @@
               </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>
@@ -34,12 +35,12 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined"
                 v-for="item in pageColumns"
-                :key="item.key" sortable>
+                :key="item.key"
+                sortable>
                 <template slot-scope="scope">
                   <div v-if="item.key==='status'">{{scope.row[item.key]===0?'现行':scope.row[item.key]===1?'即将实施':
                     scope.row[item.key]===2?'部分被代替':scope.row[item.key]===3?'被代替':scope.row[item.key]===4?'作废':''}}
                   </div>
-
                   <div v-else-if="item.key==='classify'">
                     {{scope.row[item.key]===0?'判定依据':scope.row[item.key]===1?'检测依据':scope.row[item.key]===2?'其他':''}}
                   </div>
@@ -47,13 +48,13 @@
                     {{scope.row[item.key]===0?'待检':scope.row[item.key]===1?'备样':scope.row[item.key]===2?'备用': ''}}
                   </div>
 
-                  <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  <div v-else-if="item.date" :class='scope.row.keepLimitTime<=currentTime?"redFont":""'>{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
                   </div>
                   <div v-else-if="item.key==='fileUrl'">
                     <span v-if="scope.row['fileUrl']" class="green-color">是</span>
                     <span v-else class="red-color">否</span>
                   </div>
-                  <div v-else>{{scope.row[item.key]}}</div>
+                  <div v-else :class='scope.row.keepLimitTime<=currentTime?"redFont":""'>{{scope.row[item.key]}}</div>
                 </template>
               </vxe-table-column>
             </PTVXETable>
@@ -110,6 +111,8 @@ export default {
         { title: '库房号', key: 'storehouse' },
         { title: '架位号', key: 'shelfCode' }
       ],
+      // 当前时间
+      currentTime: new Date().getTime(),
       // 操作
       iconMsg: [
         {
@@ -350,3 +353,8 @@ export default {
   }
 }
 </script>
+<style>
+.redFont {
+  color: red;
+}
+</style>

pages/soil-alone-sample/EntrustRegister.vue

@@ -82,7 +82,7 @@ export default {
         {
           type: 'success',
           id: '',
-          name: '登记'
+          name: '来样登记'
         },
         {
           type: 'success',
@@ -146,7 +146,7 @@ export default {
           case '试验委托单导入':
             this._import()
             break
-          case '登记':
+          case '来样登记':
             this._editModal(false)
             break
           case '提交':

pages/soil-report-manage/report-manage/tab/ReportByReport.vue

@@ -54,6 +54,7 @@
       </Col>
     </Row>
     <keep-alive>
+      <!-- eslint-disable-next-line vue/require-component-is -->
       <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
     </keep-alive>
   </div>

pages/soil-sample-manage/SoilSampleSplit.vue

@@ -8,19 +8,6 @@
         <!--内容-->
         <Row>
           <!--查询-->
-          <Col span="24">
-            <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
-              <label class="label-sign"></label>
-              <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
-              </Form-item>
-              <Form-item class="search-btn">
-                <Button @click="_page" type="primary">
-                  搜索
-                </Button>
-              </Form-item>
-            </Form>
-          </Col>
           <!--操作-->
           <Col span="24">
             <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
@@ -101,7 +88,7 @@ export default {
       currentRow: '',
       footerList: [
         { id: '', name: '取消', type: '' },
-        { id: '', name: '确定', type: 'primary' }
+        { id: '', name: '关闭', type: 'primary' }
       ],
       iconMsg: [
         {
@@ -174,7 +161,7 @@ export default {
           this._cancel()
           break
         case '关闭':
-          this._ok()
+          this._cancel()
           break
       }
     },

pages/soil-sample-manage/sample-alone-keep/entrust-sample-manage/WaitReceive.vue

@@ -15,9 +15,6 @@
                 <Option v-for="(item,index) in itemData" :key="index" :value="item.value">{{item.name}}</Option>
               </Select>
             </Form-item>
-            <Form-item label="筛选试样:" class="search-item">
-              <Input v-model="formObj.experimentNames" @on-enter="_formSearch" name="experimentNames" placeholder="请输入试验项目" clearable></Input>
-            </Form-item>
             <Form-item label="试验科室:" class="search-item">
                 <el-select v-model="formObj.groupId" @change="_selGroup" placeholder="请选择" clearable style="width: 100%">
                   <el-option
@@ -28,8 +25,11 @@
                   />
                 </el-select>
             </Form-item>
-            <Form-item class="search-btn">
-              <Button @click="_formSearch" type="primary">搜索</Button>
+            <Form-item :label-width="150" label="试验项目/试验项目简写:" class="search-item">
+              <Input v-model="formObj.experimentNames" @on-enter="_formSearch" style="width: 150px;" placeholder="请输入试验项目或试验项目简写" clearable />
+            </Form-item>
+            <Form-item class="search-btn" style="margin-left: 10px;">
+              <Button type="primary" @click="_formSearch">搜索</Button>
             </Form-item>
           </Form>
         </Col>
@@ -126,6 +126,7 @@ export default {
         { title: '收样时间', key: 'receiveTime', width: 100, date: true },
         { title: '接收人', key: 'receiver', width: 100 },
         { title: '试验项目', key: 'experimentNames', width: 220 },
+        { title: '试验项目简写', key: 'experimentShortNames', width: 220 },
         { title: '土质描述', key: 'sampleDescribe', width: 205 },
         { title: '样品包装类型', key: 'samplePack', width: 120 },
         { title: '备注', key: 'remark', width: 210 }

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue

@@ -15,9 +15,6 @@
                 <Option v-for="(item,index) in itemData" :key="index" :value="item.value">{{item.name}}</Option>
               </Select>
             </Form-item>
-            <Form-item label="筛选试样:" class="search-item">
-              <Input v-model="formObj.experimentNames" name="experimentNames" placeholder="请输入试验项目" clearable @on-enter="_formSearch"></Input>
-            </Form-item>
             <Form-item label="试验科室:" class="search-item">
                 <el-select v-model="formObj.groupId" placeholder="请选择" clearable style="width: 100%" @change="_selGroup">
                   <el-option
@@ -28,7 +25,10 @@
                   />
                 </el-select>
             </Form-item>
-            <Form-item class="search-btn">
+            <Form-item :label-width="150" label="试验项目/试验项目简写:" class="search-item">
+              <Input v-model="formObj.experimentNames" @on-enter="_formSearch" style="width: 150px;" placeholder="请输入试验项目或试验项目简写" clearable />
+            </Form-item>
+            <Form-item class="search-btn" style="margin-left: 10px;">
               <Button type="primary" @click="_formSearch">搜索</Button>
             </Form-item>
           </Form>
@@ -112,6 +112,7 @@ export default {
         { title: '试样深度', key: 'sampleDepth', width: 100 },
         { title: '现场编号', key: 'siteNo', width: 100 },
         { title: '试验项目', key: 'experimentNames', width: 220 },
+        { title: '试验项目简写', key: 'experimentShortNames' },
         { title: '土质描述', key: 'sampleDescribe', width: 205 },
         { title: '样品包装类型', key: 'samplePack', width: 120 },
         { title: '备注', key: 'remark', width: 210 }

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitScan.vue

@@ -15,9 +15,6 @@
                 <Option v-for="(item,index) in itemData" :value="item.value" :key="index">{{item.name}}</Option>
               </Select>
             </Form-item>
-            <Form-item label="筛选试样:" class="search-item">
-              <Input @on-enter="_formSearch" v-model="formObj.experimentNames" name="experimentNames" placeholder="请输入试验项目" clearable></Input>
-            </Form-item>
             <Form-item label="试验科室:" class="search-item">
               <el-select @change="_selGroup" v-model="formObj.groupId" placeholder="请选择" clearable style="width: 100%">
                 <el-option
@@ -28,8 +25,11 @@
                 />
               </el-select>
             </Form-item>
-            <Form-item class="search-btn">
-              <Button @click="_formSearch" type="primary">搜索</Button>
+            <Form-item :label-width="150" label="试验项目/试验项目简写:" class="search-item">
+              <Input v-model="formObj.experimentNames" @on-enter="_formSearch" style="width: 150px;" placeholder="请输入试验项目或试验项目简写" clearable />
+            </Form-item>
+            <Form-item class="search-btn" style="margin-left: 10px;">
+              <Button type="primary" @click="_formSearch">搜索</Button>
             </Form-item>
           </Form>
         </Col>
@@ -101,6 +101,7 @@ export default {
         { title: '试样深度', key: 'sampleDepth', width: 95 },
         { title: '现场编号', key: 'siteNo', width: 100 },
         { title: '试验项目', key: 'experimentNames', width: 225 },
+        { title: '试验项目简写', key: 'experimentShortNames' },
         { title: '土质描述', key: 'sampleDescribe', width: 185 },
         { title: '样品包装类型', key: 'samplePack', width: 120 }
       ],

router/soil-routes.js

@@ -82,17 +82,17 @@ export default [
       {
         path: 'storehouse_place',
         component: StorehousePlace,
-        meta: { title: '库房位置管理' }
+        meta: { title: '货架管理' }
       },
       {
         path: 'storehouse_sample',
         component: StorehouseSample,
-        meta: { title: '库房样品管理' }
+        meta: { title: '样品管理' }
       },
       {
         path: 'in_out_export_template',
         component: InOutExportTemplate,
-        meta: { title: '库房样品管理' }
+        meta: { title: '出入库导出模板' }
       }
     ]
   },
@@ -121,12 +121,12 @@ export default [
       {
         path: 'receive',
         component: SampleReceiveIndex,
-        meta: { title: '样品分波' }
+        meta: { title: '样品分拨' }
       },
       {
         path: 'alone_keep',
         component: AloneKeepIndex,
-        meta: { title: '独立留存' }
+        meta: { title: '独立预检' }
       },
       {
         path: 'prepare',