Skip to content

P
patzn-cloud-web-back-soil
Commit 5ff171c0 by lichengming
Options

修改了委托单登记导入样品

parent 59c16123
Showing with 143 additions and 94 deletions
components/base/AutoCompletes.vue
......@@ -127,6 +127,9 @@ export default {
if (this.focus !== undefined) {
this.$emit('on-result-change', 'focus', '', this.dataHandObj)
}
},
_clear() {
this.dataValue = ''
}
}
}
......
components/headers/top-bar-menu.vue
......@@ -243,8 +243,8 @@ export default {
this._workflow()
this._localStorageSkin()
// 定时锁屏
this._timeLock()
window.addEventListener('mouseup', this._timeLock)
// this._timeLock()
// window.addEventListener('mouseup', this._timeLock)
}
},
methods: {
......
pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" width="1200">
<p slot="header">{{modalTitle}}</p>
<div>
<Form id="MeterSendTestEdit" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
<Form id="MeterSendTestEdit" ref="formObj" :model="formObj" :label-width="90" inline>
<Form-item label="委托商" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
<AutoComplete ref="autoInput" v-model="formObj.client" :down-data="customerData"
@on-result-change="_cusNameChange" name="client" placeholder="请输入或选择委托单位"
></AutoComplete>
</Form-item>
<Form-item label="委托日期：" prop="entrustDate" class="width-48">
......@@ -57,7 +60,7 @@
</Form>
</div>
<div style="margin-bottom: 10px;">
<btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick"
<btn-list :msg="edit?btnEdit:btn" :open="searchOpen" @on-result-change="_btnClick"
class="contHide"></btn-list>
</div>
<div>
......@@ -200,6 +203,7 @@ export default {
},
showBtn: true,
customerData: [],
edit: false,
cityData: [],
selectData: [],
searchOpen: true,
......@@ -238,6 +242,29 @@ export default {
// name: '导入'
// }
],
btnEdit: [
{
type: 'success',
id: '',
name: '添加'
},
{
type: 'success',
id: '',
name: '导入样品'
},
{
type: 'success',
id: '',
name: '导入试验项目'
}
// ,
// {
// type: 'success',
// id: '',
// name: '导入'
// }
],
options: [
{
name: '检定'
......@@ -451,7 +478,7 @@ export default {
case '导入试验项目':
this._importItem()
break
case '导入':
case '导入样品':
this._importSample()
break
case 'search':
......@@ -468,37 +495,51 @@ export default {
this.allSelect(this.selectData)
}
},
_getByEntrustId: async function(id) {
const result = await soilEntrust.getVOById(id)
if (result) {
this.$forceUpdate()
const sampleList = Object.assign(
this.getPage.records,
result.sampleList
)
this.$set(this.getPage.records, sampleList)
}
},
_inputBack(data) {
console.log(data)
if (undefined !== data) {
if (this.getPage.records.length > 0) {
const j = this.getPage.records.length
for (let i = j; i < data.length + j; i++) {
console.log(i)
this.getPage.records.push(data[i - j])
if (data[i - j].lastTime !== undefined) {
this.getPage.records[i].lastTime = new Date(data[i - j].lastTime)
}
console.log(this.getPage.records)
// this.getPage.records[i].lastTime = new Date(data[0].lastTime)
}
} else {
for (let i = 0; i < data.length; i++) {
// if (this.getPage.records[i].lastTime !== undefined) {
// const t = this.getPage.records[i].lastTime
// const d = t.valueOf(t)
// console.log('时间戳', d)
// this.getPage.records[i].lastTime = d
// this.getPage.records = []
// }
this.getPage.records.push(data[i])
if (data[i].lastTime !== undefined) {
this.getPage.records[i].lastTime = new Date(data[i].lastTime)
}
console.log(data[i].lastTime)
}
}
}
if (data) {
this._getByEntrustId(this.id)
}
// if (undefined !== data) {
// if (this.getPage.records.length > 0) {
// const j = this.getPage.records.length
// for (let i = j; i < data.length + j; i++) {
// console.log(i)
// this.getPage.records.push(data[i - j])
// if (data[i - j].lastTime !== undefined) {
// this.getPage.records[i].lastTime = new Date(data[i - j].lastTime)
// }
// console.log(this.getPage.records)
// // this.getPage.records[i].lastTime = new Date(data[0].lastTime)
// }
// } else {
// for (let i = 0; i < data.length; i++) {
// // if (this.getPage.records[i].lastTime !== undefined) {
// // const t = this.getPage.records[i].lastTime
// // const d = t.valueOf(t)
// // console.log('时间戳', d)
// // this.getPage.records[i].lastTime = d
// // this.getPage.records = []
// // }
// this.getPage.records.push(data[i])
// if (data[i].lastTime !== undefined) {
// this.getPage.records[i].lastTime = new Date(data[i].lastTime)
// }
// console.log(data[i].lastTime)
// }
// }
// }
},
_ctimeChange(data) {
this.formObj.entrustDate = data
......@@ -618,9 +659,9 @@ export default {
},
_importSample() {
const data = {
importUrl: '/meter/v1/sample/import_sample_pre',
importUrl: '/soil/v1/entrust/edit_import_entrust/?id=' + this.id,
downloadUrl: '/meter/v1/excel/template/MeterSampleImport',
title: '导入'
title: '样品导入'
}
this.$refs.importModal._open(data, '样品导入')
},
......@@ -779,7 +820,6 @@ export default {
}
} else {
this.$Message.error('表单验证失败!')
this._hideLoading()
}
})
},
......@@ -807,6 +847,8 @@ export default {
this.showModal = false
},
_open(formObj) {
this.$refs.autoInput._clear()
this.edit = false
this._getList()
this._getTestType()
this._getPackList()
......@@ -814,22 +856,19 @@ export default {
this._getUser()
this.showBtn = true
this.showModal = true
this.$refs.formObj.resetFields()
this._getUser()
this._hideLoading()
if (this.$string(formObj).isEmpty()) {
this.$refs.formObj.resetFields()
this.getPage.records = []
this.formObj.client = ''
this.id = ''
this.formObj.entrustDate = new Date()
this.modalTitle = '委托单新增'
} else {
this.id = formObj.id
this.formObj = formObj
this.modalTitle = '委托单编辑'
this._showTime(formObj)
}
},
_openEdit(formObj) {
this.edit = true
console.log(formObj)
this._getList()
this._getTestType()
......@@ -896,13 +935,10 @@ export default {
_getList: async function() {
const result = await meterEntrust.pageList()
const list = []
console.log('result', result)
if (result) {
for (let i = 0; i < result.length; i++) {
console.log(result[i].cname)
list.push(result[i].cname)
}
console.log('委托单位名单', list)
this.customerData = list
}
},
......@@ -913,6 +949,7 @@ export default {
}
},
_save: async function(data) {
this._hideLoading()
console.log(data)
const result = await soilEntrust.save(data)
console.log(result)
......@@ -921,10 +958,17 @@ export default {
}
},
_edit: async function(data) {
this._hideLoading()
const result = await soilEntrust.editDTO(data)
if (result) {
this._resultChange('编辑成功!')
}
},
_visibleChange(data) {
this.$forceUpdate()
console.log('清空')
this.formObj.client = ''
this.formObj = {}
}
}
}
......
pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue
......@@ -30,7 +30,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :iconMsg="iconMsg" :tableName="tableName" :rows="100"
@on-result-change="_tableResultChange" :getPage="getPage" :iconMsg="iconMsg" :tableName="tableName"
select-data is-report>
<vxe-table-column
:field="item.key"
......
pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue
......@@ -41,7 +41,7 @@
:tableHeight="tableHeight"
:getPage="getPage"
:iconMsg="iconMsg"
@on-result-change="_tableResultChange" :rows="100" select-data>
@on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......
pages/soil-report-manage/report-make/tabs/ReportMakeBySample.vue
......@@ -28,7 +28,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :tableHeight="tableHeight" @on-result-change="_tableResultChange"
:getPage="getPage" :rows="100" select-data>
:getPage="getPage" select-data>
<vxe-table-column
:field="item.key"
:title="item.title"
......
pages/soil-report-manage/report-manage/tab/ReportByContract.vue
......@@ -34,7 +34,7 @@
:getPage="getPage"
:iconMsg="iconMsg"
@on-result-change="_tableResultChange"
:rows="100">
>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......
pages/soil-report-manage/report-manage/tab/ReportByReport.vue
......@@ -29,7 +29,7 @@
:getPage="getPage"
:iconMsg="iconMsg"
@on-result-change="_tableResultChange"
:rows="100">
>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......
pages/soil-sample-manage/sample-take/TakeByEwm.vue
......@@ -93,9 +93,7 @@ export default {
},
// 关闭弹框，刷新界面
_visibleChange(data) {
if (!data) {
this.$emit('on-result-change')
}
this.$emit('on-result-change')
}
}
}
......
pages/soil-sample-manage/sample-take/TakeBySample.vue
......@@ -59,7 +59,7 @@
<!--打印（可填打印数量）-->
<!--选择领样人-->
<UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
<TakeByEwm ref="ewmModal"></TakeByEwm>
<TakeByEwm ref="ewmModal" @on-result-change="_page"></TakeByEwm>
</div>
</template>
......
pages/soil-sample-manage/sample-take/TakeSampleManage.vue
<template>
<div>
<Modal v-model="showSampleModal" width="1100"
class="zIndex-900 modal-footer-none">
<Modal v-model="showSampleModal" @on-visible-change="_visibleChange"
width="1100" class="zIndex-900 modal-footer-none">
<div>
<!--内容-->
<Row>
<!--查询-->
<Col span="24" style="padding-bottom: 5px">
<Form v-show="searchOpen" id="search-wait" :label-width="90" inline onsubmit="return false">
<Form id="search-wait" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item label="试样编号:" class="search-item">
<Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch"></Input>
<Input v-model="formObj.sampleCode" @on-enter="_formSearch" name="sampleCode" placeholder="请输入样品编号" clearable></Input>
<input name="contractId" type="hidden">
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" @on-result-change="_btnClick">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick" class="contHide">
<!--<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"
select-data
@on-result-change="_tableResultChange">
@on-result-change="_tableResultChange"
select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -358,11 +358,9 @@ export default {
}
},
_resultChange(msg) {
if (this.$store.state.FoodSample.success) {
this._page()
this.$Message.success(msg)
this.selectIds = []
}
this._page()
this.$Message.success(msg)
this.selectIds = []
},
_exportReceiveRecord() {
......@@ -617,6 +615,9 @@ export default {
this.$store.dispatch('FoodSample/listReceiveStandard', obj).then(() => {
this.stdList = this.$store.state.FoodSample.list
})
},
_visibleChange(data) {
this.$emit('on-result-change')
}
}
}
......
pages/soil-test-manage/test-data-audit/IndexManageEdit.vue
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" @on-visible-change="_visibleChange" width="900">
<p slot="header">{{modalTitle}}</p>
<div>
......
pages/soil-test-manage/test-data-audit/item-tabs/ItemLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" :rows="100" select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-data-audit/item-tabs/ItemRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-data-audit/sample-tabs/SampleLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100">
@on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-data-audit/sample-tabs/SampleRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-data-check/item-tabs/ItemLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" :rows="100" select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-data-check/item-tabs/ItemRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-data-check/sample-tabs/SampleLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100">
@on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-data-check/sample-tabs/SampleRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-input/SelectOriTempRecord.vue
......@@ -141,6 +141,7 @@ export default {
this.$refs.footerModal._hideLoading()
},
_open(ids, entrustId) {
console.log(Global.recordURL)
this.formObj = this.$resetFields(this.formObj)
this.entrustId = entrustId
this._classTree()
......
pages/soil-test-manage/test-input/item-tab/ItemLeftList.vue
......@@ -18,7 +18,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" select-data :getPage="getPage" :rows="100">
@on-result-change="_tableResultChange" select-data :getPage="getPage" >
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-input/item-tab/ItemRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-input/item-tabs/ItemLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" :rows="100" select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-input/sample-tab/SampleLeftList.vue
......@@ -18,7 +18,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100">
@on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-input/sample-tab/SampleRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-input/sample-tabs/SampleLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100">
@on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/item-tabs/ItemLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100" :is-radio="true" select-data hide-checkbox>
@on-result-change="_tableResultChange" :getPage="getPage" :is-radio="true" select-data hide-checkbox>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/item-tabs/ItemRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/sample-tabs/SampleLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100">
@on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/sample-tabs/SampleRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :page-columns="pageColumns" :table-height="tableHeight"
:get-page="getPage" :table-name="tableName" :rows="100" is-task select-data @on-result-change="_tableResultChange">
:get-page="getPage" :table-name="tableName" is-task select-data @on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100" :is-radio="true" select-data hide-checkbox>
@on-result-change="_tableResultChange" :getPage="getPage" :is-radio="true" select-data hide-checkbox>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/sample-tabs/SampleLeftList.vue
......@@ -20,7 +20,7 @@
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100">
@on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/sample-tabs/SampleRightList.vue
......@@ -20,7 +20,7 @@
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
@on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" is-task select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment