浏览代码

修复table和图片预览冲突、修改el-date-picker禁用样式

Hwf 9 月之前
父节点
当前提交
34dd805fe1

+ 7 - 0
src/api/comprehensiveGuarantee/materialReserveManagement/materialInformation.ts

@@ -30,3 +30,10 @@ export function updateMaterial(data, id) {
     data: data
   });
 }
+// 删除
+export function deleteMaterial(id: string) {
+  return request({
+    url: '/api/resource_provison/material/material/delete/' + id,
+    method: 'delete'
+  });
+}

+ 1 - 1
src/api/comprehensiveGuarantee/materialReserveManagement/typesMaterialsManagement.ts

@@ -31,7 +31,7 @@ export function updateMaterialType(data, id) {
   });
 }
 // 删除
-export function deleteMaterial(id: string) {
+export function deleteMaterialType(id: string) {
   return request({
     url: '/api/resource_provison/material/material/delete/' + id,
     method: 'delete'

+ 4 - 0
src/assets/styles/index.scss

@@ -845,3 +845,7 @@ aside {
     }
   }
 }
+.image-table .el-table__cell {
+  position: static !important;
+}
+

+ 2 - 4
src/views/comprehensiveGuarantee/MaterialReserveManagement/MaterialInformation.vue

@@ -32,7 +32,7 @@
             </el-row>
           </div>
         </transition>
-        <el-table ref="multipleTable" v-loading="loading" :data="tableData" border :max-height="maxHeight">
+        <el-table ref="multipleTable" v-loading="loading" :data="tableData" border class="image-table" :max-height="maxHeight">
           <el-table-column label="图片" align="center" prop="materialImageData">
             <template #default="scope">
               <el-image
@@ -69,9 +69,7 @@
 import addMaterialInformation from './addMaterialInformation.vue';
 import MaterialInformationDetails from './MaterialInformationDetails.vue';
 import { getMaterialWarehouseList } from '@/api/comprehensiveGuarantee/materialReserveManagement/godownManagement';
-import { getMaterialList } from '@/api/comprehensiveGuarantee/materialReserveManagement/materialInformation';
-import { deleteMaterialRoot } from '@/api/comprehensiveGuarantee/materialReserveManagement/warehouseManagement';
-import { deleteMaterial } from '@/api/comprehensiveGuarantee/materialReserveManagement/typesMaterialsManagement';
+import { deleteMaterial, getMaterialList } from '@/api/comprehensiveGuarantee/materialReserveManagement/materialInformation';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { material_source } = toRefs<any>(proxy?.useDict('material_source'));

+ 8 - 19
src/views/comprehensiveGuarantee/MaterialReserveManagement/MaterialInformationDetails.vue

@@ -328,29 +328,18 @@ onMounted(() => {
   font-size: 18px;
   font-weight: bold;
 }
-.custom-disabled {
-  :deep(.el-select__wrapper.is-disabled),
-  :deep(.el-input__wrapper),
-  :deep(.el-textarea__inner) {
+
+:deep(.custom-disabled) {
+  .el-select__wrapper.is-disabled,
+  .el-input__wrapper,
+  .el-textarea__inner {
     background-color: #ffffff !important;
   }
-  :deep(.el-select__wrapper.is-disabled .el-select__selected-item),
-  :deep(.el-input__inner),
-  :deep(.el-textarea__inner) {
+  .el-select__wrapper.is-disabled .el-select__selected-item,
+  .el-input__inner,
+  .el-textarea__inner {
     color: rgba(0, 0, 0, 0.85) !important;
     -webkit-text-fill-color: rgba(0, 0, 0, 0.85) !important;
   }
 }
-/* 禁用状态下的文本颜色修改 */
-.el-date-editor {
-  :deep(.el-input.is-disabled .el-input__inner) {
-    color: #063caa !important;
-  }
-}
-
-/* 禁用状态下的背景颜色修改 */
-.el-date-editor {
-
-  background-color: #8c142c !important; /* 修改为需要的颜色 */
-}
 </style>

+ 1 - 4
src/views/comprehensiveGuarantee/MaterialReserveManagement/TypesMaterialsManagement.vue

@@ -45,10 +45,7 @@ import addTypesMaterials from './addTypesMaterials.vue';
 import impotTypesMaterials from './impotTypesMaterials.vue';
 import TypesMaterialsDetails from './TypesMaterialsDetails.vue';
 import { ref, reactive, onMounted, onBeforeUnmount } from 'vue';
-import {
-  deleteMaterialType,
-  getMaterialTypeList
-} from '@/api/comprehensiveGuarantee/materialReserveManagement/typesMaterialsManagement';
+import { deleteMaterialType, getMaterialTypeList } from '@/api/comprehensiveGuarantee/materialReserveManagement/typesMaterialsManagement';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { show_status, material_category_level } = toRefs<any>(proxy?.useDict('show_status', 'material_category_level'));
 // 定义响应式变量