xiaohaizhao 1 год назад
Родитель
Сommit
596ffd1e10

+ 5 - 5
packageA/offers/addProjectOffer.js

@@ -105,7 +105,7 @@ Page({
 	}) {
 		this.setData({
 			loading: detail,
-			subLoading: detail,
+			subLoading: detail
 		})
 	},
 	onLoad(options) {
@@ -141,7 +141,6 @@ Page({
 					required: true,
 					interrupt: true
 				});
-				//业务员
 				form.splice(form.findIndex(v => v.label == '备注'), 0, {
 					label: "业务员",
 					error: false,
@@ -357,7 +356,7 @@ Page({
 					checking: "base",
 					required: true
 				};
-				form.splice(form.findIndex(v => v.label == '备注'), form.some(v => v.label == '业务员') ? 1 : 0, hr);
+				form.splice(form.findIndex(v => v.label == '备注') - 1, form.some(v => v.label == '业务员') ? 1 : 0, hr);
 				break;
 			case "sys_enterpriseid":
 				obj = {
@@ -456,7 +455,8 @@ Page({
 		const {
 			submit
 		} = e.currentTarget.dataset;
-		if (submit) {
+		console.log(submit)
+		if (submit == 1) {
 			this.setData({
 				subLoading: true
 			})
@@ -496,7 +496,7 @@ Page({
 				loading: false,
 				subLoading: false
 			});
-			if (submit) {
+			if (submit == 1) {
 				_Http.basic({
 					"id": 20221020165303,
 					"version": 1,

+ 2 - 2
packageA/offers/addProjectOffer.wxml

@@ -26,6 +26,6 @@
 
 <view style="height: 130rpx;" />
 <view class="new-footer">
-	<van-button custom-class='new-submit' data-submit="false" disabled='{{disabled || loading || subLoading}}' loading='{{loading}}' bindclick='submit'>{{language['保存']||'保存'}}</van-button>
-	<van-button wx:if="{{sa_quotedpriceid == 0}}" custom-class='new-submit orange' data-submit="true" disabled='{{disabled || loading  || subLoading}}' loading='{{subLoading}}' bindclick='submit'>{{language['保存并提交']||'保存并提交'}}</van-button>
+	<van-button custom-class='new-submit' data-submit="0" disabled='{{disabled || loading || subLoading}}' loading='{{loading}}' bindclick='submit'>{{language['保存']||'保存'}}</van-button>
+	<van-button wx:if="{{sa_quotedpriceid == 0}}" custom-class='new-submit orange' data-submit="1" disabled='{{disabled || loading  || subLoading}}' loading='{{subLoading}}' bindclick='submit'>{{language['保存并提交']||'保存并提交'}}</van-button>
 </view>

+ 4 - 4
packageA/offers/addSetclientOffer.js

@@ -252,7 +252,6 @@ Page({
 			};
 			form.splice(1, form.some(v => v.label == '联系人') ? 1 : 0, contacts);
 
-			//业务员
 			let hr = {
 				label: "业务员",
 				error: false,
@@ -277,7 +276,7 @@ Page({
 				checking: "base",
 				required: true
 			};
-			form.splice(form.findIndex(v => v.label == '备注'), form.some(v => v.label == '业务员') ? 1 : 0, hr);
+			form.splice(form.findIndex(v => v.label == '备注') -1, form.some(v => v.label == '业务员') ? 1 : 0, hr);
 		}
 		form[temporary.index] = temporary.item;
 		wx.navigateBack()
@@ -343,7 +342,8 @@ Page({
 		const {
 			submit
 		} = e.currentTarget.dataset;
-		if (submit) {
+		console.log(submit)
+		if (submit == 1) {
 			this.setData({
 				subLoading: true
 			})
@@ -382,7 +382,7 @@ Page({
 				loading: false,
 				subLoading: false
 			});
-			if (submit) {
+			if (submit == 1) {
 				_Http.basic({
 					"id": 20221020165303,
 					"version": 1,

+ 2 - 2
packageA/offers/addSetclientOffer.wxml

@@ -25,6 +25,6 @@
 
 <view style="height: 130rpx;" />
 <view class="new-footer">
-	<van-button custom-class='new-submit' data-submit="false" disabled='{{disabled || loading || subLoading}}' loading='{{loading}}' bindclick='submit'>{{language['保存']||'保存'}}</van-button>
-	<van-button wx:if="{{sa_quotedpriceid == 0}}" custom-class='new-submit orange' data-submit="true" disabled='{{disabled || loading  || subLoading}}' loading='{{subLoading}}' bindclick='submit'>{{language['保存并提交']||'保存并提交'}}</van-button>
+	<van-button custom-class='new-submit' data-submit="0" disabled='{{disabled || loading || subLoading}}' loading='{{loading}}' bindclick='submit'>{{language['保存']||'保存'}}</van-button>
+	<van-button wx:if="{{sa_quotedpriceid == 0}}" custom-class='new-submit orange' data-submit="1" disabled='{{disabled || loading  || subLoading}}' loading='{{subLoading}}' bindclick='submit'>{{language['保存并提交']||'保存并提交'}}</van-button>
 </view>