修改了报价单驳回按钮

api/meter/meter-contract.js

@@ -48,6 +48,46 @@ export default {
   // 删除
   deleteById: data =>
     http.delete('meter/v1/contract/?ids=' + data).then(res => res),
+  // 初审退回
+  check: data =>
+    http
+      .post(
+        'meter/v1/contract/back_to_review_first?ids=' +
+          data.ids +
+          '&remark=' +
+          data.remark
+      )
+      .then(res => res),
+  // 复审退回
+  checkSecond: data =>
+    http
+      .post(
+        'meter/v1/contract/back_review_second?ids=' +
+          data.ids +
+          '&remark=' +
+          data.remark
+      )
+      .then(res => res),
+  // 报价单批准退回
+  approve: data =>
+    http
+      .post(
+        'meter/v1/contract/back_review_third?ids=' +
+          data.ids +
+          '&remark=' +
+          data.remark
+      )
+      .then(res => res),
+  // 业务受理退回
+  reception: data =>
+    http
+      .post(
+        'meter/v1/contract/back_accepted?ids=' +
+          data.ids +
+          '&remark=' +
+          data.remark
+      )
+      .then(res => res),
   // 保存
   save: data =>
     https

pages/meter-business/accepted/MeterContractAccepted.vue

@@ -6,24 +6,24 @@
         <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">
@@ -45,6 +45,7 @@
         </Row>
       </div>
     </div>
+    <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>
@@ -53,10 +54,11 @@
 <script>
 import { meterContract, meterEntrust, meterSubcontractor } from '../../../api'
 import Operation from '../../../components/operation/Operation'
+import Reason from '../../../components/base/Reason'
 import MeterSampleManage from './MeterSampleManage'
 import MeterEntrustDetail from './MeterContractAcceptedDetail'
 export default {
-  components: { MeterSampleManage, MeterEntrustDetail, Operation },
+  components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
   data() {
     return {
       currentComponent: 'FoodSampleGovern',
@@ -160,12 +162,42 @@ export default {
           case '通过':
             this._passReview()
             break
+          case '驳回':
+            this._goBack()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
         }
       })
     },
+    _goBack() {
+      // 退回
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条委托！')
+        // this.$refs.reasonModal._open('退回原因')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        this._reportCheckBack(data)
+        console.log('退回')
+      }
+      console.log(data)
+    },
+    _reportCheckBack: async function(data) {
+      const result = await meterContract.reception({
+        ids: this.selectIds,
+        remark: data
+      })
+
+      if (result) {
+        this.$Message.success('退回成功！')
+        await this._page()
+      }
+    },
     _iconClick(res, data) {
       this.$nextTick(function() {
         switch (res) {

pages/meter-business/accepted/MeterSampleManage.vue

@@ -10,24 +10,24 @@
             <Form id="formId" :label-width="80" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="样品名称:" class="search-item">
-                <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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" :get-page="getPage"
-                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
+                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -70,6 +70,7 @@ export default {
   data() {
     return {
       currentComponent: '',
+      searchOpen: true,
       // btn: [
       //   {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'},
       //   {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'},

pages/meter-business/quote-approval/MeterContractApproval.vue

@@ -6,24 +6,24 @@
         <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">
@@ -45,6 +45,7 @@
         </Row>
       </div>
     </div>
+    <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>
@@ -53,10 +54,11 @@
 <script>
 import { meterContract, meterSubcontractor } from '../../../api'
 import Operation from '../../../components/operation/Operation'
+import Reason from '../../../components/base/Reason'
 import MeterSampleManage from './MeterSampleManage'
 import MeterEntrustDetail from './MeterContractApprovalDetail'
 export default {
-  components: { MeterSampleManage, MeterEntrustDetail, Operation },
+  components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
   data() {
     return {
       currentComponent: 'FoodSampleGovern',
@@ -160,12 +162,42 @@ export default {
           case '通过':
             this._passReview()
             break
+          case '驳回':
+            this._goBack()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
         }
       })
     },
+    _goBack() {
+      // 退回
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条委托！')
+        // this.$refs.reasonModal._open('退回原因')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        this._reportCheckBack(data)
+        console.log('退回')
+      }
+      console.log(data)
+    },
+    _reportCheckBack: async function(data) {
+      const result = await meterContract.approve({
+        ids: this.selectIds,
+        remark: data
+      })
+
+      if (result) {
+        this.$Message.success('退回成功！')
+        await this._page()
+      }
+    },
     _iconClick(res, data) {
       this.$nextTick(function() {
         switch (res) {

pages/meter-business/quote-approval/MeterSampleManage.vue

@@ -10,24 +10,24 @@
             <Form id="formId" :label-width="80" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="样品名称:" class="search-item">
-                <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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" :get-page="getPage"
-                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
+                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -69,6 +69,7 @@ export default {
   },
   data() {
     return {
+      searchOpen: true,
       currentComponent: '',
       // btn: [
       //   {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'},

pages/meter-business/quote-check-second/MeterContractCheckSecond.vue

@@ -6,24 +6,24 @@
         <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">
@@ -45,6 +45,7 @@
         </Row>
       </div>
     </div>
+    <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>
@@ -53,10 +54,11 @@
 <script>
 import { meterContract, meterSubcontractor } from '../../../api'
 import Operation from '../../../components/operation/Operation'
+import Reason from '../../../components/base/Reason'
 import MeterSampleManage from './MeterSampleManage'
 import MeterEntrustDetail from './MeterContractCheckDetail'
 export default {
-  components: { MeterSampleManage, MeterEntrustDetail, Operation },
+  components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
   data() {
     return {
       currentComponent: 'FoodSampleGovern',
@@ -160,12 +162,42 @@ export default {
           case '通过':
             this._passReview()
             break
+          case '驳回':
+            this._goBack()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
         }
       })
     },
+    _goBack() {
+      // 退回
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条委托！')
+        this.$refs.reasonModal._open('退回原因')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
+    _reportCheckBack: async function(data) {
+      const result = await meterContract.checkSecond({
+        ids: this.selectIds,
+        remark: data
+      })
+
+      if (result) {
+        this.$Message.success('退回成功！')
+        await this._page()
+      }
+    },
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        this._reportCheckBack(data)
+        console.log('退回')
+      }
+      console.log(data)
+    },
     _iconClick(res, data) {
       this.$nextTick(function() {
         switch (res) {

pages/meter-business/quote-check/MeterContractCheck.vue

@@ -6,24 +6,24 @@
         <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">
@@ -45,6 +45,7 @@
         </Row>
       </div>
     </div>
+    <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>
@@ -53,10 +54,11 @@
 <script>
 import { meterContract, meterSubcontractor } from '../../../api'
 import Operation from '../../../components/operation/Operation'
+import Reason from '../../../components/base/Reason'
 import MeterSampleManage from './MeterSampleManage'
 import MeterEntrustDetail from './MeterContractCheckDetail'
 export default {
-  components: { MeterSampleManage, MeterEntrustDetail, Operation },
+  components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
   data() {
     return {
       currentComponent: 'FoodSampleGovern',
@@ -160,12 +162,42 @@ export default {
           case '通过':
             this._passReview()
             break
+          case '驳回':
+            this._goBack()
+            break
           case 'search':
             this.searchOpen = !this.searchOpen
             break
         }
       })
     },
+    _goBack() {
+      // 退回
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条委托！')
+        // this.$refs.reasonModal._open('退回原因')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        this._reportCheckBack(data)
+        console.log('退回')
+      }
+      console.log(data)
+    },
+    _reportCheckBack: async function(data) {
+      const result = await meterContract.check({
+        ids: this.selectIds,
+        remark: data
+      })
+
+      if (result) {
+        this.$Message.success('退回成功！')
+        await this._page()
+      }
+    },
     _iconClick(res, data) {
       this.$nextTick(function() {
         switch (res) {

pages/meter-business/quote-check/MeterSampleManage.vue

@@ -10,24 +10,24 @@
             <Form id="formId" :label-width="80" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item label="样品名称:" class="search-item">
-                <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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" :get-page="getPage"
-                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
+                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -70,6 +70,7 @@ export default {
   data() {
     return {
       currentComponent: '',
+      searchOpen: true,
       // btn: [
       //   {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'},
       //   {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'},

pages/meter-review/MeterSampleManage.vue

@@ -76,7 +76,7 @@ export default {
   data() {
     return {
       currentComponent: '',
-      searchOpen: 'false',
+      searchOpen: false,
       // btn: [
       //   {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'},
       //   {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'},