diff --git a/src/api/xxcj.js b/src/api/xxcj.js index 3764a03..5eb1f90 100644 --- a/src/api/xxcj.js +++ b/src/api/xxcj.js @@ -211,3 +211,28 @@ export const xxcjTjcll = (params) => { params }) } +// 送审 +export const xxcjXxcjTjsh = (data) => { + return request({ + url: api + `/xxcj/xxcjTjsh`, + method: "post", + data + }) +} + +// 审批列表 +export const xxcjSelectDshPage = (params) => { + return request({ + url: api + `/xxcj/selectDshPage`, + method: "get", + params + }) +} +// 审批 +export const xxcjXxcjSh = (data) => { + return request({ + url: api + `/xxcj/xxcjSh`, + method: "post", + data + }) +} diff --git a/src/assets/css/layout.scss b/src/assets/css/layout.scss index 98ba3dd..093b719 100644 --- a/src/assets/css/layout.scss +++ b/src/assets/css/layout.scss @@ -187,6 +187,14 @@ header { border-radius: 4px; } +.searchBoxlive { + // padding: 15px; + border-radius: 1px; + position: relative; + background: #fff; + border-radius: 4px; +} + .app-main { height: calc(100vh - 126px); position: relative; @@ -256,6 +264,10 @@ header { } } } + + .heightBox { + height: calc(100vh - 270px); + } } ::v-deep .el-card { diff --git a/src/components/MyComponents/Upload/index.vue b/src/components/MyComponents/Upload/index.vue index 8ced42e..e03cc4a 100644 --- a/src/components/MyComponents/Upload/index.vue +++ b/src/components/MyComponents/Upload/index.vue @@ -9,7 +9,7 @@ :action="actionUrl" :list-type="props.showBtn ? '' : 'picture-card'" :file-list="fileList" - show-file-list + :show-file-list="showFileList" :before-remove="beforeRemove" :on-exceed="handleExceed" :on-success="handlerSuccess" @@ -82,6 +82,10 @@ const props = defineProps({ isAll: { type: Boolean, default: true //所有类型都可以用这个接口,接口返回的是id + }, + showFileList: { + type: Boolean, + default: true } }); const emits = defineEmits(["update:modelValue"]); @@ -102,9 +106,10 @@ watch(() => props.modelValue,(val) => { // 确保file.url始终是字符串URL const fileUrl = props.isAll ? `/mosty-api/mosty-base/minio/image/download/` + el.id : el.url; return { + ...el, url: String(fileUrl || ''), name: el.name || '', - id: el + }; } else { return { @@ -113,6 +118,8 @@ watch(() => props.modelValue,(val) => { }; } }); + console.log(fileList.value, "fileList.value"); + },{ immediate: true,deep:true }); const actionUrl = computed(() => { @@ -173,8 +180,16 @@ const handlerSuccess = (res, file) => { let arr = [] if(props.isImg){ arr = fileList.value.map((el) => el.id) - }else{ - arr = fileList.value.map((el) => ({ id:el.id, name:el.name})) + } else { + console.log(fileList,"测试"); + arr = fileList.value.map((el) => { + console.log(el,'xunhuan'); + return { + id: el.id, name: el.name + } + }) + console.log(arr,"测试2222"); + } emits("update:modelValue", arr); }; diff --git a/src/components/aboutTable/MyTable.vue b/src/components/aboutTable/MyTable.vue index ad03397..e7f6162 100644 --- a/src/components/aboutTable/MyTable.vue +++ b/src/components/aboutTable/MyTable.vue @@ -8,9 +8,8 @@ :stripe="getConfiger.stripe" :height="tableHeight" v-loading="tableConfiger.loading" :lazy="getConfiger.lazy" :load="load" :tree-props="treePros" style="width: 100%" :header-cell-class-name="() => 'HeadBgColor'" :highlight-current-row="getConfiger.showSelectType === 'radio'" - - @row-click="handleRowClick" + @cell-click="handleCellClick" :row-style="(row, index) => getRowStyle(row, index)" :row-class-name="(row, index) => getRowClassName(row, index)"> @@ -98,7 +97,7 @@ const props = defineProps({ } }); // 可选的时候选择的数据 -const emit = defineEmits(["chooseData","handleRowClick"]); +const emit = defineEmits(["chooseData","handleRowClick","handleCellClick"]); const multipleTableRef = ref(); const currentRow = ref(); let getConfiger = reactive({ @@ -160,7 +159,6 @@ const load = (date, treeNode, resolve) => { const getRowStyle = (row, index) => { // 基础行高样式 const baseStyle = { height: getConfiger.rowHeight === 'auto' ? getConfiger.rowHeight : getConfiger.rowHeight + 'px' }; - // 如果有自定义行样式函数,合并样式 if (props.rowStyle) { const customStyle = props.rowStyle(row, index); @@ -200,6 +198,9 @@ function setDefaultChoose() { const handleRowClick = (row) => { emit("handleRowClick", row); } +const handleCellClick = (row,column,event,cell) => { + emit("handleCellClick", {row,column,event,cell}); +} diff --git a/src/components/aboutTable/PageTitle.vue b/src/components/aboutTable/PageTitle.vue index 1bcb9b1..dec0226 100644 --- a/src/components/aboutTable/PageTitle.vue +++ b/src/components/aboutTable/PageTitle.vue @@ -1,11 +1,11 @@