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

api/meter/meter-sample.js

@@ -61,6 +61,17 @@ export default {
     http
       .post('meter/v1/sample/subpackage_info_reg?ids=' + data.ids, data.reg)
       .then(res => res),
+
+  reportCheckBack: data =>
+    http
+      .post(
+        'meter/v1/sample/report_check_back?ids=' +
+          data.ids +
+          '&reason=' +
+          data.reason
+      )
+      .then(res => res),
+
   distributeOutSample: data =>
     http
       .post(

pages/meter-certificate/check/MeterCertificateCheck.vue

@@ -6,29 +6,29 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="实验室名称:">
-                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+                <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                     class="contHide"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                     @on-result-change="_btnClick"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
+                        :get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -131,18 +131,21 @@ export default {
   },
   methods: {
     _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        this._reportCheckBack(data)
+      }
       console.log(data)
-      // this.$store
-      //   .dispatch('FoodContract/customerBack', {
-      //     ids: this.selectIds.join(','),
-      //     remark: data
-      //   })
-      //   .then(() => {
-      //     if (this.$store.state.FoodContract.success) {
-      //       this.$Message.success('退回成功')
-      //       this._page()
-      //     }
-      //   })
+    },
+    _reportCheckBack: async function(data) {
+      const result = await meterSample.reportCheckBack({
+        ids: this.selectIds,
+        reason: data
+      })
+
+      if (result) {
+        this.$Message.success('退回成功！')
+        await this._page()
+      }
     },
     _modalResult() {
       if (this.currentComponent === 'FoodSubcontracterEdit') {