Browse Source

修改bug

chenrui 4 months ago
parent
commit
013562a694

+ 16 - 0
node_modules/.package-lock.json

@@ -0,0 +1,16 @@
+{
+  "name": "qpls-md-app",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    }
+  }
+}

+ 19 - 1
package-lock.json

@@ -1,8 +1,26 @@
 {
   "name": "qpls-md-app",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "qpls-md-app",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "moment": "^2.29.1"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "engines": {
+        "node": "*"
+      }
+    }
+  },
   "dependencies": {
     "moment": {
       "version": "2.30.1",

+ 1 - 1
pages/common/printTag/printTag.vue

@@ -205,7 +205,7 @@
 <style lang="less">
 .printTag{
 	background-color: #fff;
-	width: 100vh;
+	width: 100%;
 	padding: 50rpx 30rpx;
 	.print-nums{
 		padding: 50rpx 30rpx 10rpx;

+ 2 - 2
pages/sales/listComponent.vue

@@ -6,7 +6,7 @@
 					<view class="list-item-tit flex align_center justify_between">
 						<view class="u-line" :style="{background: $config('primaryColor')}"></view>
 						<view class="buyer">{{item.buyerNameCurrent}}</view>
-						<view>{{item.billStatusDictValue}} <u-icon name="arrow-right" color="#969da3" size="28"></u-icon></view>
+						<view>{{item.billStatusDictValue}}<u-icon name="arrow-right" color="#969da3" size="28"></u-icon></view>
 					</view>
 					<view class="list-item-con">
 						<view class="list-item-line flex align_center justify_between">
@@ -250,7 +250,7 @@
 						}
 						>view{
 							&:last-child{
-								width: 160upx;
+								width: 165upx;
 								text-align: right;
 								color: #666;
 								font-size: 26upx;

+ 60 - 60
pages/statistics/index.vue

@@ -1,29 +1,29 @@
 <template>
 	<view class="content flex flex_column">
-		<div class="p-header" @click="openShlef">
+		<view class="p-header" @click="openShlef">
 			<text>{{curCustomerName||'全部客户'}}</text>
 			<u-icon name="arrow-right"></u-icon>
-		</div>
-		<div class="e-chart">
-			<div class="card-box" v-if="$hasPermissions('M_salesStatistics_mobile')">
-				<div class="card-tits">
+		</view>
+		<view class="e-chart">
+			<view class="card-box" v-if="$hasPermissions('M_salesStatistics_mobile')">
+				<view class="card-tits">
 					销售单
-				</div>
-				<div class="card-body">
-					<div class="data-box flex">
-						<div>
-							<div class="data-amount">
+				</view>
+				<view class="card-body">
+					<view class="data-box flex">
+						<view>
+							<view class="data-amount">
 								{{allData&&allData.salesTotalQty||0}}
-							</div>
-							<div class="data-label">销售产品数量(个)</div>
-						</div>
-						<div>
-							<div class="data-amount">
+							</view>
+							<view class="data-label">销售产品数量(个)</view>
+						</view>
+						<view>
+							<view class="data-amount">
 								<u-count-to :end-val="allData&&allData.salesTotalAmount||0" separator="," :decimals="2"></u-count-to>
-							</div>
-							<div class="data-label">销售金额(元)</div>
-						</div>
-					</div>
+							</view>
+							<view class="data-label">销售金额(元)</view>
+						</view>
+					</view>
 					<qiun-data-charts 
 					      type="line"
 						  :opts="opts"
@@ -31,27 +31,27 @@
 					      :chartData="chartData"
 						  @complete="complete"
 					    />
-				</div>
-			</div>
-			<div class="card-box" v-if="allData&&allData.xprhFlag&&$hasPermissions('M_shelfOrderTj_mobile')">
-				<div class="card-tits">
+				</view>
+			</view>
+			<view class="card-box" v-if="allData&&allData.xprhFlag&&$hasPermissions('M_shelfOrderTj_mobile')">
+				<view class="card-tits">
 					货架订单
-				</div>
-				<div class="card-body">
-					<div class="data-box flex">
-						<div>
-							<div class="data-amount">
+				</view>
+				<view class="card-body">
+					<view class="data-box flex">
+						<view>
+							<view class="data-amount">
 								{{allData&&allData.orderTotalQty||0}}
-							</div>
-							<div class="data-label">取货产品数量(个)</div>
-						</div>
-						<div>
-							<div class="data-amount">
+							</view>
+							<view class="data-label">取货产品数量(个)</view>
+						</view>
+						<view>
+							<view class="data-amount">
 								<u-count-to :end-val="allData&&allData.orderTotalAmount||0" separator="," :decimals="2"></u-count-to>
-							</div>
-							<div class="data-label">取货产品金额(元)</div>
-						</div>
-					</div>
+							</view>
+							<view class="data-label">取货产品金额(元)</view>
+						</view>
+					</view>
 					<qiun-data-charts 
 					      type="line"
 						  :opts="opts1"
@@ -59,27 +59,27 @@
 					      :chartData="chartData1"
 						  @complete="complete"
 					    />
-				</div>
-			</div>
-			<div class="card-box" v-if="allData&&allData.xprhFlag&&$hasPermissions('M_tempOrderTj_mobile')">
-				<div class="card-tits">
+				</view>
+			</view>
+			<view class="card-box" v-if="allData&&allData.xprhFlag&&$hasPermissions('M_tempOrderTj_mobile')">
+				<view class="card-tits">
 					急送订单
-				</div>
-				<div class="card-body">
-					<div class="data-box flex">
-						<div>
-							<div class="data-amount">
+				</view>
+				<view class="card-body">
+					<view class="data-box flex">
+						<view>
+							<view class="data-amount">
 								{{allData&&allData.tempTotalQty||0}}
-							</div>
-							<div class="data-label">急送产品数量(个)</div>
-						</div>
-						<div>
-							<div class="data-amount">
+							</view>
+							<view class="data-label">急送产品数量(个)</view>
+						</view>
+						<view>
+							<view class="data-amount">
 								<u-count-to :end-val="allData&&allData.tempTotalAmount||0" separator="," :decimals="2"></u-count-to>
-							</div>
-							<div class="data-label">急送产品金额(元)</div>
-						</div>
-					</div>
+							</view>
+							<view class="data-label">急送产品金额(元)</view>
+						</view>
+					</view>
 					<qiun-data-charts 
 					      type="line"
 						  :opts="opts2"
@@ -87,9 +87,9 @@
 					      :chartData="chartData2"
 						  @complete="complete"
 					    />
-				</div>
-			</div>
-		</div>
+				</view>
+			</view>
+		</view>
 		<!-- 筛选项 -->
 		<u-popup v-model="showSearch" mode="right" width="70%">
 			<view class="tabBox">
@@ -368,7 +368,7 @@
 			margin-bottom: 20rpx;
 			border-radius: 16rpx;
 			overflow: hidden;
-			> div{
+			> view{
 				padding: 20rpx;
 				&:first-child{
 					padding-bottom: 0;
@@ -379,7 +379,7 @@
 			}
 			.data-box{
 				padding-bottom: 20rpx;
-				> div{
+				> view{
 					width: 50%;
 					text-align: center;
 					border-right: 1rpx solid #eee;

+ 1 - 1
pages/stock/index.vue

@@ -214,7 +214,7 @@
 			padding: 20upx 20upx;
 			border-radius: 20upx;
 			box-shadow: 0 0 6upx #eee;
-			margin-bottom: 20upx;
+			margin: 20upx 0;
 			.item-box{
 				text-align: center;
 				display: flex;