修改了样品管理的查询

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

@@ -83,11 +83,11 @@ export default {
       },
       typeList: [{ name: '企业', value: 0 }, { name: '政府', value: 1 }],
       iconMsg: [
-        {
-          type: 'ios-beaker',
-          id: '',
-          name: '管理样品'
-        },
+        // {
+        //   type: 'ios-beaker',
+        //   id: '',
+        //   name: '管理样品'
+        // },
         { type: 'md-cloud', id: '', name: '附件' },
         { type: 'md-trash', id: '', name: '删除' },
         {

pages/soil-sample-manage/sample-address/AddressManage.vue

@@ -8,30 +8,9 @@
             <!--搜索表单-->
             <Form id="search-form" :label-width="90" v-show="searchOpen" inline onsubmit="return false">
               <label class="label-sign"></label>
-              <Form-item class="search-item" label="检测依据:">
+              <Form-item class="search-item" label="位置编号:">
                 <Input @on-enter="_formSearch" v-model="formObj.code" name="code" placeholder="请输入检测依据" clearable/>
               </Form-item>
-              <Form-item class="search-item" label="检测依据名称:">
-                <Input @on-enter="_formSearch" v-model="formObj.name" name="name" placeholder="请输入检测依据名称" clearable/>
-              </Form-item>
-<!--              <Form-item class="search-item" label="标准状态:">-->
-<!--                <Select name="status" placeholder="请选择标准状态" clearable>-->
-<!--                  <Option v-for="item in statusList" :value="item.value" :key="item.name">{{item.name}}</Option>-->
-<!--                </Select>-->
-<!--              </Form-item>-->
-<!--              <Form-item class="search-item" label="标准分类:">-->
-<!--                <Select name='classify' placeholder="请选择标准分类" clearable>-->
-<!--                  <Option v-for="item in classifyList" :value="item.value" :key="item.name">{{item.name}}</Option>-->
-<!--                </Select>-->
-<!--              </Form-item>-->
-<!--              <Form-item label="标准类型:" class="search-item margin-left-6">-->
-<!--                <Select name="type" placeholder="请选择标准类型" clearable>-->
-<!--                  <Option v-for="item in typeList" :value="item.value" :key="item.value">{{ item.name }}</Option>-->
-<!--                </Select>-->
-<!--              </Form-item>-->
-<!--              <Form-item class="search-item" label="发布单位:">-->
-<!--                <Input @on-enter="_formSearch" name="publishUnit" placeholder="请输入发布单位" clearable/>-->
-<!--              </Form-item>-->
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>

pages/soil-sample-manage/sample-take/TakeBySample.vue

@@ -8,11 +8,8 @@
           <Col span="24">
             <Form id="search-form-rel-sample" :label-width="80" v-show="searchOpen" inline onsubmit="return false">
               <label class="label-sign"></label>
-              <Form-item class="search-item" label="样品编号:">
-                <Input @on-enter="_formSearch" v-model="formObj.num" name="num" placeholder="请输入样品编号" clearable></Input>
-              </Form-item>
-              <Form-item class="search-item" label="样品名称:">
-                <Input @on-enter="_formSearch" v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable></Input>
+              <Form-item class="search-item" label="试样编号:">
+                <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable></Input>
               </Form-item>
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>

pages/soil-sample-manage/surplus-manage/tab/SampleSurplusQuery.vue

@@ -8,12 +8,6 @@
           <Col span="24">
             <Form id="search-form-query" :label-width="80" v-show="searchOpen" inline onsubmit="return false">
               <label class="label-sign"></label>
-              <Form-item class="search-item" label="委托单位:" style="margin-left: 8px;">
-                <Input @on-enter="_formSearch" v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable/>
-              </Form-item>
-              <Form-item class="search-item" label="委托编号:">
-                <Input @on-enter="_formSearch" v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托名称" clearable/>
-              </Form-item>
               <Form-item class="search-item" label="试样编号:">
                 <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入委托名称" clearable/>
               </Form-item>
@@ -28,28 +22,6 @@
           </Col>
           <!-- 表格 -->
           <Col span="24">
-            <!--<ElementTable :tableHeight="tableHeight" @on-result-change="_tableResultChange"-->
-            <!--ref="pageTable" :getPage="getPage" id="perSampleQuery" selectData>-->
-            <!--<el-table-column-->
-            <!--show-overflow-tooltip-->
-            <!--sortable-->
-            <!--:prop="item.key"-->
-            <!--:label="item.title"-->
-            <!--:width="item.width"-->
-            <!--:min-width="200"-->
-            <!--:fixed="item.fixed?item.fixed:undefined"-->
-            <!--v-for="item in pageColumns" :key="item.key">-->
-            <!--<template slot-scope="scope">-->
-            <!--<div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>-->
-            <!--<a v-else-if="item.key==='sampleSn'"-->
-            <!--@click.stop="_sampleDetailModal(scope.row)">{{scope.row[item.key]}}</a>-->
-            <!--<div v-else-if="item.key==='progress'">-->
-            <!--{{scope.row[item.key]===undefined?'':scope.row[item.key].display}}-->
-            <!--</div>-->
-            <!--<div v-else>{{scope.row[item.key]}}</div>-->
-            <!--</template>-->
-            <!--</el-table-column>-->
-            <!--</ElementTable>-->
             <PTVXETable id="perSampleQuery" ref="pageTable"
                         :tableHeight="tableHeight" :icon-msg="iconMsg" @on-result-change="_tableResultChange" :getPage="getPage" select-data>
               <vxe-table-column