增加功能,禁用收款管理

common/setting.js

@@ -10,9 +10,11 @@ module.exports = {
 	version: '1.0.0',
 	// 开发环境接口Url
 	// devUrl: 'http://192.168.0.106:1080',
-	devUrl: 'http://121.37.83.47:10004',
+	// devUrl: 'http://121.37.83.47:10004',
+	devUrl:'http://192.168.8.108:1080',
 	// 线上环境接口Url
-	prodUrl: 'http://121.37.83.47:10004',
+	// prodUrl: 'http://121.37.83.47:10004',
+	// prodUrl: 'http://192.168.8.108:1080',
 	// 后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8
 	contentType: 'application/json;charset=UTF-8',
 	// 后端返回状态码

pages/tabBar/home.vue

@@ -176,7 +176,8 @@
 						uni.$u.route('/pages/views/salesSlip/toBeCollectedlistBatch');
 						break;
 					case "collectionManagement":
-						uni.$u.route('/pages/views/salesSlip/collectionManagement');
+						this.$refs.uToast.warning("该功能开发中")
+						// uni.$u.route('/pages/views/salesSlip/collectionManagement');
 						break;
 					case 'visit':
 						this.$u.route('/pages/views/visit/visit');

pages/views/salesSlip/index.vue

@@ -100,6 +100,13 @@
 						<!-- <u-form-item label="优惠金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.thisUsedProfit" border="none" inputAlign="right" placeholder="请输入" disabledColor="#ffffff" @blur="discount(0)"/>
 						</u-form-item> -->
+						<u-form-item label="订单金额" prop="cname" borderBottom>
+							<u-input type="number" v-model="formTwo.costAmount" border="none" inputAlign="right" placeholder="请输入"
+								disabled disabledColor="#ffffff" />
+						</u-form-item>
+						<u-form-item label="优惠金额" prop="cname" borderBottom>
+							<u-input type="number" v-model="formTwo.thisUsedProfit" border="none" inputAlign="right" placeholder="请输入" disabledColor="#ffffff" @blur="discount(0)"/>
+						</u-form-item>
 						<u-form-item label="应收金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.orderAmount" border="none" inputAlign="right"
 								placeholder="请输入" disabled disabledColor="#ffffff" />
@@ -326,7 +333,8 @@
 					if (this.formTwo.thisUsedProfit < 0) {
 						return this.formTwo.thisUsedProfit = null
 					}
-					this.formTwo.orderAmount = (this.formTwo.purchaseAmount - this.formTwo.thisUsedProfit).toFixed(2)
+					this.formTwo.orderAmount = (this.formTwo.costAmount - this.formTwo.thisUsedProfit).toFixed(2)
+					this.formTwo.currentAmount = this.formTwo.orderAmount
 					if (this.formTwo.orderAmount < 0) {
 						this.$set(this.formTwo, "orderAmount", null)
 						this.$set(this.formTwo, "thisUsedProfit", null)

pages/views/salesSlip/salesOrderDetails.vue

@@ -146,6 +146,14 @@
 						<u-input v-model="form.thisUsedProfit" inputAlign="right" border="none" placeholder="请输入"
 							:disabled="form.confirmStatus == 1" disabledColor="#ffffff" @change="calculationContract" />
 					</u-form-item> -->
+					<u-form-item label="订单金额" prop="mailbox" borderBottom>
+						<u-input v-model="form.purchaseAmount" inputAlign="right" border="none" placeholder="请输入" disabled
+							disabledColor="#ffffff" />
+					</u-form-item>
+					<u-form-item label="优惠金额" prop="mailbox" borderBottom>
+						<u-input v-model="form.thisUsedProfit" inputAlign="right" border="none" placeholder="请输入" 
+							:disabled="false" disabledColor="#ffffff" @change="calculationContract"/>
+					</u-form-item>
 					<u-form-item label="应收金额" prop="mailbox" borderBottom>
 						<u-input v-model="form.orderAmount" inputAlign="right" border="none" placeholder="请输入" disabled
 							disabledColor="#ffffff" />
@@ -440,7 +448,6 @@
 					"height": "20"
 				})
 			
