生产计划和包材计划联调

pages.json

@@ -532,7 +532,7 @@
 						"titleColor": "#333",
 						"titleSize": "17px",
 						"backgroundColor": "transparent",
-						"titleText": "采购计划",
+						"titleText": "销售计划",
 						"autoBackButton": true
 					}
 				}
@@ -548,7 +548,7 @@
 						"titleColor": "#333",
 						"titleSize": "17px",
 						"backgroundColor": "#fff",
-						"titleText": "生产下单",
+						"titleText": "生产计划",
 						"autoBackButton": true,
 						"buttons": [{
 							"type": "none",
@@ -626,7 +626,7 @@
 						"titleColor": "#333",
 						"titleSize": "17px",
 						"backgroundColor": "#fff",
-						"titleText": "生产备料",
+						"titleText": "包材计划",
 						"autoBackButton": true,
 						"buttons": [{
 							"type": "none",
@@ -677,7 +677,7 @@
 						"titleColor": "#333",
 						"titleSize": "17px",
 						"backgroundColor": "#fff",
-						"titleText": "我的订单",
+						"titleText": "销售订单",
 						"autoBackButton": true
 					}
 				}

pages/account-inquiry/account-inquiry.nvue

@@ -12,10 +12,10 @@
 							<view class="cell-list">
 								<view class="middle view planout-block-item">
 									<view class="item-block item-block-code">
-										<text class="item-block-label">开票方编号：{{item.BILLTO_BP}}</text>
+										<text class="item-block-label">开票方编号：{{item.billto_bp}}</text>
 									</view>
 									<view class="item-block item-block-name">
-										<text class="item-block-label item-block__label">{{item.BILLTO_NAME}}</text>
+										<text class="item-block-label item-block__label">{{item.billto_name}}</text>
 									</view>
 									<view class="item-block item-block-date">
 										<text class="detal-item-label">开票方名称</text>
@@ -24,15 +24,15 @@
 									<view class="block-detal block-detal-last">
 										<view class="block-detal-item">
 											<text class="detal-item-label">贷款</text>
-											<text class="detal-item-value">{{item.GOODS_AMOUNT}}</text>
+											<text class="detal-item-value">{{item.goods_amount}}</text>
 										</view>
 										<view class="block-detal-item">
 											<text class="detal-item-label">随量保证金</text>
-											<text class="detal-item-value">{{item.FORWARD_AMOUNT}}</text>
+											<text class="detal-item-value">{{item.forward_amount}}</text>
 										</view>
 										<view class="block-detal-item block-detal-item-last">
 											<text class="detal-item-label">经销商保证金</text>
-											<text class="detal-item-value">{{item.DEALING_AMOUNT}}</text>
+											<text class="detal-item-value">{{item.dealing_amount}}</text>
 										</view>
 									</view>
 
@@ -114,7 +114,7 @@
 				}
 				const res = await apiAccountInquiry(params)
 
-				this.lists = res.DATA
+				this.lists = res.data
 			}
 		}
 	}

pages/marketsupportfee-select/marketsupportfee-select.nvue

@@ -41,35 +41,35 @@
 					<text class="btn-text">查询</text>
 				</button>
 			</view>
-
-			<view class="planout-block-lists" :style="scrollHeight">
-				<list class="lists-wrapper" scrollable loadmoreoffset='1' show-scrollbar='false'>
+			<scroll-view :style='scrollHeight' class="scroll-area" scroll-y="true" lower-threshold='150'
+				@scrolltolower='scrolltolower'>
+				<list class="scroll-area view"  loadmoreoffset='100' show-scrollbar='false' @loadmore="scrolltolower">
 					<cell class="list-cell" v-for="(item,index) in lists" :key='index'>
 						<!-- <scroll-view class="scroll-area" :style='scrollHeight' scroll-y="true" lower-threshold='150'
 				@scrolltolower='scrolltolower'> -->
 						<view class="middle view planout-block-item">
 							<view class="text-block">
 								<text class="middle-date middle-date-select">客户编码</text>
-								<text class="middle-date-des middle-date-des-select">{{item.CUSTOMER}}</text>
+								<text class="middle-date-des middle-date-des-select">{{item.customer}}</text>
 							</view>
 							<view class="text-block">
 								<text class="middle-date middle-date-select">客户名称</text>
-								<text class="middle-date-des middle-date-des-select">{{item.CUSTOMER_NAME}}</text>
+								<text class="middle-date-des middle-date-des-select">{{item.customer_name}}</text>
 							</view>
 							<view class="text-block">
 								<text class="middle-date middle-date-select">上账日期</text>
-								<text class="middle-date-des middle-date-des-select">{{item.POSTING_DATE}}</text>
+								<text class="middle-date-des middle-date-des-select">{{item.posting_date}}</text>
 							</view>
 							<view class="text-block text-block-last">
 								<text class="middle-date middle-date-select">金额</text>
-								<text class="middle-date-des middle-date-des-select">{{item.GOODS_AMOUNT}}</text>
+								<text class="middle-date-des middle-date-des-select">{{item.goods_amount}}</text>
 							</view>
 						</view>
 						<view class="empty-block"></view>
 						<!-- </scroll-view> -->
 					</cell>
 				</list>
-			</view>
+			</scroll-view>
 
 		</view>
 	</view>
