|
|
@@ -144,7 +144,8 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8" v-if="mainForm.EntrustStatus == 1">
|
|
|
- <el-form-item label="检测样本数量">
|
|
|
+ <el-form-item label="实际检测
|
|
|
+数量">
|
|
|
<span>{{ TestSampleNum }}</span>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -155,6 +156,21 @@
|
|
|
</el-col> -->
|
|
|
</el-row>
|
|
|
|
|
|
+ <div>
|
|
|
+ <el-table :data="equipmentEntityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
|
|
|
+ <!--<el-table-column label="操作" width="100px" fixed>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button type="plain" plain size="mini" @click="delEntrustEquipment(scope.row.Id)">删除</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>-->
|
|
|
+ <el-table-column v-for="column in tableColumns" :key="column.Id"
|
|
|
+ v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
|
|
|
+ :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
|
|
|
+ </el-pagination>
|
|
|
+ </div>
|
|
|
+
|
|
|
<el-card class="box-card deliverFormcss delivercard" style="margin-top: 1px" v-if="deliverList && deliverList.length > 0 && mainForm.ISdeliver == 1">
|
|
|
<div slot="header">
|
|
|
<legend style="color:#436EEE"></legend>
|
|
|
@@ -401,9 +417,11 @@
|
|
|
import {
|
|
|
mapGetters
|
|
|
} from 'vuex'
|
|
|
- import axios from "../../../../../.nuxt/axios";
|
|
|
- import docTemplateApi from '@/api/lims/docTemplate';
|
|
|
- import entrustApi from "@/api/lims/limsentrust";
|
|
|
+ import axios from "../../../../../.nuxt/axios"
|
|
|
+ import docTemplateApi from '@/api/lims/docTemplate'
|
|
|
+ import entrustApi from "@/api/lims/limsentrust"
|
|
|
+ import entrustEquipmentApi from '@/api/lims/entrustEquipment'
|
|
|
+
|
|
|
export default {
|
|
|
computed: {
|
|
|
...mapGetters({
|
|
|
@@ -423,6 +441,12 @@
|
|
|
pagetitle: '', //界面标题
|
|
|
ServiceId: '',
|
|
|
Id: '',
|
|
|
+ // 列表排序
|
|
|
+ Column: {
|
|
|
+ Order: '',
|
|
|
+ Prop: ''
|
|
|
+ },
|
|
|
+ equipmentEntityList: [],
|
|
|
//样本单位
|
|
|
sampeunitlist: [],
|
|
|
//委托方名称
|
|
|
@@ -566,6 +590,63 @@
|
|
|
trigger: 'blur'
|
|
|
}],
|
|
|
},
|
|
|
+ tableColumns: [
|
|
|
+ {
|
|
|
+ prop: 'TemplateTypeName',
|
|
|
+ label: '检测报告',
|
|
|
+ width: 200,
|
|
|
+ sort: true
|
|
|
+ },
|
|
|
+
|
|
|
+ {
|
|
|
+ prop: 'OrderNo',
|
|
|
+ label: '序号',
|
|
|
+ width: 100,
|
|
|
+ sort: true
|
|
|
+ },
|
|
|
+
|
|
|
+ {
|
|
|
+ prop: 'CustNo',
|
|
|
+ label: '编号',
|
|
|
+ width: 100,
|
|
|
+ sort: true
|
|
|
+ },
|
|
|
+
|
|
|
+ {
|
|
|
+ prop: 'Spec',
|
|
|
+ label: '规格型号',
|
|
|
+ width: 100,
|
|
|
+ sort: true
|
|
|
+ },
|
|
|
+
|
|
|
+ {
|
|
|
+ prop: 'Manufacturer',
|
|
|
+ label: '制造厂家',
|
|
|
+ width: 200,
|
|
|
+ sort: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ prop: 'PositionCheck',
|
|
|
+ label: '检测地点',
|
|
|
+ width: 200,
|
|
|
+ sort: true
|
|
|
+ },
|
|
|
+
|
|
|
+ {
|
|
|
+ prop: 'Position',
|
|
|
+ label: '安装位置',
|
|
|
+ width: 200,
|
|
|
+ sort: true
|
|
|
+ },
|
|
|
+
|
|
|
+ {
|
|
|
+ prop: 'DepartmentName',
|
|
|
+ label: '所属单位',
|
|
|
+ width: 200,
|
|
|
+ sort: true
|
|
|
+ }
|
|
|
+
|
|
|
+ ],
|
|
|
detail_flag: true,
|
|
|
transportDialog: false,
|
|
|
detailsDialog: false,
|
|
|
@@ -645,12 +726,50 @@
|
|
|
this.getProjectType()
|
|
|
this.getSampleTypeOrigList()
|
|
|
//this.getpartuserlist()
|
|
|
- this.getDictList();
|
|
|
+ this.getDictList()
|
|
|
//判断组织结构
|
|
|
this.getOrganizeListById()
|
|
|
this.getPermissions() //权限
|
|
|
},
|
|
|
methods: {
|
|
|
+ initDeviceList () {
|
|
|
+ let params = {
|
|
|
+ _currentPage: this.currentPage,
|
|
|
+ _size: this.size,
|
|
|
+ Order: this.Column.Order,
|
|
|
+ Prop: this.Column.Prop,
|
|
|
+ EntrustMainId: this.mainForm.Id
|
|
|
+ }
|
|
|
+ // 访问接口
|
|
|
+ entrustEquipmentApi.getList('', params, this.$axios).then(res => {
|
|
|
+ this.equipmentEntityList = res.data.items
|
|
|
+ this.currentItemCount = res.data.currentItemCount
|
|
|
+ }).catch(err => {
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ // 列表排序功能
|
|
|
+ orderby(column) {
|
|
|
+ if (column.order == 'ascending') {
|
|
|
+ this.Column.Order = 'asc'
|
|
|
+ } else if (column.order == 'descending') {
|
|
|
+ this.Column.Order = 'desc'
|
|
|
+ }
|
|
|
+ this.Column.Prop = column.prop
|
|
|
+ this.initDeviceList()
|
|
|
+ },
|
|
|
+
|
|
|
+ handleCurrentChange (value) {
|
|
|
+ this.currentPage = value
|
|
|
+ this.initDeviceList()
|
|
|
+ },
|
|
|
+ handleSizeChange (value) {
|
|
|
+ this.size = value
|
|
|
+ this.currentPage = 1
|
|
|
+ this.initDeviceList()
|
|
|
+ },
|
|
|
+
|
|
|
//验证单号是否唯一
|
|
|
trueEntrustNo() {
|
|
|
let _this = this
|
|
|
@@ -826,12 +945,13 @@
|
|
|
// }
|
|
|
_this.getAddress(_this.mainForm.CustomerId)
|
|
|
_this.getpartuserlist(this.mainForm.DataTemplateId)
|
|
|
+ _this.initDeviceList()
|
|
|
}).catch(err => {
|
|
|
// handle error
|
|
|
console.error(err)
|
|
|
})
|
|
|
},
|
|
|
- getSampleNum() {
|
|
|
+ getSampleNum () {
|
|
|
let _this = this
|
|
|
this.$axios.get('limsentrust/getsamplenum/' + _this.ServiceId, {})
|
|
|
.then(res => {
|