Merge branch 'master' of http://192.168.30.2:3000/bonus/bonus-material-app

src/pages.json

@@ -52,18 +52,23 @@
             }
         },
         {
-        	"path" : "pages/new-purchase/accept/acceptDetails",
+            "path": "pages/new-purchase/accept/acceptDetails",
-        	"style" : 
+            "style": {
-        	{
+                "navigationBarTitleText": "新购验收"
-        		"navigationBarTitleText" : "新购验收"
+            }
-        	}
         },
         {
-        	"path" : "pages/new-purchase/accept/conclusion",
+            "path": "pages/new-purchase/accept/conclusion",
-        	"style" : 
+            "style": {
-        	{
+                "navigationBarTitleText": "新购验收结论"
-        		"navigationBarTitleText" : "新购验收结论"
+            }
-        	}
+        },
+        /* 领料及其页面 */
+        {
+            "path": "pages/picking/outbound/index",
+            "style": {
+                "navigationBarTitleText": "领料出库"
+            }
         }
     ],
     "tabBar": {

src/pages/new-purchase/accept/index.vue

@@ -31,8 +31,13 @@
                 <view class="search" @click="getTableList()">搜索</view>
             </uni-col>
         </uni-row>
-	
+
-        <div class="table-list-item" v-for="(item, index) in tableList" :key="index" @click="handleItem(item)">
+        <div
+            class="table-list-item"
+            v-for="(item, index) in tableList"
+            :key="index"
+            @click="handleItem(item)"
+        >
             <div class="title">
                 <span style="font-size: 15px; font-weight: 800">新购验收</span>
                 <span :style="{ color: active == 1 ? '#3784fb' : '#ff4d4f' }">{{active == 1 ? '已完成' : '未完成'}}</span>
@@ -40,35 +45,43 @@
             <div class="line"></div>
             <uni-row :gutter="24">
                 <uni-col :span="6">到货时间：</uni-col>
-                <uni-col :span="18"><div class="cont">{{ item.arrivalTime }}</div></uni-col>
+                <uni-col :span="18"
+                    ><div class="cont">{{ item.arrivalTime }}</div></uni-col
+                >
             </uni-row>
             <uni-row :gutter="24">
                 <uni-col :span="6">采购单号：</uni-col>
-                <uni-col :span="18"><div class="cont">{{ item.code }}</div></uni-col>
+                <uni-col :span="18"
+                    ><div class="cont">{{ item.code }}</div></uni-col
+                >
             </uni-row>
             <uni-row :gutter="24">
                 <uni-col :span="6">采购物资：</uni-col>
-                <uni-col :span="18"><div class="cont">{{ item.purchaseMaTypeName }}</div></uni-col>
+                <uni-col :span="18"
+                    ><div class="cont">{{ item.purchaseMaTypeName }}</div></uni-col
+                >
             </uni-row>
             <uni-row :gutter="24">
                 <uni-col :span="6">到货数量：</uni-col>
-                <uni-col :span="18"><div class="cont">{{ item.purchaseMaNumber }}</div></uni-col>
+                <uni-col :span="18"
+                    ><div class="cont">{{ item.purchaseMaNumber }}</div></uni-col
+                >
             </uni-row>
             <uni-row :gutter="24">
                 <uni-col :span="6">验收数量：</uni-col>
-                <uni-col :span="18"><div class="cont"> </div></uni-col>
+                <uni-col :span="18"><div class="cont"></div></uni-col>
             </uni-row>
         </div>
     </view>
 </template>
 
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive } from 'vue'
-import { getPurchaseList } from '../../../services/purchase.js';
+import { getPurchaseList } from '../../../services/purchase.js'
 import { onLoad } from '@dcloudio/uni-app'
 const active = ref(1)
 const tableList = ref([])
