Browse Source

修改 task

master
xiaobai 3 years ago
parent
commit
f5a50b5e9c
  1. 1
      src/components/drawerDialog/index.vue
  2. 14
      src/views/task/list.vue
  3. 3
      src/views/ysjl/3000/common/inspection-items.vue

1
src/components/drawerDialog/index.vue

@ -251,6 +251,7 @@
@current-change="rowClick"
>
<el-table-column align="center" label="序号" width="50" type="index" />
<el-table-column :formatter="(row, index, cellValue) => jyxmModes[cellValue]" align="center" label="检验项目模式" prop="jyxmMode" />
<el-table-column align="center" label="检验项目索引" prop="sort" />
<el-table-column
align="center"

14
src/views/task/list.vue

@ -32,7 +32,7 @@
<el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-select v-model="listQuery.neibuleibie" placeholder="请选择检验类别" clearable>
<el-option v-for="item in searchNblbList" v-show="item.parentId" :key="item.code" :label="item.name" :value="item.code" />
<el-option v-for="item in allCategory" :key="item.code" :label="item.name" :value="item.code" />
</el-select>
<el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 340px" @keyup.enter.native="handleFilter" />
<el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 230px" @keyup.enter.native="handleFilter" />
@ -233,6 +233,7 @@ import Utils from '../../utils/contact.js'
import { getOwnList, terminateRenwu, completeRenwuFn } from '@/api/renwu'
import { cancelRenwuFn } from '@/api/common'
import Enclosure from '@/views/common/Enclosure'
import {mapGetters} from 'vuex'
export default {
name: 'MyTask',
components: { Sticky, Pagination, SliceUpload, Enclosure },
@ -297,9 +298,14 @@ export default {
}
},
computed: {
// 使 getter computed
searchNblbList() {
return this.$store.getters.allCategory
...mapGetters(['allCategory'])
},
watch:{
allCategory:{
handler(n,o){
return n.filter(item=>item.parentId!==null)
},
deep:true
}
},
created() {

3
src/views/ysjl/3000/common/inspection-items.vue

@ -1,4 +1,3 @@
<template>
<div class="app-container">
<el-table
@ -28,7 +27,7 @@
label="项目编号"
prop="jianyanmu"
/>
<el-table-column align="center" label="检验项目及内容" prop="jianyanneirong" />
<el-table-column align="left" label="检验项目及内容" prop="jianyanneirong" />
<el-table-column
align="center"
prop="jianyanjieguo"

Loading…
Cancel
Save