Commit 65c70b68 by lichengming

修改了委托单管理

parent 9590fc8a
...@@ -121,10 +121,7 @@ export default { ...@@ -121,10 +121,7 @@ export default {
return { return {
formId: 'SampleItemManage', formId: 'SampleItemManage',
currentComponent: '', currentComponent: '',
btn: [ btn: [],
{ type: 'success', id: '', name: '提交分包' },
{ type: 'success', id: '', name: '取消分包' }
],
iconMsg: [{ type: 'pt-a-end', id: '', name: '删除' }], iconMsg: [{ type: 'pt-a-end', id: '', name: '删除' }],
sampleId: '', // 样品id sampleId: '', // 样品id
showModal: false, showModal: false,
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<!-- 表格 --> <!-- 表格 -->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange"> :get-page="getPage" :icon-msg="iconMsg" @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"
...@@ -90,21 +90,21 @@ export default { ...@@ -90,21 +90,21 @@ export default {
formId: 'soilSampleManage', formId: 'soilSampleManage',
currentComponent: '', currentComponent: '',
btn: [ btn: [
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '导入检测项目' // name: '导入检测项目'
}, // }
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '导入检测项目包' // name: '导入检测项目包'
}, // },
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '打印标签' // name: '打印标签'
} // }
], ],
itemList: [], itemList: [],
indexList: [], indexList: [],
......
...@@ -314,7 +314,7 @@ export default { ...@@ -314,7 +314,7 @@ export default {
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.FileManage._open(id, 'contractId') this.$refs.FileManage._open(id, 'entrustId')
}, },
_exportEntrust(id) { _exportEntrust(id) {
this.$Modal.confirm({ this.$Modal.confirm({
......
...@@ -223,9 +223,9 @@ export default { ...@@ -223,9 +223,9 @@ export default {
const result = await soilTest.checkLimit(param) const result = await soilTest.checkLimit(param)
console.log(result) console.log(result)
}, },
_createOriginalRecord: async function() { _createOriginalRecord() {
const result = await soilTest.searchItem({ ids: this.itemIds.join(',') }) // const result = await soilTest.searchItem({ ids: this.itemIds.join(',') })
console.log(result) // console.log(result)
this.showModal = false this.showModal = false
const url = const url =
Global.recordURL + '/print/v1/eln/template_YT_' + this.selectData[0].id Global.recordURL + '/print/v1/eln/template_YT_' + this.selectData[0].id
......
...@@ -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" :getPage="getPage" :table-name="tableName" :rows="100" 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