修改了委托登记导入检测项目

pages/meter-aptitude/standard-manage/SampleItemSelect.vue

@@ -10,9 +10,8 @@
       <Row>
         <Col span="24">
         <Form v-model="formObj" :label-width="90" inline onsubmit="return false">
-          <Form-item class="search-item" label="检测项目:" style="margin-left: -25px">
-            <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
-            <input v-model="formObj.catalogueId" type="hidden">
+          <Form-item class="search-item" label="试验名称:" style="margin-left: -25px">
+            <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入试验名称" clearable />
           </Form-item>
           <!--          <Form-item class="search-item" label="检测依据:">-->
           <!--            <Input v-model="formObj.code" placeholder="请输入检测依据名称" clearable @on-enter="_formSearch" />-->
@@ -30,27 +29,15 @@
         </Col>
         <!-- 表格 -->
         <Col span="24">
-        <element-table
-          ref="pageTable"
-          :page-columns="pageColumns"
-          :table-height="350"
-          :get-page="getPage"
-          :icon-msg="iconMsg"
-          :opt-col-width="80"
-          @on-result-change="_tableResultChange"
-          select-data
-          show-check-box
-        >
-          <el-table-column
-            v-for="item in pageColumns"
-            :key="item.key"
-            :prop="item.key"
-            :label="item.title"
-            :width="item.width"
-            :min-width="200"
-            show-overflow-tooltip
-            sortable
-          >
+          <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
+                      :get-page="getPage" :icon-msg="iconMsg" @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" sortable>
             <template slot-scope="scope">
               <span v-if="item.key==='judged'">
                 {{ scope.row[item.key]===1?'是':'否' }}
@@ -86,8 +73,8 @@
                 {{ scope.row[item.key] }}
               </span>
             </template>
-          </el-table-column>
-        </element-table>
+            </vxe-table-column>
+          </PTVXETable>
         </Col>
       </Row>
       <div slot="footer">
@@ -236,6 +223,9 @@ export default {
         case 'iconClick':
           this._iconClick(data.name, data.rowData)
           break
+        case 'changeSize':
+          this._page()
+          break
       }
     },
     _ok() {

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

@@ -459,7 +459,6 @@ export default {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请选择至少一条数据！')
       } else {
-        console.log('导入检测项目')
         this.$refs.sampleItemSelectModal._open()
         this.allSelect(this.selectData)
       }

pages/soil-test-manage/test-task-manage/AllotBySample.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>
@@ -135,7 +132,7 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '委托商', key: 'client', width: 200 },
-        { title: '试样编号', key: 'entrustCode', width: 120 },
+        { title: '试样编号', key: 'sampleCode', width: 120 },
         { title: '委托日期', key: 'entrustDate', width: 120, date: true },
         { title: '钻孔位置', key: 'boreholeLocation', width: 120 },
         { title: '水深（米）', key: 'waterDepth', width: 120 },