调整下单流程和新建报表模板页面

subpackage/applyCard/choice-product.vue

@@ -53,7 +53,7 @@ const savaHandle = (val) => {
       setItem("productId", val.id);
       setItem("isValueCard", val.isValueCard);
       uni.redirectTo({
-        url: `/subpackage/applyCard/essential-information?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+        url: `/subpackage/applyCard/essential-information?productId=${val.id}&userType=${state.userType}&type=${state.type}`,
       });
 
     // if (state.userType === 1) {

subpackage/applyCard/essential-information.vue

@@ -147,6 +147,7 @@ import {
   etcCreatOrder,
   etcVehiclePlateVer,
   searchOrder,
+  productReCode,
 } from "@/utils/network/api.js";
 import { request } from "@/utils/network/request.js";
 import { reactive, ref } from "vue";
@@ -168,9 +169,10 @@ const state = reactive({
     region: "",
     address: "",
     postalCode: "",
+	productId:"",
   },
   show: false,
-  addressArray: [],
+  addressArray: [],  
 });
 
 /* 选择车牌颜色 */
@@ -243,6 +245,22 @@ const nextAction = () => {
         orderGoAction();
       } else {
         const data = stringToJson(res.bizContent);
+		console.log(data);
+		
+		//提交产品信息
+		productReCodeAction(data.orderId).then((result)=>{
+			console.log(result);
+			if (state.data.userType === 1) {
+			  uni.navigateTo({
+			    url: `/subpackage/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+			  });
+			} else {
+			  uni.navigateTo({
+			    url: `/subpackage/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+			  });
+			}
+			
+		})
         // uni.navigateTo({
         // 	url: `/subpackage/applyCard/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
         // })
@@ -250,15 +268,7 @@ const nextAction = () => {
         //   url: `/subpackage/applyCard/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
         // });
 
-        if (state.data.userType === 1) {
-          uni.navigateTo({
-            url: `/subpackage/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
-          });
-        } else {
-          uni.navigateTo({
-            url: `/subpackage/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
-          });
-        }
+        
       }
     });
   });
@@ -287,7 +297,7 @@ const orderStepGoActon = (val: any) => {
   console.log(val);
   //完成填写基本信息
   if (val.orderStep === 1) {
-    if (state.data.userType === "1") {
+    if (state.data.userType === 1) {
       uni.redirectTo({
         url: `/subpackage/applyCard/opening-account-people?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
       });
@@ -314,6 +324,7 @@ onLoad((option: any) => {
   state.data.opId = getItem(StorageKeys.OpenId);
   state.data.type = option.type; //客车
   state.data.userType = option.userType;
+  state.data.productId = option.productId;
 });
 
 //监听页面滚动
@@ -341,6 +352,27 @@ onShow(() => {
     });
   }
 });
+
+const productReCodeAction = (orderId) => {
+  var data = {
+    productId: state.data.productId,
+    orderId: orderId,
+  };
+  const options = {
+    type: 2,
+    data: data,
+    method: "POST",
+    showLoading: true,
+  };
+
+  return new Promise(async (resolve, reject) => {
+    const res = await request(productReCode, options);
+    const data = stringToJson(res.bizContent);
+    resolve(data);
+  }).catch((error) => {
+    reject(error);
+  });
+};
 </script>
 
 <style lang="scss" scoped>

subpackage/personal-center/excel.vue

@@ -1,22 +1,91 @@
 <template>
-	<view>
-		
+	<view class="wrapper">
+		<view class="tabel">
+			<view class="tr">
+				<view class="th">仓库名称</view>
+				<view class="th">设备类型</view>
+				<view class="th">库存数量</view>
+				<view class="th">剩余可用数量</view>
+			</view>
+			<view class="tr">
+				<view class="td">黔通智联仓库1</view>
+				<view class="td">2X储值卡</view>
+				<view class="td">10000</view>
+				<view class="td">100001</view>
+			</view>
+			<view class="tr">
+				<view class="td">黔通智联仓库2</view>
+				<view class="td">2X储值卡</view>
+				<view class="td">10000</view>
+				<view class="td">100001</view>
+			</view>
+			<view class="tr">
+				<view class="td">黔通智联仓库3</view>
+				<view class="td">2X储值卡</view>
+				<view class="td">100022</view>
+				<view class="td">10000</view>
+			</view>
+			<view class="tr">
+				<view class="td">黔通智联仓库4</view>
+				<view class="td">2X储值卡</view>
+				<view class="td">188000</view>
+				<view class="td">100001</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
+
 </script>
 
 <style>
-
+	page {
+		background: #eef7f7;
+	}
 </style>
+<style scoped>
+	.wrapper {
+		padding: 30rpx;
+	}
+
+	.tabel {
+		display: table;
+		border-collapse: collapse;
+		overflow-x: auto;
+		word-break: keep-all;
+		white-space: nowrap;
+		background-color: #FFFFFF;
+		font-size: 28rpx;
+		width: 100%;
+	}
+
+	.tabel .tr {
+		display: table-row;
+	}
+
+	.tabel .tr .th {
+		display: table-cell;
+		height: 72rpx;
+		line-height: 72rpx;
+		text-align: center;
+		border: 1rpx solid #DDDDDD;
+		border-right: none;
+		border-bottom: none;
+		background-color: #00B38B;
+		color: #FFFFFF;
+		font-weight: bold;
+		box-sizing: border-box;
+	}
+
+	.tabel .tr .td {
+		padding: 0rpx 10rpx;
+		display: table-cell;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		border: 1rpx solid #DDDDDD;
+		border-right: none;
+		box-sizing: border-box;
+	}
+</style>