修改了试验委托评审

components/table/PTVXETable.vue

@@ -267,7 +267,7 @@ export default {
           for (let i = 0; i < selData.length; i++) {
             idList.push(selData[i].id)
           }
-          this.$emit('on-result-change', 'selectIds', idList)
+          this.$emit('on-result-change', 'selectIds', idList, selData)
         } else {
           // 有selectData参数时执行
           this.$emit('on-result-change', 'selectData', selData)
@@ -276,6 +276,7 @@ export default {
     },
     // 整行变色
     _tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex
       if (this.checkData.length !== 0) {
         /* 选中的进行高亮显示 */
         const index = this.checkData.indexOf(row)
@@ -418,6 +419,10 @@ export default {
         obj: obj
       })
     },
+    checkedData() {
+      console.log(this.$refs.xTable.selection)
+      this.$emit('on-result-change', 'allSelect', this.$refs.xTable.selection)
+    },
     // 双击行操作
     _dbChange(data, event) {
       this.$emit('on-result-change', 'dbSelect', data.row)

pages/meter-aptitude/standard-manage/SampleItemSelect.vue

+<!--检测项目编辑列表（添加、导入检测项目）-->
+<template>
+  <div>
+    <Modal
+      v-model="showModal"
+      :mask-closable="false"
+      title="检测项目管理"
+      :width="1200"
+    >
+      <Row>
+        <Col span="24">
+        <Form v-model="formObj" inline onsubmit="return false" :label-width="90">
+          <Form-item class="search-item" label="检测项目:" style="margin-left: -25px">
+            <Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
+            <input v-model="formObj.catalogueId" type="hidden">
+          </Form-item>
+          <!--          <Form-item class="search-item" label="检测依据:">-->
+          <!--            <Input v-model="formObj.code" placeholder="请输入检测依据名称" clearable @on-enter="_formSearch" />-->
+          <!--          </Form-item>-->
+          <Form-item class="search-btn">
+            <Button type="primary" @click="_formSearch">
+              搜索
+            </Button>
+          </Form-item>
+        </Form>
+        </Col>
+        <!--正常界面-->
+        <Col span="24">
+        <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" />
+        </Col>
+        <!-- 表格 -->
+        <Col span="24">
+        <element-table
+          ref="pageTable"
+          :page-columns="pageColumns"
+          select-data
+          :table-height="350"
+          :get-page="getPage"
+          :icon-msg="iconMsg"
+          :opt-col-width="80"
+          show-check-box
+          @on-result-change="_tableResultChange"
+        >
+          <el-table-column
+            v-for="item in pageColumns"
+            :key="item.key"
+            show-overflow-tooltip
+            sortable
+            :prop="item.key"
+            :label="item.title"
+            :width="item.width"
+            :min-width="200"
+          >
+            <template slot-scope="scope">
+              <span v-if="item.key==='judged'">
+                {{ scope.row[item.key]===1?'是':'否' }}
+              </span>
+              <div v-else-if="item.key==='compareSymbol'" @click.stop="_handleRow(scope)">
+                <el-input
+                  v-model="scope.row.compareSymbol"
+                  placeholder="请输入比较符"
+                />
+              </div>
+              <div v-else-if="item.key==='limitValue'" @click.stop="_handleRow(scope)">
+                <el-input
+                  v-model="scope.row.limitValue"
+                  placeholder="请输入限值"
+                />
+              </div>
+              <div v-else-if="item.key==='unit'" @click.stop="_handleRow(scope)">
+                <el-input
+                  v-model="scope.row.unit"
+                  placeholder="请输入单位"
+                />
+              </div>
+              <div v-else-if="item.key==='code'" @click.stop="_handleRow(scope)">
+                <el-input
+                  v-model="scope.row.code"
+                  style="width: 130px;"
+                  blur
+                  placeholder="请选择检测依据"
+                />
+                <i style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search" @click.stop="_selectjudgeBasis(scope.$index)"></i>
+              </div>
+              <span v-else>
+                {{ scope.row[item.key] }}
+              </span>
+            </template>
+          </el-table-column>
+        </element-table>
+        </Col>
+      </Row>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+export default {
+  components: {},
+  data() {
+    return {
+      formObj: {
+        catalogueId: '',
+        name: '',
+        code: '',
+        standardCode: '',
+        standardName: ''
+      },
+      showModal: false,
+      searchOpen: false,
+      btn: [],
+      index: '',
+      iconMsg: [],
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '保存', type: 'primary' }
+      ],
+      pageColumns: [
+        { title: '项目类别', key: 'type', width: 140 },
+        { title: '检测项目', key: 'name', width: 140 },
+        { title: '子项目', key: 'sonItem', width: 140 },
+        { title: '方法', key: 'method', width: 180 },
+        { title: '设备', key: 'device', width: 180 },
+        { title: '检测依据', key: 'code', width: 180 },
+        { title: '检测科室', key: 'groupName', width: 110 },
+        { title: '比较符', key: 'compareSymbol', width: 120 },
+        { title: '限值', key: 'limitValue' },
+        { title: '单位', key: 'unit' },
+        { title: '是否系统判定', key: 'judged', width: 120, judged: true },
+        { title: '备注', key: 'remark' }
+      ],
+      catalogueId: '',
+      getPage: {},
+      selectData: []
+    }
+  },
+  methods: {
+    _open(catalogueId, label) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.showModal = true
+      this.catalogueId = catalogueId
+      this.formObj.catalogueId = catalogueId
+      this.getPage.records = []
+      this.$refs.pageTable._hideLoading()
+      // this._page()
+      // if (catalogueId) {
+      //   this._page()
+      // }
+    },
+    _handleRow(scope) {
+      console.log(scope)
+    },
+    _selectjudgeBasis(index) {
+      console.log(index)
+      this.index = index
+      this.$refs.EditModal._open()
+    },
+    _backData(data) {
+      console.log(typeof this.index)
+      this.getPage.records[this.index].code = data.code
+      this.$set(
+        this.getPage.records,
+        this.index,
+        this.getPage.records[this.index]
+      )
+      console.log(this.getPage.records)
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '保存':
+          this._ok()
+          break
+      }
+    },
+    // _page: async function() {
+    //   Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+    //   const result = await aptitudeItem.pageAptitudeItem(
+    //     this.$serializeForm(this.formObj)
+    //   )
+    //   if (result) {
+    //     this.getPage = result
+    //     this.$refs.pageTable._initTable()
+    //   }
+    // },
+    _btnClick(msg) {
+      switch (msg) {
+        case '导入检测项目':
+          this.$refs.relItemModal._open(this.catalogueId)
+          break
+      }
+    },
+    // 操作列操作
+    _iconClick(res, data) {
+      switch (res) {
+        case '删除':
+          this._deleteById(data.relPackageId)
+          break
+      }
+    },
+    // 删除
+    _deleteById(id) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: '确定删除该数据？',
+        onOk: () => {
+          this._deleteOk(id)
+        }
+      })
+    },
+    // _deleteOk: async function(id) {
+    //   // const result = await drugCatalogueItem.deleteById(id)
+    //   if (result) {
+    //     this.$Message.success('删除成功')
+    //     this._page()
+    //   }
+    // },
+    // table结果  返回整行
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          this._page()
+          break
+        case 'selectData':
+          this.selectData = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+      }
+    },
+    _ok() {
+      const data = this.selectData
+      if (data.length === 0) {
+        this._hideLoading()
+        this.$Message.warning('请选择至少一条数据！')
+      }
+      const ids = []
+      data.forEach(item => {
+        ids.push(item.id)
+      })
+      this._saveCatalogueItem(data)
+    },
+    _saveCatalogueItem(data) {
+      this.showModal = false
+      this._hideLoading()
+      this.$emit('on-result-change', data)
+      console.log('data------', data)
+      this._hideLoading()
+    },
+    _cancel() {
+      this.selectData = []
+      this.showModal = false
+    },
+    _hideLoading() {
+      this.$refs.footerModal._hideLoading()
+    }
+  }
+}
+</script>

