Merge remote-tracking branch 'origin/dev' into dev

src/api/comprehensiveGuarantee/materialReserveManagement/typesMaterialsManagement.ts

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

src/types/components.d.ts

@@ -24,6 +24,8 @@ declare module 'vue' {
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
     DrawMap: typeof import('./../components/Map/YztMap/DrawMap.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
+    ElAnchor: typeof import('element-plus/es')['ElAnchor']
+    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
@@ -35,6 +37,8 @@ declare module 'vue' {
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -48,7 +52,6 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -60,7 +63,6 @@ declare module 'vue' {
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
@@ -87,7 +89,8 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
+    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']

src/views/comprehensiveGuarantee/MaterialReserveManagement/WarehouseManagement.vue

@@ -12,20 +12,20 @@
           </el-row>
         </transition>
         <el-table ref="multipleTable" v-loading="loading" :data="tableData" border :max-height="maxHeight">
-          <el-table-column label="库房名称" align="center" prop="room_name" width="180" />
-          <el-table-column label="所在仓库" align="center" prop="warehouse_name" width="130" />
-          <el-table-column label="库房面积(平方米)" align="center" prop="room_area" width="130" />
-          <el-table-column label="可用仓储面积(平方米)" align="center" prop="available_area" width="160" />
-          <el-table-column label="高度(米)" align="center" prop="height" width="130" />
-          <el-table-column label="库房容积(立方米)" align="center" prop="room_volume" width="130" />
-          <el-table-column label="可用库房容积(立方米)" align="center" prop="available_volume" width="160" />
-          <el-table-column label="等级" align="center" prop="level" width="130">
+          <el-table-column label="库房名称" align="center" prop="room_name" width="190" />
+          <el-table-column label="所在仓库" align="center" prop="warehouse_name" width="150" />
+          <el-table-column label="库房面积(平方米)" align="center" prop="room_area" />
+          <el-table-column label="可用仓储面积(平方米)" align="center" prop="available_area"/>
+          <el-table-column label="高度(米)" align="center" prop="height" />
+          <el-table-column label="库房容积(立方米)" align="center" prop="room_volume"/>
+          <el-table-column label="可用库房容积(立方米)" align="center" prop="available_volume" />
+          <el-table-column label="等级" align="center" prop="level">
             <template #default="scope">
               <dict-tag :options="material_category_level" :value="scope.row.level" />
             </template>
           </el-table-column>
-          <el-table-column label="存放类型" align="center" prop="storage_type" width="130" />
-          <el-table-column label="库存确认最新时间" align="center" prop="last_inventory_time" width="170">
+          <el-table-column label="存放类型" align="center" prop="storage_type" />
+          <el-table-column label="库存确认最新时间" align="center" prop="last_inventory_time" width="200">
             <template #default="scope">
               {{ parseTime(scope.row.last_inventory_time) }}
             </template>

src/views/comprehensiveGuarantee/MaterialReserveManagement/addOutbound.vue

@@ -6,7 +6,7 @@
         <div>新增出库单</div>
       </div>
       <div class="common-dialog-box">
-        <el-form ref="eventFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="eventFormRef" :model="form" :rules="rules" label-width="200px">
           <el-form-item label="出库单号：" prop="invoice_number">
             <el-input v-model="form.invoice_number" placeholder="请输入出库单号" style="width: 468px !important" />
           </el-form-item>