Merge remote-tracking branch 'origin/dev' into dev

api/meter/meter-entrust.js

@@ -40,7 +40,16 @@ export default {
     http
       .post('meter/v1/entrust/page_subpackage_entrust', data)
       .then(res => res),
-
+  // 委托评审驳回
+  back: data =>
+    http
+      .post(
+        'meter/v1/entrust/review_back?ids=' +
+          data.ids +
+          '&reason=' +
+          data.remark
+      )
+      .then(res => res),
   pageSubpackageInputEntrust: data =>
     http
       .post('meter/v1/entrust/page_subpackage_input_entrust', data)

pages/meter-review/MeterReviewEntrust.vue

@@ -46,6 +46,7 @@
       </div>
     </div>
     <FileManage ref="FileManage"></FileManage>
+    <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
     <MeterSampleManage ref="meterSampleManageModal"  @on-result-change="_componentResult"></MeterSampleManage>
     <MeterEntrustDetail ref="meterSampleEdit" @on-result-change="_componentResult"></MeterEntrustDetail>
     <Operation ref="operation"></Operation>
@@ -54,10 +55,11 @@
 <script>
 import { meterEntrust, meterSubcontractor } from '../../api'
 import Operation from '../../components/operation/Operation'
+import Reason from '../../components/base/Reason'
 import MeterSampleManage from './MeterSampleManage'
 import MeterEntrustDetail from './MeterEntrustDetail'
 export default {
-  components: { MeterSampleManage, MeterEntrustDetail, Operation },
+  components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
   data() {
     return {
       currentComponent: 'FoodSampleGovern',
@@ -155,6 +157,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (msg) {
+          case '驳回':
+            this._goBack()
+            break
           case '添加':
             this._editModal(false)
             break
@@ -167,6 +172,33 @@ export default {
         }
       })
     },
+    _goBack() {
+      // 退回
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条委托！')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        console.log(data)
+        this._reportCheckBack(data)
+        console.log('退回')
+      }
+      console.log(data)
+    },
+    _reportCheckBack: async function(data) {
+      const result = await meterEntrust.back({
+        ids: this.selectIds,
+        remark: data
+      })
+
+      if (result) {
+        this.$Message.success('退回成功！')
+        await this._page()
+      }
+    },
     _iconClick(res, data) {
       this.$nextTick(function() {
         switch (res) {