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

pages/meter-subcontract/subpackage-task/MeterSubpackageTask.vue

@@ -6,29 +6,29 @@
         <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">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" hide-checkbox @on-result-change="_tableResultChange">
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -45,12 +45,14 @@
         </Row>
       </div>
     </div>
+    <subSampleManage ref="subSampleManage"></subSampleManage>
   </div>
 </template>
 <script>
 import { meterEntrust, meterSubcontractor } from '../../../api'
+import subSampleManage from './MeterSubSampleManage'
 export default {
-  components: {},
+  components: { subSampleManage },
   data() {
     return {
       currentComponent: '',
@@ -72,19 +74,19 @@ export default {
       ],
       iconMsg: [
         {
-          type: 'ios-clock',
+          type: 'md-paper',
           id: '',
           name: '编辑'
         },
         {
-          type: 'ios-clock',
+          type: 'ios-beaker',
           id: '',
-          name: '资质项目'
+          name: '分包样品管理'
         },
-        { type: 'ios-clock', id: '', name: '附件' },
-        { type: 'ios-clock', id: '', name: '删除' },
+        { type: 'md-cloud', id: '', name: '附件' },
+        { type: 'md-trash', id: '', name: '删除' },
         {
-          type: 'ios-clock',
+          type: 'md-book',
           id: '',
           name: '操作日志'
         }
@@ -145,6 +147,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (res) {
+          case '分包样品管理':
+            this.subSampleManage(data)
+            break
           case '编辑':
             this._editModal(true, data.id)
             break
@@ -163,6 +168,10 @@ export default {
         }
       })
     },
+    subSampleManage(data) {
+      // 管理样品
+      this.$refs.subSampleManage._open(data.id)
+    },
     _record(id) {
       this.$refs.refModal._open(id)
     },