报价单退回

pages/meter-business/MeterSampleQuoteManage.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"
@@ -60,7 +60,7 @@
   </div>
 </template>
 <script>
-import { meterSample } from '../../../api'
+import { meterSample } from '../../api'
 export default {
   components: {
     // FoodSampleGovernDetail,

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">
@@ -55,10 +55,10 @@
 import { meterContract, meterEntrust, meterSubcontractor } from '../../../api'
 import Operation from '../../../components/operation/Operation'
 import Reason from '../../../components/base/Reason'
-import MeterSampleManage from './MeterSampleManage'
+import MeterSampleManage from '../MeterSampleQuoteManage'
 import MeterEntrustDetail from './MeterContractAcceptedDetail'
 export default {
-  components: { MeterSampleManage, MeterEntrustDetail, Operation },
+  components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
   data() {
     return {
       currentComponent: 'FoodSampleGovern',
@@ -175,7 +175,6 @@ export default {
       // 退回
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条委托！')
-        // this.$refs.reasonModal._open('退回原因')
       } else {
         this.$refs.reasonModal._open('退回原因')
       }