Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

api/meter/meter-entrust.js

@@ -50,5 +50,8 @@ export default {
   // 城市
   getCity: data => http.post('/base/v1/city/list_' + data).then(res => res),
   // 地区
-  getArea: data => http.post('/base/v1/area/list_' + data).then(res => res)
+  getArea: data => http.post('/base/v1/area/list_' + data).then(res => res),
+  //
+  getInfo: data =>
+    http.post('meter/v1/sample/page?entrustId=' + data).then(res => res)
 }

pages/meter-review/MeterReviewEntrust.vue

@@ -6,29 +6,29 @@
         <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.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" 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">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" hide-checkbox @on-result-change="_tableResultChange">
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -45,15 +45,18 @@
         </Row>
       </div>
     </div>
+<!--    <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult" keep-alive></component>-->
+    <FoodSampleGovern ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></FoodSampleGovern>
   </div>
 </template>
 <script>
 import { meterEntrust, meterSubcontractor } from '../../api'
+import FoodSampleGovern from './FoodSampleGovern'
 export default {
-  components: {},
+  components: { FoodSampleGovern },
   data() {
     return {
-      currentComponent: '',
+      currentComponent: 'FoodSampleGovern',
       formId: 'meterSubcontractorFormId',
       searchOpen: false,
       btn: [
@@ -144,6 +147,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (res) {
+          case '样品管理':
+            this._manageSample(data)
+            break
           case '编辑':
             this._editModal(true, data.id)
             break
@@ -162,6 +168,39 @@ export default {
         }
       })
     },
+    _manageSample(data) {
+      // 管理样品
+      console.log(data)
+      if (data.type === 0) {
+        // 企业
+        alert(123456)
+        // this.currentComponent = 'FoodSampleCompany'
+      } else {
+        // 政府
+        this.currentComponent = 'FoodSampleGovern'
+      }
+      this.$nextTick(() => {
+        console.log('要传的数字')
+        console.log(data.id)
+        this.$refs.refModal._open(data.id)
+      })
+    },
+    _componentResult(data, msg) {
+      switch (this.currentComponent) {
+        case 'FoodContractCompanyEdit':
+          this._page()
+          break
+        case 'FoodContractGovernEdit':
+          this._page()
+          break
+        case 'FoodContractCompanyEditByDLTB':
+          this._page()
+          break
+        case 'FoodContractCompanyEditByHES':
+          this._page()
+          break
+      }
+    },
     _record(id) {
       this.$refs.refModal._open(id)
     },
@@ -183,6 +222,8 @@ export default {
       console.log('this.formObj', this.formObj)
       const result = await meterEntrust.pageEntrustReview(this.formObj)
       if (result) {
+        console.log('结果')
+        console.log(result)
         this.$refs.pageTable._hideLoading()
         this.getPage = result
       }