优化

pages/breakwords-clue/breakwords-clue.vue

@@ -6,6 +6,26 @@
 		</view>
 		<view class="main">
 			<view class="middle view">
+				<view class="text-block">
+					<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">
+								<input-autocomplete
+							        class="unit-item__input"
+							        :value="testObj.sname"
+							        v-model="testObj.sname"
+							        placeholder="请输入"
+							        highlightColor="#FF0000"
+							        :stringList="autocompleteStringList"
+									:isNoShow='isNoShow'
+									v-on:onInputTap='onInputTap'
+							        v-on:selectItem="selectItemS">
+								</input-autocomplete>
+							</view>
+						</view>
+					</view>
+				</view>
 				<view class="text-block">
 					<text class="middle-date">匿名提报</text>
 					<view class="middle-date-des uni-list picker-year">
@@ -382,10 +402,19 @@
 
 
 	import timeFormat from '@/uview-ui/libs/function/timeFormat.js'
-
+	import inputAutocomplete from '@/components/input-autocomplete/input-autocomplete.vue';
 	export default {
+		components: {
+			inputAutocomplete
+		},
 		data() {
 			return {
+				isNoShow: true,
+				autocompleteStringList: ['四川省成都市温江区樱花街东红大厦8-8-888', '四川省成都市锦江区樱花街东红大厦8-8-999', '四川省成都市金牛区樱花街东红大厦8-8-666', '四川省成都市龙泉区樱花街东红大厦8-8-777'],
+				testObj: {
+					sname: '',
+					dname: ''
+				},
 				condition: {
 					submitMethod: '',
 					submitMethodName: '',
@@ -505,6 +534,15 @@
 			uni.$off('selectSalesAreaAccountInfo')
 		},
 		methods: {
+			onInputTap(){
+				this.isNoShow = true
+			},
+			onPageScroll(e) {
+				this.isNoShow = false
+			},
+			selectItemS(data) {
+				console.log('收到数据了:', data);
+			},
 			async getDictionary(key) {
 				const params = {
 					dictionaryKey: key
@@ -560,9 +598,17 @@
 				}
 			},
 			selectClueTerminal() {
-				uni.navigateTo({
-					url: `/pages/select-clue-terminal/select-clue-terminal?keywords=${this.condition.provinceName||this.condition.terminalName}`
-				});
+				if(this.condition.provinceName&& this.condition.cityName){
+					uni.navigateTo({
+						url: `/pages/select-clue-terminal/select-clue-terminal?keywords=${this.condition.provinceName}`
+					});
+				}else{
+					uni.showToast({
+						title: '请先选择省份和城市',
+						duration: 2000,
+						icon: 'none'
+					});
+				}
 			},
 			selectSalesAreaAccountInfo() {
 				uni.navigateTo({
@@ -936,4 +982,18 @@
 	.btn-text-l {
 		color: $wly-primary-color;
 	}
+	/deep/ .str-auto-complete-container{
+		// min-width: 50%;
+		max-width: 50%;
+		position: fixed;
+	}
+	/deep/ .str-auto-complete-item{
+		line-height: 1;
+	}
+	/deep/ .iac-input-wrap{
+		min-height: 96rpx;
+	}
+	/deep/ .uni-input-input{
+		font-size: 28rpx;
+	}
 </style>

pages/group-buy/group-baseinfo.nvue

@@ -335,7 +335,7 @@
 				this.paintDesignIndex = e.detail.value
 				switch (e.detail.value) {
 					case 1:
-						this.condition.ZZFLD000098 = this.condition.GRPUTID
+						this.condition.ZZFLD000098 = ''
 						break;
 					case 2:
 						this.condition.ZZFLD000098 = this.selectedGroupClient.OBJNAME

pages/group-buy/order-upload.nvue

@@ -77,56 +77,69 @@
 		},
 		methods: {
 			async updateGroupOrder() {
-				const {
-					INFO,
-					ITEM,
-					ATTACHMENT
-				} = this.groupOrder
-				const params = {
-					"MODE": "SAVE",
-					INFO,
-					ITEM,
-					ATTACHMENT,
-					"USER_BP": this.userInfo.code,
-					"ROLE": "WLY001"
-				}
-				const res = await apiUpdateGroupOrder(params)
-
-				const {
-					ATTACHMENT: ATTACHMENT2,
-					HISTORY,
-					INFO: INFO2,
-					ITEM: ITEM2
-				} = res.DATA
-
-				const params2 = {
-					"MODE": "SUBMIT",
-					"INFO": INFO2,
-					'ITEM': ITEM2,
-					"ATTACHMENT": ATTACHMENT2,
-					"USER_BP": this.userInfo.code,
-					"ROLE": "WLY001"
+				let res1 = null
+				try{
+					const {
+						INFO,
+						ITEM,
+						ATTACHMENT
+					} = this.groupOrder
+					const params = {
+						"MODE": "SAVE",
+						INFO,
+						ITEM,
+						ATTACHMENT,
+						"USER_BP": this.userInfo.code,
+						"ROLE": "WLY001"
+					}
+					res1 = await apiUpdateGroupOrder(params)
+					if(res1.MSGTYPE !== 'S'){
+						return
+					}
+				}catch(e){
+					//TODO handle the exception
 				}
-				const res2 = await apiUpdateGroupOrder(params2)
-				console.log('apiUpdateGroupOrder', res2)
-
-				const {
-					INFO: INFO3,
-					ITEM: ITEM3,
-					ATTACHMENT: ATTACHMENT3,
-				} = res2.DATA
-				this.orderInfo = INFO3
-				let groupOrder = {
-					...this.groupOrder,
-					INFO: INFO3,
-					ITEM: ITEM3,
-					ATTACHMENT: ATTACHMENT3,
+				try{
+					const {
+						ATTACHMENT: ATTACHMENT2,
+						HISTORY,
+						INFO: INFO2,
+						ITEM: ITEM2
+					} = res1.DATA
+
+					const params2 = {
+						"MODE": "SUBMIT",
+						"INFO": INFO2,
+						'ITEM': ITEM2,
+						"ATTACHMENT": ATTACHMENT2,
+						"USER_BP": this.userInfo.code,
+						"ROLE": "WLY001"
+					}
+					const res2 = await apiUpdateGroupOrder(params2)
+					console.log('apiUpdateGroupOrder', res2)
+					if(res2.MSGTYPE !== 'S'){
+						return
+					}
+					const {
+						INFO: INFO3,
+						ITEM: ITEM3,
+						ATTACHMENT: ATTACHMENT3,
+					} = res2.DATA
+					this.orderInfo = INFO3
+					let groupOrder = {
+						...this.groupOrder,
+						INFO: INFO3,
+						ITEM: ITEM3,
+						ATTACHMENT: ATTACHMENT3,
+					}
+					this.$uStore({
+						name: 'groupOrder',
+						value: groupOrder
+					});
+					this.$refs.popup.open('center')
+				}catch(e){
+					//TODO handle the exception
 				}
-				this.$uStore({
-					name: 'groupOrder',
-					value: groupOrder
-				});
-				this.$refs.popup.open('center')
 			},
 			change(e) {
 				console.log('当前模式：' + e.type + ',状态：' + e.show);

pages/login/login.nvue

@@ -83,7 +83,9 @@
 	import {
 		apiLogin
 	} from '@/servers/user.js'
-
+	import {
+		apiFindUnreadMsg
+	} from '@/servers/message.js'
 
 	export default {
 		data() {
@@ -186,6 +188,23 @@
 				this.passwordVisible = !this.passwordVisible;
 				this.$refs.password.blur()
 			},
+			async getMessageList(code) {
+				let params = {
+					customer: code,
+					msgType: 'app',
+					page: 1,
+					pagesize: 1,
+					msgStatus: 0
+				}
+				let res = await apiFindUnreadMsg(params)
+				if (res.status === 1 && res.data.Rows.length > 0) {
+					uni.setTabBarBadge({
+					  index:3,
+					  text: res.data.Total.toString()
+					})
+				}
+
+			},
 			// 登录
 			async goLogin() {
 				if (this.loginType === 'phone') {
@@ -238,6 +257,7 @@
 						uni.switchTab({
 							url: '/pages/home/home'
 						});
+						this.getMessageList(this.account)
 					}
 
 				}

pages/message/message.nvue

@@ -74,6 +74,10 @@
 					if (type === 0) {
 						this.unreadList = res.data.Rows
 						this.unreadCount = res.data.Total
+						uni.setTabBarBadge({
+						  index:3,
+						  text: res.data.Total.toString()
+						})
 					} else {
 						this.readList = res.data.Rows
 					}

pages/no-quota/order-upload.nvue

@@ -82,57 +82,71 @@
 		},
 		methods: {
 			async updateQuotaOrder() {
-				const {
-					INFO,
-					ITEM,
-				} = this.noQuotaOrder
-				let ATTACHMENT = this.noQuotaOrder.ATTACHMENT
-
-				ATTACHMENT = [...ATTACHMENT, ...this.imgFileBase64]
-
-				const params = {
-					"MODE": "SAVE",
-					INFO,
-					ITEM,
-					// "item_d": [],
-					// "USE": [],
-					ATTACHMENT
-				}
-				const res = await apiUpdateNoQuotaOrder(params)
-
-				const {
-					ATTACHMENT: ATTACHMENT2,
-					HISTORY,
-					INFO: INFO2,
-					ITEM: ITEM2
-				} = res.DATA
-
-				const params2 = {
-					// "USER_BP": "81000010",
-					"MODE": "SUBMIT",
-					"info": INFO2,
-					'ITEM': ITEM2,
-					// "item_d": [],
-					"attachment": ATTACHMENT2
+				let res1 = null
+				try{
+					const {
+						INFO,
+						ITEM,
+					} = this.noQuotaOrder
+					let ATTACHMENT = this.noQuotaOrder.ATTACHMENT
+
+					ATTACHMENT = [...ATTACHMENT, ...this.imgFileBase64]
+
+					const params = {
+						"MODE": "SAVE",
+						INFO,
+						ITEM,
+						// "item_d": [],
+						// "USE": [],
+						ATTACHMENT
+					}
+					res1 = await apiUpdateNoQuotaOrder(params)
+					if(res1.MSGTYPE !== 'S'){
+						return
+					}
+				}catch(e){
+					//TODO handle the exception
 				}
-				const res2 = await apiUpdateNoQuotaOrder(params2)
-				console.log('updateQuotaOrder', res2)
-				const {
-					INFO: INFO3,
-					ITEM: ITEM3,
-					ATTACHMENT: ATTACHMENT3,
-				} = res2.DATA
-				this.orderInfo = INFO3
-				let noQuotaOrder = {
-					INFO: INFO3,
-					ITEM: ITEM3,
-					ATTACHMENT: ATTACHMENT3,
+				try{
+					const {
+						ATTACHMENT: ATTACHMENT2,
+						HISTORY,
+						INFO: INFO2,
+						ITEM: ITEM2
+					} = res1.DATA
+
+					const params2 = {
+						// "USER_BP": "81000010",
+						"MODE": "SUBMIT",
+						"info": INFO2,
+						'ITEM': ITEM2,
+						// "item_d": [],
+						"attachment": ATTACHMENT2
+					}
+					const res2 = await apiUpdateNoQuotaOrder(params2)
+					console.log('updateQuotaOrder', res2)
+					if(res2.MSGTYPE !== 'S'){
+						return
+					}
+					const {
+						INFO: INFO3,
+						ITEM: ITEM3,
+						ATTACHMENT: ATTACHMENT3,
+					} = res2.DATA
+					this.orderInfo = INFO3
+					let noQuotaOrder = {
+						INFO: INFO3,
+						ITEM: ITEM3,
+						ATTACHMENT: ATTACHMENT3,
+					}
+					this.$uStore({
+						name: 'noQuotaOrder',
+						value: noQuotaOrder
+					});
+					this.$refs.popup.open('center')
+				}catch(e){
+					//TODO handle the exception
 				}
-				this.$uStore({
-					name: 'noQuotaOrder',
-					value: noQuotaOrder
-				});
-				this.$refs.popup.open('center')
 			},
 			change(e) {
 				console.log('当前模式：' + e.type + ',状态：' + e.show);

pages/no-quota/quota-order.nvue

@@ -194,7 +194,9 @@
 					ITEM
 				} = res
 				this.selectedSalesCenterArr = YXDY
-
+				if(YXDY.length === 1){
+					this.salesCenterIndex = 0
+				}
 				if (this.isKeepData) {
 					const {
 						INFO,

pages/order-detail-group/order-detail-group.nvue

@@ -40,7 +40,7 @@
 								</view>
 								<view class="text-block-box text-block-box-last">
 									<view class="text-block text-block-last">
-										<view class="middle-date">{{INFO.ZZFLD000099}}
+										<view class="middle-date">{{INFO.ZZFLD000099==='X'?'是':'否'}}
 											<button class="diy-entry" type="default" @click="goDiyPage">
 												<image class="diy-icon" src="../../static/image/address@3x.png" mode="">
 												</image>

pages/produce-order/order-list.nvue

@@ -9,7 +9,7 @@
 								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.prodpl_type}}</text>
+						<text class="item-block-label item-block__label">{{itemHead.prodpltype}}</text>
 					</view>
 					<view class="item-block">
 						<text class="item-block-label-des">{{itemHead.datum}}</text>

pages/purchase-receive/purchase-receive.nvue

@@ -46,7 +46,6 @@
 						</view>
 					</view>
 				</view>
-
 				<view class="middle view">
 					<view class="text-block" v-if="orderItem.isShunt - 1 === 0" @click="handleShuntAdress">
 						<text class="middle-date">分流收货单位</text>
@@ -501,7 +500,7 @@
 
 	.uni-list-cell {
 		flex: 1;
-		height: 100%;
+		// height: 100%;
 	}
 
 	.uni-list-cell-db {

pages/quota/order-upload.nvue

@@ -77,63 +77,76 @@
 		},
 		methods: {
 			async updateQuotaOrder() {
-				const {
-					INFO,
-					ITEM_INNER,
-					ITEM_OUTER,
-					ATTACHMENT
-				} = this.quotaOrder
-				const params = {
-					// "USER_BP": "81000010",
-					"MODE": "SAVE",
-					INFO,
-					ITEM_INNER,
-					ITEM_OUTER,
-					// "item_d": [],
-					// "USE": [],
-					ATTACHMENT
-				}
-				const res = await apiUpdateQuotaOrder(params)
-
-				const {
-					ATTACHMENT: ATTACHMENT2,
-					HISTORY,
-					INFO: INFO2,
-					ITEM_INNER: ITEM_INNER2,
-					ITEM_OUTER: ITEM_OUTER2,
-					USE
-				} = res.DATA
-
-				const params2 = {
-					// "USER_BP": "81000010",
-					"MODE": "SUBMIT",
-					INFO: INFO2,
-					'ITEM_INNER': ITEM_INNER2,
-					"ITEM_OUTER": ITEM_OUTER2,
-					// "item_d": [],
-					// "USE": USE,
-					"ATTACHMENT": ATTACHMENT2
+				let res1 = null
+				try{
+					const {
+						INFO,
+						ITEM_INNER,
+						ITEM_OUTER,
+						ATTACHMENT
+					} = this.quotaOrder
+					const params = {
+						// "USER_BP": "81000010",
+						"MODE": "SAVE",
+						INFO,
+						ITEM_INNER,
+						ITEM_OUTER,
+						// "item_d": [],
+						// "USE": [],
+						ATTACHMENT
+					}
+					res1 = await apiUpdateQuotaOrder(params)
+					if(res1.MSGTYPE !== 'S'){
+						return
+					}
+				}catch(e){
+					//TODO handle the exception
 				}
-				const res2 = await apiUpdateQuotaOrder(params2)
-				console.log('updateQuotaOrder', res2)
-				const {
-					INFO: INFO3,
-					ITEM_INNER: ITEM_INNER3,
-					ITEM_OUTER: ITEM_OUTER3,
-					ATTACHMENT: ATTACHMENT3,
-				} = res2.DATA
-				this.orderInfo = INFO3
-				let quotaOrder = {
-					INFO: INFO3,
-					ITEM_INNER: ITEM_INNER3,
-					ITEM_OUTER: ITEM_OUTER3,
-					ATTACHMENT: ATTACHMENT3,
+				try{
+					const {
+						ATTACHMENT: ATTACHMENT2,
+						HISTORY,
+						INFO: INFO2,
+						ITEM_INNER: ITEM_INNER2,
+						ITEM_OUTER: ITEM_OUTER2,
+						USE
+					} = res1.DATA
+					const params2 = {
+						// "USER_BP": "81000010",
+						"MODE": "SUBMIT",
+						INFO: INFO2,
+						'ITEM_INNER': ITEM_INNER2,
+						"ITEM_OUTER": ITEM_OUTER2,
+						// "item_d": [],
+						// "USE": USE,
+						"ATTACHMENT": ATTACHMENT2
+					}
+					const res2 = await apiUpdateQuotaOrder(params2)
+					if(res2.MSGTYPE !== 'S'){
+						return
+					}
+					console.log('updateQuotaOrder', res2)
+					const {
+						INFO: INFO3,
+						ITEM_INNER: ITEM_INNER3,
+						ITEM_OUTER: ITEM_OUTER3,
+						ATTACHMENT: ATTACHMENT3,
+					} = res2.DATA
+					this.orderInfo = INFO3
+					let quotaOrder = {
+						INFO: INFO3,
+						ITEM_INNER: ITEM_INNER3,
+						ITEM_OUTER: ITEM_OUTER3,
+						ATTACHMENT: ATTACHMENT3,
+					}
+					this.$uStore({
+						name: 'quotaOrder',
+						value: quotaOrder
+					});
+					this.$refs.popup.open('center')
+				}catch(e){
+					//TODO handle the exception
 				}
-				this.$uStore({
-					name: 'quotaOrder',
-					value: quotaOrder
-				});
-				this.$refs.popup.open('center')
 			},
 			change(e) {
 				console.log('当前模式：' + e.type + ',状态：' + e.show);
@@ -251,8 +264,8 @@
 		align-items: center;
 		justify-content: center;
 		align-self: center;
-		width: 344rpx;
-		height: 344rpx;
+		width: 388rpx;
+		height: 388rpx;
 		background: #f5f6f7;
 		border: 1px dashed #dedede;
 		border-radius: 4px;
@@ -267,6 +280,7 @@
 	/deep/ .uni-file-picker__container {
 		width: 100%;
 		height: 100%;
+		margin: 0;
 	}
 
 	.bottom-area {

pages/quota/quota-order.nvue

@@ -298,7 +298,9 @@
 					ITEM_INNER
 				} = res
 				this.selectedSalesCenterArr = YXDY
-
+				if(YXDY.length === 1){
+					this.salesCenterIndex = 0
+				}
 				if (this.isKeepData) {
 					const {
 						INFO,

pages/select-shunt-adress/select-shunt-adress.nvue

@@ -135,7 +135,7 @@
 				this.reset()
 				this.getSalesPlan(true, this.searchName);
 			},
-			async getSalesPlan(isRefresh, customerCode = this.orderItem.shuntingCustomer) {
+			async getSalesPlan(isRefresh, customerCode = this.orderItem.customerCode) {
 				if (this.loadParams.isDone) {
 					return
 				}