@@ -89,6 +89,8 @@
 	export default {
 		data() {
 			return {
+				loadingText: '加载中...',
+				refreshing: false,
 				isOpened: 'none',
 				condition: {
 					start: '',
@@ -121,7 +123,7 @@
 			},
 			scrollHeight() {
 				return {
-					'height': `${this.sysinfo.safeArea.height - 237- 44 - 20}px`
+					'height': `${this.sysinfo.safeArea.height - 265 - 44}px`
 				}
 			}
 		},
@@ -170,7 +172,7 @@
 				}
 				const res = await apiGetMarketSupportFee(params)
 
-				this.lists = res.DATA.concat(res.DATA).concat(res.DATA)
+				this.lists = res.data
 			},
 			reset() {
 				this.loadParams = {
@@ -183,6 +185,16 @@
 				this.lists = []
 				this.loadingText = '加载中'
 			},
+			scrolltolower() {
+				console.log('onReachBottom');
+				if (this.page.PAGE < this.loadParams.totalPage) {
+					this.page.PAGE++
+					this.getMarketSupportFee()
+				} else {
+					this.loadParams.isDone = true
+					this.loadingText = '-- 到底了 --'
+				}
+			},
 			search() {
 				this.reset()
 				this.getMarketSupportFee(true)
@@ -210,15 +222,15 @@
 	}
 
 	.header-bg-img {
-		position: relative;
 		width: 750rpx;
 	}
 
 	.lists {
 		position: relative;
 		flex-direction: column;
+		overflow-y: scroll;
 		background: #f0f4f5;
-		// height: 100vh;
+		overflow-x: hidden;
 	}
 
 	.main {
@@ -323,7 +335,7 @@
 	.planout-block {
 		display: flex;
 		justify-content: space-between;
-		height: 84rpx;
+		height: 92rpx;
 		margin-top: 64rpx;
 		margin-bottom: 48rpx;
 		padding: 0 24rpx;
@@ -331,8 +343,6 @@
 
 	.planout-block-item {
 		flex: 1;
-		// width: 750rpx;
-		// margin-bottom: 26rpx;
 	}
 
 	.btn {
@@ -351,4 +361,7 @@
 		height: 26rpx;
 		background: #f0f4f5;
 	}
+	.scroll-area {
+		overflow-y: scroll;
+	}
 </style>

pages/my-purchase/order-item.nvue

@@ -21,7 +21,7 @@
 					<text class="middle-date">{{newsItem.createdDate}}</text>
 					<text class="middle-date-des">申请时间</text>
 				</view>
-				<view class="text-block text-block-last">
+				<view class="text-block text-block-last" v-if="newsItem.significanceTextView">
 					<view class="middle-date-right">
 						<text class="dot"></text>
 						<text class="middle-date">{{newsItem.significanceTextView}}</text>
@@ -73,7 +73,7 @@
 				</uni-cell>
 			</view>
 
-			<view class="receive-info" ref='receiveInfo' :style=""
+			<view class="receive-info" ref='receiveInfo' :style="receiveInfoHeightComputed"
 				:class="{'receive-info-auto':ishowReceiveDetail}">
 				<view class="block-detal-item">
 					<text class="detal-item-label detal-item-title">收货信息</text>
@@ -155,8 +155,13 @@
 		// },
 		computed: {
 			receiveInfoHeightComputed() {
-				return {
-					"height": `${this.receiveInfoHeight}px`
+				console.log(this.receiveInfoHeight - 0,'[][]')
+				if(this.receiveInfoHeight - 0 === 0){
+					return { "minHeight": "300px" }
+				}else{
+					return {
+						"height": `${this.receiveInfoHeight}px`
+					}
 				}
 			}
 		},
@@ -184,7 +189,7 @@
 			handleShowReceiveDetail() {
 				this.ishowReceiveDetail = !this.ishowReceiveDetail
 				if (this.ishowReceiveDetail === true) {
-					this.receiveInfoHeight = '480'
+					this.receiveInfoHeight = '0'
 				} else {
 					this.receiveInfoHeight = '132'
 				}
@@ -422,7 +427,7 @@
 	.float-btn-block {
 		position: absolute;
 		left: 0;
-		bottom: 0;
+		bottom: -2rpx;
 		z-index: 10;
 		width: 620rpx;
 		height: 120rpx;
@@ -448,4 +453,4 @@
 	.cell-list {
 		flex-direction: column;
 	}
-</style>
+</style>

pages/my-purchase/order-page.nvue

@@ -20,7 +20,7 @@
 				</view>
 			</uni-cell>
 		</uni-list>
-		<!-- <no-data class="no-data" v-if="isNoData" @retry="loadMore"></no-data> -->
+		<no-data class="no-data" v-if="isNoData" @retry="loadMore"></no-data>
 	</view>
 </template>
 
@@ -119,6 +119,7 @@
 				}else{
 					this.isNoData = true;
 				}
+				this.isNoData = (res.data.Rows.length <= 0);
 				if (refresh) {
 					this.dataList = res.data.Rows;
 					this.requestParams.minId = 0;
@@ -131,7 +132,12 @@
 				}
 			},
 			loadMore(e) {
-				this.loadData();
+				if (this.page.page < this.loadParams.totalPage) {
+					this.page.page++
+					this.loadData();
+				} else {
+					this.loadingText = '--已到底--'
+				}
 			},
 			clear() {
 				this.dataList.length = 0;

pages/produce-material/order-list.nvue

@@ -4,15 +4,15 @@
 			<view class="cell-list">
 				<view class="middle view planout-block-item">
 					<view class="item-block item-block-code">
-						<text class="item-block-label">单号：{{itemHead.PACKPL_ID}}</text>
+						<text class="item-block-label">单号：{{itemHead.packpl_id}}</text>
 						<button class="item-block-btn" type="default"><text
-								class="item-block-btn__text">{{itemHead.STATUS}}</text></button>
+								class="item-block-btn__text">{{itemHead.status}}</text></button>
 					</view>
 					<view class="item-block item-block-name">
-						<text class="item-block-label item-block__label">{{itemHead.PACKTYPE}}</text>
+						<text class="item-block-label item-block__label">{{itemHead.packtype}}</text>
 					</view>
 					<view class="item-block">
-						<text class="item-block-label-des">{{itemHead.DATUM}}</text>
+						<text class="item-block-label-des">{{itemHead.datum}}</text>
 					</view>
 					<view class="item-block item-block-date">
 						<text class="detal-item-label">下单日期</text>
@@ -22,24 +22,28 @@
 						v-for="(item,index) in itemLists" :key="index">
 						<view class="block-detal-item">
 							<text class="detal-item-label">产品</text>
-							<text class="detal-item-value">{{item.DESCRIPTION}}</text>
+							<text class="detal-item-value">{{item.description}}</text>
 						</view>
 						<view class="block-detal-item">
 							<text class="detal-item-label">件数</text>
-							<text class="detal-item-value">{{item.PLANQTY_BOX}}</text>
+							<text class="detal-item-value">{{item.planqty_box}}</text>
 						</view>
-						<view class="block-detal-item block-detal-item-last">
+						<view class="block-detal-item">
 							<text class="detal-item-label">吨数</text>
-							<text class="detal-item-value">{{item.PLANQTY_TON}}</text>
+							<text class="detal-item-value">{{item.planqty_ton}}</text>
+						</view>
+						<view class="block-detal-item block-detal-item-last">
+							<text class="detal-item-label">备注</text>
+							<text class="detal-item-value">{{item.remark}}</text>
 						</view>
 					</view>
 
-					<view class="item-block">
-						<text class="item-block-label-des">{{itemHead.REMARK}}</text>
+					<!-- <view class="item-block">
+						<text class="item-block-label-des">{{itemHead.remark}}</text>
 					</view>
 					<view class="item-block item-block-date">
 						<text class="detal-item-label">备注</text>
-					</view>
+					</view> -->
 
 				</view>
 			</view>
@@ -77,10 +81,10 @@
 				}
 			},
 			itemHead() {
-				return this.newsItem.HEAD || {}
+				return this.newsItem.head || {}
 			},
 			itemLists() {
-				return this.newsItem.ITEM || []
+				return this.newsItem.item || []
 			},
 			...mapState(['sysinfo'])
 		},

pages/produce-material/produce-material.nvue

@@ -41,7 +41,7 @@
 				</view>
 			</uni-cell>
 		</uni-list>
-		<no-data class="no-data" v-if="isNoData" @retry="loadMore"></no-data>
+		<no-data v-if="isNoData" @retry="loadMore"></no-data>
 	</view>
 </template>
 
@@ -170,14 +170,14 @@
 				apiGetProduceMaterialOrder(params).then((res) => {
 					console.log('loadData', res)
 					const {
-						DATA,
-						PAGE,
-						TOTAL
+						data,
+						page,
+						total
 					} = res
-					const data_list = DATA;
-					this.page.PAGE = PAGE
-					this.loadParams.total = TOTAL
-					this.loadParams.totalPage = Math.ceil(TOTAL * 1 / this.page.PAGESIZE * 1)
+					const data_list = data;
+					this.page.PAGE = page
+					this.loadParams.total = total
+					this.loadParams.totalPage = Math.ceil(total * 1 / this.page.pagesize * 1)
 
 					this.isNoData = (data_list.length <= 0);
 
@@ -477,4 +477,4 @@
 		font-size: 12px;
 		color: #999;
 	}
-</style>
+</style>

pages/produce-material/produce-plan.nvue

@@ -15,8 +15,9 @@
 		</view>
 
 		<view class="middle upload salescenter">
-			<text class="middle-date">营销中心</text>
-			<view class="middle-date-des uni-list picker-year">
+			<text class="middle-date">包材汇总保证金</text>
+			<text class="middle-date-des">{{HEADINFO.tby_dmbtr}}</text>
+			<!-- <view class="middle-date-des uni-list picker-year">
 				<view class="uni-list-cell">
 					<view class="uni-list-cell-db">
 						<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
@@ -29,7 +30,7 @@
 					</view>
 				</view>
 				<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
-			</view>
+			</view> -->
 		</view>
 
 		<!-- <uni-list :border="false">
@@ -48,7 +49,6 @@
 			<image class="planout-block-icon" src="@/static/image/order_more@3x.png" @click="addPlanout()"
 				mode="aspectFit"></image>
 		</view>
-
 		<scroll-view class="scroll-area view" :scroll-top="scrollTop" scroll-y="true" :show-scrollbar='false'>
 			<uni-swipe-action class="planout-block-lists">
 				<uni-swipe-action-item v-for="(item,index) in planinnerLists" :key='index'>
@@ -61,7 +61,7 @@
 							<view class="middle-date-des uni-list picker-year">
 								<view class="uni-list-cell">
 									<view class="uni-list-cell-db">
-										<text class="middle-date-des">{{item.DESCRIPTION}}</text>
+										<text class="middle-date-des">{{item.description}}</text>
 									</view>
 								</view>
 								<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
@@ -70,19 +70,19 @@
 						<view class="text-block">
 							<text class="middle-date">备料件数</text>
 							<input class="middle-date-des" type="text" @blur="updateNoQuotaData(index,'',item)"
-								v-model="item.quantity" placeholder="请填写" />
+								v-model="item.planqty_box" placeholder="请填写" />
 						</view>
 						<view class="text-block">
 							<text class="middle-date">吨</text>
-							<text class="middle-date-des">{{item.PLANQTY_TON}}</text>
+							<text class="middle-date-des">{{item.planqty_ton}}</text>
+						</view>
+						<view class="text-block">
+							<text class="middle-date">包材保证金</text>
+							<text class="middle-date-des">{{item.by_dmbtr}}</text>
 						</view>
-						<!-- 	<view class="text-block">
-							<text class="middle-date">保证金</text>
-							<text class="middle-date-des">0.00</text>
-						</view> -->
 						<view class="text-block text-block-last">
 							<text class="middle-date">备注</text>
-							<input class="middle-date-des" type="text" v-model="item.REMARK" placeholder="请填写" />
+							<input class="middle-date-des" type="text" v-model="item.remark" placeholder="请填写" />
 						</view>
 					</view>
 					<template v-slot:right>
@@ -178,7 +178,8 @@
 				_this.planinnerLists = _this.planinnerLists.map((item, i) => {
 					if (i === fromIndex) {
 						item.product_info = {
-							...selectedProduct
+							...selectedProduct,
+							product_id: selectedProduct.PRODUCT_ID
 						}
 						product = {
 							...item
@@ -207,17 +208,17 @@
 				}
 				const res = await apiProduceMaterialPlanInit(params)
 				const {
-					HEAD,
-					YXDY,
-					ITEM
-				} = res.DATA
-				this.selectedSalesCenterArr = YXDY
+					head,
+					yxdy,
+					item
+				} = res.data
+				this.selectedSalesCenterArr = yxdy
 				this.planinnerLists[0] = {
 					...this.planinnerLists[0],
-					...ITEM[0]
+					...item[0]
 				}
-				this.HEADINFO = HEAD
-				this.productInitInfo = ITEM[0]
+				this.HEADINFO = head
+				this.productInitInfo = item[0]
 			},
 			async updateNoQuotaData(productIndex, mode = '', product) {
 				console.log('updateNoQuotaData---entry', productIndex, mode, product)
@@ -228,20 +229,20 @@
 				console.log('productAfterInit', productAfterInit)
 
 				// 产品编号和件数 都有才请求
-				if (!(productAfterInit?.product_info?.PRODUCT_ID &&
-						productAfterInit?.PLANQTY_BOX)) {
+				if (!(productAfterInit?.product_info?.product_id &&
+						productAfterInit?.planqty_box)) {
 					return
 				}
 
-				item_inner = productAfterInit
+				item_inner = [productAfterInit]
 
 				const params = {
-					// "HEAD": this.HEADINFO,
-					"ITEM": item_inner,
+					"head": this.HEADINFO,
+					"item": item_inner,
 				}
 				const res = await apiUpdateProduceMaterialPlanData(params)
 				console.log('updateNoQuotaData', res)
-
+				this.HEADINFO.tby_dmbtr = res.data.head.tby_dmbtr || 0
 				this.planinnerLists = this.planinnerLists.map((item, i) => {
 					if (i === productIndex) {
 						item = {
@@ -265,9 +266,9 @@
 				let obj = {}
 				this.planinnerLists = this.planinnerLists.map((item, i) => {
 					if (i === productIndex) {
-						item.PRODUCT_ID = PRODUCT_ID
-						item.DESCRIPTION = SHORT_TEXT
-						item.PLANQTY_BOX = item.quantity
+						item.product_id = PRODUCT_ID
+						item.description = SHORT_TEXT
+						item.planqty_box = item.planqty_box
 						obj = item
 					}
 					return item
@@ -275,24 +276,15 @@
 				return obj
 			},
 			selectProduct(index) {
-				if (this.salesCenterIndex !== -1) {
-					uni.navigateTo({
-						url: `/pages/select-product-pro/select-product-pro?from=produceMaterialOrder&mode=&index=${index*1}&head=${JSON.stringify(this.HEADINFO)}`
-					});
-				} else {
-					uni.showToast({
-						title: '请先选择营销中心',
-						duration: 2000,
-						icon: 'none'
-					});
-				}
-
+				uni.navigateTo({
+					url: `/pages/select-product-pro/select-product-pro?from=produceMaterialOrder&mode=&index=${index*1}&head=${JSON.stringify(this.HEADINFO)}`
+				});
 			},
 			addPlanout() {
 				let product = {
 					checked: false,
-					"PRODUCT_ID": "",
-					"DESCRIPTION": "",
+					"product_id": "",
+					"description": "",
 					"SHORT_TEXT": "",
 					'product_info': {}
 				}
@@ -322,7 +314,7 @@
 			switchChange(e) {
 				console.log('switch1 发生 change 事件，携带值为', e.detail.value)
 				this.isChecked = e.detail.value
-				this.HEADINFO.PREORDER = e.detail.value === false ? 0 : 1
+				this.HEADINFO.preorder = e.detail.value === false ? 0 : 1
 			},
 			async submit() {
 
@@ -333,20 +325,16 @@
 				}
 				const res = await apiUpdateProduceMaterialOrder(params)
 
-				const {
-					HEAD: HEAD2,
-					ITEM: ITEM2
-				} = res
-
+				const { head, item } = res
 				const params2 = {
 					USER_BP: this.userInfo.code,
-					HEAD: HEAD2,
-					ITEM: ITEM2
+					ROLE:'WLY001',
+					MODE: 'SUBMIT',
+					head,
+					item
 				}
-
 				// this.HEADINFO = HEAD2
 				//  this.planinnerLists = ITEM2
-
 				const res2 = await apiSubmitProduceMaterialOrder(params2)
 
 				this.orderInfo = res.HEAD
@@ -648,4 +636,4 @@
 		background: #ff1d32;
 		border: 1px solid #ff1d32;
 	}
-</style>
+</style>

pages/produce-order/order-list.nvue

@@ -4,43 +4,44 @@
 			<view class="cell-list">
 				<view class="middle view planout-block-item">
 					<view class="item-block item-block-code">
-						<text class="item-block-label">单号：{{itemHead.PRODPL_ID}}</text>
+						<text class="item-block-label">单号：{{itemHead.prodpl_id}}</text>
 						<button class="item-block-btn" type="default"><text
-								class="item-block-btn__text">{{itemHead.STATUS}}</text></button>
+								class="item-block-btn__text">{{itemHead.status}}</text></button>
 					</view>
 					<view class="item-block item-block-name">
-						<text class="item-block-label item-block__label">{{itemHead.PRODPLTYPE}}</text>
+						<text class="item-block-label item-block__label">{{itemHead.prodpl_type}}</text>
 					</view>
 					<view class="item-block">
-						<text class="item-block-label-des">{{itemHead.DATUM}}</text>
+						<text class="item-block-label-des">{{itemHead.datum}}</text>
 					</view>
 					<view class="item-block item-block-date">
 						<text class="detal-item-label">下单日期</text>
 					</view>
-
 					<view class="block-detal" :class="{'block-detal-last':index === itemLists.length-1}"
 						v-for="(item,index) in itemLists" :key="index">
 						<view class="block-detal-item">
 							<text class="detal-item-label">产品</text>
-							<text class="detal-item-value">{{item.DESCRIPTION}}</text>
+							<text class="detal-item-value">{{item.description}}</text>
 						</view>
 						<view class="block-detal-item">
 							<text class="detal-item-label">件数</text>
-							<text class="detal-item-value">{{item.PLANQTY_BOX}}</text>
+							<text class="detal-item-value">{{item.planqty_box}}</text>
+						</view>
+						<view class="block-detal-item">
+							<text class="detal-item-label">所需货款</text>
+							<text class="detal-item-value">{{item.huokuan}}</text>
 						</view>
 						<view class="block-detal-item block-detal-item-last">
-							<text class="detal-item-label">期望交货期</text>
-							<!-- <text class="detal-item-value">7</text> -->
+							<text class="detal-item-label">备注</text>
+							<text class="detal-item-value">{{item.remark}}</text>
 						</view>
 					</view>
-
-					<view class="item-block">
-						<text class="item-block-label-des">sap返回无</text>
+					<!-- <view class="item-block">
+						<text class="item-block-label-des">{{itemHead.remark}}</text>
 					</view>
 					<view class="item-block item-block-date">
 						<text class="detal-item-label">备注</text>
-					</view>
-
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -77,10 +78,10 @@
 				}
 			},
 			itemHead() {
-				return this.newsItem.HEAD || {}
+				return this.newsItem.head || {}
 			},
 			itemLists() {
-				return this.newsItem.ITEM || []
+				return this.newsItem.item || []
 			},
 			...mapState(['sysinfo'])
 		},

pages/produce-order/produce-order.nvue

@@ -41,7 +41,7 @@
 				</view>
 			</uni-cell>
 		</uni-list>
-		<!-- <no-data class="no-data" v-if="isNoData" @retry="loadMore"></no-data> -->
+		<no-data v-if="isNoData" @retry="loadMore"></no-data>
 	</view>
 </template>
 
@@ -110,7 +110,7 @@
 					}]
 				},
 				page: {
-					"PAGE": "1",
+					"page": "1",
 					"PAGESIZE": "10",
 				},
 				loadParams: {
@@ -169,14 +169,14 @@
 				apiGetProduceOrder(params).then((res) => {
 					console.log('loadData', res)
 					const {
-						DATA,
-						PAGE,
-						TOTAL
+						data,
+						page,
+						total
 					} = res
-					const data_list = DATA;
-					this.page.PAGE = PAGE
-					this.loadParams.total = TOTAL
-					this.loadParams.totalPage = Math.ceil(TOTAL * 1 / this.page.PAGESIZE * 1)
+					const data_list = data;
+					this.page.page = page
+					this.loadParams.total = total
+					this.loadParams.totalPage = Math.ceil(total * 1 / this.page.PAGESIZE * 1)
 
 
 					this.isNoData = (data_list.length <= 0);
@@ -211,8 +211,8 @@
 			},
 			loadMore(e) {
 				console.log('loadMore')
-				if (this.page.PAGE < this.loadParams.totalPage) {
-					this.page.PAGE++
+				if (this.page.page < this.loadParams.totalPage) {
+					this.page.page++
 					this.loadData();
 				} else {
 					this.loadingText = '--已到底--'
@@ -238,7 +238,7 @@
 					isDone: false,
 					isRefresh: false
 				}
-				this.page.PAGE = 1
+				this.page.page = 1
 				this.loadData(true);
 			},
 			onrefresh(e) {
@@ -478,4 +478,4 @@
 		font-size: 12px;
 		color: #999;
 	}
-</style>
+</style>

pages/produce-order/produce-plan.nvue

@@ -13,21 +13,8 @@
 		</view>
 
 		<view class="middle upload salescenter">
-			<text class="middle-date">营销中心</text>
-			<view class="middle-date-des uni-list picker-year">
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-db">
-						<picker class="picker-block" @change="bindPickerSalesCenterChange" mode="selector"
-							:value="salesCenterIndex" range-key='TEXT' :range="selectedSalesCenterArr">
-							<view class="uni-input">
-								<text
-									class="uni-input-text">{{selectedSalesCenterArr[salesCenterIndex] && selectedSalesCenterArr[salesCenterIndex].TEXT || '请选择'}}</text>
-							</view>
-						</picker>
-					</view>
-				</view>
-				<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
-			</view>
+			<text class="middle-date">包材汇总保证金</text>
+			<text class="middle-date-des">{{HEADINFO.huokuan}}</text>
 		</view>
 
 		<view class="planout-block">
@@ -48,7 +35,7 @@
 							<view class="middle-date-des uni-list picker-year">
 								<view class="uni-list-cell">
 									<view class="uni-list-cell-db">
-										<text class="middle-date-des">{{item.DESCRIPTION}}</text>
+										<text class="middle-date-des">{{item.description}}</text>
 									</view>
 								</view>
 								<image class="icon-arrow" src="@/static/image/arrow_r@3x.png" mode="aspectFit"></image>
@@ -57,15 +44,19 @@
 						<view class="text-block">
 							<text class="middle-date">数量（件）</text>
 							<input class="middle-date-des" type="text" @blur="updateNoQuotaData(index,'',item)"
-								v-model="item.quantity" placeholder="请填写" />
+								v-model="item.planqty_box" placeholder="请填写" />
 						</view>
 						<view class="text-block">
 							<text class="middle-date">期望交货日期</text>
-							<text class="middle-date-des">{{item.PUR_DATE}}</text>
+							<text class="middle-date-des">{{item.pur_date}}</text>
+						</view>
+						<view class="text-block">
+							<text class="middle-date">包材保证金</text>
+							<text class="middle-date-des">{{item.huokuan}}</text>
 						</view>
 						<view class="text-block text-block-last">
 							<text class="middle-date">备注</text>
-							<input class="middle-date-des" type="text" v-model="item.REMARK" placeholder="请填写" />
+							<input class="middle-date-des" type="text" v-model="item.remark" placeholder="请填写" />
 						</view>
 					</view>
 					<template v-slot:right>
@@ -123,9 +114,9 @@
 				salesCenterIndex: -1,
 				planinnerLists: [{
 					checked: false,
-					'quantity': 0,
+					'planqty_box': 0,
 					'total': 0,
-					'DESCRIPTION': '请选择',
+					'description': '请选择',
 					'product_info': {},
 				}],
 				HEADINFO: {},
@@ -162,7 +153,8 @@
 				_this.planinnerLists = _this.planinnerLists.map((item, i) => {
 					if (i === fromIndex) {
 						item.product_info = {
-							...selectedProduct
+							...selectedProduct,
+							product_id: selectedProduct.PRODUCT_ID
 						}
 						product = {
 							...item
@@ -191,17 +183,17 @@
 				}
 				const res = await apiProducePlanInit(params)
 				const {
-					HEAD,
-					YXDY,
-					ITEM
-				} = res.DATA
-				this.selectedSalesCenterArr = YXDY
+					head,
+					yxdy,
+					item
+				} = res.data
+				this.selectedSalesCenterArr = yxdy
 				this.planinnerLists[0] = {
 					...this.planinnerLists[0],
-					...ITEM[0]
+					...item[0]
 				}
-				this.HEADINFO = HEAD
-				this.productInitInfo = ITEM[0]
+				this.HEADINFO = head
+				this.productInitInfo = item[0]
 			},
 			async updateNoQuotaData(productIndex, mode = '', product) {
 				console.log('updateNoQuotaData---entry', productIndex, mode, product)
@@ -212,26 +204,26 @@
 				console.log('productAfterInit', productAfterInit)
 
 				// 产品编号和件数 都有才请求
-				if (!(productAfterInit?.product_info?.PRODUCT_ID &&
-						productAfterInit?.PLANQTY_BOX)) {
+				if (!(productAfterInit?.product_info?.product_id &&
+						productAfterInit?.planqty_box)) {
 					return
 				}
 
 				item_inner = [productAfterInit]
 
 				const params = {
-					"HEAD": this.HEADINFO,
-					"ITEM": item_inner,
+					"head": this.HEADINFO,
+					"item": item_inner,
 				}
 				const res = await apiUpdateProducePlanData(params)
 				console.log('updateNoQuotaData', res)
-
+				this.HEADINFO.huokuan = res.data.head.huokuan || 0
 				this.planinnerLists = this.planinnerLists.map((item, i) => {
 					if (i === productIndex) {
 						item = {
 							...item,
 							...product,
-							...res.DATA[0]
+							...res.data[0]
 						}
 					}
 					return item
@@ -250,8 +242,8 @@
 				this.planinnerLists = this.planinnerLists.map((item, i) => {
 					if (i === productIndex) {
 						item.PROD_ID = PRODUCT_ID
-						item.DESCRIPTION = SHORT_TEXT
-						item.PLANQTY_BOX = item.quantity
+						item.description = SHORT_TEXT
+						item.planqty_box = item.planqty_box
 						obj = item
 					}
 					return item
@@ -259,28 +251,19 @@
 				return obj
 			},
 			selectProduct(index) {
-				if (this.salesCenterIndex !== -1) {
 					uni.navigateTo({
 						url: `/pages/select-product-pro/select-product-pro?from=produceOrder&mode=&index=${index*1}&head=${JSON.stringify(this.HEADINFO)}`
 					});
-				} else {
-					uni.showToast({
-						title: '请先选择营销中心',
-						duration: 2000,
-						icon: 'none'
-					});
-				}
-
 			},
 			addPlanout() {
 				let product = {
 					checked: false,
-					"PRODUCT_ID": "",
-					"ORDERED_PROD": "",
-					"DESCRIPTION": "",
-					"SHORT_TEXT": "",
-					'NET_PRICE': '',
-					'NET_VALUE': '',
+					"product_id": "",
+					"ordered_prod": "",
+					"description": "",
+					"short_text": "",
+					'net_price': '',
+					'net_value': '',
 					'product_info': {}
 				}
 				this.planinnerLists.unshift(product)
@@ -312,34 +295,32 @@
 			switchChange(e) {
 				console.log('switch1 发生 change 事件，携带值为', e.detail.value)
 				this.isChecked = e.detail.value
-				this.HEADINFO.PREORDER = e.detail.value === false ? 0 : 1
+				this.HEADINFO.preorder = e.detail.value === false ? 0 : 1
 			},
 			async submit() {
+				try{
+					const params = {
+						head: this.HEADINFO,
+						item: this.planinnerLists
+					}
+					const res = await apiUpdateProduceOrder(params)
+					const { head, item } = res.data
+					const params2 = {
+						ROLE:'WLY001',
+						MODE: 'SUBMIT',
+						head,
+						item
+					}
+					// this.HEADINFO = HEAD2
+					//  this.planinnerLists = ITEM2
+					const res2 = await apiSubmitProduceOrder(params2)
 
-				const params = {
-					HEAD: this.HEADINFO,
-					ITEM: this.planinnerLists
-				}
-				const res = await apiUpdateProduceOrder(params)
-
-				const {
-					DATA1: HEAD2,
-					DATA2: ITEM2
-				} = res
+					this.orderInfo = res.DATA1
 
-				const params2 = {
-					HEAD: HEAD2,
-					ITEM: ITEM2
+					this.$refs.popup.open('center')
+				}catch(e){
+					//TODO handle the exception
 				}
-
-				// this.HEADINFO = HEAD2
-				//  this.planinnerLists = ITEM2
-
-				const res2 = await apiSubmitProduceOrder(params2)
-
-				this.orderInfo = res.DATA1
-
-				this.$refs.popup.open('center')
 			},
 			resetData() {
 				this.$refs.popup.close()
@@ -617,4 +598,4 @@
 		background: #ff1d32;
 		border: 1px solid #ff1d32;
 	}
-</style>
+</style>

pages/purchase-plan/purchase-plan.nvue

@@ -38,55 +38,56 @@
 					</view>
 				</view>
 			</view>
-
-			<list ref="list" class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower"
-				:show-scrollbar='false'>
-				<refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'">
-					<!-- <loading-indicator></loading-indicator> -->
-				</refresh>
-				<cell v-for="(item,index) in lists" :key="item.plan_number">
-					<view class="scroll-item">
-						<view class="item-block item-block-code">
-							<text class="item-block-label">单号：{{item.plan_number}}</text>
-						</view>
-						<view class="item-block item-block-name">
-							<text class="item-block-label item-block__label">{{item.plan_type_text}}</text>
-						</view>
-						<view class="item-block">
-							<text class="item-block-label-des">{{item.gjahr}}-{{item.monat}}</text>
-						</view>
-						<view class="block-detal">
-							<view class="block-detal-item">
-								<text class="detal-item-label">存货分类</text>
-								<text class="detal-item-value">{{item.wlybrand_text}}</text>
-							</view>
-							<view class="block-detal-item">
-								<text class="detal-item-label">总计划(件)</text>
-								<text class="detal-item-value">{{item.total_qty}}</text>
+			<scroll-view class="scroll-area" scroll-y="true" lower-threshold='150'
+				@scrolltolower='scrolltolower'>
+				<list ref="list" class="scroll-area view" loadmoreoffset='100' @loadmore="scrolltolower"
+					:show-scrollbar='false'>
+					<!-- <refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'">
+						<loading-indicator></loading-indicator>
+					</refresh> -->
+					<cell v-for="(item,index) in lists" :key="item.plan_number">
+						<view class="scroll-item">
+							<view class="item-block item-block-code">
+								<text class="item-block-label">单号：{{item.plan_number}}</text>
 							</view>
-							<view class="block-detal-item">
-								<text class="detal-item-label">初始计划(件)</text>
-								<text class="detal-item-value">{{item.initplan_qty}}</text>
+							<view class="item-block item-block-name">
+								<text class="item-block-label item-block__label">{{item.plan_type_text}}</text>
 							</view>
-							<view class="block-detal-item">
-								<text class="detal-item-label">已开票计划(件)</text>
-								<text class="detal-item-value">{{item.billing_qty}}</text>
+							<view class="item-block">
+								<text class="item-block-label-des">{{item.gjahr}}-{{item.monat}}</text>
 							</view>
-							<view class="block-detal-item block-detal-item-last">
-								<text class="detal-item-label">已占用计划(件)</text>
-								<text class="detal-item-value">{{item.atp_qty}}</text>
+							<view class="block-detal">
+								<view class="block-detal-item">
+									<text class="detal-item-label">存货分类</text>
+									<text class="detal-item-value">{{item.wlybrand_text}}</text>
+								</view>
+								<view class="block-detal-item">
+									<text class="detal-item-label">总计划(件)</text>
+									<text class="detal-item-value">{{item.total_qty}}</text>
+								</view>
+								<view class="block-detal-item">
+									<text class="detal-item-label">初始计划(件)</text>
+									<text class="detal-item-value">{{item.initplan_qty}}</text>
+								</view>
+								<view class="block-detal-item">
+									<text class="detal-item-label">已开票计划(件)</text>
+									<text class="detal-item-value">{{item.billing_qty}}</text>
+								</view>
+								<view class="block-detal-item block-detal-item-last">
+									<text class="detal-item-label">已占用计划(件)</text>
+									<text class="detal-item-value">{{item.atp_qty}}</text>
+								</view>
 							</view>
 						</view>
-					</view>
-				</cell>
-				<cell>
-					<view class="loading-more" v-if='lists.length>2'>
-						<text class="loading-more-text">{{loadingText}}</text>
-					</view>
-				</cell>
-				<view class="planout-block-item__last"> </view>
-			</list>
-
+					</cell>
+					<cell>
+						<view class="loading-more" v-if='lists.length>2'>
+							<text class="loading-more-text">{{loadingText}}</text>
+						</view>
+					</cell>
+					<view class="planout-block-item__last"> </view>
+				</list>
+			</scroll-view>
 		</view>
 	</view>
 </template>

pages/select-product/select-product.vue

@@ -24,15 +24,6 @@
 
 			<scroll-view class="scroll-area" :style='scrollHeight' scroll-y="true" lower-threshold='150'
 				@scrolltolower='scrolltolower'>
-				<!-- <uni-swipe-action class="planout-block-lists">
-					<uni-swipe-action-item v-for="(item,index) in lists" :key='item.PRODUCT_ID' :auto-close="false"
-						:disabled='true' :show="isOpened" @click="handleClick"> -->
-				<!-- <template v-slot:left>
-							<view class="swipe-right-block" @click="handleChecked($event,item, index)"><text
-									class="swipe-right-block__text"
-									:class="{'swipe-right-block__active':item.checked}"></text>
-							</view>
-						</template> -->
 				<view class="middle view planout-block-item" v-for="(item,index) in lists" :key='item.PRODUCT_ID'
 					@click="handleChecked($event,item, index)">
 					<view class="text-block">
@@ -52,9 +43,6 @@
 						<text class="middle-date-des middle-date-des-select">{{item.NORMS}}</text>
 					</view>
 				</view>
-
-				<!-- 			</uni-swipe-action-item>
-				</uni-swipe-action> -->
 				<view class="loading-more" v-if='lists.length>2'>
 					<text class="loading-more-text">{{loadingText}}</text>
 				</view>

pages/usercenter/usercenter.nvue

@@ -27,14 +27,14 @@
 					<image class="entry-bill-icon" src="@/static/image/usercenter_purchaseplan@3x.png" mode=""></image>
 					<!-- <text class="entry-bill-dot">25</text> -->
 				</view>
-				<text class="entry-bill-text">采购计划</text>
+				<text class="entry-bill-text">销售计划</text>
 			</view>
 
 			<view class="entry-block" @click="goPage('produce-order')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon" src="@/static/image/usercenter_produceorder@3x.png" mode=""></image>
 				</view>
-				<text class="entry-bill-text">生产下单</text>
+				<text class="entry-bill-text">生产计划</text>
 			</view>
 
 			<view class="entry-block" @click="goPage('ticket-order')">
@@ -42,7 +42,7 @@
 					<image class="entry-bill-icon entry-bill-icon_billing"
 						src="@/static/image/usercenter_ticketorder@3x.png" mode=""></image>
 				</view>
-				<text class="entry-bill-text">我的开票</text>
+				<text class="entry-bill-text">开票查询</text>
 			</view>
 
 			<view class="entry-block" @click="goPage('produce-material')">
@@ -51,21 +51,21 @@
 						src="@/static/image/usercenter_producematerial@3x.png" mode="">
 					</image>
 				</view>
-				<text class="entry-bill-text">生产备料</text>
+				<text class="entry-bill-text">包材计划</text>
 			</view>
 
 			<view class="entry-block" @click="goPage('my-purchase')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon" src="@/static/image/usercenter_mypurchase@3x.png" mode=""></image>
 				</view>
-				<text class="entry-bill-text">我的要货</text>
+				<text class="entry-bill-text">要货单查询</text>
 			</view>
 
 			<view class="entry-block" @click="goPage('my-order')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon" src="@/static/image/uc_company@3x.png" mode=""></image>
 				</view>
-				<text class="entry-bill-text">我的订单</text>
+				<text class="entry-bill-text">销售订单</text>
 			</view>
 
 			<view class="entry-block" @click="goPage('billing-invoice')">
@@ -74,7 +74,7 @@
 						src="@/static/image/usercenter_billinginvoice@3x.png" mode="">
 					</image>
 				</view>
-				<text class="entry-bill-text">账票查询</text>
+				<text class="entry-bill-text">账票管理</text>
 			</view>
 
 		</view>