修复已知bug

src/api/basicdata/basicdataCategory.js

@@ -11,6 +11,7 @@ export const getList = (current, size, params) => {
     },
   });
 };
+
 export const getListCo = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/basicdataCategory/list',
@@ -79,3 +80,10 @@ export const getDownTemplate = () => {
     responseType: 'blob',
   });
 };
+export const $_getList = (params) => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataCategory/list',
+    method: 'get',
+    params
+  });
+};

src/option/basicdata/basicdataCategoryData.js

@@ -0,0 +1,67 @@
+export const columnList = [
+    {
+      prop: '',
+      label: '复选框',
+      type: 0,
+      width: 10,
+      fixed: true,
+    },
+    {
+      prop: '',
+      label: '序号',
+      type: 12,
+      values: '',
+      width: 20,
+      fixed: true,
+    },
+    {
+      prop: 'name',
+      label: '名称',
+      type: 2,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
+    {
+      prop: 'type',
+      label: '类型',
+      type: 3,
+      values: '',
+      width: '150',
+      checkarr: [
+        {
+        label: '一类',
+        value: '1',
+      },
+      {
+        label: '二类',
+        value: '2',
+      },
+      {
+        label: '三类',
+        value: '3',
+      },
+      {
+        label: '四类',
+        value: '4',
+      },
+    ],
+      fixed: false,
+      sortable: true,
+    },
+    
+    {
+      prop: '',
+      label: '操作',
+      type: 6,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: 'right',
+      sortable: true,
+    },
+  ];
+  

src/option/warehouse/PreStoragePackage.js

@@ -220,13 +220,37 @@ export const columnList = [
 
   {
     prop: 'quantity',
-    label: '包件数量',
+    label: '计划数量',
     type: 1,
     values: '',
     width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
+  },
+  {
+    prop: 'loadNum',
+    label: '装车数量',
+    type: 1,
+    values: '',
+    width: '120',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+  },
+  {
+    prop: 'unloadNum',
+    label: '入库数量',
+    type: 1,
+    values: '',
+    width: '120',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+
   },
   {
     prop: '',

src/views/basicdata/brand/basicdataCategoryTemp.vue

@@ -12,7 +12,7 @@
             <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           </el-form-item>
         </el-form>
-    </div>
+      </div>
 
       <!-- 控件模块 -->
       <el-row>
@@ -87,13 +87,24 @@
 
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
-import { columnList } from '@/option/storagecost/OrderTotalTransferDetails.js';
+import { columnList } from '@/option/basicdata/basicdataCategoryData.js';
+import {
+  $_getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getDeptLazyTree,
+  getDownTemplate,
+} from '@/api/basicdata/basicdataCategory';
 import { processRowPropertyName, setNodeHeight } from '@/utils/util';
 import { ElMessageBox, ElMessage } from 'element-plus';
+import { getDictionaryBiz } from '@/api/system/dict';
 import { downloadXls, handleClearTableQuery } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
 const $router = useRouter(); //跳转
+const Categorytype = ref([]); //品类类型码表
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const details = reactive({
@@ -138,7 +149,7 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -252,8 +263,8 @@ const searchReset = () => {
 };
 // 顶部搜索
 const searchHide = () => {
-  console.log(details,';details.search');
- details.search = !details.search;
+  console.log(details, ';details.search');
+  details.search = !details.search;
   const _node = document.querySelector('.tableNode');
   setNodeHeight(_node, '', true);
 };
@@ -269,8 +280,39 @@ function updateDictionary(targetArray, dictionaryType) {
     });
   });
 }
+
+// 页面初始化
+const onLoad = async () => {
+  try {
+    let data = {
+      current: details.page.currentPage,
+      size: details.page.pageSize,
+    };
+    let _res = await $_getList(data);
+    if (_res.data.code == 200 && _res.data.data) {
+      details.data = _res.data.data.records || [];
+      details.page.total = _res.data.data.total || 0;
+      CategoryType()
+    }
+    console.log(_res, 'res');
+  } catch (e) {
+    console.log(e, 'error');
+  } finally {
+  }
+};
+// 品类码表转换
+const CategoryType =()=>{
+    console.log(  details.data);
+    console.log(  Categorytype.value);
+    
+}
+const onLoadPage = () => {
+  updateDictionary(Categorytype.value, 'category'); //获取品类类型码表
+  onLoad();
+
+};
 // 页面初始化
-const onLoad = () => {};
+onLoadPage();
 </script>
 
 <style scoped lang="scss">

src/views/distribution/reservation/reservationDetails.vue

@@ -172,7 +172,7 @@
               @selection="selectionsc"
             >
               <template #default="slotProps">
-                <el-text size="small" @click="handleQRCode(slotProps.scope)">查看二维码</el-text>
+                <el-text size="small" v-if="slotProps.scope.row.conditions !=3" @click="handleQRCode(slotProps.scope)">查看二维码</el-text>
               </template>
             </tablecmt>
           </el-tab-pane>