Prechádzať zdrojové kódy

修改背景图弹框高度

yangg 1 rok pred
rodič
commit
544e992b8d

+ 10 - 10
src/components/taber/mainTaberItem.vue

@@ -3,10 +3,10 @@
         <tab-bar>
             <tab-bar-item path="/" activeColor="purple">
                 <template v-slot:item-icon>
-                    <img src="../../assets/images/u34.png" class="w-auto h-auto" alt="">
+                    <img src="../../assets/images/u34.png" class="w-auto h-auto bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-icon-active>
-                    <img src="../../assets/images/u34.png" class="w-auto h-auto" alt="">
+                    <img src="../../assets/images/u34.png" class="w-auto h-auto bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-text>
                     <div>首页</div>
@@ -14,10 +14,10 @@
             </tab-bar-item>
             <tab-bar-item path="/apps/order" activeColor="purple">
                 <template v-slot:item-icon>
-                    <img src="../../assets/images/u36.png" alt="">
+                    <img src="../../assets/images/u36.png" class="bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-icon-active>
-                    <img src="../../assets/images/u36.png" alt="">
+                    <img src="../../assets/images/u36.png" class="bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-text>
                     <div>订单</div>
@@ -25,10 +25,10 @@
             </tab-bar-item>
             <tab-bar-item path="/allocation/index" activeColor="purple">
                 <template v-slot:item-icon>
-                    <img src="../../assets/images/u40.png" alt="">
+                    <img src="../../assets/images/u40.png" class="bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-icon-active>
-                    <img src="../../assets/images/u40.png" alt="">
+                    <img src="../../assets/images/u40.png" class="bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-text>
                     <div>调拨</div>
@@ -36,10 +36,10 @@
             </tab-bar-item>
             <tab-bar-item path="/InoutStorage/index" activeColor="purple">
                 <template v-slot:item-icon>
-                    <img src="../../assets/images/u42.png" alt="">
+                    <img src="../../assets/images/u42.png" class="bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-icon-active>
-                    <img src="../../assets/images/u42.png" alt="">
+                    <img src="../../assets/images/u42.png" class="bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-text>
                     <div>出入库</div>
@@ -47,10 +47,10 @@
             </tab-bar-item>
             <tab-bar-item path="/Inventory/index" activeColor="purple">
                 <template v-slot:item-icon>
-                    <img src="../../assets/images/u38.png" alt="">
+                    <img src="../../assets/images/u38.png" class="bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-icon-active>
-                    <img src="../../assets/images/u38.png" alt="">
+                    <img src="../../assets/images/u38.png" class="bg-white dark:bg-[#0e1726]" alt="">
                 </template>
                 <template v-slot:item-text>
                     <div>盘点</div>

+ 1 - 1
src/components/taber/taber.vue

@@ -1,5 +1,5 @@
 <template>  
-    <div id="tab-bar">
+    <div class="bg-white " id="tab-bar"><!-- dark:bg-[#0e1726] -->
       <slot></slot>
     </div>
 </template>

+ 1 - 1
src/components/taber/taberItem.vue

@@ -60,7 +60,7 @@ export default {
 }
 
 #tab-bar {
-    background-color: #fff;
+   
     border-top: 2px #ccc;
     position: fixed;
     left: 0;

+ 1 - 0
src/views/InoutStorage/inStorage.vue

@@ -167,6 +167,7 @@ const toSearch = async () => {
                 snInputRef.value.focus();
             });
         } else {
+            if (goodsExchangeAddForm.value.order_item_vos[index.value].num >= goodsExchangeAddForm.value.order_item_vos[index.value].orderNum) return ElMessage.warning('待入库数量不能大于入库数量!')
             goodsExchangeAddForm.product_list[index.value].num += 1
             /* this.scanDialogVisible = false; */
         }

+ 4 - 3
src/views/InoutStorage/index.vue

@@ -147,6 +147,7 @@
                             data._rawValue }}</span>
                     </template> -->
                 </vue3-datatable>
+
             </div>
         </div>
     </div>
@@ -194,17 +195,17 @@ const outcols = ref([
     { field: 'notes', title: '备注', hide: false },
     { field: 'actions', title: '操作', hide: true }
 ]);
