出库单管理 查看、明细

src/api/comprehensiveGuarantee/materialReserveManagement/OutboundManagement.ts

@@ -15,3 +15,10 @@ export function createOutboundOrder(data) {
     data: data
   });
 }
+//出库单详情
+export function getOutboundOrderInfo(id) {
+  return request({
+    url: '/api/resource_provison/material/warehouse_outbound/info/' + id,
+    method: 'get'
+  });
+}

src/types/components.d.ts

@@ -24,20 +24,13 @@ 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']
-    ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     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 +41,6 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -58,21 +50,13 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
-    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']

src/views/comprehensiveGuarantee/MaterialReserveManagement/InventoryDetails.vue

@@ -142,7 +142,7 @@ const fetchWorkrData = () => {
 
 const route = useRoute();
 const id = ref(route.query.id || null);
-data.queryParams.io_number = id;
+queryParams.value.io_number = id;
 watch(
   () => route.query.id, // 监听的对象
   (newVal, oldVal) => {

src/views/comprehensiveGuarantee/MaterialReserveManagement/OutboundManagement.vue

@@ -24,124 +24,107 @@
             prop="outbound_number"
           width="150"
           fixed
-          show-overflow-tooltip
           />
           <el-table-column
             label="仓库名称"
             align="center"
             prop="warehouse_id"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="出库单商品总体积(cm³）"
             align="center"
             prop="total_volume"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="出库单商品总重量(kg)"
             align="center"
             prop="total_weight"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="出库单发货总体积(cm³)"
             align="center"
             prop="total_shipping_volume"
           width="150"
-          show-overflow-tooltip
           />
           <el-table-column
             label="出库单发货总重量(kg)"
             align="center"
             prop="total_shipping_weight"
           width="150"
-          show-overflow-tooltip
           />
           <el-table-column
             label="出库单商品总数量"
             align="center"
             prop="total_quantity"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="出库单发货时间"
             align="center"
             prop="shipping_time"
           width="180"
-          show-overflow-tooltip
           />
           <el-table-column
             label="灾种名称"
             align="center"
             prop="disaster_type"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="调运机构名称"
             align="center"
             prop="dispatching_agency"
           width="150"
-          show-overflow-tooltip
           />
           <el-table-column
             label="发货人姓名"
             align="center"
             prop="shipper_name"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="发货人手机"
             align="center"
             prop="shipper_mobile"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="发货人地址"
             align="center"
             prop="shipper_address"
           width="200"
-          show-overflow-tooltip
           />
           <el-table-column
             label="发货方备注"
             align="center"
             prop="shipper_remark"
           width="180"
-          show-overflow-tooltip
           />
           <el-table-column
             label="收货人姓名"
             align="center"
             prop="receiver_name"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="收货人手机"
             align="center"
             prop="receiver_mobile"
           width="120"
-          show-overflow-tooltip
           />
           <el-table-column
             label="收货人地址"
             align="center"
             prop="receiver_address"
           width="200"
-          show-overflow-tooltip
           />
           <el-table-column label="操作" align="center" fixed="right" width="88" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-button type="text" class="common-btn-text-primary" @click="handleWrite(scope.row)">查看</el-button>
-              <el-button type="text" class="common-btn-text-primary" @click="handleView(scope.row)">明细</el-button>
+              <el-button type="text" class="common-btn-text-primary" @click="goToInventory(scope.row.outbound_number)">明细</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -155,7 +138,7 @@
       </div>
     </div>
     <addOutbound v-if="addOutboundState.show" :event-id="addOutboundState.eventId" @close="handleCancel" />
-    <outboundDetails v-if="outboundDetailsState.show" :event-id="outboundDetailsState.eventId" @close="handleCancel" />
+    <outboundDetails v-if="outboundDetailsState.show" :id="outboundDetailsState.eventId" @close="handleCancel" />
   </div>
 </template>
 <script setup lang="ts">
@@ -164,6 +147,7 @@ import outboundDetails from "./outboundDetails.vue";
 import { parseTime } from '@/utils/ruoyi';
 import { ref,reactive, onMounted, onBeforeUnmount } from "vue";
 import { getOutboundOrder } from '@/api/comprehensiveGuarantee/materialReserveManagement/OutboundManagement';
+import router from '@/router';
 // 定义响应式变量
 const loading = ref(false);
 const maxHeight = ref(window.innerHeight * 0.8);
@@ -210,6 +194,7 @@ const upload = () => {
 const handleCancel = () => {
   addOutboundState.show = false;
   outboundDetailsState.show = false;
+  getDataList();
 };
 
 const handleWrite = (row:any) => {
@@ -217,6 +202,10 @@ const handleWrite = (row:any) => {
   outboundDetailsState.show=true;
 };
 
+const goToInventory = (id) => {
+  router.push({ path:'/comprehensiveGuarantee/MaterialReserveManagement/InventoryDetails', query: { id } });
+};
+
 const handleView = () => {
   outboundDetailsState.show=true;
 };

src/views/comprehensiveGuarantee/MaterialReserveManagement/addOutbound.vue

@@ -187,6 +187,7 @@ const submitForm = async (formEl) => {
       createOutboundOrder(temp).then(() => {
         proxy.$modal.msgSuccess('新增成功');
         emits('confirm');
+        emits('close');
       })
     } else {
       nextTick(() => {

src/views/comprehensiveGuarantee/MaterialReserveManagement/outboundDetails.vue

@@ -5,54 +5,54 @@
         <h3 class="common-dialog-title">查看详情</h3>
       </div>
       <div class="common-dialog-box">
-        <el-form ref="form" :model="form" label-width="160px">
-          <el-form-item label="仓库名称：" prop="warehouse_name">
-            <el-input v-model="form.warehouse_name" disabled class="custom-disabled" style="width: 468px" />
+        <el-form ref="formRef" :model="form" label-width="160px">
+          <el-form-item label="仓库名称：" prop="warehouse_id">
+            <el-input v-model="form.warehouse_id" disabled class="custom-disabled" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="出库单商品总体积(cm³)：" prop="totalVolume">
-            <el-input v-model="form.totalVolume" style="width: 468px" />
+          <el-form-item label="出库单商品总体积(cm³)：" prop="total_volume">
+            <el-input v-model="form.total_volume" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="出库单商品总重量(kg)：" prop="totalWeight">
-            <el-input v-model="form.totalWeight" style="width: 468px" />
+          <el-form-item label="出库单商品总重量(kg)：" prop="total_weight">
+            <el-input v-model="form.total_weight" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="出库单发货总体积(cm³)：" prop="shipmentTotalVolume">
-            <el-input v-model="form.shipmentTotalVolume" style="width: 468px" />
+          <el-form-item label="出库单发货总体积(cm³)：" prop="total_shipping_volume">
+            <el-input v-model="form.total_shipping_volume" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="出库单发货总重量(kg)：" prop="shipmentTotalWeight">
-            <el-input v-model="form.shipmentTotalWeight" style="width: 468px" />
+          <el-form-item label="出库单发货总重量(kg)：" prop="total_shipping_weight">
+            <el-input v-model="form.total_shipping_weight" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="出库单商品总数量：" prop="totalQuantity">
-            <el-input v-model="form.totalQuantity" style="width: 468px" />
+          <el-form-item label="出库单商品总数量：" prop="total_quantity">
+            <el-input v-model="form.total_quantity" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="出库单发货时间：" prop="shipmentDate">
-            <el-input v-model="form.shipmentDate" style="width: 468px" />
+          <el-form-item label="出库单发货时间：" prop="shipping_time">
+            <el-input v-model="form.shipping_time" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="灾种名称：" prop="disasterType">
-            <el-input v-model="form.disasterType" style="width: 468px" />
+          <el-form-item label="灾种名称：" prop="disaster_type">
+            <el-input v-model="form.disaster_type" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="调运机构名称：" prop="transportationOrgName">
-            <el-input v-model="form.transportationOrgName" style="width: 468px" />
+          <el-form-item label="调运机构名称：" prop="dispatching_agency">
+            <el-input v-model="form.dispatching_agency" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="发货人姓名：" prop="shipperName">
-            <el-input v-model="form.shipperName" style="width: 468px" />
+          <el-form-item label="发货人姓名：" prop="shipper_name">
+            <el-input v-model="form.shipper_name" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="发货人手机：" prop="shipperPhone">
-            <el-input v-model="form.shipperPhone" style="width: 468px" />
+          <el-form-item label="发货人手机：" prop="shipper_mobile">
+            <el-input v-model="form.shipper_mobile" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="发货人地址：" prop="shipperAddress">
-            <el-input v-model="form.shipperAddress" style="width: 468px" />
+          <el-form-item label="发货人地址：" prop="shipper_address">
+            <el-input v-model="form.shipper_address" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="发货方备注：" prop="shipperRemark">
-            <el-input v-model="form.shipperRemark" style="width: 468px" />
+          <el-form-item label="发货方备注：" prop="shipper_remark">
+            <el-input v-model="form.shipper_remark" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="收货人姓名：" prop="receiverName">
-            <el-input v-model="form.receiverName" style="width: 468px" />
+          <el-form-item label="收货人姓名：" prop="receiver_name">
+            <el-input v-model="form.receiver_name" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="收货人手机：" prop="receiverPhone">
-            <el-input v-model="form.receiverPhone" style="width: 468px" />
+          <el-form-item label="收货人手机：" prop="receiver_mobile">
+            <el-input v-model="form.receiver_mobile" style="width: 468px" />
           </el-form-item>
-          <el-form-item label="收货人地址：" prop="receiverAddress">
-            <el-input v-model="form.receiverAddress" style="width: 468px" />
+          <el-form-item label="收货人地址：" prop="receiver_address">
+            <el-input v-model="form.receiver_address" style="width: 468px" />
           </el-form-item>
         </el-form>
         <div class="common-dialog-footer">
@@ -65,7 +65,10 @@
 
 <script setup lang="ts">
 import { getMaterialWarehouseInfo } from '@/api/comprehensiveGuarantee/materialReserveManagement/godownManagement';
+import { getOutboundOrderInfo } from '@/api/comprehensiveGuarantee/materialReserveManagement/OutboundManagement';
+import { parseTime } from '@/utils/ruoyi';
 const emits = defineEmits(['close']);
+
 const closeDialog = () => {
   emits('close');
 };
@@ -75,26 +78,27 @@ const props = defineProps({
 
 // 模拟的数据
 const form = ref({
-  outStockNumber: '', // 出库单号
-  warehouse_name: '', // 仓库名称
-  totalVolume: '', // 出库单商品总体积(cm³)
-  totalWeight: '', // 出库单商品总重量(kg)
-  shipmentTotalVolume: '', // 出库单发货总体积(cm³)
-  shipmentTotalWeight: '', // 出库单发货总重量(kg)
-  totalQuantity: '', // 出库单商品总数量
-  shipmentDate: '', // 出库单发货时间（注意：这里应该是日期格式，但el-input默认处理字符串）
-  disasterType: '', // 灾种名称
-  transportationOrgName: '', // 调运机构名称
-  shipperName: '', // 发货人姓名
-  shipperPhone: '', // 发货人手机
-  shipperAddress: '', // 发货人地址
-  shipperRemark: '', // 发货方备注
-  receiverName: '', // 收货人姓名
-  receiverPhone: '', // 收货人手机
-  receiverAddress: '' // 收货人地址
+  outbound_number: '', // 出库单号
+  warehouse_id: '', // 仓库名称
+  total_volume: '', // 出库单商品总体积(cm³)
+  total_weight: '', // 出库单商品总重量(kg)
+  total_shipping_volume: '', // 出库单发货总体积(cm³)
+  total_shipping_weight: '', // 出库单发货总重量(kg)
+  total_quantity: '', // 出库单商品总数量
+  shipping_time: '', // 出库单发货时间（注意：这里应该是日期格式，但el-input默认处理字符串）
+  disaster_type: '', // 灾种名称
+  dispatching_agency: '', // 调运机构名称
+  shipper_name: '', // 发货人姓名
+  shipper_mobile: '', // 发货人手机
+  shipper_address: '', // 发货人地址
+  shipper_remark: '', // 发货方备注
+  receiver_name: '', // 收货人姓名
+  receiver_mobile: '', // 收货人手机
+  receiver_address: '' // 收货人地址
 });
 
-getMaterialWarehouseInfo(props.id).then((res) => {
+getOutboundOrderInfo(props.id).then((res) => {
+  res.data.shipping_time = parseTime(res.data.shipping_time);
   form.value = res.data;
 });
 </script>