-const statusList = ref(["3","13","4","14","19"])
+const statusList = ref(['3', '13', '4', '14', '19'])
 
 const getTableList = () => { 
 	let obj = {
@@ -87,22 +100,21 @@ const getTableList = () => {
 
 const changeTab = (index) => {
     active.value = index
-	if(index==1){
+    if (index == 1) {
-		statusList.value=["3","13","4","14","19"]
+        statusList.value = ['3', '13', '4', '14', '19']
-		getTableList()
+        getTableList()
-	}else if(index==2){
+    } else if (index == 2) {
-		statusList.value=["2","12"]
+        statusList.value = ['2', '12']
-		getTableList()
+        getTableList()
-	}
+    }
-		
 }
 const maskClick = () => {}
 const handleItem = (item) => {
     console.log('🚀 ~ handleItem ~ item:', item)
     uni.navigateTo({ url: `/pages/new-purchase/accept/acceptDetails?id=${item.id}&taskId=${item.taskId}` })
 }
-onLoad((options)=>{
+onLoad((options) => {
-	getTableList()
+    getTableList()
 })
 </script>
 

src/pages/picking/outbound/index.vue

@@ -0,0 +1,23 @@
+<template>
+    <!-- 领料出库 -->
+    <view class="page-common"> </view>
+    <uni-row :gutter="24" class="search-form">
+        <uni-col :span="10">
+            <view>
+                <uni-datetime-picker type="date" placeholder="请选择日期" :clear-icon="false" />
+            </view>
+        </uni-col>
+        <uni-col :span="10">
+            <view>
+                <uni-easyinput placeholder="请输入项目名称" />
+            </view>
+        </uni-col>
+        <uni-col :span="4">
+            <view class="search" @click="getTableList()">搜索</view>
+        </uni-col>
+    </uni-row>
+</template>
+
+<script setup></script>
+
+<style></style>

src/pages/work/index.vue

@@ -1,24 +1,64 @@
 <template>
     <view class="content">
         <view class="new-purchase">
-            <text
+            <view
-                v-for="(item, index) in newPurchaseList"
+                class="purchase-item"
                 :key="index"
                 @tap="onNavigateTo(item.url)"
+                v-for="(item, index) in newPurchaseList"
             >
-                {{ item.title }}
+                <image :src="item.iconSrc" mode="scaleToFill" />
-            </text>
+                <text>
+                    {{ item.title }}
+                </text>
+            </view>
+        </view>
+
+        <view class="new-purchase">
+            <view
+                class="purchase-item"
+                :key="index"
+                @tap="onNavigateTo(item.url)"
+                v-for="(item, index) in pickingList"
+            >
+                <image :src="item.iconSrc" mode="scaleToFill" />
+                <text>
+                    {{ item.title }}
+                </text>
+            </view>
         </view>
     </view>
 </template>
 
 <script setup>
 import { ref } from 'vue'
+// 新购
 const newPurchaseList = ref([
-    { title: '新购验收', url: '/pages/new-purchase/accept/index' },
+    {
+        title: '新购验收',
+        url: '/pages/new-purchase/accept/index',
+        iconSrc: '../../static/workbench/newInStore.png',
+    },
     // { title: '新购到货', url: '/pages/new-purchase/bind/index' },
-    { title: '新购绑定', url: '/pages/new-purchase/bind/index' },
+    {
-    { title: '新购入库', url: '/pages/new-purchase/entry/index' },
+        title: '新购绑定',
+        url: '/pages/new-purchase/bind/index',
+        iconSrc: '../../static/workbench/newInStore.png',
+    },
+    {
+        title: '新购入库',
+        url: '/pages/new-purchase/entry/index',
+        iconSrc: '../../static/workbench/newInStore.png',
+    },
+])
+
+// 领料
+const pickingList = ref([
+    {
+        title: '领料出库',
+        url: '/pages/picking/outbound/index',
+        iconSrc: '../../static/workbench/fetchMaterialOutStore.png',
+    },
 ])
 
 const onNavigateTo = (url) => {
@@ -27,15 +67,25 @@ const onNavigateTo = (url) => {
 </script>
 
 <style lang="scss">
+page {
+    overflow: hidden;
+}
 .new-purchase {
     display: flex;
+    margin: 15rpx 0;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+    .purchase-item {
+        margin: 12rpx;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        font-size: 28rpx;
 
-    text {
+        image {
-        margin: 10rpx 20rpx;
+            width: 70rpx;
-        padding: 10rpx;
+            height: 70rpx;
-        font-size: 30rpx;
+            margin-bottom: 15rpx;
-        background-color: #3381fb;
+        }
-        color: #fff;
     }
 }
 </style>

src/styles/reset.css

@@ -1,35 +1,70 @@
 /* 基础设置 */
-body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{
+body,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+hr,
+p,
+blockquote,
+dl,
+dt,
+dd,
+ul,
+ol,
+li,
+pre,
+form,
+fieldset,
+legend,
+button,
+input,
+textarea,
+th,
+td {
     margin: 0;
     padding: 0;
 }
 
-ul,ol {
+ul,
+ol {
     list-style: none;
 }
 
 img {
     /* 底部留白 */
     display: block;
-	border:0;
+    border: 0;
 }
 
-b,strong {
+b,
+strong {
     font-weight: 400;
 }
 
-h1,h2,h3,h4,h5,h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
     /* 父元素字号的百分比 */
     font-size: 100%;
     font-weight: normal;
 }
 
-i,em {
+i,
+em {
     /* 不倾斜 */
     font-style: normal;
 }
 
-u,ins,s,del {
+u,
+ins,
+s,
+del {
     /* 去掉中划线和下划线 */
     text-decoration: none;
 }
@@ -42,19 +77,21 @@ table {
     border-collapse: collapse;
 }
 
-td,th {
+td,
+th {
     border: 1px solid #999;
 }
 
-input,button {
+input,
+button {
     /* 去掉轮廓线 */
     outline: none;
-    border:none;
+    border: none;
 }
 
 /* 风格设置 */
 body {
-    font: 12px/1.5 "Microsoft YaHei", Tahoma, Helvetica, Arial, "\5b8b\4f53", sans-serif;
+    font: 12px/1.5 'Microsoft YaHei', Tahoma, Helvetica, Arial, '\5b8b\4f53', sans-serif;
     color: #333;
 }
 
@@ -64,7 +101,7 @@ a {
 }
 
 a:hover {
-    color:#DD302D;
+    color: #dd302d;
     text-decoration: none;
 }
 
@@ -77,7 +114,12 @@ a:hover {
 }
 
 .clearfix::after {
-    content: "";
+    content: '';
     display: block;
     clear: both;
 }
+
+page {
+    height: 100%;
+    font-size: 16px;
+}

src/utils/http.js

@@ -33,7 +33,6 @@ const httpInterceptor = {
         const memberStore = useMemberStore()
         const token = memberStore.token
 
-        console.log('token---', token)
         // const token = "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjQ2NDdmYjlkLWI5OTItNDRiNy05MTdkLTMwZjg0ZjUxYzM5MCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.9xM5bFhrmHK09-4ZgL5SS8WraNIJjIijuB-1P0lJF-n0KlVM5Bglvyjltk1NQbdqgi1hwRocZS1OU41cLiwuig"
         if (token) {
             options.header.Authorization = token