-const params = ref([
+const params:any = ref([
     { page_no: 1, page_size: 10 }
 ])
-let activeName = ref('first')
+let activeName:any = ref('first')
 const handleClick = (tab: TabsPaneContext) => {
     if (tab.props.name == 'first') {
         getentryList()
     } else {
         getoutList()
     }
-    //activeName = tab.props.name
+   activeName.value = tab.props.name
 }
 //入库
 const inStorage = (row) => {

+ 1 - 0
src/views/InoutStorage/outStorage.vue

@@ -183,6 +183,7 @@ const toSearch = async () => {
                 snInputRef.value.focus();
             });
         } else {
+            if (goodsExchangeAddForm.value.order_item_vos[index.value].out_num >= goodsExchangeAddForm.value.order_item_vos[index.value].orderNum) return ElMessage.warning('待出库数量不能大于出库数量!')
             goodsExchangeAddForm.product_list[index.value].out_num += 1
             /* this.scanDialogVisible = false; */
         }

+ 1 - 1
src/views/Inventory/addInventory.vue

@@ -43,7 +43,7 @@
             </el-table>
         </el-form>
         <el-dialog v-model="dialogVisible" :modal=false title="商品扫码" :close-on-click-modal="false" top="80px"
-            width="90%" style="height: 200px" :before-close="handleClose">
+            width="90%" style="height: 190px" :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" clearable :inputmode="inputmode" @keyup.enter="toSearch()" >

+ 33 - 15
src/views/allocation/index.vue

@@ -1,6 +1,6 @@
 <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="hover:underline" @click="goHome">首页</a>
             </li>
@@ -54,7 +54,7 @@
                     lastArrow='<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="w-4.5 h-4.5 rtl:rotate-180"> <path d="M11 19L17 12L11 5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> <path opacity="0.5" d="M6.99976 19L12.9998 12L6.99976 5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> </svg> '
                     previousArrow='<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="w-4.5 h-4.5 rtl:rotate-180"> <path d="M15 5L9 12L15 19" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> </svg>'
                     nextArrow='<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" class="w-4.5 h-4.5 rtl:rotate-180"> <path d="M9 5L15 12L9 19" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> </svg>'>
-                   <!--  <template #transfer_time="data">
+                    <!--  <template #transfer_time="data">
                         {{ formatDate(data.value.transfer_time) }}
                     </template> -->
                     <template #in_warehouse_id="data">
@@ -69,10 +69,10 @@
                     <!-- <template #order_vo.pay_type="data">
                         {{ collectingAccountName(data.value.order_vo.pay_type) }}
                     </template>-->
-                    
+
                     <template #status="data">
                         {{ typeName(data.value.status) }}
-                    </template> 
+                    </template>
                     <!-- 定义操作栏的模板 -->
                     <template #actions="data">
                         <button @click="deliveryOrder(data)" class="btn btn-primary">查看</button>
@@ -82,6 +82,9 @@
                             data._rawValue }}</span> -->
                     </template>
                 </vue3-datatable>
+                <el-pagination class="p-2 flex justify-end" v-model:current-page="params.page_no"
+                    :page-size="params.page_size" :small="true" layout="total, prev, pager, next" :total="totalRows"
+                    @size-change="handleSizeChange" @current-change="handleCurrentChange" />
             </div>
         </div>
     </div>
@@ -101,13 +104,13 @@ useMeta({ title: 'Column Chooser Table' });
 const router = useRouter();
 const store = useAppStore();
 const search = ref('');
