Skip to content

P
patzn-cloud-web-back-soil
Commit 6191e020 by zhangmengqi
Options

Merge branch 'dev'

parents 499ab1c8 23d5ea3d
Showing with 523 additions and 307 deletions
components/base/AutoCompletes.vue
...@@ -127,6 +127,9 @@ export default { ...@@ -127,6 +127,9 @@ export default {
if (this.focus !== undefined) { if (this.focus !== undefined) {
this.$emit('on-result-change', 'focus', '', this.dataHandObj) this.$emit('on-result-change', 'focus', '', this.dataHandObj)
} }
},
_clear() {
this.dataValue = ''
} }
} }
} }
......
components/headers/top-bar-menu.vue
...@@ -243,8 +243,8 @@ export default { ...@@ -243,8 +243,8 @@ export default {
this._workflow() this._workflow()
this._localStorageSkin() this._localStorageSkin()
// 定时锁屏 // 定时锁屏
this._timeLock() // this._timeLock()
window.addEventListener('mouseup', this._timeLock) // window.addEventListener('mouseup', this._timeLock)
} }
}, },
methods: { methods: {
......
env/.env.production
...@@ -3,4 +3,5 @@ WEB_URL=http://soil.patzn.com ...@@ -3,4 +3,5 @@ WEB_URL=http://soil.patzn.com
BASE_URL=http://api.patzn.com BASE_URL=http://api.patzn.com
SSO_URL=http://sso.patzn.com SSO_URL=http://sso.patzn.com
STATIC_URL=http://static.patzn.com STATIC_URL=http://static.patzn.com
RECORD_URL=http://record.patzn.com
NC_URL=http://123.133.38.68:8088 NC_URL=http://123.133.38.68:8088
pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue
<template> <template>
<div> <div>
<Modal v-model="showModal" :mask-closable="false" width="1200"> <Modal v-model="showModal" :mask-closable="false" width="1200">
<p slot="header">{{modalTitle}}</p> <p slot="header">{{modalTitle}}</p>
<div> <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"> <Form-item label="委托商" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange" <AutoComplete ref="autoInput" v-model="formObj.client" :down-data="customerData"
name="client" placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange" name="client" placeholder="请输入或选择委托单位"
></AutoComplete> ></AutoComplete>
</Form-item> </Form-item>
<Form-item label="委托日期：" prop="entrustDate" class="width-48"> <Form-item label="委托日期：" prop="entrustDate" class="width-48">
...@@ -57,7 +60,7 @@ ...@@ -57,7 +60,7 @@
</Form> </Form>
</div> </div>
<div style="margin-bottom: 10px;"> <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> class="contHide"></btn-list>
</div> </div>
<div> <div>
...@@ -200,6 +203,7 @@ export default { ...@@ -200,6 +203,7 @@ export default {
}, },
showBtn: true, showBtn: true,
customerData: [], customerData: [],
edit: false,
cityData: [], cityData: [],
selectData: [], selectData: [],
searchOpen: true, searchOpen: true,
...@@ -238,6 +242,29 @@ export default { ...@@ -238,6 +242,29 @@ export default {
// name: '导入' // name: '导入'
// } // }
], ],
btnEdit: [
{
type: 'success',
id: '',
name: '添加'
},
{
type: 'success',
id: '',
name: '导入样品'
},
{
type: 'success',
id: '',
name: '导入试验项目'
}
// ,
// {
// type: 'success',
// id: '',
// name: '导入'
// }
],
options: [ options: [
{ {
name: '检定' name: '检定'
...@@ -451,7 +478,7 @@ export default { ...@@ -451,7 +478,7 @@ export default {
case '导入试验项目': case '导入试验项目':
this._importItem() this._importItem()
break break
case '导入': case '导入样品':
this._importSample() this._importSample()
break break
case 'search': case 'search':
...@@ -468,37 +495,51 @@ export default { ...@@ -468,37 +495,51 @@ export default {
this.allSelect(this.selectData) 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) { _inputBack(data) {
console.log(data) console.log(data)
if (undefined !== data) { if (data) {
if (this.getPage.records.length > 0) { this._getByEntrustId(this.id)
const j = this.getPage.records.length }
for (let i = j; i < data.length + j; i++) { // if (undefined !== data) {
console.log(i) // if (this.getPage.records.length > 0) {
this.getPage.records.push(data[i - j]) // const j = this.getPage.records.length
if (data[i - j].lastTime !== undefined) { // for (let i = j; i < data.length + j; i++) {
this.getPage.records[i].lastTime = new Date(data[i - j].lastTime) // console.log(i)
} // this.getPage.records.push(data[i - j])
console.log(this.getPage.records) // if (data[i - j].lastTime !== undefined) {
// this.getPage.records[i].lastTime = new Date(data[0].lastTime) // this.getPage.records[i].lastTime = new Date(data[i - j].lastTime)
} // }
} else { // console.log(this.getPage.records)
for (let i = 0; i < data.length; i++) { // // this.getPage.records[i].lastTime = new Date(data[0].lastTime)
// if (this.getPage.records[i].lastTime !== undefined) { // }
// const t = this.getPage.records[i].lastTime // } else {
// const d = t.valueOf(t) // for (let i = 0; i < data.length; i++) {
// console.log('时间戳', d) // // if (this.getPage.records[i].lastTime !== undefined) {
// this.getPage.records[i].lastTime = d // // const t = this.getPage.records[i].lastTime
// this.getPage.records = [] // // const d = t.valueOf(t)
// } // // console.log('时间戳', d)
this.getPage.records.push(data[i]) // // this.getPage.records[i].lastTime = d
if (data[i].lastTime !== undefined) { // // this.getPage.records = []
this.getPage.records[i].lastTime = new Date(data[i].lastTime) // // }
} // this.getPage.records.push(data[i])
console.log(data[i].lastTime) // if (data[i].lastTime !== undefined) {
} // this.getPage.records[i].lastTime = new Date(data[i].lastTime)
} // }
} // console.log(data[i].lastTime)
// }
// }
// }
}, },
_ctimeChange(data) { _ctimeChange(data) {
this.formObj.entrustDate = data this.formObj.entrustDate = data
...@@ -618,9 +659,9 @@ export default { ...@@ -618,9 +659,9 @@ export default {
}, },
_importSample() { _importSample() {
const data = { 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', downloadUrl: '/meter/v1/excel/template/MeterSampleImport',
title: '导入' title: '样品导入'
} }
this.$refs.importModal._open(data, '样品导入') this.$refs.importModal._open(data, '样品导入')
}, },
...@@ -779,7 +820,6 @@ export default { ...@@ -779,7 +820,6 @@ export default {
} }
} else { } else {
this.$Message.error('表单验证失败!') this.$Message.error('表单验证失败!')
this._hideLoading()
} }
}) })
}, },
...@@ -807,6 +847,8 @@ export default { ...@@ -807,6 +847,8 @@ export default {
this.showModal = false this.showModal = false
}, },
_open(formObj) { _open(formObj) {
this.$refs.autoInput._clear()
this.edit = false
this._getList() this._getList()
this._getTestType() this._getTestType()
this._getPackList() this._getPackList()
...@@ -814,22 +856,19 @@ export default { ...@@ -814,22 +856,19 @@ export default {
this._getUser() this._getUser()
this.showBtn = true this.showBtn = true
this.showModal = true this.showModal = true
this.$refs.formObj.resetFields()
this._getUser() this._getUser()
this._hideLoading() this._hideLoading()
if (this.$string(formObj).isEmpty()) { if (this.$string(formObj).isEmpty()) {
this.$refs.formObj.resetFields()
this.getPage.records = [] this.getPage.records = []
this.formObj.client = ''
this.id = '' this.id = ''
this.formObj.entrustDate = new Date() this.formObj.entrustDate = new Date()
this.modalTitle = '委托单新增' this.modalTitle = '委托单新增'
} else {
this.id = formObj.id
this.formObj = formObj
this.modalTitle = '委托单编辑'
this._showTime(formObj)
} }
}, },
_openEdit(formObj) { _openEdit(formObj) {
this.edit = true
console.log(formObj) console.log(formObj)
this._getList() this._getList()
this._getTestType() this._getTestType()
...@@ -896,13 +935,10 @@ export default { ...@@ -896,13 +935,10 @@ export default {
_getList: async function() { _getList: async function() {
const result = await meterEntrust.pageList() const result = await meterEntrust.pageList()
const list = [] const list = []
console.log('result', result)
if (result) { if (result) {
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
console.log(result[i].cname)
list.push(result[i].cname) list.push(result[i].cname)
} }
console.log('委托单位名单', list)
this.customerData = list this.customerData = list
} }
}, },
...@@ -913,6 +949,7 @@ export default { ...@@ -913,6 +949,7 @@ export default {
} }
}, },
_save: async function(data) { _save: async function(data) {
this._hideLoading()
console.log(data) console.log(data)
const result = await soilEntrust.save(data) const result = await soilEntrust.save(data)
console.log(result) console.log(result)
...@@ -921,10 +958,17 @@ export default { ...@@ -921,10 +958,17 @@ export default {
} }
}, },
_edit: async function(data) { _edit: async function(data) {
this._hideLoading()
const result = await soilEntrust.editDTO(data) const result = await soilEntrust.editDTO(data)
if (result) { if (result) {
this._resultChange('编辑成功!') this._resultChange('编辑成功!')
} }
},
_visibleChange(data) {
this.$forceUpdate()
console.log('清空')
this.formObj.client = ''
this.formObj = {}
} }
} }
} }
......
pages/soil-report-manage/report-make/OriginalRecordEdit.vue
...@@ -43,13 +43,21 @@ export default { ...@@ -43,13 +43,21 @@ export default {
// 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式 // 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式
const bindUri = const bindUri =
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source=' Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url = let url = ''
Global.recordURL + if (process.env.NODE_ENV === 'production') {
'/print/v1/eln/form_YT_' + url =
formId + 'http://record.patzn.com/print/v1/eln/form_YT_' +
'?bindUri=' + formId +
encodeURIComponent(bindUri) '?bindUri=' +
encodeURIComponent(bindUri)
} else {
url =
Global.recordURL +
'/print/v1/eln/form_YT_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri)
}
// this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>'; // this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>';
this.$layx(this.formIdTemp, '编辑原始记录', url) this.$layx(this.formIdTemp, '编辑原始记录', url)
}, },
...@@ -62,15 +70,25 @@ export default { ...@@ -62,15 +70,25 @@ export default {
// 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式 // 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式
const bindUri = const bindUri =
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source=' Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url = let url = ''
Global.recordURL + if (process.env.NODE_ENV === 'production') {
'/print/v1/eln/form_YT_' + url =
formId + 'http://record.patzn.com/print/v1/eln/form_YT_' +
'?bindUri=' + formId +
encodeURIComponent(bindUri) + '?bindUri=' +
'&type=' + encodeURIComponent(bindUri) +
fromType '&type=' +
fromType
} else {
url =
Global.recordURL +
'/print/v1/eln/form_YT_' +
formId +
'?bindUri=' +
encodeURIComponent(bindUri) +
'&type=' +
fromType
}
// this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>'; // this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>';
this.$layx(this.formIdTemp, '编辑原始记录', url) this.$layx(this.formIdTemp, '编辑原始记录', url)
}, },
......
pages/soil-report-manage/report-make/OriginalRecordView.vue
...@@ -325,14 +325,17 @@ export default { ...@@ -325,14 +325,17 @@ export default {
// 查看原始记录 // 查看原始记录
_recordView(originalRecordId) { _recordView(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + recordUrl + '/print/v1/form/' + originalRecordId + '?type=ENVTESTMAKE',
'/print/v1/form/' +
originalRecordId +
'?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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> select-data is-report>
<vxe-table-column <vxe-table-column
:field="item.key" :field="item.key"
......
pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
:tableHeight="tableHeight" :tableHeight="tableHeight"
:getPage="getPage" :getPage="getPage"
:iconMsg="iconMsg" :iconMsg="iconMsg"
@on-result-change="_tableResultChange" :rows="100" select-data> @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-report-manage/report-make/tabs/ReportMakeBySample.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :tableHeight="tableHeight" @on-result-change="_tableResultChange" <PTVXETable ref="pageTable" :tableHeight="tableHeight" @on-result-change="_tableResultChange"
:getPage="getPage" :rows="100" select-data> :getPage="getPage" select-data>
<vxe-table-column <vxe-table-column
:field="item.key" :field="item.key"
:title="item.title" :title="item.title"
......
pages/soil-report-manage/report-manage/tab/ReportByContract.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
:getPage="getPage" :getPage="getPage"
:iconMsg="iconMsg" :iconMsg="iconMsg"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
:rows="100"> >
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-report-manage/report-manage/tab/ReportByReport.vue
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
:getPage="getPage" :getPage="getPage"
:iconMsg="iconMsg" :iconMsg="iconMsg"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
:rows="100"> >
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-sample-manage/SoilSampleManage.vue
...@@ -28,14 +28,20 @@ ...@@ -28,14 +28,20 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" is-edit select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
:field="item.key" :field="item.key"
:title="item.title" :title="item.title"
:width="item.width?item.width:200" :width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined"
:edit-render="item.editCell?{autofocus: 'input'}:null" sortable>
<template v-slot:edit="scope">
<div v-if="item.key==='describeDetail'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.describeDetail" @blur="_page()" @change="_inputChange(scope.row)"></el-input>
</div>
</template>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.detail"> <div v-if="item.detail">
<a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a> <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
...@@ -46,9 +52,6 @@ ...@@ -46,9 +52,6 @@
<div v-else-if="item.date"> <div v-else-if="item.date">
{{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }} {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
</div> </div>
<div v-else-if="item.key==='describeDetail'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.describeDetail" @change="_inputChange(scope.row)"></el-input>
</div>
<div v-else> <div v-else>
{{ scope.row[item.key] }} {{ scope.row[item.key] }}
</div> </div>
...@@ -125,7 +128,12 @@ export default { ...@@ -125,7 +128,12 @@ export default {
{ title: '现场编号', key: 'siteNo', width: 100 }, { title: '现场编号', key: 'siteNo', width: 100 },
{ title: '试验项目', key: 'experimentNames', width: 100 }, { title: '试验项目', key: 'experimentNames', width: 100 },
{ title: '土质描述', key: 'sampleDescribe', width: 160 }, { title: '土质描述', key: 'sampleDescribe', width: 160 },
{ title: '土质描述详情', key: 'describeDetail', width: 160 }, {
title: '土质描述详情',
key: 'describeDetail',
width: 200,
editCell: true
},
{ title: '样品包装类型', key: 'samplePack', width: 120 } { title: '样品包装类型', key: 'samplePack', width: 120 }
], ],
sampleId: '', sampleId: '',
......
pages/soil-sample-manage/sample-preparation/SamplePreparation.vue
...@@ -58,6 +58,7 @@ import { soilEntrust } from '../../../api' ...@@ -58,6 +58,7 @@ import { soilEntrust } from '../../../api'
import http from '../../../api/http' import http from '../../../api/http'
import Operation from '../../../components/operation/Operation' import Operation from '../../../components/operation/Operation'
import SoilSampleManage from '../SoilSampleManage' import SoilSampleManage from '../SoilSampleManage'
import global from '../../../api/config'
import SamplePreparationEdit from './SamplePreparationEdit' import SamplePreparationEdit from './SamplePreparationEdit'
import SoilSampleItemManageEdit from './SoilSampleItemManageEdit' import SoilSampleItemManageEdit from './SoilSampleItemManageEdit'
export default { export default {
...@@ -109,6 +110,11 @@ export default { ...@@ -109,6 +110,11 @@ export default {
id: '', id: '',
name: '试验项目列表' name: '试验项目列表'
}, },
{
type: 'ios-download',
id: '',
name: '导出开土制备记录'
},
// { // {
// type: 'ios-beaker', // type: 'ios-beaker',
// id: '', // id: '',
...@@ -197,6 +203,9 @@ export default { ...@@ -197,6 +203,9 @@ export default {
case '试验项目列表': case '试验项目列表':
this._itemManage(data.id) this._itemManage(data.id)
break break
case '导出开土制备记录':
this._exportPrepare(data.id)
break
case '试样列表': case '试样列表':
this._sampleManage(data.id) this._sampleManage(data.id)
break break
...@@ -224,6 +233,20 @@ export default { ...@@ -224,6 +233,20 @@ export default {
this._page() this._page()
} }
}, },
_exportPrepare(id) {
this.$Modal.confirm({
title: '提示',
content: '确定导出这条记录',
onOk: () => {
window.open(
global.baseURL +
'/soil/v1/entrust/export_soil_prepare_record?ids=' +
id,
'_blank'
)
}
})
},
_sampleManage(data) { _sampleManage(data) {
// 管理样品 // 管理样品
this.currentComponent = 'SoilSampleManage' this.currentComponent = 'SoilSampleManage'
......
pages/soil-sample-manage/sample-take/TakeByEwm.vue
...@@ -93,9 +93,7 @@ export default { ...@@ -93,9 +93,7 @@ export default {
}, },
// 关闭弹框，刷新界面 // 关闭弹框，刷新界面
_visibleChange(data) { _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 @@ ...@@ -59,7 +59,7 @@
<!--打印（可填打印数量）--> <!--打印（可填打印数量）-->
<!--选择领样人--> <!--选择领样人-->
<UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo> <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
<TakeByEwm ref="ewmModal"></TakeByEwm> <TakeByEwm ref="ewmModal" @on-result-change="_page"></TakeByEwm>
</div> </div>
</template> </template>
......
pages/soil-sample-manage/sample-take/TakeSampleManage.vue
<template> <template>
<div> <div>
<Modal v-model="showSampleModal" width="1100" <Modal v-model="showSampleModal" @on-visible-change="_visibleChange"
class="zIndex-900 modal-footer-none"> width="1100" class="zIndex-900 modal-footer-none">
<div> <div>
<!--内容--> <!--内容-->
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24" style="padding-bottom: 5px"> <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> <label class="label-sign"></label>
<Form-item label="试样编号:" class="search-item"> <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"> <input name="contractId" type="hidden">
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<Col span="24"> <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">--> <!--<template slot="processTask">-->
<!--<div class="fr process-task">--> <!--<div class="fr process-task">-->
<!--<Button @click="_exportReceiveRecord">导出交接记录</Button>--> <!--<Button @click="_exportReceiveRecord">导出交接记录</Button>-->
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
:table-height="tableHeight" :table-height="tableHeight"
:get-page="getPage" :get-page="getPage"
:icon-msg="iconMsg" :icon-msg="iconMsg"
select-data @on-result-change="_tableResultChange"
@on-result-change="_tableResultChange"> select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -358,11 +358,9 @@ export default { ...@@ -358,11 +358,9 @@ export default {
} }
}, },
_resultChange(msg) { _resultChange(msg) {
if (this.$store.state.FoodSample.success) { this._page()
this._page() this.$Message.success(msg)
this.$Message.success(msg) this.selectIds = []
this.selectIds = []
}
}, },
_exportReceiveRecord() { _exportReceiveRecord() {
...@@ -617,6 +615,9 @@ export default { ...@@ -617,6 +615,9 @@ export default {
this.$store.dispatch('FoodSample/listReceiveStandard', obj).then(() => { this.$store.dispatch('FoodSample/listReceiveStandard', obj).then(() => {
this.stdList = this.$store.state.FoodSample.list this.stdList = this.$store.state.FoodSample.list
}) })
},
_visibleChange(data) {
this.$emit('on-result-change')
} }
} }
} }
......
pages/soil-sample-manage/surplus-manage/SampleSurplusBatchEdit.vue 0 → 100644
<template>
<div>
<Modal v-model="showModal" :mask-closable="false">
<p slot="header">填写存放信息</p>
<div>
<Form id="storage-location-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
<Form-item label="保存容器:" prop="keepContainer">
<el-select v-model="formObj.keepContainer" clearable style="width:100%" size="small">
<el-option v-for="item in containerList" :value="item.name" :key="item.name">{{ item.name }}
</el-option>
</el-select>
</Form-item>
<Form-item label="制备数量">
<Input v-model="formObj.quantity" clearable placeholder="请输入备样数量"></Input>
</Form-item>
<Form-item label="留存位置">
<Input v-model="formObj.keepLocation" clearable placeholder="请输入留存位置"></Input>
</Form-item>
</Form>
</div>
<div slot="footer">
<modal-footer ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></modal-footer>
</div>
</Modal>
</div>
</template>
<script>
import { soilSample } from '../../../api'
export default {
components: {},
data() {
return {
ids: [], // 委托ids
showModal: false,
formObj: {},
ruleValidate: {
backupLocation: [
{ required: true, message: '备样位置不能为空', trigger: 'blur' }
]
},
footerList: [
{ id: '', name: '取消', type: '' },
{ id: '', name: '保存', type: 'primary' }
],
containerList: [],
locList: [],
backupUserList: [],
sampleUnit: ''
}
},
mounted() {
this._getContainerList()
},
methods: {
_getContainerList: async function() {
const result = await soilSample.getDictList('保存容器')
if (result) {
this.containerList = result
}
},
_locChange(msg, data) {
switch (msg) {
case 'select':
this.formObj.backupPlace = data.backupPlace
this._getCondition(data.backupPlace)
break
case 'query':
this.formObj.backupPlace = data.backupPlace
this._getLocList(data.backupPlace)
break
}
},
selCondi(data) {
this.$forceUpdate()
this.formObj.conditions = data
},
selUser(data) {
this.$forceUpdate()
if (data) {
for (let i = 0; i < this.backupUserList.length; i++) {
if (this.backupUserList[i].id === data) {
this.formObj.backupUser = this.backupUserList[i].realname
}
}
} else {
this.getPage.records[this.currentIndex].backupUser = ''
}
this.formObj.backupUserId = data
},
// 存储条件 回调
_locChangeCondition(msg, data) {
switch (msg) {
case 'select':
this.formObj.storageCondition = data.name
this._getLocCondition(data.name)
break
case 'query':
this.formObj.storageCondition = data.name
this._getLocConditionList(data.name)
break
}
},
_footerResult(name) {
switch (name) {
case '取消':
this._cancel()
break
case '保存':
this._ok()
break
}
},
_open(data) {
this.showModal = true
this.formObj = this.$resetFields(this.formObj)
this.sampleUnit = ''
this.$refs.footerModal._hideLoading()
this.ids = data
// 循环遍历数据
},
_getConditionList: async function() {
const result = await soilSample.getDictList('存储条件')
if (result) {
this.conditionList = result
}
},
_getUserList: async function() {
const result = await soilSample.getUserList()
if (result) {
console.log(result)
this.backupUserList = result.records
}
},
//
_dateChange(data) {
this.formObj.endDate = data
},
_cancel() {
this.showModal = false
this.$refs.footerModal._hideLoading()
},
_hideLoading() {
this.$refs.footerModal._hideLoading()
},
_ok() {
this.$refs.formObj.validate(valid => {
if (valid) {
const data = this.formObj
this._saveInfo({ id: this.ids.join(','), obj: data })
} else {
this.$Message.error('表单验证失败!')
this.$refs.footerModal._hideLoading()
}
})
},
_saveInfo: async function(data) {
const result = await soilSample.editPrepare(data)
if (result) {
this.$Message.success('保存成功')
this.$emit('on-result-change')
this.showModal = false
}
}
}
}
</script>
pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
...@@ -48,6 +48,18 @@ ...@@ -48,6 +48,18 @@
</el-select> </el-select>
</div> </div>
</div> </div>
<div v-else-if="item.key==='quantity'">
<div v-if="editIndex!==scope.rowIndex">{{scope.row[item.key]}}</div>
<div v-else>
<el-input v-model="scope.row.quantity" placeholder="制备数量"></el-input>
</div>
</div>
<div v-else-if="item.key==='keepLocation'">
<div v-if="editIndex!==scope.rowIndex">{{scope.row[item.key]}}</div>
<div v-else>
<el-input v-model="scope.row.keepLocation" placeholder="留存位置"></el-input>
</div>
</div>
<span v-else>{{scope.row[item.key]}}</span> <span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
...@@ -68,10 +80,12 @@ ...@@ -68,10 +80,12 @@
</div> </div>
<SampleParpareApply ref="applyModal" @on-result-change="_page"></SampleParpareApply> <SampleParpareApply ref="applyModal" @on-result-change="_page"></SampleParpareApply>
<Operation ref="recordModal"></Operation> <Operation ref="recordModal"></Operation>
<SampleSurplusBatchEdit ref="batchEdit" @on-result-change="_page"></SampleSurplusBatchEdit>
</div> </div>
</template> </template>
<script> <script>
import SampleParpareApply from '../SurplusParpareApply' import SampleParpareApply from '../SurplusParpareApply'
import SampleSurplusBatchEdit from '../SampleSurplusBatchEdit'
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
import http from '../../../../api/http' import http from '../../../../api/http'
import { soilSample } from '../../../../api' import { soilSample } from '../../../../api'
...@@ -79,7 +93,8 @@ import Operation from '../../../../components/operation/Operation' ...@@ -79,7 +93,8 @@ import Operation from '../../../../components/operation/Operation'
export default { export default {
components: { components: {
SampleParpareApply, SampleParpareApply,
Operation Operation,
SampleSurplusBatchEdit
}, },
data() { data() {
return { return {
...@@ -101,6 +116,11 @@ export default { ...@@ -101,6 +116,11 @@ export default {
type: 'primary', type: 'primary',
id: '', id: '',
name: '完成处理' name: '完成处理'
},
{
type: 'primary',
id: '',
name: '批量填写存放信息'
} }
// { type: '', id: '', name: '填写存放信息' }, // { type: '', id: '', name: '填写存放信息' },
// { type: '', id: '', name: '申请处理' }, // { type: '', id: '', name: '申请处理' },
...@@ -116,6 +136,7 @@ export default { ...@@ -116,6 +136,7 @@ export default {
{ title: '状态', key: 'status', status: true, width: 100 }, { title: '状态', key: 'status', status: true, width: 100 },
{ title: '包装类型', key: 'samplePack', width: 100 }, { title: '包装类型', key: 'samplePack', width: 100 },
{ title: '保存容器', key: 'keepContainer', width: 150 }, { title: '保存容器', key: 'keepContainer', width: 150 },
{ title: '留存位置', key: 'keepLocation', width: 150 },
{ title: '制备数量', key: 'quantity', width: 100 }, { title: '制备数量', key: 'quantity', width: 100 },
{ title: '单位', key: 'unit', width: 70 }, { title: '单位', key: 'unit', width: 70 },
{ title: '制备人', key: 'preparer', width: 130 }, { title: '制备人', key: 'preparer', width: 130 },
...@@ -176,11 +197,6 @@ export default { ...@@ -176,11 +197,6 @@ export default {
}, },
mounted() { mounted() {
this.$refs.pageTable._showLoading() this.$refs.pageTable._showLoading()
// 样品存储期限预警
// this.sampleHandleValue = Number(localStorage.getItem('sampleHandleValue'))
// this._getLocList()
// this._getConditionList()
// this._getBackUpCount()
this._getContainerList() this._getContainerList()
}, },
methods: { methods: {
...@@ -222,7 +238,9 @@ export default { ...@@ -222,7 +238,9 @@ export default {
_save() { _save() {
this.$nextTick(function() { this.$nextTick(function() {
const tempData = { const tempData = {
keepContainer: this.getPage.records[this.currentIndex].keepContainer keepContainer: this.getPage.records[this.currentIndex].keepContainer,
quantity: this.getPage.records[this.currentIndex].quantity,
keepLocation: this.getPage.records[this.currentIndex].keepLocation
} }
this._saveOk({ this._saveOk({
id: this.getPage.records[this.currentIndex].id, id: this.getPage.records[this.currentIndex].id,
...@@ -333,6 +351,9 @@ export default { ...@@ -333,6 +351,9 @@ export default {
case '填写存放信息': case '填写存放信息':
this._batchEdit() this._batchEdit()
break break
case '批量填写存放信息':
this._writeInfo()
break
case '导出': case '导出':
if (this.getPage.records.length === 0) { if (this.getPage.records.length === 0) {
this.$Message.warning('暂无数据，不可导出') this.$Message.warning('暂无数据，不可导出')
...@@ -348,6 +369,13 @@ export default { ...@@ -348,6 +369,13 @@ export default {
break break
} }
}, },
_writeInfo() {
if (this.selectIds.length === 0) {
this.$Message.warning('请选择一条或多条数据！')
} else {
this.$refs.batchEdit._open(this.selectIds)
}
},
_resultChange(msg) { _resultChange(msg) {
this.$Message.success(msg) this.$Message.success(msg)
this._page() this._page()
......
pages/soil-test-manage/test-data-audit/IndexManageEdit.vue
<template> <template>
<div> <div>
<Modal v-model="showModal" :mask-closable="false" @on-visible-change="_visibleChange" width="900"> <Modal v-model="showModal" :mask-closable="false" @on-visible-change="_visibleChange" width="900">
<p slot="header">{{modalTitle}}</p> <p slot="header">{{modalTitle}}</p>
<div> <div>
......
pages/soil-test-manage/test-data-audit/item-tabs/ItemLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-data-audit/item-tabs/ItemRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
...@@ -214,14 +214,17 @@ export default { ...@@ -214,14 +214,17 @@ export default {
}, },
_viewRecord(originalRecordId) { _viewRecord(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + recordUrl + '/print/v1/form/' + originalRecordId + '?type=ENVTESTMAKE',
'/print/v1/form/' +
originalRecordId +
'?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
pages/soil-test-manage/test-data-audit/sample-tabs/SampleLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100"> @on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-data-audit/sample-tabs/SampleRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
...@@ -459,14 +459,17 @@ export default { ...@@ -459,14 +459,17 @@ export default {
}, },
_viewRecord(originalRecordId) { _viewRecord(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + recordUrl + '/print/v1/form/' + originalRecordId + '?type=ENVTESTMAKE',
'/print/v1/form/' +
originalRecordId +
'?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
pages/soil-test-manage/test-data-check/item-tabs/ItemLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-data-check/item-tabs/ItemRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
...@@ -207,14 +207,17 @@ export default { ...@@ -207,14 +207,17 @@ export default {
}, },
_viewRecord(originalRecordId) { _viewRecord(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + recordUrl + '/print/v1/form/' + originalRecordId + '?type=ENVTESTMAKE',
'/print/v1/form/' +
originalRecordId +
'?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
pages/soil-test-manage/test-data-check/sample-tabs/SampleLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100"> @on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-data-check/sample-tabs/SampleRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
...@@ -459,14 +459,17 @@ export default { ...@@ -459,14 +459,17 @@ export default {
}, },
_viewRecord(originalRecordId) { _viewRecord(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + recordUrl + '/print/v1/form/' + originalRecordId + '?type=ENVTESTMAKE',
'/print/v1/form/' +
originalRecordId +
'?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
pages/soil-test-manage/test-input/OriginalRecordEdit.vue
...@@ -39,17 +39,21 @@ export default { ...@@ -39,17 +39,21 @@ export default {
this.formIdTemp = formId + this.$randomCode() this.formIdTemp = formId + this.$randomCode()
this.again = true this.again = true
// this.showModal = true; // this.showModal = true;
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式 // 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式
const bindUri = const bindUri =
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source=' Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url = const url =
Global.recordURL + recordUrl +
'/print/v1/eln/form_YT_' + '/print/v1/eln/form_YT_' +
formId + formId +
'?bindUri=' + '?bindUri=' +
encodeURIComponent(bindUri) encodeURIComponent(bindUri)
// this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>'; // this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>';
this.$layx(this.formIdTemp, '编辑原始记录', url) this.$layx(this.formIdTemp, '编辑原始记录', url)
}, },
...@@ -58,19 +62,23 @@ export default { ...@@ -58,19 +62,23 @@ export default {
this.formIdTemp = formId + this.$randomCode() this.formIdTemp = formId + this.$randomCode()
this.again = true this.again = true
// this.showModal = true; // this.showModal = true;
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式 // 编辑的时候传此bindUri 是为了 绑定spreadJs自定义的公式
const bindUri = const bindUri =
Global.baseURL + '/env/v1/env_item/original_record_data_bind?source=' Global.baseURL + '/env/v1/env_item/original_record_data_bind?source='
const url = const url =
Global.recordURL + recordUrl +
'/print/v1/eln/form_YT_' + '/print/v1/eln/form_YT_' +
formId + formId +
'?bindUri=' + '?bindUri=' +
encodeURIComponent(bindUri) + encodeURIComponent(bindUri) +
'&type=' + '&type=' +
fromType fromType
// this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>'; // this.htmlContent = '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' + encodeURI(url) + '></iframe>';
this.$layx(this.formIdTemp, '编辑原始记录', url) this.$layx(this.formIdTemp, '编辑原始记录', url)
}, },
......
pages/soil-test-manage/test-input/OriginalRecordView.vue
...@@ -287,14 +287,17 @@ export default { ...@@ -287,14 +287,17 @@ export default {
// 查看原始记录 // 查看原始记录
_recordView(originalRecordId) { _recordView(originalRecordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + recordUrl + '/print/v1/form/' + originalRecordId + '?type=ENVTESTMAKE',
'/print/v1/form/' +
originalRecordId +
'?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
pages/soil-test-manage/test-input/SelectOriTempRecord.vue
...@@ -81,6 +81,7 @@ export default { ...@@ -81,6 +81,7 @@ export default {
businessTypeList: 0 businessTypeList: 0
}, },
entrustId: '', entrustId: '',
clientList: [],
selectData: [], selectData: [],
itemIds: [], itemIds: [],
footerList: [ footerList: [
...@@ -140,9 +141,11 @@ export default { ...@@ -140,9 +141,11 @@ export default {
_hideLoading() { _hideLoading() {
this.$refs.footerModal._hideLoading() this.$refs.footerModal._hideLoading()
}, },
_open(ids, entrustId) { _open(ids, entrustId, clientInfo) {
console.log(Global.recordURL)
this.formObj = this.$resetFields(this.formObj) this.formObj = this.$resetFields(this.formObj)
this.entrustId = entrustId this.entrustId = entrustId
this.clientList = clientInfo
this._classTree() this._classTree()
this.showModal = true this.showModal = true
this.itemIds = ids this.itemIds = ids
...@@ -152,15 +155,6 @@ export default { ...@@ -152,15 +155,6 @@ export default {
this._hideLoading() this._hideLoading()
count = 0 count = 0
}, },
// _page() {
// // 只查实验室的
// console.log('page')
// // this.$refs.pageTable._page(
// // '',
// // 'ElnTemplate/page',
// // this.$serializeFormSearch(this.formObj)
// // )
// },
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.id this.formObj.entrustId = this.id
...@@ -177,10 +171,6 @@ export default { ...@@ -177,10 +171,6 @@ export default {
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
case 'page':
this.selectData = []
this.getPage = this.$store.state.ElnTemplate.page
break
case 'singleSelect': case 'singleSelect':
this.selectData = [data] this.selectData = [data]
break break
...@@ -198,25 +188,9 @@ export default { ...@@ -198,25 +188,9 @@ export default {
this.$Message.warning('请选择一个原始记录模板！') this.$Message.warning('请选择一个原始记录模板！')
this._hideLoading() this._hideLoading()
} else { } else {
console.log(this.selectData)
// 校验多样品多项目原始记录模板 // 校验多样品多项目原始记录模板
const param = {
ids: '1289126946969550850',
tempId: this.selectData[0].id
}
console.log(param)
this._createOriginalRecord() this._createOriginalRecord()
// this._check(param)
// this.$store.dispatch('EnvItem/checkLimit', param).then(() => {
// const result = this.$store.state.EnvItem.success
// if (result) {
// // 不是多样品项目模板或者数量小于限值,填写原始记录
// // (3)originalTemplateId不为0也不为undefined ---- 填写过或者绑定过
// this._bindOriginalRecord()
// } else {
// this.$msgTip('warning', '所选数据超过，原始记录模板设置最大值！')
// this._hideLoading()
// }
// })
} }
}, },
_check: async function(param) { _check: async function(param) {
...@@ -224,72 +198,24 @@ export default { ...@@ -224,72 +198,24 @@ export default {
console.log(result) console.log(result)
}, },
_createOriginalRecord() { _createOriginalRecord() {
// const result = await soilTest.searchItem({ ids: this.itemIds.join(',') })
// console.log(result)
this.showModal = false this.showModal = false
console.log('环境', process.env.NODE_ENV)
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
const url = const url =
Global.recordURL + '/print/v1/eln/template_YT_' + this.selectData[0].id recordUrl + '/print/v1/eln/template_meter_' + this.selectData[0].id
const params = { const params = {
ids: this.itemIds.join(',') ids: this.itemIds.join(','),
// allSampleCount: '', client: this.clientList[0]
// normalSampleCount: '',
// itemCount: '',
// parallelCount: '',
// labelSample: ''
} }
this.$refs.iframeModal._createIframe(url, params) this.$refs.iframeModal._createIframe(url, params)
console.log('原始记录', url, params)
localStorage.setItem('recordStatus', 'addLabRecord') localStorage.setItem('recordStatus', 'addLabRecord')
}, },
// 生成原始记录
_bindOriginalRecord() {
this.$store
.dispatch('EnvItem/allCommonSampleCount', {
ids: this.itemIds.join(',')
})
.then(() => {
const result = this.$store.state.EnvItem.list
let allSampleCount = ''
let normalSampleCount = ''
let itemCount = ''
let parallel = ''
let labelSample = ''
result.forEach(item => {
if (item.sampleCountType === 'all') {
allSampleCount = item.sampleCountInteger
} else if (item.sampleCountType === 'normal') {
normalSampleCount = item.sampleCountInteger
} else if (item.sampleCountType === 'item') {
itemCount = item.sampleCountInteger
} else if (item.sampleCountType === 'parallel') {
parallel = item.sampleCountInteger
} else if (item.sampleCountType === 'mark') {
labelSample = item.sampleCountInteger
}
})
this.showModal = false
const url =
Global.recordURL +
'/print/v1/eln/template_YT_' +
this.selectData[0].id
const params = {
ids: this.itemIds.join(','),
allSampleCount: allSampleCount,
normalSampleCount: normalSampleCount,
itemCount: itemCount,
parallelCount: parallel,
labelSample: labelSample
}
this.$refs.iframeModal._createIframe(url, params)
localStorage.setItem('recordStatus', 'addLabRecord')
// this.$layx('recordAddTemplate', '原始记录添加', Global.recordURL + '/print/v1/eln/template_YT_'
// + this.selectData[0].id
// + '?bindUri=' + encodeURIComponent(bindUri))
})
},
_recordChange() { _recordChange() {
this.$emit('on-result-change') this.$emit('on-result-change')
}, },
...@@ -336,17 +262,6 @@ export default { ...@@ -336,17 +262,6 @@ export default {
tempData.entrustId = this.entrustId tempData.entrustId = this.entrustId
this._save(tempData) this._save(tempData)
} }
// this.$store
// .dispatch('EnvItem/saveFormForItem', tempData)
// .then(() => {
// if (this.$store.state.EnvItem.success) {
// this.$Message.success('添加成功')
// this._recordChange()
// this.$refs.iframeModal._closeIframe()
// // 关闭所有layx弹框
// // layx.destroyAll('recordAddTemplate');
// }
// })
} }
} }
count = count + 1 count = count + 1
......
pages/soil-test-manage/test-input/TestInput.vue
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
<!-- eslint-disable-next-line vue/require-component-is --> <!-- eslint-disable-next-line vue/require-component-is -->
<component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component> <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
</keep-alive> </keep-alive>
<!-- <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
<!-- <Operation ref="operation"></Operation>-->
<!-- <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>-->
<!-- <FileManage ref="FileManage"></FileManage>-->
</div> </div>
</template> </template>
<script> <script>
......
pages/soil-test-manage/test-input/item-tab/ItemLeftList.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" select-data :getPage="getPage" :rows="100"> @on-result-change="_tableResultChange" select-data :getPage="getPage" >
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-input/item-tab/ItemRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-input/item-tabs/ItemLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
</Col> </Col>
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" @on-result-change="_btnClick" class="contHide"></btn-list> <btn-list :msg="envPro?btnPro:btn" @on-result-change="_btnClick" class="contHide"></btn-list>
</Col> </Col>
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
...@@ -90,6 +90,7 @@ export default { ...@@ -90,6 +90,7 @@ export default {
testBasis: '' testBasis: ''
}, },
entrustId: '', entrustId: '',
envPro: false,
// 用户自己选中的列 // 用户自己选中的列
userColumns: [], userColumns: [],
currentComponent: '', currentComponent: '',
...@@ -117,14 +118,12 @@ export default { ...@@ -117,14 +118,12 @@ export default {
btn: [ btn: [
{ type: 'success', id: '', name: '填写原始记录' }, { type: 'success', id: '', name: '填写原始记录' },
{ type: 'success', id: '', name: '完成提交' }, { type: 'success', id: '', name: '完成提交' },
{ type: 'success', id: '', name: '设备' }
],
btnPro: [
{ type: 'success', id: '', name: '填写原始记录' },
{ type: 'success', id: '', name: '设备' }, { type: 'success', id: '', name: '设备' },
{ type: '', id: 'food-task-assign-adjust-group', name: '调整分组' }, { type: 'success', id: '', name: '完成提交' }
{
type: '',
id: 'food-task-assign-plan-date',
name: '设置计划完成时间'
},
{ type: '', id: 'food-task-assign-maintain-info', name: '信息维护' }
], ],
iconMsg: [ iconMsg: [
{ type: 'ios-book', id: '', name: '查看原始记录' }, { type: 'ios-book', id: '', name: '查看原始记录' },
...@@ -137,9 +136,9 @@ export default { ...@@ -137,9 +136,9 @@ export default {
pageColumns: [ pageColumns: [
{ title: '试验项目', key: 'name', width: 120, fixed: 'left' }, { title: '试验项目', key: 'name', width: 120, fixed: 'left' },
{ title: '试样编号', key: 'sampleCode', width: 180 }, { title: '试样编号', key: 'sampleCode', width: 180 },
{ title: '是否填写原始记录', key: 'recorded', width: 180 },
{ title: '试样深度', key: 'sampleDepth', width: 180 }, { title: '试样深度', key: 'sampleDepth', width: 180 },
{ title: '试样包装类型', key: 'samplePack', width: 180 }, { title: '试样包装类型', key: 'samplePack', width: 180 },
{ title: '是否填写原始记录', key: 'recorded', width: 180 },
{ title: '状态', key: 'progress', width: 180 }, { title: '状态', key: 'progress', width: 180 },
{ title: '大类', key: 'mainType', width: 140 }, { title: '大类', key: 'mainType', width: 140 },
{ title: '小类', key: 'smallType', width: 140 }, { title: '小类', key: 'smallType', width: 140 },
...@@ -173,6 +172,9 @@ export default { ...@@ -173,6 +172,9 @@ export default {
}, },
mounted() { mounted() {
// this._dicSearch() // this._dicSearch()
if (process.env.NODE_ENV === 'production') {
this.envPro = true
}
}, },
methods: { methods: {
_iconClick(res, data, currentComponent) { _iconClick(res, data, currentComponent) {
...@@ -181,7 +183,6 @@ export default { ...@@ -181,7 +183,6 @@ export default {
case '查看原始记录': case '查看原始记录':
console.log(data) console.log(data)
if (data.recordId) { if (data.recordId) {
// this._viewRecord('1309434759937146882')
this._viewRecord(data.recordId) this._viewRecord(data.recordId)
} else { } else {
this.$Message.warning('未填写原始记录') this.$Message.warning('未填写原始记录')
...@@ -217,11 +218,17 @@ export default { ...@@ -217,11 +218,17 @@ export default {
_viewRecord(recordId) { _viewRecord(recordId) {
console.log(recordId) console.log(recordId)
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + '/print/v1/form/' + recordId + '?type=ENVTESTMAKE', recordUrl + '/print/v1/form/' + recordId + '?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
...@@ -266,22 +273,6 @@ export default { ...@@ -266,22 +273,6 @@ export default {
if (result) { if (result) {
this.$Message.success('添加成功') this.$Message.success('添加成功')
} }
// let equipIds = []
// for (let i = 0; i < res.length; i++) {
// equipIds.push(res[i].id)
// }
// this.$layxLoading()
// this.$store.dispatch('FoodItem/selectEquip', {
// ids: this.selectIds.join(','),
// equipIds: equipIds.join(',')
// }).then(() => {
// if (this.$store.state.FoodItem.success) {
// this.$Message.success('操作成功！');
// this._updateRows('selected');
// }
// this.$layxLoading(false);
// });
}, },
// 从字典查预警期 // 从字典查预警期
_dicSearch() { _dicSearch() {
...@@ -466,17 +457,23 @@ export default { ...@@ -466,17 +457,23 @@ export default {
this.$message.warning('请至少选择一条数据') this.$message.warning('请至少选择一条数据')
} else { } else {
const errorInfo = [] const errorInfo = []
const clientInfo = []
for (let i = 0; i < this.selectData.length; i++) { for (let i = 0; i < this.selectData.length; i++) {
clientInfo.push(this.selectData[i].client)
console.log(this.selectData[i].recorded) console.log(this.selectData[i].recorded)
if (this.selectData[i].recorded !== '否') { if (this.selectData[i].recorded !== '否') {
errorInfo.push(this.selectData[i].index + 1) errorInfo.push(this.selectData[i].index + 1)
} }
} }
if (errorInfo.length !== 0) { if (errorInfo.length !== 0) {
this.$Message.warning('第' + errorInfo + '条数据已填写原始记录') this.$Message.warning('所选数据中有已填写原始记录的')
} else { } else {
console.log('打开填写原始记录界面') console.log('打开填写原始记录界面')
this.$refs.recordModal._open(this.selectIds, this.entrustId) this.$refs.recordModal._open(
this.selectIds,
this.entrustId,
clientInfo
)
} }
} }
}, },
...@@ -535,14 +532,6 @@ export default { ...@@ -535,14 +532,6 @@ export default {
return obj return obj
}, },
_page: async function() { _page: async function() {
// const saveName = []
// const saveMethod = []
// for (let i = 0; i < this.leftSelectData.length; i++) {
// saveName.push(this.leftSelectData[i].name)
// saveMethod.push(this.leftSelectData[i].testMethod)
// }
// const data = this.$serialize('task-assign-item-right')
// console.log(data)
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.entrustId this.formObj.entrustId = this.entrustId
this.formObj.name = this.leftSelectData.name this.formObj.name = this.leftSelectData.name
......
pages/soil-test-manage/test-input/sample-tab/SampleLeftList.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100"> @on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-input/sample-tab/SampleRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-input/sample-tabs/SampleLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100"> @on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
...@@ -120,9 +120,9 @@ export default { ...@@ -120,9 +120,9 @@ export default {
pageColumns: [ pageColumns: [
{ title: '试验项目', key: 'name', width: 120, fixed: 'left' }, { title: '试验项目', key: 'name', width: 120, fixed: 'left' },
{ title: '试样编号', key: 'sampleCode', width: 180 }, { title: '试样编号', key: 'sampleCode', width: 180 },
{ title: '是否填写原始记录', key: 'recorded', width: 180 },
{ title: '试样深度', key: 'sampleDepth', width: 180 }, { title: '试样深度', key: 'sampleDepth', width: 180 },
{ title: '试样包装类型', key: 'samplePack', width: 180 }, { title: '试样包装类型', key: 'samplePack', width: 180 },
{ title: '是否填写原始记录', key: 'recorded', width: 180 },
{ title: '状态', key: 'progress', width: 180 }, { title: '状态', key: 'progress', width: 180 },
{ title: '大类', key: 'mainType', width: 140 }, { title: '大类', key: 'mainType', width: 140 },
{ title: '小类', key: 'smallType', width: 140 }, { title: '小类', key: 'smallType', width: 140 },
...@@ -378,7 +378,7 @@ export default { ...@@ -378,7 +378,7 @@ export default {
} }
} }
if (errorInfo.length !== 0) { if (errorInfo.length !== 0) {
this.$Message.warning('第' + errorInfo + '条数据已填写原始记录') this.$Message.warning('所选数据中有已填写原始记录的')
} else { } else {
console.log('打开填写原始记录界面') console.log('打开填写原始记录界面')
this.$refs.recordModal._open(this.selectIds, this.entrustId) this.$refs.recordModal._open(this.selectIds, this.entrustId)
...@@ -451,13 +451,6 @@ export default { ...@@ -451,13 +451,6 @@ export default {
switch (msg) { switch (msg) {
case 'page': case 'page':
this._page() this._page()
// this.result = this.getPage.records;
// this.$nextTick(() => {
// this.$refs.pageTable._checkAll()
// })
// if (this.getPage.records.length === 0) {
// this.$emit('on-result-change')
// }
break break
case 'selectData': case 'selectData':
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
...@@ -475,7 +468,6 @@ export default { ...@@ -475,7 +468,6 @@ export default {
break break
case 'changeSize': case 'changeSize':
this._page() this._page()
// this.$refs.pageTable._checkAll()
break break
} }
}, },
...@@ -485,7 +477,6 @@ export default { ...@@ -485,7 +477,6 @@ export default {
case '查看原始记录': case '查看原始记录':
console.log(data) console.log(data)
if (data.recordId) { if (data.recordId) {
// this._viewRecord('1309434759937146882')
this._viewRecord(data.recordId) this._viewRecord(data.recordId)
} else { } else {
this.$Message.warning('未填写原始记录') this.$Message.warning('未填写原始记录')
...@@ -508,11 +499,17 @@ export default { ...@@ -508,11 +499,17 @@ export default {
}, },
_viewRecord(recordId) { _viewRecord(recordId) {
// layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, { // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
let recordUrl = ''
if (process.env.NODE_ENV === 'production') {
recordUrl = 'http://record.patzn.com'
} else {
recordUrl = Global.recordURL
}
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
layx.iframe( layx.iframe(
'labRecordWriteOriView', 'labRecordWriteOriView',
'原始记录预览', '原始记录预览',
Global.recordURL + '/print/v1/form/' + recordId + '?type=ENVTESTMAKE', recordUrl + '/print/v1/form/' + recordId + '?type=ENVTESTMAKE',
{ {
event: { event: {
onload: { onload: {
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/item-tabs/ItemLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/item-tabs/ItemRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/sample-tabs/SampleLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100"> @on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-task-manage-his/entrust-sample-manage/sample-tabs/SampleRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :page-columns="pageColumns" :table-height="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/sample-tabs/SampleLeftList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :rows="100"> @on-result-change="_tableResultChange" :getPage="getPage" >
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
pages/soil-test-manage/test-task-manage/entrust-sample-manage/sample-tabs/SampleRightList.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight" <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 <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :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