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

src/api/comprehensiveGuarantee/materialReserveManagement/InventoryDetails.ts

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+// 查询
+export function getMovementList(params) {
+  return request({
+    url: '/api/resource_provison/material/warehouse_movement/list',
+    method: 'get',
+    params: params
+  });
+}

src/views/comprehensiveGuarantee/MaterialReserveManagement/InventoryDetails.vue

@@ -2,28 +2,18 @@
 <!--企业画像-->
 <template>
   <div>
-    <div v-show="!BussinessAddState.show && !BussinessEditState.show " class="app-container">
+    <div class="app-container">
       <div>
         <transition name="fade">
           <div v-show="showSearch" class="mb-[10px]">
             <el-form ref="queryFormRef" :model="queryParams" :inline="true">
               <el-form-item :span="5" label="商品信息：" prop="area_code" label-width="auto">
-                <el-input
-                  v-model="queryParams.keyword1"
-                  placeholder="请输入物资ID"
-                  clearable
-                  @keyup.enter="handleQuery"
-                />
+                <el-input v-model="queryParams.keyword1" placeholder="请输入物资ID" clearable @keyup.enter="handleQuery" />
               </el-form-item>
-              <el-form-item  :span="5" label="出入库单号："  prop="keyword" label-width="auto">
-                <el-input
-                  v-model="queryParams.keyword2"
-                  placeholder="请输入出入库单号"
-                  clearable
-                  @keyup.enter="handleQuery"
-                />
+              <el-form-item :span="5" label="出入库单号：" prop="keyword" label-width="auto">
+                <el-input v-model="queryParams.keyword2" placeholder="请输入出入库单号" clearable @keyup.enter="handleQuery" />
               </el-form-item>
-              <el-form-item  :span="5"  prop="keyword" label-width="auto">
+              <el-form-item :span="5" prop="keyword" label-width="auto">
                 <el-select v-model="queryParams.type" placeholder="全部" clearable>
                   <el-option v-for="item in type" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
@@ -35,55 +25,46 @@
                 <el-button icon="Refresh" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-form>
-<!--            <el-row :gutter="10" class="mb8">-->
-<!--              <el-col :span="1.5">-->
-<!--                <el-button type="primary" icon="Plus" @click="handleAdd">新建</el-button>-->
-<!--              </el-col>-->
-<!--              <el-col :span="1.5">-->
-<!--                <el-button type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete(selectedRow)"> 删除 </el-button>-->
-<!--              </el-col>-->
-<!--            </el-row>-->
+            <!--            <el-row :gutter="10" class="mb8">-->
+            <!--              <el-col :span="1.5">-->
+            <!--                <el-button type="primary" icon="Plus" @click="handleAdd">新建</el-button>-->
+            <!--              </el-col>-->
+            <!--              <el-col :span="1.5">-->
+            <!--                <el-button type="danger" plain :disabled="multiple" icon="Delete" @click="handleDelete(selectedRow)"> 删除 </el-button>-->
+            <!--              </el-col>-->
+            <!--            </el-row>-->
           </div>
         </transition>
-        <el-table ref="multipleTable" v-loading="loading" :data="tableData" border :max-height="maxHeight" style="width: 96%" @selection-change="handleSelectionChange">
+        <el-table
+          ref="multipleTable"
+          v-loading="loading"
+          :data="tableData"
+          border
+          :max-height="maxHeight"
+          style="width: 96%"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column type="selection" width="55" align="center" fixed />
-          <el-table-column label="商品信息" align="center" prop="goods_information" fixed show-overflow-tooltip/>
-          <el-table-column label="出入库单号" align="center" prop="odd_numbers" show-overflow-tooltip/>
-          <el-table-column label="入库/出库" align="center" prop="type" show-overflow-tooltip/>
-          <el-table-column label="变动库存" align="center" prop="change_inventory" show-overflow-tooltip/>
-          <el-table-column label="剩余库存" align="center" prop="remaining_inventory" show-overflow-tooltip/>
-          <el-table-column label="创建时间" align="center" prop="created_time" show-overflow-tooltip/>
-<!--          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">-->
-<!--            <template #default="scope">-->
-<!--              <el-button type="text" class="common-btn-text-primary" @click="handleedit(scope.row)">编辑</el-button>-->
-<!--              <el-button type="text" class="common-btn-text-primary" @click="handleDelete(scope.row)">移除</el-button>-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <el-table-column label="商品信息" align="center" prop="goods_information" fixed show-overflow-tooltip />
+          <el-table-column label="出入库单号" align="center" prop="odd_numbers" show-overflow-tooltip />
+          <el-table-column label="入库/出库" align="center" prop="type" show-overflow-tooltip />
+          <el-table-column label="变动库存" align="center" prop="change_inventory" show-overflow-tooltip />
+          <el-table-column label="剩余库存" align="center" prop="remaining_inventory" show-overflow-tooltip />
+          <el-table-column label="创建时间" align="center" prop="created_time" show-overflow-tooltip />
         </el-table>
-        <pagination
-          v-show="total > 0"
-          v-model:page="queryParams.page"
-          v-model:limit="queryParams.pageSize"
-          :total="total"
-          @pagination="tableData"
-        />
+        <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
       </div>
     </div>
