Skip to content

P
patzn-cloud-web-back-soil
Commit 070f1e66 by lichengming
Options

修改了样品管理

parent 69db33b9
Showing with 101 additions and 53 deletions
pages/soil-sample-manage/sample-preparation/SampleManage.vue
...@@ -71,8 +71,7 @@ export default { ...@@ -71,8 +71,7 @@ export default {
}, },
// 关闭弹框的时候刷新上个界面 // 关闭弹框的时候刷新上个界面
_visibleChange(data) { _visibleChange(data) {
if (data === false) { this.$emit('on-result-change')
}
} }
} }
} }
......
pages/workbench/workbench.vue
...@@ -13,61 +13,62 @@ ...@@ -13,61 +13,62 @@
<template> <template>
<div class="layout-content-padding"> <div class="layout-content-padding">
<div class="layout-content-main"> <div class="layout-content-main">
<div class="config_home"> <Row :gutter="10">
<Row :gutter="16"> <Col span="12">
<!--title--> <messagePanel></messagePanel>
<Col span="24"> </Col>
<statisticalPanel /> <Col span="12">
</Col> <myTask></myTask>
<Col span="12" style="margin-bottom: 10px"> </Col>
<messagePanel /> <Col span="12">
</Col> <taskCalendar></taskCalendar>
<Col span="12" style="margin-bottom: 10px"> </Col>
<toDoTask /> <Col span="12">
</Col> <UnfinishedContract></UnfinishedContract>
<Col span="12" style="margin-bottom: 10px"> </Col>
<myTask /> <Col span="12">
</Col> <UnfinishedItem></UnfinishedItem>
<Col span="12" style="margin-bottom: 10px"> </Col>
<TaskFlow /> <Col span="12">
</Col> <YearContractNum></YearContractNum>
<Col span="12" style="margin-bottom: 10px"> </Col>
<taskCalendar /> <Col span="12">
</Col> <DetectTypeNum></DetectTypeNum>
<Col span="12" style="margin-bottom: 10px"> </Col>
<UnfinishedContract></UnfinishedContract> <Col span="12">
</Col> <ContractEndNum></ContractEndNum>
<Col span="12" style="margin-bottom: 10px"> </Col>
<UnfinishedItem></UnfinishedItem> <Col span="12">
</Col> <YearTestItem></YearTestItem>
<Col span="12" style="margin-bottom: 10px"> </Col>
<YearContractNum></YearContractNum> <Col span="12">
</Col> <YearOverItem></YearOverItem>
<Col span="12" style="margin-bottom: 10px"> </Col>
<DetectTypeNum></DetectTypeNum> <Col span="12">
</Col> <GroupItem></GroupItem>
<Col span="12" style="margin-bottom: 10px"> </Col>
<ContractEndNum></ContractEndNum> <Col span="12">
</Col> <CustomerContract></CustomerContract>
<Col span="12" style="margin-bottom: 10px"> </Col>
<YearTestItem></YearTestItem> <!-- <div :style="{height}" v-if="moduleList.length" class="config_home">-->
</Col> <!-- <Row :gutter="10">-->
<Col span="12" style="margin-bottom: 10px"> <!-- <Col-->
<YearOverItem></YearOverItem> <!-- :sm="{span:item.alias === 'FoodToDoAndOverdue'?24:12}"-->
</Col> <!-- v-for="(item,index) in moduleList"-->
<Col span="12" style="margin-bottom: 10px"> <!-- :key="index"-->
<GroupItem></GroupItem> <!-- style="margin-bottom: 10px">-->
</Col> <!-- &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;-->
<Col span="12" style="margin-bottom: 10px"> <!-- <component :is="item.alias" @on-result-change="_result" keep-alive></component>-->
<CustomerContract></CustomerContract> <!-- </Col>-->
</Col> <!-- </Row>-->
</Row> <!-- </div>-->
</div> </Row>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Global from '../../api/config'
import { sysOrg } from '../../api'
import statisticalPanel from './statisticalPanel' import statisticalPanel from './statisticalPanel'
import messagePanel from './messagePanel' import messagePanel from './messagePanel'
import toDoTask from './ToDoTask' import toDoTask from './ToDoTask'
...@@ -86,21 +87,69 @@ import CustomerContract from './CustomerContract' ...@@ -86,21 +87,69 @@ import CustomerContract from './CustomerContract'
export default { export default {
name: 'Workbench', name: 'Workbench',
components: { components: {
// eslint-disable-next-line vue/no-unused-components
statisticalPanel, statisticalPanel,
// eslint-disable-next-line vue/no-unused-components
messagePanel, messagePanel,
// eslint-disable-next-line vue/no-unused-components
myTask, myTask,
// eslint-disable-next-line vue/no-unused-components
toDoTask, toDoTask,
// eslint-disable-next-line vue/no-unused-components
TaskFlow, TaskFlow,
// eslint-disable-next-line vue/no-unused-components
taskCalendar, taskCalendar,
// eslint-disable-next-line vue/no-unused-components
UnfinishedContract, UnfinishedContract,
// eslint-disable-next-line vue/no-unused-components
UnfinishedItem, UnfinishedItem,
// eslint-disable-next-line vue/no-unused-components
YearContractNum, YearContractNum,
// eslint-disable-next-line vue/no-unused-components
DetectTypeNum, DetectTypeNum,
// eslint-disable-next-line vue/no-unused-components
ContractEndNum, ContractEndNum,
// eslint-disable-next-line vue/no-unused-components
YearTestItem, YearTestItem,
// eslint-disable-next-line vue/no-unused-components
YearOverItem, YearOverItem,
// eslint-disable-next-line vue/no-unused-components
GroupItem, GroupItem,
// eslint-disable-next-line vue/no-unused-components
CustomerContract CustomerContract
},
data() {
return {
height: document.documentElement.clientHeight - 115 + 'px',
moduleList: []
}
},
mounted() {
if (Global.getLn()) {
this._open()
}
},
methods: {
// 模块返回结果
_result(module) {
switch (module) {
case 'FoodMyTask':
this.$bus.emit('task-detail')
break
}
},
_open() {
this._myModule()
},
_myModule: async function() {
// this.$store.dispatch('SysModule/listUserFood').then(() => {
// this.moduleList = this.$store.state.SysModule.list
// })
const result = await sysOrg.getModulesList()
if (result) {
console.log('菜单', result)
}
}
} }
} }
</script> </script>
......
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