Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

pages/soil-sample-manage/sample-take/TakeBySample.vue

@@ -114,23 +114,12 @@ export default {
         id: 'rel-sample-receive-del-sample',
         name: '删除'
       },
-      copy: {
-        type: 'ios-copy',
-        id: 'rel-sample-receive-copy-sample',
-        name: '复制'
-      },
       record: {
         type: 'ios-clock',
         id: '',
         name: '操作日志',
         componentName: 'FoodSampleRecord'
       },
-      sampleDownloadContract: {
-        type: 'share',
-        id: 'food-sample-receive-sample-download-contract',
-        name: '导出委托协议'
-      },
-
       getPage: {},
       pageColumns: [
         { title: '试样编号', key: 'sampleCode', width: 130 },

pages/soil-sample-manage/sample-take/TakeSampleManage.vue

 <template>
   <div>
-    <Modal v-model="showSampleModal" @on-visible-change="_visibleChange"
-           width="1100" class="zIndex-900 modal-footer-none">
+    <Modal v-model="showSampleModal" width="1100"
+           class="zIndex-900 modal-footer-none" @on-visible-change="_visibleChange">
     <div>
       <!--内容-->
       <Row>
         <!--查询-->
         <Col span="24" style="padding-bottom: 5px">
-          <Form id="search-wait" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+          <Form v-show="searchOpen" id="search-wait" :label-width="90" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="试样编号:" class="search-item">
-              <Input v-model="formObj.sampleCode" @on-enter="_formSearch" name="sampleCode" placeholder="请输入样品编号" clearable></Input>
+              <Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch"></Input>
               <input name="contractId" type="hidden">
             </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 :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" @on-result-change="_btnClick">
             <!--<template slot="processTask">-->
             <!--<div class="fr process-task">-->
             <!--<Button @click="_exportReceiveRecord">导出交接记录</Button>-->
@@ -33,8 +33,8 @@
             :table-height="tableHeight"
             :get-page="getPage"
             :icon-msg="iconMsg"
-            @on-result-change="_tableResultChange"
-            select-data>
+            select-data
+            @on-result-change="_tableResultChange">
             <vxe-table-column
               v-for="item in pageColumns"
               :key="item.key"
@@ -76,8 +76,8 @@ export default {
         { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
         { title: '试样深度', key: 'sampleDepth', width: 95 },
         { title: '检测科室', key: 'groupName', width: 95 },
-        { title: '土质描述', key: 'sampleDescribe', width: 185 },
-        { title: '样品描述', key: 'describeDetail', width: 185 },
+        { title: '土质描述', key: 'describeDetail', width: 285 },
+        { title: '样品描述', key: 'sampleDescribe', width: 130 },
         { title: '样品包装类型', key: 'samplePack', width: 120 },
         { title: '样品制备人', key: 'preparer', width: 120 },
         { title: '样品制备时间', key: 'prepareDate', width: 135, date: true }
@@ -213,7 +213,7 @@ export default {
             this._editModal(true, data)
             break
           case '试验项目':
-            this._itemManage(data.sampleId)
+            this._itemManage(data.sampleId, data.groupId)
             break
           case '复制':
             this._copySample(data)
@@ -230,13 +230,9 @@ export default {
         }
       })
     },
-    _itemManage(data) {
+    _itemManage(sampleId, groupId) {
       // 管理检测项目
-      if (this.recordHis) {
-        this.$refs.sampleItemManage._openRecord(data)
-      } else {
-        this.$refs.ItemManage._open(data)
-      }
+      this.$refs.ItemManage._open(sampleId, groupId)
     },
     _btnClick(msg, currentComponent) {
       this.currentComponent = currentComponent

pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/SampleManage.vue

@@ -43,12 +43,11 @@ export default {
   },
   methods: {
     _open(contractId, type, name) {
-      this.type = type // 类型（采样或送样）
+      this.type = type
       this.name = name
       this.showSampleModal = true
-      this.entrustId = contractId // 合同id
+      this.entrustId = contractId
       this.activeName = 'waitReceive'
-      // this.currentComponent = 'waitScan'
       this.selectIds = []
       this._waitPage()
     },