-    <BussinessAdd v-if="BussinessAddState.show"  @close="handleCancel" />
-    <BussinessEdit v-if="BussinessEditState.show" :event-id="BussinessEditState.eventId"  @close="handleCancel" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref,reactive, onMounted, onBeforeUnmount } from "vue";
-import {companyDelete, getCompanyList} from "@/api/riskPrevention/BusinessPortraits";
-import BussinessAdd from "@/views/riskPrevention/SafetyProductionManagement/BussinessAdd.vue";
-// import BussinessEdit from "./BussinessEdit.vue";
-import {to} from "await-to-js";
+import { ref, reactive, onMounted, onBeforeUnmount } from 'vue';
+import { getMovementList } from '@/api/comprehensiveGuarantee/materialReserveManagement/InventoryDetails';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const showSearch = ref(true);
-// const tableData = ref();
+const tableData = ref();
 const multiple = ref(true);
 const ids = ref<Array<number | string>>([]);
 const single = ref(true);
@@ -103,61 +84,18 @@ const initFormData = reactive({
   remaining_inventory: '',
   created_time: ''
 });
-const data =reactive({
-  form: {...initFormData},
-  queryParams:{
+const data = reactive({
+  form: { ...initFormData },
+  queryParams: {
     page: '1',
     pageSize: '10',
-    type: '',
-    keycode1: '',
-    keyword2: ''
+    material_id: '',
+    io_number: '',
+    io_flag: ''
   },
   selectedRow: null,
   selectedRowKeys: []
 });
-const tableData = ref([
-  {
-    "goods_information": "苹果 iPhone 13 Pro Max 256GB 石墨色",
-    "odd_numbers": "WH20230401001",
-    "type": "入库",
-    "change_inventory": 50,
-    "remaining_inventory": 200,
-    "created_time": "2023-04-01T10:30:00Z"
-  },
-  {
-    "goods_information": "华为 MateBook X Pro 笔记本电脑",
-    "odd_numbers": "WH20230401002",
-    "type": "出库",
-    "change_inventory": -10,
-    "remaining_inventory": 190,
-    "created_time": "2023-04-01T11:15:00Z"
-  },
-  {
-    "goods_information": "小米 Redmi Note 11 Pro+ 5G 手机",
-    "odd_numbers": "WH20230401003",
-    "type": "入库",
-    "change_inventory": 30,
-    "remaining_inventory": 150,
-    "created_time": "2023-04-01T13:45:00Z"
-  },
-  {
-    "goods_information": "三星 Galaxy S22 Ultra 5G 手机",
-    "odd_numbers": "WH20230401004",
-    "type": "出库",
-    "change_inventory": -5,
-    "remaining_inventory": 55,
-    "created_time": "2023-04-01T15:00:00Z"
-  },
-  {
-    "goods_information": "戴尔 XPS 13 9310 笔记本电脑",
-    "odd_numbers": "WH20230402001",
-    "type": "入库",
-    "change_inventory": 15,
-    "remaining_inventory": 30,
-    "created_time": "2023-04-02T09:00:00Z"
-  }
-])
-
 
 const { queryParams, form } = toRefs(data);
 
@@ -169,58 +107,23 @@ const type = [
 
 const handleQuery = () => {
   queryParams.value.page = 1;
-  // fetchWorkrData();
+  fetchWorkrData();
 };
 const resetQuery = () => {
-  queryParams.value = { page: 1, pageSize: 10, area_code: '', keycode: '' };
+  queryParams.value = { page: 1, pageSize: 10, material_id: '', io_number: '', io_flag: '' };
   handleQuery();
 };
-const BussinessAddState = reactive({
-  show: false, // 初始化show为false
-});
-
-const BussinessEditState = reactive({
-  show:false
-});
-
-const handleAdd = () => {
-  BussinessAddState.show = true;
-};
-
-const handleDelete = async (row) => {
-  let id = [];
-  if (row) {
-    id = [row.id];
-  } else {
-    id = ids.value;
-  }
-  const [err] = await to(proxy?.$modal.confirm('是否确认删除选择的数据项？') as any);
-  if (!err) {
-    await companyDelete(id);
-    proxy.$modal.msgSuccess('删除成功');
-    fetchWorkrData();
-  }
-};
-const handleedit = (row) => {
-  BussinessEditState.eventId = row.id + "";
-  BussinessEditState.show = true;
-};
-
-const handleCancel = () => {
-  BussinessAddState.show = false;
-  BussinessEditState.show =false;
-};
 
 const fetchWorkrData = () => {
-  // loading.value = true;
-  // getCompanyList(queryParams.value)
-  //   .then((res) => {
-  //     tableData.value = res.data;
-  //     total.value = res.total;
-  //   })
-  //   .finally(() => {
-  //     loading.value = false;
-  //   });
+  loading.value = true;
+  getMovementList(queryParams.value)
+    .then((res) => {
+      tableData.value = res.data;
+      total.value = res.total;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 
 const handleSelectionChange = (selection) => {
@@ -238,10 +141,7 @@ onMounted(() => {
 // 在组件卸载前移除窗口大小变化监听器
 onBeforeUnmount(() => {
   window.removeEventListener('resize', handleResize);
-
 });
 </script>
 
 <style lang="scss" scoped></style>
-
-