管理样品添加了试验项目和试验项目简写查询条件

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,6 +17,12 @@
             <Form-item label="现场编号:" class="search-item">
               <Input v-model="formObj.siteNo" @on-enter="_formSearch" placeholder="请输入现场编号" clearable />
             </Form-item>
+            <Form-item label="试验项目:" class="search-item">
+              <Input v-model="formObj.experimentNames" @on-enter="_formSearch" placeholder="请输入试验项目" clearable />
+            </Form-item>
+            <Form-item label="试验项目简写:" class="search-item">
+              <Input v-model="formObj.experimentShortNames" @on-enter="_formSearch" placeholder="请输入试验项目简写" clearable />
+            </Form-item>
             <Form-item class="search-btn">
               <Button @click="_page" type="primary">
                 搜索
@@ -107,7 +113,9 @@ export default {
       dateList: [],
       formObj: {
         siteNo: undefined,
-        sampleCode: undefined
+        sampleCode: undefined,
+        experimentNames: undefined,
+        experimentShortNames: undefined
       }
     }
   },

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

@@ -18,6 +18,9 @@
             <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">
+              <Input v-model="formObj.experimentShortNames" @on-enter="_formSearch" name="experimentShortNames" 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

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

@@ -18,6 +18,9 @@
             <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">
+              <Input v-model="formObj.experimentShortNames" name="experimentShortNames" 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

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

@@ -18,6 +18,9 @@
             <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">
+              <Input v-model="formObj.experimentShortNames" name="experimentShortNames" placeholder="请输入试验项目简写" clearable @on-enter="_formSearch"></Input>
+            </Form-item>
             <Form-item label="试验科室:" class="search-item">
               <el-select @change="_selGroup" v-model="formObj.groupId" placeholder="请选择" clearable style="width: 100%">
                 <el-option