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

# Conflicts:
#	pages/meter-business/MeterSampleQuoteManage.vue

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" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
+                <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item label="样品编号:" class="search-item">
-                <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
+                <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn" style="margin-left: -10px">
-                <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" :get-page="getPage"
-                        :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
+                        :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -60,7 +60,7 @@
   </div>
 </template>
 <script>
-import { meterSample } from '../../api'
+import { meterSampleQuote } from '../../api'
 export default {
   components: {
     // FoodSampleGovernDetail,
@@ -232,7 +232,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await meterSample.page(this.formObj)
+      const result = await meterSampleQuote.page(this.formObj)
       if (result) {
         this.getPage = result
         this.$refs.pageTable._hideLoading()
@@ -270,21 +270,6 @@ export default {
         })
       })
     },
-    _editModal(edit, id) {
-      this.currentComponent = 'FoodSampleGovernEdit'
-      this.$nextTick(function() {
-        if (edit) {
-          this.$store.dispatch('FoodSample/getByGovernId', id).then(() => {
-            this.$refs.refModal._open(
-              this.$store.state.FoodSample.governModel,
-              this.contractId
-            )
-          })
-        } else {
-          this.$refs.refModal._open('', this.contractId)
-        }
-      })
-    },
     _editLY(id) {
       // 粮油的编辑
       this.currentComponent = 'FoodSampleGovernLYEdit'
@@ -310,62 +295,6 @@ export default {
         this.$Message.success(msg)
       }
     },
-    _copy(sampleId, type) {
-      this.$refs.refModal._open(sampleId, type)
-    },
-    // 复制样品
-    _copySample(data) {
-      if (data.type === 2) {
-        // 粮油的编辑页
-        this.currentComponent = 'FoodSampleGovernLYEdit'
-        this.$store
-          .dispatch('FoodSample/getByGovernId', data.sampleId)
-          .then(() => {
-            this.$nextTick(function() {
-              this.$refs.refModal._openCopySample(
-                this.$store.state.FoodSample.governModel
-              )
-            })
-          })
-      } else {
-        this.currentComponent = 'FoodSampleGovernEdit'
-        this.$store
-          .dispatch('FoodSample/getByGovernId', data.sampleId)
-          .then(() => {
-            this.$nextTick(function() {
-              this.$refs.refModal._openCopySample(
-                this.$store.state.FoodSample.governModel
-              )
-            })
-          })
-      }
-    },
-    _copyAll(data) {
-      if (data.type === 2) {
-        // 粮油的编辑页
-        this.currentComponent = 'FoodSampleGovernLYEdit'
-        this.$store
-          .dispatch('FoodSample/getByGovernId', data.sampleId)
-          .then(() => {
-            this.$nextTick(function() {
-              this.$refs.refModal._openCopyAll(
-                this.$store.state.FoodSample.governModel
-              )
-            })
-          })
-      } else {
-        this.currentComponent = 'FoodSampleGovernEdit'
-        this.$store
-          .dispatch('FoodSample/getByGovernId', data.sampleId)
-          .then(() => {
-            this.$nextTick(function() {
-              this.$refs.refModal._openCopyAll(
-                this.$store.state.FoodSample.governModel
-              )
-            })
-          })
-      }
-    },
     // 导入样品
     _importSample() {
       const data = {
@@ -401,13 +330,6 @@ export default {
         this._subpackage(this.selectIds)
       }
     },
-    _subpackage: async function(ids) {
-      const result = await meterSample.subpackageSample(ids)
-      if (result) {
-        this.$Message.success('分包成功！')
-        await this._page()
-      }
-    },
 
     _importItemPackage() {
       if (this.selectIds.length === 0) {