bug修复，需求更改

src/api/system/menu/index.ts

@@ -17,10 +17,11 @@ export function listRoutes() {
  *
  * @param queryParams
  */
-export function listMenus(): AxiosPromise<any> {
+export function listMenus(data:object): AxiosPromise<any> {
   return request({
     url: "/api/v1/sys/menu/tree",
     method: "POST",
+    data: data,
   });
 }
 

src/views/storage/check/index.vue

@@ -377,6 +377,7 @@ import {
 import { getUserList } from "@/api/system/user";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import { ref } from "vue";
+import {select} from "three/tsl";
 const { username } = useUserStoreHook().user;
 // 弹窗对象
 const dialog0 = reactive({
@@ -644,6 +645,7 @@ option2.value = {
       prop: "houseNo",
       type: "select",
       overHidden: true,
+        cascader: ['houseArea'],
       search: true,
       dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.warehouse_type,
       props: {
@@ -659,19 +661,21 @@ option2.value = {
       ],
     },
     {
-      label: "盘点库区",
+      label: "盘点货区",
       prop: "houseArea",
       search: true,
+      type: "select",
+        cascader: ['locationNo'],
       overHidden: true,
-      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.warehouse_type,
+      dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/wms/position/position?houseNo={{houseNo}}",
       props: {
-        label: "dictLabel",
-        value: "dictValue",
+        label: "area",
+        value: "area",
       },
       rules: [
         {
           required: true,
-          message: "仓库编码不能为空",
+          message: "盘点货区",
           trigger: "trigger",
         },
       ],
@@ -679,17 +683,18 @@ option2.value = {
     {
       label: "盘点库位",
       prop: "locationNo",
+      type:"select",
       search: true,
       overHidden: true,
-      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.warehouse_type,
+        dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/wms/position/locationNo?houseNo={{houseNo}}&houseArea={{houseArea}}",
       props: {
-        label: "dictLabel",
-        value: "dictValue",
+        label: "coordinate",
+        value: "coordinate",
       },
       rules: [
         {
           required: true,
-          message: "仓库编码不能为空",
+          message: "盘点库位不能为空",
           trigger: "trigger",
         },
       ],

src/views/storage/stock/index.vue

@@ -62,6 +62,12 @@
     >
       <print-stock-info :excelRow="clickObjs" />
     </el-dialog>
+    <CommonTable
+        ref="ctableRef"
+        tableTitle="库存物料更改"
+        tableType="MARTERIAL"
+        @selected-sure="onSelectedFinish"
+    />
   </div>
 </template>
 <script setup>
@@ -85,7 +91,7 @@ const data2 = ref(
     src: "/api/v1/wms",
   })
 );
-
+const ctableRef = ref(null);
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const dialog1 = reactive({
   title: "物料打印",
@@ -137,6 +143,7 @@ option.value = Object.assign(option.value, {
       label: "货区",
       prop: "locationNo",
       editDisabled: true,
+      search: true,
       rules: [
         {
           required: true,
@@ -149,6 +156,7 @@ option.value = Object.assign(option.value, {
       label: "货位",
       prop: "coordinate",
       editDisabled: true,
+      search: true,
       rules: [
         {
           required: true,
@@ -190,6 +198,7 @@ option.value = Object.assign(option.value, {
       search: true,
       overHidden: true,
       prop: "materialNo",
+      editDisabled: true,
     },
     {
       label: "物料名称",
@@ -200,7 +209,7 @@ option.value = Object.assign(option.value, {
       overHidden: true,
       click: ({ value, column }) => {
         if(column.boxType){
-          dialog1.visible = true
+          ctableRef.value.startSelect();
         }
       },
       /*rules: [
@@ -230,9 +239,17 @@ option.value = Object.assign(option.value, {
     {
       label: "单位",
       prop: "unit",
+      editDisabled: true,
     },
   ],
 });
+
+const onSelectedFinish=(val)=>{
+   console.log(val);
+   form.value.materialNo=val.materialCode;
+   form.value.materialName=val.materialName;
+   form.value.unit=val.unitDictValue;
+}
 const rowStyle = ({row,column,rowIndex}) =>{
   if(row.warningMsg){
     return {

src/views/storage/wmsOrder/index.vue

@@ -138,6 +138,11 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "货区",
+      overHidden: true,
+      prop: "locationNo",
+    },
+    {
+      label: "库位",
       width: 110,
       overHidden: true,
       prop: "coordinate",
@@ -149,11 +154,7 @@ option.value = Object.assign(option.value, {
       overHidden: true,
       prop: "taskNo",
     },
-    {
-      label: "库位",
-      overHidden: true,
-      prop: "locationNo",
-    },
+
     {
       label: "状态",
       prop: "state",

src/views/system/menu/index.vue

@@ -425,7 +425,7 @@ const menuCacheData = reactive({
 function handleQuery() {
   // 重置父组件
   loading.value = true;
-  listMenus()
+  listMenus(queryParams)
     .then(({ data }) => {
       menuList.value = data;
       let treeData = Array.from(data);

src/views/system/user/index.vue

@@ -128,7 +128,18 @@
               prop="phone"
               width="120"
             />
-
+            <el-table-column
+              label="角色"
+              align="center"
+              prop="roleNamesStr"
+              width="120"
+            />
+            <el-table-column
+              label="岗位"
+              align="center"
+              prop="postNamesStr"
+              width="120"
+            />
             <el-table-column label="状态" align="center" prop="state">
               <template #default="scope">
                 <el-tag :type="scope.row.state == 0 ? 'success' : 'info'">{{