Merge branch 'main' of https://www.sanduolantoyoga.com/xiezuo001/palletApp

pages/index/index.vue

@@ -57,7 +57,7 @@
 					{
 						name:"配送接收",
 						src:"../../static/image/ps.png",
-						key:"js",
+						key:"ps",
 						remark:"扫码配送单二维码接收",
 						url:"/pages/pallet/ps",
 						opentype:"1",

pages/pallet/yz.vue

@@ -95,11 +95,11 @@
 					<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.loadQty" type="number" maxlength="200"></u-input>
 				</u-form-item>
 				 
-				<u-form-item label="装盘描述" label-width="140rpx" label-position="left" prop="assemcode">
+				<u-form-item label="装盘描述" label-width="140rpx" label-position="left" prop="loadDesc">
-					<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.assemcode" type="textarea" maxlength="200"></u-input>
+					<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.loadDesc" type="textarea" maxlength="200"></u-input>
 				</u-form-item>
-				<u-form-item label="备注" label-width="140rpx" label-position="left" prop="loadDesc">
+				<u-form-item label="备注" label-width="140rpx" label-position="left" prop="fromRemark">
-					<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.loadDesc" type="textarea" maxlength="500"></u-input>
+					<u-input :border="true" :height="60" placeholder="请输入" input-align="left" v-model="itemList.fromRemark" type="textarea" maxlength="500"></u-input>
 				</u-form-item>
 			</view>
         </u-form>
@@ -269,7 +269,8 @@ export default {
 				loadInst:"", // 托盘表号
 				loadQty:"", // 装盘数量
 				assemcode:"", // 部件代号
-				loadDesc:""
+				loadDesc:"",
+        fromRemark:"",
 			},
 			address:[],
 			users:[],