Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-CLI

src/components/Pagination/index.vue

@@ -35,7 +35,7 @@ const props = defineProps({
   pageSizes: {
     type: Array as PropType<number[]>,
     default() {
-      return [10, 20, 30, 50];
+      return [10, 20, 30, 50, 100, 500];
     }
   },
   layout: {

src/views/Query/StockQuery/StockTransaction/index.vue

@@ -8,7 +8,7 @@
             <el-form ref="queryFormRef" :model="queryParams" label-width="60px" label-position="left">
                 <el-row :gutter="24" class="form-row">
                     <el-col :span="4">
-                        <el-form-item label="作业类型" prop="JobType">
+                        <el-form-item label="作业类型" prop="RECEIVEREQUESTNAMETYPE">
                             <el-select multiple filterable v-model="queryParams.RECEIVEREQUESTNAMETYPE" placeholder="选择作业类型"
                                 style="width: 240px" default-first-option>
                                 <el-option v-for="item in state.ReceiveList" :key="item.ENUMVALUE" :label="item.DESCRIPTION"
@@ -77,7 +77,7 @@
             </el-form>
             <div class="page-search-btns">
                 <el-button type="primary" @click="handleQueryInfo">搜索</el-button>
-                <el-button type="primary" @click="exportExcel">导出</el-button>
+                <el-button type="primary" @click="exportTransactionExcel">导出</el-button>
                 <el-button @click="resetQuery">重置</el-button>
             </div>
         </el-row>
@@ -99,7 +99,8 @@
                     </el-popover>
                 </div>
             </div>
-            <el-table border v-loading="loading" :data="list" highlight-current-row row-key="id"  show-summary style="width: 100%" :height="tableHeight">
+<!--            <el-table border v-loading="loading" :data="list" highlight-current-row row-key="id"  show-summary style="width: 100%" :height="tableHeight">-->
+            <el-table border v-loading="loading" :data="list" highlight-current-row row-key="id"  show-summary style="width: 100%; height: 100%">
                 <el-table-column
                         type="index"
                         width="50"
@@ -198,26 +199,34 @@ const { ERPFACTORY,loading, list, column, queryParams, page } = toRefs(state)
 
 onMounted(() => {
   materialTableConfig.value.column = [
+    { header: "作业类型", field: "LASTEVENTNAME", hide: false , width: '150px'},
     { header: "标签", field: "MATERIALPACKINGNAME", hide: false, width: '320px' },
     { header: "批次", field: "CHARGE", hide: false, width: '200px' },
     { header: "料号", field: "MATERIALSPECNAME", hide: false , width: '100px'},
+    { header: "品名", field: "DESC_CN", hide: false , width: '100px'},
     { header: "规格", field: "DESCRIPTION", hide: false, width: '200px' },
     { header: "阶段", field: "PHASE", hide: false, width: '100px' },
     //入库
+    { header: "入库组织编码", field: "INERPFACTORY", hide: false, width: '100px' },
     { header: "入库组织", field: "INERPFACTORYDESC", hide: false, width: '100px' },
-    { header: "入库仓库", field: "INLOCATIONDESC", hide: false, width: '150px' },
+    { header: "入库仓库编码", field: "INERPLOCATION", hide: false, width: '150px' },
+    { header: "入库仓库", field: "INERPLOCATIONDESC", hide: false, width: '150px' },
+    { header: "入库货位编码", field: "INLOCATION", hide: false, width: '150px' },
     { header: "入库货位", field: "INLOCATIONNAME", hide: false, width: '150px' },
     //出库
+    { header: "出库组织编码", field: "OUTERPFACTORY", hide: false, width: '100px' },
     { header: "出库组织", field: "OUTERPFACTORYDESC", hide: false, width: '100px' },
-    { header: "出库仓库", field: "OUTLOCATIONDESC", hide: false, width: '150px' },
+    { header: "出库仓库编码", field: "OUTERPLOCATION", hide: false, width: '150px' },
+    { header: "出库仓库", field: "OUTERPLOCATIONDESC", hide: false, width: '150px' },
+    { header: "出库货位编码", field: "OUTLOCATION", hide: false, width: '150px' },
     { header: "出库货位", field: "OUTLOCATIONNAME", hide: false, width: '150px' },
     // 无来源转库、货位调整
-    { header: "转出组织", field: "TRANSFEROUTERPFACTORYDESC", hide: false, width: '100px' },
+   /* { header: "转出组织", field: "TRANSFEROUTERPFACTORYDESC", hide: false, width: '100px' },
     { header: "转出仓库", field: "TRANSFEROUTLOCATIONDESC", hide: false, width: '150px' },
     { header: "转出货位", field: "TRANSFEROUTLOCATIONNAME", hide: false, width: '150px' },
     { header: "转入组织", field: "TRANSFERINERPFACTORYDESC", hide: false, width: '100px' },
     { header: "转入仓库", field: "TRANSFERINLOCATIONDESC", hide: false, width: '150px' },
-    { header: "转入货位", field: "TRANSFERINLOCATIONNAME", hide: false, width: '150px' },
+    { header: "转入货位", field: "TRANSFERINLOCATIONNAME", hide: false, width: '150px' },*/
     { header: "数量", field: "MATERIALQUANTITY", hide: false, width: '100px' },
     { header: "单位", field: "FNAME", hide: false, width: '100px' },
     { header: "入库单号", field: "RECEIVEREQUESTNAME", hide: false, width: '100px'  },
@@ -225,7 +234,6 @@ onMounted(() => {
     { header: "作业凭证", field: "UNDOID", hide: false, width: '120px' },
     { header: "操作人", field: "LASTEVENTUSER", hide: false, width: '120px' },
     { header: "操作时间", field: "LASTEVENTTIME", hide: false , width: '150px' },
-    { header: "测试操作事件", field: "LASTEVENTNAME", hide: false , width: '150px' },
     /*
     { header: "组织", field: "ERPFACTORYDESC", hide: false, width: '100px' },
     { header: "仓库", field: "LOCATIONDESC", hide: false, width: '150px' },
@@ -245,7 +253,7 @@ onMounted(() => {
     */
   ]
     getPRINTLIST()
-    handleQuery()
+    //handleQuery()
      updateTableHeight();
     window.addEventListener('resize', handleResize);
 
@@ -301,6 +309,11 @@ function handleQuery() {
     for (let i = 0; i < state.queryParams.RECEIVEREQUESTNAMETYPE.length; i++) {
         loactionString = loactionString + state.queryParams.RECEIVEREQUESTNAMETYPE[i] + ','
     }
+    /*
+    if (loactionString == '') {
+      loactionString = 'BarCodeToTransferIn,allocateStockIn,receiveMesShippInfo,Assign';
+    }
+    */
     let erpFactoryString = ''
     for (let i = 0; i < state.queryParams.ERPFACTORY.length; i++) {
       erpFactoryString = erpFactoryString + state.queryParams.ERPFACTORY[i] + ','
@@ -430,7 +443,9 @@ function exportExcel() {
 function resetQuery() {
     queryFormRef.value.resetFields();
     setDefaultDates();
-    handleQuery();
+    //handleQuery();
+    state.list = [];
+    state.page.total = 0;
 }
 
 /**
@@ -498,6 +513,16 @@ function formatDate(param: any) {
   const day = String(param.getDate()).padStart(2, '0');
   return `${year}${month}${day}`;
 }
+
+function exportTransactionExcel() {
+  if (state.list.length > 0) {
+    state.loading = false
+    exportDataToExcel(state.list, '出入库报表')
+  } else {
+    state.loading = false
+    proxy.$ElMessage.warning('当前查询没有数据可以导出');
+  }
+}
 </script>
 
 <style scoped lang="scss">