KouJin 1 year ago
parent
commit
0885ca3cc6

+ 20 - 0
src/layout/TopMenu.vue

@@ -0,0 +1,20 @@
1
+<script lang="ts" setup>
2
+
3
+import router from "@/router";
4
+</script>
5
+
6
+<template>
7
+  <div v-hasPermi="['system:help','system:version']" class="mr-20px">
8
+    <span
9
+      v-hasPermi="['system:version']" class="cursor-pointer"
10
+      @click="router.push('/integratedManagement/version')">版本</span>
11
+    &nbsp;&nbsp; | &nbsp;&nbsp;
12
+    <span
13
+      v-hasPermi="['system:help']" class="cursor-pointer"
14
+      @click="router.push('/integratedManagement/help')">帮助</span>
15
+  </div>
16
+</template>
17
+
18
+<style lang="scss" scoped>
19
+
20
+</style>

+ 2 - 5
src/layout/components/ToolHeader.vue

@@ -4,6 +4,7 @@ import {UserInfo} from '@/layout/components/UserInfo'
4 4
 import {useAppStore} from '@/store/modules/app'
5 5
 import {useDesign} from '@/hooks/web/useDesign'
6 6
 import router from "@/router";
7
+import TopMenu from "@/layout/TopMenu.vue";
7 8
 
8 9
 const {getPrefixCls, variables} = useDesign()
9 10
 
@@ -80,11 +81,7 @@ export default defineComponent({
80 81
           ) : undefined}
81 82
           <ThemeSwitch />
82 83
             */}
83
-          <div class="mr-20px">
84
-            <span class="cursor-pointer" onClick={()=>router.push('/integratedManagement/version')}>版本</span>
85
-            &nbsp;&nbsp;  |  &nbsp;&nbsp;
86
-            <span class="cursor-pointer" onClick={()=>router.push('/integratedManagement/help')}>帮助</span>
87
-          </div>
84
+         <TopMenu/>
88 85
 
89 86
           <UserInfo></UserInfo>
90 87
         </div>

+ 4 - 2
src/views/DeliveryWarehouse/ComprehensiveQuery/index.vue

@@ -344,6 +344,7 @@ const yanshi = ref(false)
344 344
       class="-mb-15px"
345 345
       label-width="68px"
346 346
     >
347
+
347 348
       <el-form-item label="所属省份" prop="shengCode">
348 349
         <el-select
349 350
           v-model="queryParams.shengCode"
@@ -386,10 +387,10 @@ const yanshi = ref(false)
386 387
         </el-select>
387 388
       </el-form-item>
388 389
       <el-form-item label-width="82px" label="仓房总容量" prop="cfzrl">
389
-        <el-input v-model="queryParams.cfzrl" clearable placeholder="请输入仓房总容量" />
390
+        <el-input         class="!w-226px" v-model="queryParams.cfzrl" clearable placeholder="请输入仓房总容量" />
390 391
       </el-form-item>
391 392
       <el-form-item label="单仓仓容" prop="dccr">
392
-        <el-input v-model="queryParams.dccr" clearable placeholder="请输入单仓仓容" />
393
+        <el-input         class="!w-240px" v-model="queryParams.dccr" clearable placeholder="请输入单仓仓容" />
393 394
       </el-form-item>
394 395
       <el-form-item>
395 396
         <el-button type="primary" @click="handleQuery">
@@ -447,6 +448,7 @@ const yanshi = ref(false)
447 448
         min-width="180"
448 449
         prop="sndjlr"
449 450
       />
451
+      <el-table-column align="center" label="选定状态" min-width="150" prop="xdzt" />
450 452
       <el-table-column align="center" label="仓房状态" min-width="120" prop="cfzt" />
451 453
     </el-table>
452 454
 

+ 3 - 2
src/views/DeliveryWarehouse/compontents/ComprehensiveQueryForm.vue

@@ -82,11 +82,12 @@
82 82
           v-if="typeflag == '1' || typeflag == '2'"
83 83
           label="操作"
84 84
           min-width="140"
85
+          fixed="right"
85 86
           prop=""
86 87
         >
87 88
           <template #default="">
88
-            <el-button link type="primary" size="small">通过</el-button>
89
-            <el-button link type="primary" size="small">退回</el-button>
89
+            <el-button  type="primary" size="small">通过</el-button>
90
+            <el-button  type="danger" size="small">退回</el-button>
90 91
           </template>
91 92
         </el-table-column>
92 93
       </el-table>