土工试验Lims

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

@@ -9,13 +9,13 @@
         <Row>
           <!--查询-->
           <Col span="24">
-          <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
+          <Form v-show="searchOpen" id="search-sample-company" :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 />
+              <Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch" />
             </Form-item>
             <Form-item class="search-btn">
-              <Button @click="_page" type="primary">
+              <Button type="primary" @click="_page">
                 搜索
               </Button>
             </Form-item>
@@ -23,12 +23,12 @@
           </Col>
           <!--操作-->
           <Col span="24">
-          <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
+          <btn-list :msg="btn" :open="searchOpen" class="contHide" show-search-btn="true" @on-result-change="_btnClick"></btn-list>
           </Col>
           <!-- 表格 -->
           <Col span="24">
             <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" @on-result-change="_tableResultChange"  select-data>
+                        :get-page="getPage" select-data  @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -104,7 +104,7 @@ export default {
       dateList: [],
       formObj: {
         receiveLocation: undefined,
-        sampleCode: undefined
+        entrustId: undefined
       }
     }
   },
@@ -149,10 +149,6 @@ export default {
       this.$refs.footerModal._hideLoading()
       console.log(this.getPage)
     },
-    _dateChange(data) {
-      this.formObj.ctimeBegin = data[0]
-      this.formObj.ctimeEnd = data[1]
-    },
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -241,22 +237,13 @@ export default {
       }
       console.log('索引', this.indexList)
     },
-    _open(id) {
+    _open(id, name) {
       this.formObj = this.$resetFields(this.formObj)
       this.dateList = []
       this.showModal = true
       this.formObj.entrustId = id // 委托id
-      console.log(this.entrustId)
-      this.$refs.pageTable._hideLoading()
-      this._page()
-    },
-    _openHis(adress) {
-      this.formObj = this.$resetFields(this.formObj)
-      this.dateList = []
-      this.showModal = true
-      this.formObj.receiveLocation = adress // 委托id
+      this.formObj.receiveLocation = name // 委托id
       this.$refs.pageTable._hideLoading()
-      this.recordHis = true
       this._page()
     },
     _formSearch() {