diff --git a/src/api/badwgl.js b/src/api/badwgl.js new file mode 100644 index 0000000..5db2a5f --- /dev/null +++ b/src/api/badwgl.js @@ -0,0 +1,17 @@ +import request from "@/utils/request"; +const api = "/bagl/mosty-base"; + +export const getDwglnfo = (id) => { + return request({ + url: api + "/baxx/dwgl/getInfo/" + id, + method: "POST", + }); +}; +export const editDwglEdit = (data) => { + return request({ + url: api + "/baxx/dwgl/edit", + method: "POST", + data, + }); +}; + diff --git a/src/assets/css/layout.scss b/src/assets/css/layout.scss index 295a4ef..a070cc3 100644 --- a/src/assets/css/layout.scss +++ b/src/assets/css/layout.scss @@ -99,6 +99,7 @@ overflow: auto; border: 1px solid #ccc; top: 4px; + right: 10px; left: 10px; background-color: #fff; @@ -169,6 +170,10 @@ justify-content: space-between; line-height: 48px; color: #000; + position: sticky; + top: 0; + z-index: 10; + background: #fff; } &::v-deep .el-form--inline { @@ -348,6 +353,7 @@ margin-top: 14px; } } -.makerTitlezb{ + +.makerTitlezb { color: orangered; } \ No newline at end of file diff --git a/src/components/MyComponents/index.js b/src/components/MyComponents/index.js index 8a2428a..8e742be 100644 --- a/src/components/MyComponents/index.js +++ b/src/components/MyComponents/index.js @@ -18,6 +18,7 @@ import MarkdownEdit from "./MarkdownEdit/index.vue"; import FileUpload from "./FileUpload/index.vue"; import Date from "./Date/index.vue"; import Empty from "./Empty/index.vue"; +import CheckBox from "@/components/checkBox/index.vue"; export { AddressSelect, FrameWork, @@ -38,5 +39,6 @@ export { MarkdownEdit, FileUpload, Date, - Empty + Empty, + CheckBox }; diff --git a/src/components/aboutTable/FormMessage.vue b/src/components/aboutTable/FormMessage.vue index 013210c..25e3c5a 100644 --- a/src/components/aboutTable/FormMessage.vue +++ b/src/components/aboutTable/FormMessage.vue @@ -14,8 +14,8 @@ style="width:100%" :min="item.min || 0" :max="item.max || 1000" /> + v-model="listQuery[item.prop]" :collapse-tags="item.multiple" :dictEnum="item.options" width="100%" + clearable :placeholder="`请选择${item.label}`" /> @@ -24,16 +24,18 @@ v-model="listQuery[item.prop]" clearable filterable /> + :placeholder="listQuery.ssbm ? listQuery.ssbm : `请选择${item.label}`" + @getDepValue="getdep($event, item.depMc)" v-model="listQuery[item.prop]" /> - + + + :m="item.options" :placeholder="`请选择${item.label}`" /> @@ -69,8 +71,8 @@ style="width:100%" :min="child.min || 0" :max="child.max || 1000" /> + v-model="listQuery[child.prop]" :collapse-tags="child.multiple" :dictEnum="child.options" width="100%" + clearable :placeholder="`请选择${child.label}`" /> @@ -81,8 +83,10 @@ + + + :data="child.options" :placeholder="`请选择${child.label}`" /> {{ obj.label }} @@ -136,7 +140,15 @@ const submit = (resfun) => { resfun(listQuery.value); }); }; - +const getdep = (e, val) => { + if (val) { + if (Array.isArray(e)) { + listQuery.value[val] = e ? e.map(item => item.orgName) : ''; + } else { + listQuery.value[val] = e ? e.orgName : ''; + } + } +} const reset = () => { listQuery.value = {}; elform.value.resetFields(); diff --git a/src/components/aboutTable/MyTable.vue b/src/components/aboutTable/MyTable.vue index 243dc36..6c3d831 100644 --- a/src/components/aboutTable/MyTable.vue +++ b/src/components/aboutTable/MyTable.vue @@ -1,20 +1,20 @@ - @@ -83,6 +83,8 @@ const props = defineProps({ // 可选的时候选择的数据 const emit = defineEmits(["chooseData"]); const multipleTableRef = ref(); +console.log(props.tableConfiger); + const currentRow = ref(); let getConfiger = reactive({ showSelectType: null, // 显示多选还是单选还是没有选择 checkBox/radio/null diff --git a/src/components/checkBox/index.vue b/src/components/checkBox/index.vue index 7c544f7..c9a56db 100644 --- a/src/components/checkBox/index.vue +++ b/src/components/checkBox/index.vue @@ -1,8 +1,9 @@ + {{ data }} 全部 - {{item}} + {{item.zdmc}} @@ -20,6 +21,10 @@ const props = defineProps({ }, showAll: { type: Boolean, default: true + }, + m: { + type: Array, + default:()=>[] } }); const checkAll = ref(false); diff --git a/src/views/securityManagement/unitManagement/unitInformation/components/pxApllication.vue b/src/views/securityManagement/unitManagement/unitInformation/components/pxApllication.vue new file mode 100644 index 0000000..5e20b31 --- /dev/null +++ b/src/views/securityManagement/unitManagement/unitInformation/components/pxApllication.vue @@ -0,0 +1,283 @@ + + + + + + 年检培训申请 + + 保存 + 关闭 + + + + + + 单位基本信息 + + + 法人信息 + + + 负责人信息 + + + 保安信息 + + + 补充信息 + + + + + + + + + diff --git a/src/views/securityManagement/unitManagement/unitInformation/components/viewDetailsDialog.vue b/src/views/securityManagement/unitManagement/unitInformation/components/viewDetailsDialog.vue index ccd39a9..8583c83 100644 --- a/src/views/securityManagement/unitManagement/unitInformation/components/viewDetailsDialog.vue +++ b/src/views/securityManagement/unitManagement/unitInformation/components/viewDetailsDialog.vue @@ -1,5 +1,5 @@ - + {{ title }} @@ -138,7 +138,9 @@ defineExpose({ open })