-			
 				data.push({
 					"top": Number(i * 40 + 110),
 					"left": "20",
@@ -546,7 +553,8 @@
 					purchaseAmount: this.form.purchaseAmount ? Number(this.form.purchaseAmount) : 0,
 					thisUsedProfit: this.form.thisUsedProfit ? Number(this.form.thisUsedProfit) : 0
 				}
-				this.form.orderAmount = data.purchaseAmount - data.thisUsedProfit
+				this.form.orderAmount = data.purchaseAmount - data.thisUsedProfit;
+				this.form.currentAmount = this.form.orderAmount;
 			},
 			getMap() {
 				let this_ = this

pages/views/salesSlip/salesOrderList.vue

@@ -98,13 +98,13 @@
 				<view style="width: calc(700rpx - 20px);margin: 10px;">
 					<text>收款台</text>
 					<view>
-						<!-- <u-form-item label="订单金额" prop="cname" borderBottom>
+						<u-form-item label="订单金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.purchaseAmount" border="none" inputAlign="right" placeholder="请输入"
 								disabled disabledColor="#ffffff" />
-						</u-form-item> -->
-						<!-- <u-form-item label="优惠金额" prop="cname" borderBottom>
+						</u-form-item>
+						<u-form-item label="优惠金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.thisUsedProfit" border="none" inputAlign="right" placeholder="请输入" disabledColor="#ffffff" @blur="discount(0)"/>
-						</u-form-item> -->
+						</u-form-item>
 						<u-form-item label="应收金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.orderAmount" border="none" inputAlign="right"
 								placeholder="请输入" disabled disabledColor="#ffffff" />

pages/views/salesSlip/toBeCollectedlist.vue

@@ -116,17 +116,18 @@
 				<view style="width: calc(700rpx - 20px);margin: 10px;">
 					<text>收款台</text>
 					<view>
-						<!-- <u-form-item label="订单金额" prop="cname" borderBottom>
+						<u-form-item label="订单金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.purchaseAmount" border="none" inputAlign="right" placeholder="请输入"
 								disabled disabledColor="#ffffff" />
-						</u-form-item> -->
-						<!-- <u-form-item label="优惠金额" prop="cname" borderBottom>
+						</u-form-item>
+						<u-form-item label="优惠金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.thisUsedProfit" border="none" inputAlign="right" placeholder="请输入" disabledColor="#ffffff" @blur="discount(0)"/>
-						</u-form-item> -->
+						</u-form-item>
 						<u-form-item label="应收金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.orderAmount" border="none" inputAlign="right"
 								placeholder="请输入" disabled disabledColor="#ffffff" />
 						</u-form-item>
+	
 						<u-form-item label="已收金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.settlmentAmount" border="none" inputAlign="right"
 								placeholder="请输入" disabled disabledColor="#ffffff" />

pages/views/salesSlip/toBeCollectedlistBatch.vue

@@ -114,16 +114,16 @@
 				<view style="width: calc(700rpx - 20px);margin: 10px;">
 					<text>收款台</text>
 					<view>
-						<!-- <u-form-item label="订单金额" prop="cname" borderBottom>
+						<u-form-item label="订单金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.purchaseAmount" border="none" inputAlign="right" placeholder="请输入"
 								disabled disabledColor="#ffffff" />
-						</u-form-item> -->
-						<!-- <u-form-item label="优惠金额" prop="cname" borderBottom>
+						</u-form-item>
+						<u-form-item label="优惠金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.thisUsedProfit" border="none" inputAlign="right" placeholder="请输入" disabledColor="#ffffff" @blur="discount(0)"/>
-						</u-form-item> -->
-						<u-form-item label="应收金额" prop="cname" borderBottom>
-							<u-input type="number" v-model="formTwo.orderAmount" border="none" inputAlign="right" placeholder="请输入"
-								disabled disabledColor="#ffffff" />
+						</u-form-item>
+						<u-form-item label="应收金额" prop="cname" borderBottom>
+							<u-input type="number" v-model="formTwo.orderAmount" border="none" inputAlign="right" placeholder="请输入"
+								disabled disabledColor="#ffffff" />
 						</u-form-item>
 						<u-form-item label="已收金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.settlmentAmount" border="none" inputAlign="right" placeholder="请输入" disabled disabledColor="#ffffff" />

pages/views/warehouseDelivery/salesOrderList.vue

@@ -106,6 +106,13 @@
 						<!-- <u-form-item label="优惠金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.thisUsedProfit" border="none" inputAlign="right" placeholder="请输入" disabledColor="#ffffff" @blur="discount(0)"/>
 						</u-form-item> -->
+						<u-form-item label="订单金额" prop="cname" borderBottom>
+							<u-input type="number" v-model="formTwo.purchaseAmount" border="none" inputAlign="right" placeholder="请输入"
+								disabled disabledColor="#ffffff" />
+						</u-form-item>
+						<u-form-item label="优惠金额" prop="cname" borderBottom>
+							<u-input type="number" v-model="formTwo.thisUsedProfit" border="none" inputAlign="right" placeholder="请输入" disabledColor="#ffffff" @blur="discount(0)"/>
+						</u-form-item>
 						<u-form-item label="应收金额" prop="cname" borderBottom>
 							<u-input type="number" v-model="formTwo.orderAmount" border="none" inputAlign="right"
 								placeholder="请输入" disabled disabledColor="#ffffff" />