Skip to content

P
patzn-cloud-web-back-soil
Commit 3a55afe6 by lichengming
Options

修改了附件和表格列

parent b5887ea1
Showing with 32 additions and 38 deletions
pages/soil-sample-manage/backups-manage/tab/SampleBackupsManage.vue
...@@ -166,20 +166,20 @@ export default { ...@@ -166,20 +166,20 @@ export default {
pageColumns: [ pageColumns: [
{ title: '委托商', key: 'client', width: 180 }, { title: '委托商', key: 'client', width: 180 },
{ title: '委托编号', key: 'entrustCode', width: 180 }, { title: '委托编号', key: 'entrustCode', width: 180 },
{ title: '存储条件', key: 'conditions', width: 180 },
{ title: '试样编号', key: 'sampleCode', width: 180 }, { title: '试样编号', key: 'sampleCode', width: 180 },
{ title: '试样深度', key: 'sampleDepth', width: 180 }, { title: '试样深度', key: 'sampleDepth', width: 180 },
{ title: '样品包装类型', key: 'samplePack', width: 180 }, { title: '样品包装类型', key: 'samplePack', width: 180 },
{ title: '现场编号', key: 'siteNo', width: 180 }, { title: '现场编号', key: 'siteNo', width: 180 },
{ title: '存储条件', key: 'conditions', width: 180 },
{ title: '备样位置', key: 'backupLocation', width: 180 }, { title: '备样位置', key: 'backupLocation', width: 180 },
{ title: '备样数量', key: 'quantity', width: 180 }, { title: '备样数量', key: 'quantity', width: 180 },
{ title: '备样人', key: 'backupUser', width: 140 }, { title: '备样人', key: 'backupUser', width: 140 },
{ title: '钻孔位置', key: 'boreholeLocation', width: 110 }, { title: '钻孔位置', key: 'boreholeLocation', width: 110 },
{ title: '钻孔名称', key: 'boreholeName', width: 160 }, { title: '钻孔名称', key: 'boreholeName', width: 160 },
{ title: '水深（米）', key: 'waterDepth', width: 160 }, { title: '水深（米）', key: 'waterDepth', width: 160 },
{ title: '状态', key: 'status', width: 160 }, { title: '状态', key: 'status', width: 160 }
{ title: '备份开始日期', key: 'startTime', width: 170 }, // { title: '备份开始日期', key: 'startTime', width: 170 },
{ title: '备份结束日期', key: 'endTime', width: 170 } // { title: '备份结束日期', key: 'endTime', width: 170 }
/* {title: '处置方式', key: 'handleMethod', width: 120,}, */ /* {title: '处置方式', key: 'handleMethod', width: 120,}, */
], ],
conditionList: [], conditionList: [],
......
pages/soil-sample-manage/sample-preparation/SamplePreparation.vue
...@@ -144,12 +144,12 @@ export default { ...@@ -144,12 +144,12 @@ export default {
{ title: '水深（米）', key: 'waterDepth', width: 120 }, { title: '水深（米）', key: 'waterDepth', width: 120 },
{ title: '钻孔名称', key: 'boreholeName', width: 120 }, { title: '钻孔名称', key: 'boreholeName', width: 120 },
{ title: '进度', key: 'progress', width: 120, status: true }, { title: '进度', key: 'progress', width: 120, status: true },
{ title: '工程号', key: 'projectNo', width: 120 }, // { title: '工程号', key: 'projectNo', width: 120 },
{ title: '报告编号', key: 'reportCode', width: 120 }, // { title: '报告编号', key: 'reportCode', width: 120 },
{ title: '制表日期', key: 'tabulateDate', width: 120, date: true }, { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
{ title: '制表人', key: 'tabulater', width: 120 }, { title: '制表人', key: 'tabulater', width: 120 },
{ title: '批准日期', key: 'approveDate', width: 120, date: true }, // { title: '批准日期', key: 'approveDate', width: 120, date: true },
{ title: '批准人', key: 'approver', width: 120 }, // { title: '批准人', key: 'approver', width: 120 },
{ title: '检验类别', key: 'testType', width: 120 } { title: '检验类别', key: 'testType', width: 120 }
] ]
} }
......
pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
<SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage> <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>
<ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage> <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>
<Operation ref="operation"></Operation> <Operation ref="operation"></Operation>
<FileManage ref="FileManage"></FileManage>
</div> </div>
</template> </template>
<script> <script>
...@@ -98,13 +99,13 @@ export default { ...@@ -98,13 +99,13 @@ export default {
id: '', id: '',
name: '项目管理' name: '项目管理'
}, },
{ // {
type: 'md-create', // type: 'md-create',
id: '', // id: '',
name: '编辑协议' // name: '编辑协议'
}, // },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-trash', id: '', name: '删除' }, // { type: 'md-trash', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: '',
...@@ -452,7 +453,7 @@ export default { ...@@ -452,7 +453,7 @@ export default {
}, },
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'contractId') this.$refs.FileManage._open(id, 'entrustId')
} }
} }
} }
......
pages/soil-sample-manage/sample-receive/ReceiveBySample.vue
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
:getPage="getPage" :getPage="getPage"
:icon-msg="iconMsg"
select-data> select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
...@@ -80,13 +79,13 @@ export default { ...@@ -80,13 +79,13 @@ export default {
formObj: { num: undefined, name: undefined }, formObj: { num: undefined, name: undefined },
iconMsgDis: [], iconMsgDis: [],
iconMsg: [ iconMsg: [
{ // {
type: 'md-create', // type: 'md-create',
id: '', // id: '',
name: '编辑' // name: '编辑'
}, // },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-trash', id: '', name: '删除' }, // { type: 'md-trash', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: '',
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/AlreadyIssued.vue
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
:getPage="getPage" :getPage="getPage"
:iconMsg="iconMsg"
select-data> select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
:getPage="getPage" :getPage="getPage"
:iconMsg="iconMsg"
select-data> select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
...@@ -82,7 +81,6 @@ export default { ...@@ -82,7 +81,6 @@ export default {
], ],
iconMsg: [ iconMsg: [
{ type: 'md-create', id: '', name: '编辑' }, { type: 'md-create', id: '', name: '编辑' },
{ type: 'ios-browsers', id: '', name: '复制' },
{ type: 'md-trash', id: '', name: '删除' }, { type: 'md-trash', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
......
pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitScan.vue
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
:tableHeight="tableHeight" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" @on-result-change="_tableResultChange"
:getPage="getPage" :getPage="getPage"
:iconMsg="iconMsg"
select-data> select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
......
pages/soil-sample-manage/sample-take/TakeByEntrust.vue
...@@ -120,12 +120,12 @@ export default { ...@@ -120,12 +120,12 @@ export default {
{ title: '水深（米）', key: 'waterDepth', width: 120 }, { title: '水深（米）', key: 'waterDepth', width: 120 },
{ title: '钻孔名称', key: 'boreholeName', width: 120 }, { title: '钻孔名称', key: 'boreholeName', width: 120 },
{ title: '进度', key: 'progress', width: 120, status: true }, { title: '进度', key: 'progress', width: 120, status: true },
{ title: '工程号', key: 'projectNo', width: 120 }, // { title: '工程号', key: 'projectNo', width: 120 },
{ title: '报告编号', key: 'reportCode', width: 120 }, // { title: '报告编号', key: 'reportCode', width: 120 },
{ title: '制表日期', key: 'tabulateDate', width: 120, date: true }, { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
{ title: '制表人', key: 'tabulater', width: 120 }, { title: '制表人', key: 'tabulater', width: 120 },
{ title: '批准日期', key: 'approveDate', width: 120, date: true }, // { title: '批准日期', key: 'approveDate', width: 120, date: true },
{ title: '批准人', key: 'approver', width: 120 }, // { title: '批准人', key: 'approver', width: 120 },
{ title: '检验类别', key: 'testType', width: 120 } { title: '检验类别', key: 'testType', width: 120 }
], ],
searchOpen: false, searchOpen: false,
......
pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
...@@ -166,20 +166,18 @@ export default { ...@@ -166,20 +166,18 @@ export default {
pageColumns: [ pageColumns: [
{ title: '委托商', key: 'client', width: 180 }, { title: '委托商', key: 'client', width: 180 },
{ title: '委托编号', key: 'entrustCode', width: 180 }, { title: '委托编号', key: 'entrustCode', width: 180 },
{ title: '存储条件', key: 'conditions', width: 180 },
{ title: '试样编号', key: 'sampleCode', width: 180 }, { title: '试样编号', key: 'sampleCode', width: 180 },
{ title: '试样深度', key: 'sampleDepth', width: 180 }, { title: '试样深度', key: 'sampleDepth', width: 180 },
{ title: '样品包装类型', key: 'samplePack', width: 180 }, { title: '样品包装类型', key: 'samplePack', width: 180 },
{ title: '现场编号', key: 'siteNo', width: 180 }, { title: '现场编号', key: 'siteNo', width: 180 },
{ title: '存储条件', key: 'conditions', width: 180 },
{ title: '备样位置', key: 'backupLocation', width: 180 }, { title: '备样位置', key: 'backupLocation', width: 180 },
{ title: '备样数量', key: 'quantity', width: 180 }, { title: '备样数量', key: 'quantity', width: 180 },
{ title: '备样人', key: 'backupUser', width: 140 }, { title: '备样人', key: 'backupUser', width: 140 },
{ title: '钻孔位置', key: 'boreholeLocation', width: 110 }, { title: '钻孔位置', key: 'boreholeLocation', width: 110 },
{ title: '钻孔名称', key: 'boreholeName', width: 160 }, { title: '钻孔名称', key: 'boreholeName', width: 160 },
{ title: '水深（米）', key: 'waterDepth', width: 160 }, { title: '水深（米）', key: 'waterDepth', width: 160 },
{ title: '状态', key: 'status', width: 160 }, { title: '状态', key: 'status', width: 160 }
{ title: '备份开始日期', key: 'startTime', width: 170 },
{ title: '备份结束日期', key: 'endTime', width: 170 }
/* {title: '处置方式', key: 'handleMethod', width: 120,}, */ /* {title: '处置方式', key: 'handleMethod', width: 120,}, */
], ],
conditionList: [], conditionList: [],
......
pages/soil-test-manage/test-input/TestInput.vue
...@@ -108,12 +108,12 @@ export default { ...@@ -108,12 +108,12 @@ export default {
{ title: '水深（米）', key: 'waterDepth', width: 120 }, { title: '水深（米）', key: 'waterDepth', width: 120 },
{ title: '钻孔名称', key: 'boreholeName', width: 120 }, { title: '钻孔名称', key: 'boreholeName', width: 120 },
{ title: '进度', key: 'progress', width: 120, status: true }, { title: '进度', key: 'progress', width: 120, status: true },
{ title: '工程号', key: 'projectNo', width: 120 }, // { title: '工程号', key: 'projectNo', width: 120 },
{ title: '报告编号', key: 'reportCode', width: 120 }, // { title: '报告编号', key: 'reportCode', width: 120 },
{ title: '制表日期', key: 'tabulateDate', width: 120, date: true }, { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
{ title: '制表人', key: 'tabulater', width: 120 }, { title: '制表人', key: 'tabulater', width: 120 },
{ title: '批准日期', key: 'approveDate', width: 120, date: true }, // { title: '批准日期', key: 'approveDate', width: 120, date: true },
{ title: '批准人', key: 'approver', width: 120 }, // { title: '批准人', key: 'approver', width: 120 },
{ title: '检验类别', key: 'testType', width: 120 } { title: '检验类别', key: 'testType', width: 120 }
], ],
searchOpen: false, searchOpen: false,
......
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