From 910f71577a2dbda62c9d55458d228d68e50449be Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 29 Jan 2024 16:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98=20?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=8F=98=E5=8A=A8=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/heli/storagelog/StorageLogForm.vue  |  39 ++--
 .../src/views/heli/storagelog/index.vue       | 199 +++++++++++-------
 2 files changed, 150 insertions(+), 88 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
index 900f3a4d..2fabda45 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
@@ -1,7 +1,11 @@
 <template>
-  <ContentWrap>
+<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="68px">
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
       <el-form-item label="物料编码" prop="matCode">
         <el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
@@ -39,7 +43,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="handleQuery">
+        <el-button @click="handleQuery" type="primary">
           <Icon icon="ep:search" class="mr-5px" /> 搜索
         </el-button>
         <el-button @click="resetQuery">
@@ -51,24 +55,25 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="物料编码" align="center" prop="matCode" />
-      <el-table-column label="物料名称" align="center" prop="matName" />
-      <el-table-column label="物料类型" align="center" prop="matType" />
-      <el-table-column label="物料简称" align="center" prop="shortName" />
-      <el-table-column label="规格/型号" align="center" prop="matSpec" />
-      <el-table-column label="品牌" align="center" prop="matBrand" />
-      <el-table-column label="仓库" align="center" prop="whName" />
-      <el-table-column label="库区" align="center" prop="rgName" />
-      <el-table-column label="库位" align="center" prop="pnName" />
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="变动数量" align="center" prop="storageOkQty" />
-      <el-table-column label="库存单位" align="center" prop="matUnit" />
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
+      <el-table-column label="物料编码" align="center" prop="matCode" fixed min-width="120" />
+      <el-table-column label="物料名称" align="center" prop="matName" fixed min-width="120"/>
+      <el-table-column label="物料类型" align="center" prop="matType" min-width="120"/>
+      <el-table-column label="物料简称" align="center" prop="shortName" min-width="120"/>
+      <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
+      <el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
+      <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
+      <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
+      <el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
+      <el-table-column label="批次号" align="center" prop="lotNo" min-width="120"/>
+      <el-table-column label="库存数量" align="center" prop="storageOkQty" min-width="120"/>
+      <el-table-column label="库存单位" align="center" prop="matUnit" min-width="120"/>
     </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">
@@ -167,4 +172,4 @@ onMounted(async () => {
   await init_page_pn()
   await getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
index 350c6c3d..fd82a0ab 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
@@ -1,75 +1,132 @@
 <template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-      <el-form-item label="物料编码" prop="matCode">
-        <el-input v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="matName">
-        <el-input v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery"
-          class="!w-240px" />
-      </el-form-item>
-      <el-form-item label="物料类型" prop="matType">
-        <el-select v-model="queryParams.matType" placeholder="下拉选择" clearable class="!w-240px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label"
-            :value="dict.label" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input v-model="queryParams.lotNo" placeholder="批次号" clearable @keyup.enter="handleQuery" class="!w-240px" />
-      </el-form-item>
-      <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="stockType">
-        <el-select v-model="queryParams.stockType" placeholder="下拉选择" clearable class="!w-240px">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_TYPE)" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
-        </el-select>
-      </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-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="120px"
+      >
+        <el-form-item label="物料编码" prop="matCode">
+          <el-input
+            v-model="queryParams.matCode"
+            placeholder="物料编码"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="matName">
+          <el-input
+            v-model="queryParams.matName"
+            placeholder="物料名称"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="物料类型" prop="matType">
+          <el-select
+            v-model="queryParams.matType"
+            placeholder="下拉选择"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)"
+              :key="dict.label"
+              :label="dict.label"
+              :value="dict.label"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="批次号" prop="lotNo">
+          <el-input
+            v-model="queryParams.lotNo"
+            placeholder="批次号"
+            clearable
+            @keyup.enter="handleQuery"
+            class="!w-240px"
+          />
+        </el-form-item>
+        <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="stockType">
+          <el-select
+            v-model="queryParams.stockType"
+            placeholder="下拉选择"
+            clearable
+            class="!w-240px"
+          >
+            <el-option
+              v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </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>
+          <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-form-item>
+      </el-form>
+    </ContentWrap>
 
-      <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-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="物料编码" align="center" prop="matCode" />
-      <el-table-column label="物料名称" align="center" prop="matName" />
-      <el-table-column label="物料类型" align="center" prop="matType" />
-      <el-table-column label="物料简称" align="center" prop="shortName" />
-      <el-table-column label="规格/型号" align="center" prop="matSpec" />
-      <el-table-column label="品牌" align="center" prop="matBrand" />
-      <el-table-column label="业务单据编号" align="center" prop="stockNo" />
-      <el-table-column label="业务单据类型" align="center" prop="stockTypeName" />
-      <el-table-column label="上游单据编号" align="center" prop="headerNo" />
-      <el-table-column label="仓库" align="center" prop="whName" />
-      <el-table-column label="库区" align="center" prop="rgName" />
-      <el-table-column label="库位" align="center" prop="pnName" />
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="变动数量" align="center" prop="storageOkQty" />
-      <el-table-column label="库存单位" align="center" prop="matUnit" />
-    </el-table>
-    <!-- 分页 -->
-    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
-  </ContentWrap>
-
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" class="hl-table">
+        <el-table-column label="物料编码" align="center" prop="matCode" min-width="120" fixed />
+        <el-table-column label="物料名称" align="center" prop="matName" min-width="120" fixed />
+        <el-table-column label="物料类型" align="center" prop="matType" min-width="120" />
+        <el-table-column label="物料简称" align="center" prop="shortName" min-width="120" />
+        <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
+        <el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
+        <el-table-column label="业务单据编号" align="center" prop="stockNo" min-width="120"/>
+        <el-table-column label="业务单据类型" align="center" prop="stockTypeName" min-width="120"/>
+        <el-table-column label="上游单据编号" align="center" prop="headerNo" min-width="120"/>
+        <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
+        <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
+        <el-table-column label="库位" align="center" prop="pnName" min-width="120"/>
+        <el-table-column label="批次号" align="center" prop="lotNo" min-width="120"/>
+        <el-table-column label="变动数量" align="center" prop="storageOkQty" fixed="right" min-width="120"/>
+        <el-table-column label="库存单位" align="center" prop="matUnit" fixed="right" min-width="120"/>
+      </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">
@@ -104,7 +161,7 @@ const queryParams = reactive({
   pnId: undefined,
   stockNo: undefined,
   stockType: undefined,
-  headerNo: undefined,
+  headerNo: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 
@@ -151,4 +208,4 @@ onMounted(async () => {
   // await init_page_pn()
   await getList()
 })
-</script>
\ No newline at end of file
+</script>