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

api/meter/meter-entrust.js

@@ -14,6 +14,10 @@ export default {
       .then(res => res),
   pageGoOutEntrust: data =>
     http.post('meter/v1/entrust/page_out_draft_entrust', data).then(res => res),
+  pageOutTaskDistribute: data =>
+    http
+      .post('meter/v1/entrust/page_out_task_distribute', data)
+      .then(res => res),
   pageEntrustReview: data =>
     http.post('meter/v1/entrust/page_review_entrust', data).then(res => res),
   pageSubpackageEntrust: data =>
@@ -45,6 +49,9 @@ export default {
     https
       .post('meter/v1/entrust/submit_to_review?ids=' + data)
       .then(res => res),
+  passReview: data =>
+    http.post('meter/v1/entrust/pass_review?ids=' + data).then(res => res),
+
   // 编辑
   edit: data =>
     http.put('meter/v1/entrust/' + data.id, data.obj).then(res => res),

pages/meter-out/task-distribute/MeterOutTaskDistribute.vue

@@ -223,7 +223,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await meterEntrust.pageGoOutEntrust(this.formObj)
+      const result = await meterEntrust.pageOutTaskDistribute(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result

pages/meter-review/MeterReviewEntrust.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" hide-checkbox>
+                        :get-page="getPage" :icon-msg="iconMsg"  @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -58,7 +58,7 @@ export default {
   data() {
     return {
       currentComponent: 'FoodSampleGovern',
-      formId: 'meterSubcontractorFormId',
+      formId: 'meterReviewEntrustFormId',
       searchOpen: false,
       btn: [
         {
@@ -155,6 +155,9 @@ export default {
           case '添加':
             this._editModal(false)
             break
+          case '通过':
+            this._passReview()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
@@ -213,15 +216,15 @@ export default {
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodSubcontracter.page
-          break
         case 'iconClick':
           this._iconClick(data.name, data.rowData)
           break
         case 'changeSize':
           this._page()
           break
+        case 'selectIds':
+          this.selectIds = data
+          break
       }
     },
     _page: async function() {
@@ -259,6 +262,29 @@ export default {
         this.$refs.editSubcontractorModal._open()
       }
     },
+
+    _passReview() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请选择要通过评审的委托单！')
+        return false
+      }
+      this.$Modal.confirm({
+        title: '提示',
+        content: '确定通过该委托单？',
+        onOk: () => {
+          this._passEntrustReview(this.selectIds)
+        }
+      })
+    },
+
+    _passEntrustReview: async function(ids) {
+      const result = await meterEntrust.passReview(ids)
+      if (result) {
+        this.$Message.success('提交成功！')
+        await this._page()
+      }
+    },
+
     // 追加项目
     _itemModal(data) {
       this.$refs.refModal._open(data)