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

src/api/wms/inventoryLedger/types.ts

@@ -73,7 +73,6 @@ export interface InventoryLedgerVO {
    * 更新时间
    */
   updateTime: string;
-
 }
 
 export interface InventoryLedgerForm extends BaseEntity {
@@ -121,11 +120,9 @@ export interface InventoryLedgerForm extends BaseEntity {
    * 变动数量
    */
   changeAmount?: number;
-
 }
 
 export interface InventoryLedgerQuery extends PageQuery {
-
   /**
    * 库位编码
    */
@@ -160,7 +157,17 @@ export interface InventoryLedgerQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
+
+  /**
+   * 产品编码
+   */
+  productCode?: string;
+
+  /**
+   * 产品名称
+   */
+  productName?: string;
+
+  orderByColumn?: string;
+  isAsc?: string;
 }
-
-
-

src/views/wms/inventoryLedger/index.vue

@@ -7,8 +7,19 @@
             <!--<el-form-item label="库位编码" prop="locationCode">
               <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="物料ID" prop="materielId">
-              <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+            <!--<el-form-item label="物料ID" prop="materielId">-->
+            <!--  <el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />-->
+            <!--</el-form-item>-->
+            <el-form-item label="仓库" prop="warehouseId">
+              <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable filterable>
+                <el-option v-for="item in warehouseInfoList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="物料编码" prop="productCode">
+              <el-input v-model="queryParams.productCode" placeholder="请输入产品编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materielName">
+              <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="批次号" prop="batchNumber">
               <el-input v-model="queryParams.batchNumber" placeholder="请输入批次号" clearable @keyup.enter="handleQuery" />
@@ -146,6 +157,7 @@
 <script setup name="InventoryLedger" lang="ts">
 import { addInventoryLedger, delInventoryLedger, getInventoryLedger, listInventoryLedger, updateInventoryLedger } from '@/api/wms/inventoryLedger';
 import { InventoryLedgerForm, InventoryLedgerQuery, InventoryLedgerVO } from '@/api/wms/inventoryLedger/types';
+import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wms_ledger_change_type, wms_ledger_state } = toRefs<any>(proxy?.useDict('wms_ledger_change_type', 'wms_ledger_state'));
@@ -161,6 +173,13 @@ const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
 const inventoryLedgerFormRef = ref<ElFormInstance>();
+// 仓库列表
+const warehouseInfoList = ref([]);
+/** 获取仓库列表 */
+const getWarehouseInfoList = async () => {
+  const res = await getWmsWarehouseInfoList();
+  warehouseInfoList.value = res.data || [];
+};
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -208,6 +227,8 @@ const data = reactive<PageData<InventoryLedgerForm, InventoryLedgerQuery>>({
     batchNumber: undefined,
     changeType: undefined,
     ledgerState: undefined,
+    productCode: undefined,
+    productName: undefined,
     orderByColumn: 'createTime',
     isAsc: 'desc',
     params: {}
@@ -315,5 +336,6 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
+  getWarehouseInfoList();
 });
 </script>

src/views/wms/outStockBill/index.vue

@@ -64,19 +64,19 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:outStockBill:add']">新增 </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:outStockBill:edit']"
-              >修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:outStockBill:remove']"
-              >删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:outStockBill:export']">导出 </el-button>
-          </el-col>
+          <!--<el-col :span="1.5">-->
+          <!--  <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:outStockBill:edit']"-->
+          <!--    >修改-->
+          <!--  </el-button>-->
+          <!--</el-col>-->
+          <!--<el-col :span="1.5">-->
+          <!--  <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:outStockBill:remove']"-->
+          <!--    >删除-->
+          <!--  </el-button>-->
+          <!--</el-col>-->
+          <!--<el-col :span="1.5">-->
+          <!--  <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:outStockBill:export']">导出 </el-button>-->
+          <!--</el-col>-->
           <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
@@ -154,16 +154,16 @@
             <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:outStockBill:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:outStockBill:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
+        <!--<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">-->
+        <!--  <template #default="scope">-->
+        <!--    <el-tooltip content="修改" placement="top">-->
+        <!--      <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:outStockBill:edit']"></el-button>-->
+        <!--    </el-tooltip>-->
+        <!--    <el-tooltip content="删除" placement="top">-->
+        <!--      <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:outStockBill:remove']"></el-button>-->
+        <!--    </el-tooltip>-->
+        <!--  </template>-->
+        <!--</el-table-column>-->
       </el-table>
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
@@ -367,7 +367,7 @@ const columns = ref<FieldOption[]>([
   { key: 16, label: `创建人`, visible: false },
   { key: 17, label: `创建时间`, visible: true },
   { key: 18, label: `更新人`, visible: false },
-  { key: 19, label: `更新时间`, visible: true }
+  { key: 19, label: `更新时间`, visible: false }
 ]);
 
 const initFormData: OutStockBillForm = {

src/views/wms/sampleLedger/index.vue

@@ -615,6 +615,7 @@ const handleExpandChange = async (row, expandRows) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
+  selectInventorys.value = [];
   dialog.visible = true;
   dialog.title = '样品借出';
 };