yangg hai 1 ano
pai
achega
cb0fd0a6a6

+ 1 - 1
src/layouts/app-layout.vue

@@ -62,7 +62,7 @@
                 <!--  END TOP NAVBAR  -->
 
                 <!--  BEGIN CONTENT AREA  -->
-                <div class="p-6 animation">
+                <div class="p-3 animation">
                     <router-view></router-view>
                 </div>
                 <!--  END CONTENT AREA  -->

+ 29 - 21
src/views/InoutStorage/index.vue

@@ -1,17 +1,18 @@
 <template>
     <div>
+          <ul class="flex space-x-2 rtl:space-x-reverse pb-2">
+            <li>
+                <a href="javascript:;" class=" hover:underline" @click="goHome">首页</a>
+            </li>
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary">
+                <span>出入明细</span>
+            </li>
+        </ul>
         <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick">
             <el-tab-pane label="入库明细" name="first"></el-tab-pane>
             <el-tab-pane label="出库明细" name="second"></el-tab-pane>
         </el-tabs>
-        <!--   <ul class="flex space-x-2 rtl:space-x-reverse">
-            <li>
-                <a href="javascript:;" class="text-primary hover:underline">首页</a>
-            </li>
-            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
-                <span>订单列表</span>
-            </li>
-        </ul> -->
+
 
         <div v-if="activeName == 'first'" class="panel pb-0 mt-6">
 
@@ -71,8 +72,9 @@
                         {{ deliveryName(data.value.has_submit) }}
                     </template>
                     <!-- 定义操作栏的模板 -->
