From e377490c90ef9655230ccf3525d0354fd084cc32 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 19 Jan 2024 18:02:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/storage/index.vue          | 369 +++++++++---------
 1 file changed, 175 insertions(+), 194 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue
index 1548a172..86addfdc 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue
@@ -1,41 +1,43 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="入库单号" prop="stockNo">
-        <el-input 
-          v-model="queryParams.stockNo"
-          placeholder="入库单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="上游单号" prop="headerNo">
-        <el-input
-          v-model="queryParams.headerNo"
-          placeholder="上游单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="物料编码" prop="matNo">
-        <el-input
-          v-model="queryParams.matNo"
-          placeholder="物料编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="物料名称" prop="matName">
+  <el-card class="hl-card">
+    <template #header> <span>入库管理</span></template>
+    <ContentWrap class="borderxx">
+      <!-- 搜索工作栏 -->
+      <el-form
+        class="-mb-15px"
+        :model="queryParams"
+        ref="queryFormRef"
+        :inline="true"
+        label-width="108px"
+      >
+        <el-form-item label="入库单号" prop="stockNo">
+          <el-input
+            v-model="queryParams.stockNo"
+            placeholder="入库单号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="上游单号" prop="headerNo">
+          <el-input
+            v-model="queryParams.headerNo"
+            placeholder="上游单号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="matNo">
+          <el-input
+            v-model="queryParams.matNo"
+            placeholder="物料编码"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <!-- <el-form-item label="物料名称" prop="matName">
         <el-input
           v-model="queryParams.matName"
           placeholder="物料名称"
@@ -44,64 +46,52 @@
           class="!w-240px"
         />
       </el-form-item> -->
-      <el-form-item label="入库类型" prop="stockInType">
-        <el-select
-          v-model="queryParams.stockInType"
-          placeholder="下拉选择"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_IN_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="入库仓库" prop="whId">
-        <el-select
-          v-model="queryParams.whId"
-          placeholder="下拉选择"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in warehouseList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      
-      <el-form-item label="单据状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="下拉选择"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-     
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openDetail('create')"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <!-- <el-button
+        <el-form-item label="入库类型" prop="stockInType">
+          <el-select
+            v-model="queryParams.stockInType"
+            placeholder="下拉选择"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_IN_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="入库仓库" prop="whId">
+          <el-select v-model="queryParams.whId" placeholder="下拉选择" clearable class="!w-240px">
+            <el-option
+              v-for="dict in warehouseList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="单据状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="下拉选择" clearable class="!w-240px">
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_STATUS)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary"
+            ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
+          >
+          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <el-button type="primary" plain @click="openDetail('create')">
+            <Icon icon="ep:plus" class="mr-5px" /> 新增
+          </el-button>
+          <!-- <el-button
           type="success"
           plain
           @click="handleExport"
@@ -110,104 +100,96 @@
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button> -->
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
 
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-      <el-table-column label="入库单号" align="center" prop="stockNo" />
-      <el-table-column label="入库类型" align="center" prop="stockInType">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HELI_STORAGE_IN_TYPE" :value="scope.row.stockInType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="上游单号" align="center" prop="headerNo" />
-      <el-table-column label="入库仓库" align="center" prop="whId" >
-        <template #default="scope">
-          {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column label="创建人" align="center" prop="creator" >
-        <template #default="scope">
-          {{ userList.find((user) => user.id === scope.row.creator)?.nickname }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="入库单号" align="center" prop="stockNo" />
+        <el-table-column label="入库类型" align="center" prop="stockInType">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.HELI_STORAGE_IN_TYPE" :value="scope.row.stockInType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="上游单号" align="center" prop="headerNo" />
+        <el-table-column label="入库仓库" align="center" prop="whId">
+          <template #default="scope">
+            {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="description" />
+        <el-table-column label="创建人" align="center" prop="creator">
+          <template #default="scope">
+            {{ userList.find((user) => user.id === scope.row.creator)?.nickname }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter"
+          width="180px"
+        />
 
-      <el-table-column label="提交人" align="center" prop="keeper" >
-        <template #default="scope">
-          {{ userList.find((user) => user.id == scope.row.keeper)?.nickname }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="提交时间"
-        align="center"
-        prop="keeperTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="作废人" align="center" prop="cancel" >
-        <template #default="scope">
-          {{ userList.find((user) => user.id == scope.row.cancel)?.nickname }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="作废时间"
-        align="center"
-        prop="cancelTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="单据状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HELI_STORAGE_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openDetail('update', scope.row.id)"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="primary"
-            @click="openDetail('review', scope.row.id)"
-          >
-            查看
-          </el-button>
-          <!-- <el-button
+        <el-table-column label="提交人" align="center" prop="keeper">
+          <template #default="scope">
+            {{ userList.find((user) => user.id == scope.row.keeper)?.nickname }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="提交时间"
+          align="center"
+          prop="keeperTime"
+          :formatter="dateFormatter"
+          width="180px"
+        />
+        <el-table-column label="作废人" align="center" prop="cancel">
+          <template #default="scope">
+            {{ userList.find((user) => user.id == scope.row.cancel)?.nickname }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="作废时间"
+          align="center"
+          prop="cancelTime"
+          :formatter="dateFormatter"
+          width="180px"
+        />
+        <el-table-column label="单据状态" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.HELI_STORAGE_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="150">
+          <template #default="scope">
+            <el-button link type="primary" @click="openDetail('update', scope.row.id)">
+              编辑
+            </el-button>
+            <el-button link type="primary" @click="openDetail('review', scope.row.id)">
+              查看
+            </el-button>
+            <!-- <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
           >
             删除
           </el-button> -->
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </ContentWrap>
+  </el-card>
 </template>
 
 <script setup lang="ts">
@@ -216,13 +198,13 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as StorageApi from '@/api/heli/storage'
 import * as WarehouseApi from '@/api/heli/warehouse'
-import * as UserApi from "@/api/system/user";
+import * as UserApi from '@/api/system/user'
 
 defineOptions({ name: 'Storage' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-const router = useRouter(); // 路由
+const router = useRouter() // 路由
 
 const loading = ref(true) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -248,8 +230,8 @@ const queryParams = reactive({
   outboundTime: [],
   cancel: undefined,
   cancelTime: [],
-  matNo:undefined,
-  matName:undefined
+  matNo: undefined,
+  matName: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -287,22 +269,21 @@ const openForm = (type: string, id?: number) => {
 }
 /** 详情操作 新增/查看 */
 const openDetail = (active: string, id?: number) => {
-  router.push({ path: '/inventory/storagedetail', query: {type: active, id: id}});
+  router.push({ path: '/inventory/storagedetail', query: { type: active, id: id } })
 }
 
 /** 初始化 **/
 onMounted(async () => {
-
   const queryParamsWarehouse = reactive({
     pageNo: 1,
     pageSize: 99
   })
   const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse)
 
-  data.list.forEach(element => {
+  data.list.forEach((element) => {
     element.label = element.whName
     element.value = element.id
-  });
+  })
 
   warehouseList.value = data.list
 
@@ -313,4 +294,4 @@ onMounted(async () => {
 onActivated(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>