pages/meter-aptitude/standard-manage/StandardManage.vue

@@ -250,7 +250,7 @@ export default {
     },
     _upload(id) {
       const obj = {
-        importUrl: '/food/v1/food_standard_info/upload/' + id
+        importUrl: '/soil/v1/standard_annex/upload/' + id
       }
       this.$refs.uploadModal._open(obj)
     },
@@ -371,14 +371,16 @@ export default {
     // 预览
     _viewReport(data) {
       const fileUrl = encodeURIComponent(
-        global.baseURL + '/food/v1/food_standard_info/download/' + data.id
+        global.baseURL + '/soil/v1/standard_annex/preview/' + data.id
       )
+      console.log(fileUrl)
       window.open(
         global.staticURL + '/pdf/PDFJS/pdfjs/web/viewer.html?file=' + fileUrl
       )
     },
     // 下载
     _download(data) {
+      console.log(data)
       this.$Modal.confirm({
         title: '提示',
         content: '确定要下载文件？',
@@ -388,7 +390,7 @@ export default {
             return
           }
           window.open(
-            global.baseURL + '/food/v1/food_standard_info/download/' + data.id,
+            global.baseURL + '/soil/v1/standard_annex/download/' + data.id,
             '_blank'
           )
         }

pages/meter-aptitude/standard-manage/StandardsManageEdit.vue

@@ -3,7 +3,7 @@
     <Modal v-model="showEditModal" :mask-closable="false" :width="500" class="zIndex-1200">
       <p slot="header">{{modalTitle}}</p>
       <div>
-        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
+        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
           <Form-item label="检测依据" prop="code" style="width: 100%">
             <Input v-model="formObj.code" name="code" placeholder="请输入检测依据"/>
           </Form-item>
@@ -71,7 +71,14 @@ export default {
       ],
       modalTitle: '添加食品标准表',
       formObj: {},
-      ruleValidate: {},
+      ruleValidate: {
+        code: [
+          { required: true, message: '检测依据不能为空', trigger: 'blur' }
+        ],
+        name: [
+          { required: true, message: '检测依据名称不能为空', trigger: 'blur' }
+        ]
+      },
       showEditModal: false,
       classifyList: [
         { value: 0, name: '判定依据' },

pages/meter-entrust/entrust-review/EntrustDetail.vue

+<template>
+  <div>
+    <Modal v-model="showDetailModal" :width="700" title="委托详情" class="modal-footer-none">
+      <div :style="{height}" style="overflow-y: auto">
+        <table class="tableClass">
+          <tbody>
+          <tr>
+            <th colspan="6" class="tableClass_back">委托单信息</th>
+          </tr>
+          <tr>
+            <th>委托商</th>
+            <td>{{obj.client}}</td>
+            <th>制表人</th>
+            <td>{{obj.tabulater}}</td>
+          </tr>
+          <tr>
+            <th>钻孔名称</th>
+            <td>{{obj.boreholeName}}</td>
+            <th>钻孔位置</th>
+            <td>{{obj.boreholeLocation}}</td>
+          </tr>
+          <tr>
+            <th>水深(米)</th>
+            <td>{{obj.waterDepth}}</td>
+            <th>检验类别</th>
+            <td>{{obj.testType}}</td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+/**
+ * 政府委托信息表详情
+ */
+export default {
+  data() {
+    return {
+      obj: {
+        // detail: {},
+        // customer: {},
+        // finance: {},
+        // tested: {}
+        firsted: 0,
+        client: '',
+        boreholeLocation: '',
+        boreholeName: '',
+        waterDepth: '',
+        tabulater: '',
+        testType: ''
+      },
+      showDetailModal: false,
+      // sampleType:['退样','留样','作废'],
+      dispose: '',
+      height: '',
+      showMoney: false
+    }
+  },
+  methods: {
+    _open(obj, flag) {
+      this.showDetailModal = true
+      this.obj = obj
+      console.log('传过来的数据')
+      console.log(this.obj)
+      // if(obj.dispose !== undefined || ''){
+      //   this.dispose = this.sampleType[obj.dispose];
+      // }else{
+      //   this.dispose = '';
+      // }
+      if (flag === 'showMoney') {
+        this.showMoney = true
+      } else {
+        this.showMoney = false
+      }
+      this.height = '350px'
+    }
+  }
+}
+</script>

router/soil-routes.js

@@ -6,6 +6,7 @@ import workbench from '../pages/workbench/workbench'
 import StandardManage from '../pages/meter-aptitude/standard-manage/StandardManage'
 import ExperimentItemManage from '../pages/meter-aptitude/item-manage/ExperimentItemManage'
 import EntrustIndex from '../pages/meter-entrust/entrust-register/EntrustIndex'
+import ReviewEntrust from '../pages/meter-entrust/entrust-review/ReviewEntrust'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -24,7 +25,7 @@ export default [
       },
       {
         path: 'review',
-        component: workbench,
+        component: ReviewEntrust,
         meta: { title: '试验委托评审' }
       }
     ]