条件增加

pages/home/home.vue

@@ -146,17 +146,17 @@
 	margin 2.5px 0
 	_bis(,'../../static/images/state-item_bg.png', 100%, 100%,center)
 .welcome_text_wraper
-	height 70px
+	height 40px
 	margin 0 50px
 .welcome_text
-	_font(26px, 70px,  #F6F9FE,,)
+	_font(26px, 40px,  #F6F9FE,,)
 	padding-left 20px
 	font-family: YouSheBiaoTiHei
 	background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%);
 	-webkit-background-clip: text;
 	-webkit-text-fill-color: transparent;
 .zd_wrapper
-	_wh(calc(100% - 100px),calc(100% - 180px)) /** 120rpx + 200rpx + 130rpx */
+	_wh(calc(100% - 100px),calc(100% - 116px)) /** 120rpx + 200rpx + 130rpx */
 	margin 0px 50px 0 50px 
 	_bis(,'../../static/images/bg-task-r2.png', 100%, 100%,center)
 .menu-wrap

pages/management/in-storage_new.vue

@@ -15,8 +15,8 @@
 				<view class="zd-col-11 zd-row jcflexend">
 					<button class="confirm-button" @tap="toSearch">查询</button>
 					<button class="confirm-button" :disabled="disabled1" @tap="_easOutInBillSync">同步</button>
-					<button v-if="id !== 'CGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(2, '', '')">库位分配</button>
-					<button v-if="id !== 'CGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="inWarehouseSure">库存提交</button>
+					<button v-if="id !== 'CGRKD' && id !== 'EASCGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(2, '', '')">库位分配</button>
+					<button v-if="id !== 'CGRKD' && id !== 'EASCGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="inWarehouseSure">库存提交</button>
 					<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillUpdate">单据审核</button>
 				</view>
 			</view>

utils/mork2.js

@@ -22,6 +22,12 @@ export const getBillsCount = (area) => {
             "name": "采购退货出库",
             "counts": "7"
         },
+		{
+		    "djlx": "CGTLD",
+		    "ywlx": "OUT",
+		    "name": "采购退料",
+		    "counts": "7"
+		},
         {
             "djlx": "DBCKD",
             "ywlx": "OUT",
@@ -52,6 +58,18 @@ export const getBillsCount = (area) => {
             "name": "生产退料入库",
             "counts": "14"
         },
+		{
+		    "djlx": "EASCGRKD",
+		    "ywlx": "IN",
+		    "name": "EAS采购入库",
+		    "counts": "14"
+		},
+		{
+		    "djlx": "CGSHD",
+		    "ywlx": "IN",
+		    "name": "采购收货",
+		    "counts": "14"
+		},
         {
             "djlx": "DBRKD",
             "ywlx": "IN",