分包委托评审

components/base/VXEIconList.vue

@@ -5,7 +5,7 @@
         <Icon :type="item.type"
               :id="item.id"
               v-if="$showBtn(item.id)"
-              :style="objStyle" class="marRight-10 icons"
+              :style="objStyle" style="margin-left: 5px" class="marRight-10 icons"
               size=20></Icon>
       </span>
       <span v-else>
@@ -13,12 +13,12 @@
          <Icon :type="item.type"
                :id="item.id"
                v-if="$showBtn(item.id) && (item.name.indexOf('预览') !== -1)"
-               @click.native="_iconClick(item.name,item.componentName,rowIndex,item.id)" class="marRight-10 icons"
+               @click.native="_iconClick(item.name,item.componentName,rowIndex,item.id)"  style="margin-left: 5px" class="marRight-10 icons"
                size=20></Icon>
          <Icon :type="item.type"
                :id="item.id"
                v-else-if="$showBtn(item.id)"
-               @click.native.stop="_iconClick(item.name,item.componentName,rowIndex,item.id)" class="marRight-10 icons"
+               @click.native.stop="_iconClick(item.name,item.componentName,rowIndex,item.id)"  style="margin-left: 5px" class="marRight-10 icons"
                size=20></Icon>
       </span>
     </Tooltip>

pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue

@@ -28,7 +28,7 @@
           <!--表格-->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" >
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -73,17 +73,17 @@ export default {
       ],
       iconMsg: [
         {
-          type: 'ios-clock',
+          type: 'md-create',
           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-remove-circle', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',
@@ -137,7 +137,7 @@ export default {
             this._editModal(false)
             break
           case '提交':
-            this._editModal(false)
+            this._submitToReview()
             break
           case 'search':
             this.searchOpen = !this.searchOpen
@@ -145,6 +145,26 @@ export default {
         }
       })
     },
+    _submitToReview() {
+      this._submitByContractIds('委托评审')
+    },
+    _submitByContractIds(cont) {
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请至少选择一条数据！')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
+          onOk: () => {
+            const result = meterEntrust.submit(ids)
+            if (result) {
+              console.log(result)
+            }
+          }
+        })
+      }
+    },
     _iconClick(res, data, componentName) {
       this.currentComponent = componentName
       this.$nextTick(function() {
@@ -178,6 +198,9 @@ export default {
         case 'iconClick':
           this._iconClick(data.name, data.rowData, data.componentName)
           break
+        case 'selectIds':
+          this.selectIds = data
+          break
         case 'changeSize':
           this._page()
           break

pages/meter-entrust/send-test/MeterSendEntrust.vue

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="实验室名称:">
-                <Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/>
+                <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-item" label="资质:">
-                <Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
+                <Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn">
-                <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">

pages/meter-review/MeterReviewEntrust.vue

@@ -72,17 +72,16 @@ export default {
       ],
       iconMsg: [
         {
-          type: 'ios-clock',
+          type: 'md-paper',
           id: '',
-          name: '编辑'
+          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: 'ios-clock',
           id: '',