-                     <template #actions="data">
-                        <button v-if="data.value.has_submit=='N'" @click="inStorage(data)" class="btn btn-primary">编辑</button>
+                    <template #actions="data">
+                        <button v-if="data.value.has_submit == 'N'" @click="inStorage(data)"
+                            class="btn btn-primary">编辑</button>
                     </template>
                     <template #isActive="">
                         <!--  <span class="capitalize" :class="data.value.isActive ? 'text-success' : 'text-danger'">{{
@@ -136,8 +138,9 @@
                         {{ typeOutName(data.value.type) }}
                     </template>
                     <!-- 定义操作栏的模板 -->
-                     <template #actions="data">
-                        <button v-if="data.value.type!=='SALE_OUT'" @click="outStorage(data)" class="btn btn-primary">编辑</button>
+                    <template #actions="data">
+                        <button v-if="data.value.type !== 'SALE_OUT'" @click="outStorage(data)"
+                            class="btn btn-primary">编辑</button>
                     </template>
                     <!--   <template #isActive="data">
                        <span class="capitalize" :class="data.value.isActive ? 'text-success' : 'text-danger'">{{
@@ -164,13 +167,13 @@ useMeta({ title: 'Column Chooser Table' });
 const router = useRouter();
 const store = useAppStore();
 const search = ref('');
-const rows:any = ref([]); // 初始化rows为响应式引用
-const outrows:any = ref([]);
-const customerList:any = ref([])//初始化客户列表
-const warehouseList:any = ref([])//初始化客户列表
-const deliveryList:any = ref([])//初始化客户列表
-const entryTypeList:any = ref([])//初始化入库状态列表
-const outTypeList:any = ref([])//初始化出库状态列表
+const rows: any = ref([]); // 初始化rows为响应式引用
+const outrows: any = ref([]);
+const customerList: any = ref([])//初始化客户列表
+const warehouseList: any = ref([])//初始化客户列表
+const deliveryList: any = ref([])//初始化客户列表
+const entryTypeList: any = ref([])//初始化入库状态列表
+const outTypeList: any = ref([])//初始化出库状态列表
 //入库列表
 const cols = ref([
     { field: 'sn', title: '入库单号', isUnique: true, hide: false },
@@ -204,13 +207,13 @@ const handleClick = (tab: TabsPaneContext) => {
     //activeName = tab.props.name
 }
 //入库
-const inStorage=(row)=>{
+const inStorage = (row) => {
     router.replace({
         name: 'inStorage',
         params: { id: row.value.id }
     });
 }
-const outStorage=(row)=>{
+const outStorage = (row) => {
     router.replace({
         name: 'outStorage',
         params: { id: row.value.id }
@@ -285,4 +288,9 @@ const getInforList = async () => {
     entryTypeList.value = await dictionaryAPI.getPage({ dictType: "warehouse_entry_type" })//获取入库类型 
     outTypeList.value = await dictionaryAPI.getPage({ dictType: "out_warehouse_type" })//获取出库类型
 }
+const goHome=()=>{
+    router.replace({
+        name: 'home'
+    });
+}
 </script>

+ 10 - 5
src/views/Inventory/index.vue

@@ -1,13 +1,13 @@
 <template>
     <div>
-        <!--   <ul class="flex space-x-2 rtl:space-x-reverse">
+          <ul class="flex space-x-2 rtl:space-x-reverse">
             <li>
-                <a href="javascript:;" class="text-primary hover:underline">首页</a>
+                <a href="javascript:;" class="hover:underline" @click="goHome">首页</a>
             </li>
-            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
-                <span>订单列表</span>
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary ">
+                <span>盘点列表</span>
             </li>
-        </ul> -->
+        </ul>
 
         <div class="panel pb-0 mt-6">
 
@@ -180,4 +180,9 @@ const deliveryOrder = async (row) => {
         params: { id: row.value.id }
     });
 }
+const goHome=()=>{
+    router.replace({
+        name: 'home'
+    });
+}
 </script>

+ 10 - 5
src/views/allocation/index.vue

@@ -1,13 +1,13 @@
 <template>
     <div>
-        <!--   <ul class="flex space-x-2 rtl:space-x-reverse">
+          <ul class="flex space-x-2 rtl:space-x-reverse">
             <li>
-                <a href="javascript:;" class="text-primary hover:underline">首页</a>
+                <a href="javascript:;" class="hover:underline" @click="goHome">首页</a>
             </li>
-            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
-                <span>订单列表</span>
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary">
+                <span>调拨列表</span>
             </li>
-        </ul> -->
+        </ul>
 
         <div class="panel pb-0 mt-6">
 
@@ -181,4 +181,9 @@ const deliveryOrder = async (row) => {
         params: { id: row.value.id }
     });
 }
+const goHome=()=>{
+    router.replace({
+        name: 'home'
+    });
+}
 </script>

+ 1 - 1
src/views/apps/applist.vue

@@ -20,7 +20,7 @@
                     clip-rule="evenodd" />
             </svg>
 
-            <div class="h-4 mx-10 my-2"><span class="text-center text-base font-bold">{{ item.title }}</span></div>
+            <div class="h-4 mx-10 my-2"><span class="text-center text-base font-bold whitespace-nowrap">{{ item.title }}</span></div>
         </div>
      <!--    <div>
             <svg class="w-40 h-40 text-gray-500 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"

+ 9 - 4
src/views/apps/order.vue

@@ -1,13 +1,13 @@
 <template>
     <div>
-        <!--   <ul class="flex space-x-2 rtl:space-x-reverse">
+          <ul class="flex space-x-2 rtl:space-x-reverse">
             <li>
-                <a href="javascript:;" class="text-primary hover:underline">首页</a>
+                <a href="javascript:;" class=" hover:underline" @click="goHome">首页</a>
             </li>
-            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary hover:underline">
                 <span>订单列表</span>
             </li>
-        </ul> -->
+        </ul>
 
         <div class="panel pb-0 mt-6">
 
@@ -196,4 +196,9 @@ const deliveryOrder = async (row) => {
         params: { id: row.value.id, send_type: row.value.order_vo.send_type }
     });
 }
+const goHome=()=>{
+    router.replace({
+        name: 'home'
+    });
+}
 </script>

+ 16 - 14
src/views/apps/shippingPage.vue

@@ -71,8 +71,8 @@
                 <el-table :data="shippingForm.order_item_vos" style="width: 100%">
                     <el-table-column prop="goods_vo.name" label="商品名称" />
                     <el-table-column prop="product_vo.sku" label="SKU" />
-                    <el-table-column prop="num" label="数量" />
-                    <el-table-column prop="orderNum" label="出库数量" />
+                    <el-table-column prop="orderNum" label="订单数量" />
+                    <el-table-column prop="num" label="出库数量" />
                 </el-table>
             </el-tab-pane>
 
@@ -81,7 +81,7 @@
             :before-close="handleClose">
             <el-form :model="snCodeForm" label-width="auto" style="max-width: 600px">
                 <el-form-item label="SKU">
-                    <el-input v-model="snCodeForm.bar_code" ref="inputRef" @keyup.enter="toSearch()" />
+                    <el-input v-model="snCodeForm.bar_code"  ref="inputRef" @keyup.enter="toSearch()" />
                 </el-form-item>
                 <el-form-item label="序列号">
                     <el-input v-model="snCodeForm.sn_code" ref="snInputRef" @keyup.enter="toSnCode()" />
@@ -199,8 +199,8 @@ const params: any = ref({
     //商品信息列表
     order_item_vos: [],
     goods_list: [],
-    warehouse_id:'',
-    goods_num:'',
+    warehouse_id: '',
+    goods_num: '',
 })
 let sku = ref('');
 watch(activeTab, (newValue, oldValue) => {
@@ -317,7 +317,9 @@ const scanCode = () => {
                 inputRef.value.focus(); // 先尝试聚焦 input 元素
                 setTimeout(() => {
                     if (inputRef.value) {
-                        inputRef.value.select();
+                        // 首先,让输入框失去焦点,这会阻止键盘的唤起
+                        //inputRef.value.removeAttribute('readonly');
+                        inputRef.value.focus();
                     }
                 }, 100);
             } catch (error) {
@@ -343,9 +345,9 @@ const getOrderNumber = () => {
     /*  params.value.order_item_vos = shippingForm.value.order_item_vos */
     //商品信息
     const item = {
-        goods_name:'',
-        quantity:'',
-        unit:''
+        goods_name: '',
+        quantity: '',
+        unit: ''
     };
     shippingForm.value.order_item_vos.map((el) => {
         item.goods_name = el.goods_vo.name;
@@ -355,14 +357,14 @@ const getOrderNumber = () => {
         return params.value.goods_list.push(item);
     });
     params.value.goods_num = shippingForm.value.order_item_vos.reduce(
-            (sum, e) => sum + Number(e.orderNum || 0),
-            0
-          );
+        (sum, e) => sum + Number(e.orderNum || 0),
+        0
+    );
     if (shippingForm.appointment_type !== 0) {
         params.value.appointment_time = shippingForm.appointment_time
     }
-    params.value.warehouse_id=shippingForm.value.warehouse_id
-    params.value.send_type=send_type.value
+    params.value.warehouse_id = shippingForm.value.warehouse_id
+    params.value.send_type = send_type.value
     params.value.order_code = id.value
 
     /*console.log(shippingForm);

+ 4 - 4
src/views/list/InventoryList.vue

@@ -2,11 +2,11 @@
     <div>
           <ul class="flex space-x-2 rtl:space-x-reverse">
             <li>
-                <a href="javascript:;" class="text-primary hover:underline" @click="goIndex">首页</a>
+                <a href="javascript:;" class="hover:underline" @click="goIndex">首页</a>
+            </li>
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary">
+                <span>库存列表</span>
             </li>
-           <!--  <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
-                <span>订单列表</span>
-            </li>-->
         </ul> 
 
         <div class="panel pb-0 mt-6">

+ 4 - 1
src/views/list/InventoryLoss.vue

@@ -2,7 +2,10 @@
     <div>
         <ul class="flex space-x-2 rtl:space-x-reverse">
             <li>
-                <a href="javascript:;" class="text-primary hover:underline" @click="goIndex">首页</a>
+                <a href="javascript:;" class="hover:underline" @click="goIndex">首页</a>
+            </li>
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary">
+                <span>库存报损</span>
             </li>
         </ul> 
 

+ 4 - 4
src/views/list/locationArea.vue

@@ -2,11 +2,11 @@
     <div>
           <ul class="flex space-x-2 rtl:space-x-reverse">
             <li>
-                <a href="javascript:;" class="text-primary hover:underline" @click="goIndex">首页</a>
+                <a href="javascript:;" class=" hover:underline" @click="goIndex">首页</a>
+            </li>
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary">
+                <span>库位区域</span>
             </li>
-           <!--  <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
-                <span>订单列表</span>
-            </li>-->
         </ul> 
 
         <div class="panel pb-0 mt-6">

+ 4 - 4
src/views/list/locationList.vue

@@ -2,11 +2,11 @@
     <div>
           <ul class="flex space-x-2 rtl:space-x-reverse">
             <li>
-                <a href="javascript:;" class="text-primary hover:underline" @click="goIndex">首页</a>
+                <a href="javascript:;" class=" hover:underline" @click="goIndex">首页</a>
+            </li>
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary">
+                <span>库位管理</span>
             </li>
-           <!--  <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
-                <span>订单列表</span>
-            </li>-->
         </ul> 
 
         <div class="panel pb-0 mt-6">

+ 4 - 4
src/views/list/warehouseList.vue

@@ -2,11 +2,11 @@
     <div>
           <ul class="flex space-x-2 rtl:space-x-reverse">
             <li>
-                <a href="javascript:;" class="text-primary hover:underline" @click="goIndex">首页</a>
+                <a href="javascript:;" class=" hover:underline" @click="goIndex">首页</a>
+            </li>
+            <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2 text-primary">
+                <span>仓库列表</span>
             </li>
-           <!--  <li class="before:content-['/'] ltr:before:mr-2 rtl:before:ml-2">
-                <span>订单列表</span>
-            </li>-->
         </ul> 
 
         <div class="panel pb-0 mt-6">