-const rows:any = ref([]); // 初始化rows为响应式引用
-const customerList:any = ref([])//初始化客户列表
-const warehouseList:any= ref([])//初始化客户列表
-const collectingAccountList:any = ref([])//初始化客户列表
-const deliveryList:any = ref([])//初始化客户列表
-const orderTypeList:any = ref([])//初始化客户列表
-const cols:any = ref([
+const rows: any = ref([]); // 初始化rows为响应式引用
+const customerList: any = ref([])//初始化客户列表
+const warehouseList: any = ref([])//初始化客户列表
+const collectingAccountList: any = ref([])//初始化客户列表
+const deliveryList: any = ref([])//初始化客户列表
+const orderTypeList: any = ref([])//初始化客户列表
+const cols: any = ref([
     { field: 'sn', title: '调拨单编号', isUnique: true, hide: false },
     { field: 'transfer_time', title: '调拨时间', hide: false },
     { field: 'out_warehouse_id', title: '调出仓库', hide: false },
@@ -116,7 +119,7 @@ const cols:any = ref([
     { field: 'status', title: '状态', hide: false },
     { field: 'actions', title: '操作', hide: true }
 ]);
-const params = ref([
+const params:any = ref([
     { page_no: 1, page_size: 10 }
 ])
 /* 处理订单时间格式 */
@@ -157,6 +160,16 @@ const typeName = (value) => {
         return type ? type.label : '';
     }
 }
+const totalRows: any = ref(0);
+const handleSizeChange = (val: number) => {
+
+    console.log(`${val} items per page`)
+}
+const handleCurrentChange = (val: number) => {
+    params.page_no = val
+    getOrderList()
+    console.log(`current page: ${val}`)
+}
 onMounted(() => {
     getOrderList()
     getInforList()
@@ -171,8 +184,8 @@ const getOrderList = async () => {
 const getInforList = async () => {
     warehouseList.value = await infoApi.warehouseList({})//获取仓库列表
     deliveryList.value = await dictionaryAPI.getExpressList(params)//获取配送方式
-   /*  customerList.value = await infoApi.customer({})//获取客户列表
-    collectingAccountList.value = await infoApi.collectingAccount({})//获取支付方式列表*/
+    /*  customerList.value = await infoApi.customer({})//获取客户列表
+     collectingAccountList.value = await infoApi.collectingAccount({})//获取支付方式列表*/
     orderTypeList.value = await dictionaryAPI.getPage({ dictType: "transfer_status" })//获取状态 
 }
 const deliveryOrder = async (row) => {
@@ -181,9 +194,14 @@ const deliveryOrder = async (row) => {
         params: { id: row.value.id }
     });
 }
-const goHome=()=>{
+const goHome = () => {
     router.replace({
         name: 'home'
     });
 }
 </script>
+<style>
+.bh-pagination {
+    display: none !important;
+}
+</style>

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

@@ -12,9 +12,9 @@
         <div v-for="(item, index) in cols" :key="index" @click="goPageList(item)">
            <!--  {{ menuList }} -->
             <div v-for="(it) in menuList" :key="it.id">
-                <img v-if="it.title==item.title" :src="it.icon" alt="" class="border-dotted border-2 border-white" />
+                <img v-if="it.title==item.title" :src="it.icon" alt="" class="bg-white rounded-md " />
             </div>
-            <!-- <svg class="w-40 h-40 text-gray-500 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
+            <!-- <svg class="w-40 h-40 text-gray-500 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg"border-dotted border-2 border-white
                 fill="currentColor" viewBox="0 0 24 24">
                 <path fill-rule="evenodd"
                     d="M11.32 6.176H5c-1.105 0-2 .949-2 2.118v10.588C3 20.052 3.895 21 5 21h11c1.105 0 2-.948 2-2.118v-7.75l-3.914 4.144A2.46 2.46 0 0 1 12.81 16l-2.681.568c-1.75.37-3.292-1.263-2.942-3.115l.536-2.839c.097-.512.335-.983.684-1.352l2.914-3.086Z"

+ 30 - 5
src/views/apps/order.vue

@@ -1,6 +1,6 @@
 <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=" hover:underline" @click="goHome">首页</a>
             </li>
@@ -20,11 +20,11 @@
                             <button type="button"
                                 class="flex items-center border font-semibold
                                  border-[#e0e6ed] dark:border-[#253b5c] 
-                                 rounded-md px-4 py-2 text-sm dark:bg-[#1b2e4b] dark:text-white-dark whitespace-nowrap" >
+                                 rounded-md px-4 py-2 text-sm dark:bg-[#1b2e4b] dark:text-white-dark whitespace-nowrap">
                                 <span class="ltr:mr-1 rtl:ml-1 inline">选择</span>
                                 <icon-caret-down class="w-5 h-5" />
                             </button>
-                          <!--   <button type="button"
+                            <!--   <button type="button"
                                 style="white-space: nowrap; flex-wrap: nowrap; display: flex; align-items: center; border: 1px solid #e0e6ed; border-radius: 4px; padding: 8px 16px; font-weight: 600; background-color: transparent; text-align: left; color: inherit;">
                                 <span style="margin-right: 8px;">选择</span>
                                 <i class="icon-caret-down" style="width: 5px; height: 5px;"></i>
@@ -89,6 +89,9 @@
                             data._rawValue }}</span> -->
                     </template>
                 </vue3-datatable>
+                <el-pagination class="p-2 flex justify-end" v-model:current-page="params.page_no" :page-size="params.page_size" :small="true"
+                    layout="total, prev, pager, next" :total="totalRows" @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange" />
             </div>
         </div>
     </div>
@@ -172,13 +175,30 @@ const orderTypeName = (value) => {
         return type ? type.label : '';
     }
 }
+const params: any = ref([
+    { page_no: 1, page_size: 10 }
+])
+const totalRows: any = ref(0);
+const handleSizeChange = (val: number) => {
+
+    console.log(`${val} items per page`)
+}
+const handleCurrentChange = (val: number) => {
+    params.page_no = val
+    getOrderList()
+    console.log(`current page: ${val}`)
+}
 onMounted(() => {
     getOrderList()
     getInforList()
 });
 /* 获取订单列表的值 */
 const getOrderList = async () => {
-    orderApi.orderList({ page_no: 1, page_size: 10, selectType: 'to_be_send' }).then((res: any) => {
+    orderApi.orderList({ page_no:params.page_no,page_size:params.page_size, selectType: 'to_be_send' }).then((res: any) => {
+        params.page_no = res.data.current
+        params.page_size = res.data.size
+        totalRows.value = res.data.total
+        console.log(res);
         rows.value = res.data.records; // 更新rows的值
     });
 };
@@ -196,9 +216,14 @@ const deliveryOrder = async (row) => {
         params: { id: row.value.id, send_type: row.value.order_vo.send_type }
     });
 }
-const goHome=()=>{
+const goHome = () => {
     router.replace({
         name: 'home'
     });
 }
 </script>
+<style>
+.bh-pagination {
+    display: none !important;
+}
+</style>

+ 5 - 5
src/views/apps/shippingPage.vue

@@ -1,12 +1,12 @@
 <template>
-    <div class="p-4 bg-white">
+    <div class="p-4 bg-white dark:bg-[#0e1726]">
         <el-button type="text" @click="goBack">返回</el-button>
         <!-- <h2 class="text-center my-4">发货管理</h2> -->
         <div class="text-center my-4">
             <Vue3Barcode v-if="barcodeValue" :value='barcodeValue' width="1" height='30'></Vue3Barcode>
             <!--  <p>RYKS_DDD-20240527-00201</p> -->
         </div>
-        <el-tabs v-model="activeTab">
+        <el-tabs v-model="activeTab" class="dark:bg-[#0e1726]">
             <el-tab-pane label="基本信息" name="basic-info">
                 <div class="p-4">
                     <span>预约类型:</span>
@@ -84,7 +84,7 @@
 
         </el-tabs>
         <el-dialog v-model="dialogVisible" :modal=false title="扫码出库" :close-on-click-modal="false" top="80px"
-            width="90%" style="height: 200px" :before-close="handleClose">
+            width="90%" style="height: 190px" :before-close="handleClose">
             <el-form :model="snCodeForm" label-width="auto" style="max-width: 600px">
                 <el-form-item label="SKU">
                     <el-input class="hidden-input" v-model="snCodeForm.bar_code" @keyup.enter="toSearch()" clearable
@@ -107,7 +107,7 @@
                 </div>
             </template> -->
         </el-dialog>
-        <div class="flex justify-center pt-2 pb-2 mt-4 w-full fixed bottom-0 bg-white left-0 z-50"
+        <div class="flex justify-center pt-2 pb-2 mt-4 w-full fixed bottom-0 bg-white left-0 z-50 dark:bg-[#0e1726]"
             v-if="send_type.value !== 'EXPRESS_DELIVERY'">
             <el-button type="primary" size="large" @click="scanCode">扫码出库</el-button>
             <el-button type="primary" size="large"
@@ -281,7 +281,7 @@ const toSearch = async () => {
                 snInputRef.value.focus();
             });
         } else {
-            if (shippingForm.value.order_item_vos[index.value].num >= shippingForm.value.order_item_vos[index.value].orderNum) return ElMessage.warning('录入完成,请录入下一条!')
+            if (shippingForm.value.order_item_vos[index.value].num >= shippingForm.value.order_item_vos[index.value].orderNum) return ElMessage.warning('出库数量不能大于订单数量!')
             shippingForm.value.order_item_vos[index.value].num += 1
             snCodeForm.bar_code = ''
             //dialogVisible.value = false;