Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
This commit is contained in:
commit
41228a4606
|
@ -4,14 +4,14 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
||||||
const { createConfirm } = useMessage();
|
const { createConfirm } = useMessage();
|
||||||
|
|
||||||
enum Api {
|
enum Api {
|
||||||
list = '/ConfigMaterial/configMaterialCategory/list',
|
list = '/invoicing/configMaterialCategory/list',
|
||||||
selectMaterialList = '/ConfigMaterial/configMaterialCategory/selectMaterialList',
|
selectMaterialList = '/invoicing/configMaterialCategory/selectMaterialList',
|
||||||
save='/ConfigMaterial/configMaterialCategory/add',
|
save='/invoicing/configMaterialCategory/add',
|
||||||
edit='/ConfigMaterial/configMaterialCategory/edit',
|
edit='/invoicing/configMaterialCategory/edit',
|
||||||
deleteOne = '/ConfigMaterial/configMaterialCategory/delete',
|
deleteOne = '/invoicing/configMaterialCategory/delete',
|
||||||
deleteBatch = '/ConfigMaterial/configMaterialCategory/deleteBatch',
|
deleteBatch = '/invoicing/configMaterialCategory/deleteBatch',
|
||||||
importExcel = '/ConfigMaterial/configMaterialCategory/importExcel',
|
importExcel = '/invoicing/configMaterialCategory/importExcel',
|
||||||
exportXls = '/ConfigMaterial/configMaterialCategory/exportXls',
|
exportXls = '/invoicing/configMaterialCategory/exportXls',
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 导出api
|
* 导出api
|
||||||
|
|
|
@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
||||||
const { createConfirm } = useMessage();
|
const { createConfirm } = useMessage();
|
||||||
|
|
||||||
enum Api {
|
enum Api {
|
||||||
list = '/configMaterialInfo/configMaterialInfo/list',
|
list = '/invoicing/configMaterialInfo/list',
|
||||||
save='/configMaterialInfo/configMaterialInfo/add',
|
save='/invoicing/configMaterialInfo/add',
|
||||||
edit='/configMaterialInfo/configMaterialInfo/edit',
|
edit='/invoicing/configMaterialInfo/edit',
|
||||||
deleteOne = '/configMaterialInfo/configMaterialInfo/delete',
|
deleteOne = '/invoicing/configMaterialInfo/delete',
|
||||||
deleteBatch = '/configMaterialInfo/configMaterialInfo/deleteBatch',
|
deleteBatch = '/invoicing/configMaterialInfo/deleteBatch',
|
||||||
importExcel = '/configMaterialInfo/configMaterialInfo/importExcel',
|
importExcel = '/invoicing/configMaterialInfo/importExcel',
|
||||||
exportXls = '/configMaterialInfo/configMaterialInfo/exportXls',
|
exportXls = '/invoicing/configMaterialInfo/exportXls',
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
<div class="all-card">
|
<div class="all-card">
|
||||||
<div v-for="(item, index) in treeData" :key="index" style="position: relative;">
|
<div v-for="(item, index) in treeData" :key="index" style="position: relative;">
|
||||||
<div :class="clickCount === index ? 'card-target' : 'card'" :style="getCardStyle(index,treeData.length)" @click="handleClick(index,item)">
|
<div :class="clickCount === index ? 'card-target' : 'card'" :style="getCardStyle(index,treeData.length)" @click="handleClick(index,item)">
|
||||||
<img class="logo" src="/src/assets/images/logo.png" width="30" height="30" />
|
<img src="/src/assets/images/logo.png" width="30" height="30" />
|
||||||
<span style="margin-top: 8px;">{{ item.title }}</span>
|
<span style="margin-top: 8px;">{{ item.title }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-show="clickCount === index && index !== 4" class="sanjiao-down"></div>
|
<div v-show="clickCount === index && index !== 4" class="sanjiao-down"></div>
|
||||||
|
@ -81,7 +81,7 @@
|
||||||
<a-sub-menu v-if="item2.children.length>0" :key="`sub`+key2" style="margin:20px;background-image: url('../resource/img/bj.png');text-align:center;border-radius:5px;">
|
<a-sub-menu v-if="item2.children.length>0" :key="`sub`+key2" style="margin:20px;background-image: url('../resource/img/bj.png');text-align:center;border-radius:5px;">
|
||||||
<template #title>
|
<template #title>
|
||||||
<div style="height:50px;line-height:50px;">
|
<div style="height:50px;line-height:50px;">
|
||||||
<span><img src="/src/assets/images/logo.png" /></span><span style="margin-left: 10px;">{{item2.title}}</span>
|
<span><img src="/src/assets/images/logo.png" width="30" height="30" /></span><span style="margin-left: 10px;">{{item2.title}}</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<a-menu-item v-for="(item3,key3) in item2.children" :key="key3" style="height:50px;text-align:left;" >
|
<a-menu-item v-for="(item3,key3) in item2.children" :key="key3" style="height:50px;text-align:left;" >
|
||||||
|
@ -92,7 +92,7 @@
|
||||||
</a-sub-menu>
|
</a-sub-menu>
|
||||||
<a-menu-item v-if="item2.children.length==0" :key="`sub`+key2" style="margin:20px;background-image: url('../resource/img/bj.png');text-align:center;border-radius:5px;width:85%;height:50px;line-height:50px;">
|
<a-menu-item v-if="item2.children.length==0" :key="`sub`+key2" style="margin:20px;background-image: url('../resource/img/bj.png');text-align:center;border-radius:5px;width:85%;height:50px;line-height:50px;">
|
||||||
<div @click="onSelect(item2)">
|
<div @click="onSelect(item2)">
|
||||||
<span><img src="/src/assets/images/logo.png" /></span><span style="margin-left: 10px;">{{item2.title}}</span>
|
<span><img src="/src/assets/images/logo.png" width="30" height="30"/></span><span style="margin-left: 10px;">{{item2.title}}</span>
|
||||||
</div>
|
</div>
|
||||||
</a-menu-item>
|
</a-menu-item>
|
||||||
</template>
|
</template>
|
||||||
|
@ -343,7 +343,7 @@ const getCardStyle = (index,allSize) => {
|
||||||
|
|
||||||
// 自动请求并暴露内部方法
|
// 自动请求并暴露内部方法
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
defHttp.get({url:'/ConfigMaterial/configMaterialCategory/getMaterialTreeData'}).then(res =>{
|
defHttp.get({url:'/invoicing/configMaterialCategory/getMaterialTreeData'}).then(res =>{
|
||||||
treeData.value = res;
|
treeData.value = res;
|
||||||
console.log("🚀 ~ defHttp.get ~ treeData:", treeData)
|
console.log("🚀 ~ defHttp.get ~ treeData:", treeData)
|
||||||
console.log("🚀 ~ defHttp.get ~ res:", res)
|
console.log("🚀 ~ defHttp.get ~ res:", res)
|
||||||
|
|
|
@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
||||||
const { createConfirm } = useMessage();
|
const { createConfirm } = useMessage();
|
||||||
|
|
||||||
enum Api {
|
enum Api {
|
||||||
list = '/ConfigMaterial/configMaterialMedication/list',
|
list = '/invoicing/configMaterialMedication/list',
|
||||||
save='/ConfigMaterial/configMaterialMedication/add',
|
save='/invoicing/configMaterialMedication/add',
|
||||||
edit='/ConfigMaterial/configMaterialMedication/edit',
|
edit='/invoicing/configMaterialMedication/edit',
|
||||||
deleteOne = '/ConfigMaterial/configMaterialMedication/delete',
|
deleteOne = '/invoicing/configMaterialMedication/delete',
|
||||||
deleteBatch = '/ConfigMaterial/configMaterialMedication/deleteBatch',
|
deleteBatch = '/invoicing/configMaterialMedication/deleteBatch',
|
||||||
importExcel = '/ConfigMaterial/configMaterialMedication/importExcel',
|
importExcel = '/invoicing/configMaterialMedication/importExcel',
|
||||||
exportXls = '/ConfigMaterial/configMaterialMedication/exportXls',
|
exportXls = '/invoicing/configMaterialMedication/exportXls',
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
||||||
const { createConfirm } = useMessage();
|
const { createConfirm } = useMessage();
|
||||||
|
|
||||||
enum Api {
|
enum Api {
|
||||||
list = '/ConfigMaterial/configMaterialType/list',
|
list = '/invoicing/configMaterialType/list',
|
||||||
save='/ConfigMaterial/configMaterialType/add',
|
save='/invoicing/configMaterialType/add',
|
||||||
edit='/ConfigMaterial/configMaterialType/edit',
|
edit='/invoicing/configMaterialType/edit',
|
||||||
deleteOne = '/ConfigMaterial/configMaterialType/delete',
|
deleteOne = '/invoicing/configMaterialType/delete',
|
||||||
deleteBatch = '/ConfigMaterial/configMaterialType/deleteBatch',
|
deleteBatch = '/invoicing/configMaterialType/deleteBatch',
|
||||||
importExcel = '/ConfigMaterial/configMaterialType/importExcel',
|
importExcel = '/invoicing/configMaterialType/importExcel',
|
||||||
exportXls = '/ConfigMaterial/configMaterialType/exportXls',
|
exportXls = '/invoicing/configMaterialType/exportXls',
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
let formData = {};
|
let formData = {};
|
||||||
const queryByIdUrl = '/ConfigMaterial/configMaterialCategory/queryById';
|
const queryByIdUrl = '/invoicing/configMaterialCategory/queryById';
|
||||||
async function initFormData(){
|
async function initFormData(){
|
||||||
let params = {id: props.formData.dataId};
|
let params = {id: props.formData.dataId};
|
||||||
const data = await defHttp.get({url: queryByIdUrl, params});
|
const data = await defHttp.get({url: queryByIdUrl, params});
|
||||||
|
|
|
@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
||||||
const { createConfirm } = useMessage();
|
const { createConfirm } = useMessage();
|
||||||
|
|
||||||
enum Api {
|
enum Api {
|
||||||
list = '/configSuppliersInfo/configSuppliersInfo/list',
|
list = '/invoicing/configSuppliersInfo/list',
|
||||||
save='/configSuppliersInfo/configSuppliersInfo/add',
|
save='/invoicing/configSuppliersInfo/add',
|
||||||
edit='/configSuppliersInfo/configSuppliersInfo/edit',
|
edit='/invoicing/configSuppliersInfo/edit',
|
||||||
deleteOne = '/configSuppliersInfo/configSuppliersInfo/delete',
|
deleteOne = '/invoicing/configSuppliersInfo/delete',
|
||||||
deleteBatch = '/configSuppliersInfo/configSuppliersInfo/deleteBatch',
|
deleteBatch = '/invoicing/configSuppliersInfo/deleteBatch',
|
||||||
importExcel = '/configSuppliersInfo/configSuppliersInfo/importExcel',
|
importExcel = '/invoicing/configSuppliersInfo/importExcel',
|
||||||
exportXls = '/configSuppliersInfo/configSuppliersInfo/exportXls',
|
exportXls = '/invoicing/configSuppliersInfo/exportXls',
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 导出api
|
* 导出api
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
let formData = {};
|
let formData = {};
|
||||||
const queryByIdUrl = '/configSuppliersInfo/configSuppliersInfo/queryById';
|
const queryByIdUrl = '/invoicing/configSuppliersInfo/queryById';
|
||||||
async function initFormData(){
|
async function initFormData(){
|
||||||
let params = {id: props.formData.dataId};
|
let params = {id: props.formData.dataId};
|
||||||
const data = await defHttp.get({url: queryByIdUrl, params});
|
const data = await defHttp.get({url: queryByIdUrl, params});
|
||||||
|
|
|
@ -4,13 +4,13 @@ import { useMessage } from "/@/hooks/web/useMessage";
|
||||||
const { createConfirm } = useMessage();
|
const { createConfirm } = useMessage();
|
||||||
|
|
||||||
enum Api {
|
enum Api {
|
||||||
list = '/configMaterialInfo/configMaterialInfo/list',
|
list = '/invoicing/configMaterialInfo/list',
|
||||||
save='/configMaterialInfo/configMaterialInfo/add',
|
save='/invoicing/configMaterialInfo/add',
|
||||||
edit='/configMaterialInfo/configMaterialInfo/edit',
|
edit='/invoicing/configMaterialInfo/edit',
|
||||||
deleteOne = '/configMaterialInfo/configMaterialInfo/delete',
|
deleteOne = '/invoicing/configMaterialInfo/delete',
|
||||||
deleteBatch = '/configMaterialInfo/configMaterialInfo/deleteBatch',
|
deleteBatch = '/invoicing/configMaterialInfo/deleteBatch',
|
||||||
importExcel = '/configMaterialInfo/configMaterialInfo/importExcel',
|
importExcel = '/invoicing/configMaterialInfo/importExcel',
|
||||||
exportXls = '/configMaterialInfo/configMaterialInfo/exportXls',
|
exportXls = '/invoicing/configMaterialInfo/exportXls',
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -46,10 +46,10 @@
|
||||||
import { ref, reactive } from 'vue';
|
import { ref, reactive } from 'vue';
|
||||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||||
import { useListPage } from '/@/hooks/system/useListPage';
|
import { useListPage } from '/@/hooks/system/useListPage';
|
||||||
import { columns, superQuerySchema } from './NuInvoicingQgdInfo.data';
|
import { columns, superQuerySchema } from './QgdInfo.data';
|
||||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuInvoicingQgdInfo.api';
|
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './QgdInfo.api';
|
||||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||||
import NuInvoicingQgdInfoModal from './components/NuInvoicingQgdInfoModal.vue'
|
import NuInvoicingQgdInfoModal from './components/QgdInfoModal.vue'
|
||||||
import { useUserStore } from '/@/store/modules/user';
|
import { useUserStore } from '/@/store/modules/user';
|
||||||
|
|
||||||
const formRef = ref();
|
const formRef = ref();
|
|
@ -61,7 +61,7 @@
|
||||||
import { defHttp } from '/@/utils/http/axios';
|
import { defHttp } from '/@/utils/http/axios';
|
||||||
import { useMessage } from '/@/hooks/web/useMessage';
|
import { useMessage } from '/@/hooks/web/useMessage';
|
||||||
import { getValueType } from '/@/utils';
|
import { getValueType } from '/@/utils';
|
||||||
import { saveOrUpdate } from '../NuInvoicingQgdInfo.api';
|
import { saveOrUpdate } from '../QgdInfo.api';
|
||||||
import { Form } from 'ant-design-vue';
|
import { Form } from 'ant-design-vue';
|
||||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||||
const props = defineProps({
|
const props = defineProps({
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { ref, nextTick, defineExpose } from 'vue';
|
import { ref, nextTick, defineExpose } from 'vue';
|
||||||
import NuInvoicingQgdInfoForm from './NuInvoicingQgdInfoForm.vue'
|
import NuInvoicingQgdInfoForm from './QgdInfoForm.vue'
|
||||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||||
|
|
||||||
const title = ref<string>('');
|
const title = ref<string>('');
|
|
@ -46,10 +46,10 @@
|
||||||
import { ref, reactive } from 'vue';
|
import { ref, reactive } from 'vue';
|
||||||
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
import { BasicTable, useTable, TableAction } from '/@/components/Table';
|
||||||
import { useListPage } from '/@/hooks/system/useListPage';
|
import { useListPage } from '/@/hooks/system/useListPage';
|
||||||
import { columns, superQuerySchema } from './NuInvoicingQgdMain.data';
|
import { columns, superQuerySchema } from './QgdMain.data';
|
||||||
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuInvoicingQgdMain.api';
|
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './QgdMain.api';
|
||||||
import { downloadFile } from '/@/utils/common/renderUtils';
|
import { downloadFile } from '/@/utils/common/renderUtils';
|
||||||
import NuInvoicingQgdMainModal from './components/NuInvoicingQgdMainModal.vue'
|
import NuInvoicingQgdMainModal from './components/QgdMainModal.vue'
|
||||||
import { useUserStore } from '/@/store/modules/user';
|
import { useUserStore } from '/@/store/modules/user';
|
||||||
|
|
||||||
const formRef = ref();
|
const formRef = ref();
|
|
@ -26,7 +26,7 @@
|
||||||
import { defHttp } from '/@/utils/http/axios';
|
import { defHttp } from '/@/utils/http/axios';
|
||||||
import { useMessage } from '/@/hooks/web/useMessage';
|
import { useMessage } from '/@/hooks/web/useMessage';
|
||||||
import { getValueType } from '/@/utils';
|
import { getValueType } from '/@/utils';
|
||||||
import { saveOrUpdate } from '../NuInvoicingQgdMain.api';
|
import { saveOrUpdate } from '../QgdMain.api';
|
||||||
import { Form } from 'ant-design-vue';
|
import { Form } from 'ant-design-vue';
|
||||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||||
const props = defineProps({
|
const props = defineProps({
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { ref, nextTick, defineExpose } from 'vue';
|
import { ref, nextTick, defineExpose } from 'vue';
|
||||||
import NuInvoicingQgdMainForm from './NuInvoicingQgdMainForm.vue'
|
import NuInvoicingQgdMainForm from './QgdMainForm.vue'
|
||||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||||
|
|
||||||
const title = ref<string>('');
|
const title = ref<string>('');
|
|
@ -515,4 +515,22 @@ html[data-theme='dark'] {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* Chrome/Edge/Safari */
|
||||||
|
input:-webkit-autofill,
|
||||||
|
input:-webkit-autofill:hover,
|
||||||
|
input:-webkit-autofill:focus {
|
||||||
|
/* 重新设置背景色、文字色、边框等 */
|
||||||
|
background-color: #f5f5f5 !important;
|
||||||
|
color: #333333 !important;
|
||||||
|
/* 取消浏览器自己的内阴影 */
|
||||||
|
box-shadow: 0 0 0px 1000px #f5f5f5 inset !important;
|
||||||
|
/* 如果需要边框高亮,也可以一起重置 */
|
||||||
|
// border: 1px solid #ccc !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Firefox */
|
||||||
|
input:-moz-autofill {
|
||||||
|
background-color: #f5f5f5 !important;
|
||||||
|
color: #333333 !important;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue