Просмотр исходного кода

Merge branch 'develop_yh3' of jianguan-web/qpls-md-app into pre-release

李磊 2 лет назад
Родитель
Сommit
5e38bb0a82

+ 3 - 14
api/data.js

@@ -1,11 +1,5 @@
 import axios from '@/libs/axios.js';
 // 根据字典code查询选项
-// export const getLookUpDatas = (params) => {
-//   return axios.request({
-//     url: `lookup/findByLookup/${params.type}`,
-//     method: 'get'
-//   })
-// }
 export const getLookUpDatas = (params) => {
   const url = `lookupItem/query/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -16,20 +10,15 @@ export const getLookUpDatas = (params) => {
     method: 'post'
   })
 }
+
 export const listLookUp = (params) => {
-  const url = `/lookup/queryLike`
+  const url = `lookup/queryLike`
   return axios.request({
     url: url,
     method: 'POST'
   }).then(res => res)
 }
-// export const listLookUp = (params) => {
-//   let url = `lookup/findAll`
-//   return axios.request({
-//     url: url,
-//     method: 'post'
-//   }).then(res => res)
-// }
+ 
 // 查询最新版本信息
 export const getSysVersion = (params) => {
   return axios.request({

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "iSCM智慧供应链",
     "appid" : "__UNI__5B57B68",
     "description" : "iSCM智慧供应链系统",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
+    "versionName" : "1.1.4",
+    "versionCode" : 114,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
pages/index/printAbc.vue

@@ -36,7 +36,7 @@
 				opt.writeId, 
 				command.getData(), 
 				function(){
-					const result ='A、B、C、D、E、F、G、H、I、J'.split('、')
+					const result ='A、B、C、D、E、F、G、H、I、J、K、L、M、N、O、P、Q、R、S、T、U、V、W、X、Y、Z'.split('、')
 					_this.printIndex = _this.printIndex + 1
 					if(_this.printIndex < result.length){
 						_this.printOnce(opt,tsc,blesdk,result[_this.printIndex])
@@ -49,7 +49,7 @@
 			},
 			// 批量打印 
 			startPrint(opt,tsc,blesdk){
-				const result = 'A、B、C、D、E、F、G、H、I、J'.split('、')
+				const result = 'A、B、C、D、E、F、G、H、I、J、K、L、M、N、O、P、Q、R、S、T、U、V、W、X、Y、Z'.split('、')
 				if(result.length){
 					 if(this.isParinting){
 					 	return

+ 24 - 0
pages/sales/index.vue

@@ -56,6 +56,7 @@
 	import ListComponent from './listComponent.vue'
 	import { toThousands } from '@/libs/tools'
 	import { bizData } from '@/api/sales'
+	import { listLookUp, getLookUpDatas } from '@/api/data.js'
 	export default{
 		components: { ListComponent },
 		data(){
@@ -116,6 +117,11 @@
 				console.log(res)
 			  }
 			})
+			
+			// 获取数据字典
+			this.getListLookUp();
+			// 获取支付,收款方式
+			this.getLookUpList('SETTLE_STYLE', 'vuex_paymentTypeList');
 		},
 		onUnload() {
 			uni.$off('refreshSalesHomeBL')
@@ -125,6 +131,24 @@
 			this.getBizData()
 		},
 		methods:{
+			//  获取数据字典
+			getListLookUp() {
+				const _this = this;
+				listLookUp().then(res => {
+					if (res.status == 200) {
+						_this.$store.state.vuex_allLookUp = res.data;
+					}
+				});
+			},
+			// 或某一项字典列表,参数code
+			getLookUpList(code, vuexKey) {
+				getLookUpDatas({ pageNo: 1,pageSize: 1000, lookupCode: code}).then(res => {
+					console.log(res)
+					if (res.status == 200) {
+						this.$store.state[vuexKey] = res.data.list || [];
+					}
+				});
+			},
 			seleteTime(val){
 				this.navInd = val
 			},

+ 23 - 17
pages/sales/list.vue

@@ -72,25 +72,31 @@
 				if(this.searchForm.financialStatus){
 					data.financialStatus = this.searchForm.financialStatus
 				}
-				if(params.beginDate){
-					data.beginDate = params.beginDate
-				}
-				if(params.endDate){
-					data.endDate = params.endDate
-				}
-				if(params.buyerName){
-					data.buyerName = params.buyerName
-				}
-				if(params.salesBillNo){
-					data.salesBillNo = params.salesBillNo
-				}
-				if(params.purchaseBillNo){
-					data.purchaseBillNo = params.purchaseBillNo
-				}
-				if(params.settleStyleSn){
-					data.settleStyleSn = params.settleStyleSn
+				
+				if(params){
+					if(params.beginDate){
+						data.beginDate = params.beginDate
+					}
+					if(params.endDate){
+						data.endDate = params.endDate
+					}
+					if(params.buyerName){
+						data.buyerName = params.buyerName
+					}
+					if(params.salesBillNo){
+						data.salesBillNo = params.salesBillNo
+					}
+					if(params.purchaseBillNo){
+						data.purchaseBillNo = params.purchaseBillNo
+					}
+					if(params.settleStyleSn){
+						data.settleStyleSn = params.settleStyleSn
+					}
 				}
+				
 				this.searchParams = data
+				this.searchParams.beginDate = data.beginDate ? (data.beginDate + ' 00:00:00') : ''
+				this.searchParams.endDate = data.endDate ? (data.endDate + ' 23:59:59') : ''
 				console.log(this.searchParams,'this.searchParams')
 				this.$nextTick(function(){
 					_this.$refs.salesList.refash()

+ 1 - 1
pages/sales/listComponent.vue

@@ -25,7 +25,7 @@
 						</view>
 						<view class="list-item-line flex align_center justify_between">
 							<view class="flex_1">财务状态:<text>{{item.financialStatusDictValue||'--'}}</text></view>
-							<view class="flex_1">收款方式:<text>{{item.settleStyleEntity&&item.settleStyleEntity.name||'--'}}</text></view>
+							<view class="flex_1">收款方式:<text>{{item.settleStyleSnDictValue||'--'}}</text></view>
 						</view>
 					</view>
 					<!-- <view class="button-box">

+ 1 - 1
pages/sales/orderInfoModal.vue

@@ -23,7 +23,7 @@
 				</view>
 				<view>
 					<text class="info-item-tit">收款方式:</text>
-					<text class="info-item-txt">{{infoData && infoData.settleStyleEntity && infoData.settleStyleEntity.name || '--'}}</text>
+					<text class="info-item-txt">{{infoData && infoData.settleStyleSnDictValue || '--'}}</text>
 				</view>
 				<view>
 					<text class="info-item-tit">制单人:</text>

+ 16 - 19
pages/sales/salesSearch.vue

@@ -28,7 +28,7 @@
 		<!-- 选择日期范围 -->
 		<u-calendar v-model="showDate" @change="dateChange" mode="range"></u-calendar>
 		<!-- 选择收款方式 -->
-		<u-picker v-model="settleStyleModal" @confirm="settleStyleChange" :range="settleStyleList" range-key="name" mode="selector"></u-picker>
+		<u-picker v-model="settleStyleModal" @confirm="settleStyleChange" :range="settleStyleList" range-key="dispName" mode="selector"></u-picker>
 	</view>
 </template>
 
@@ -76,7 +76,6 @@
 		},
 		mounted() {
 			this.init()
-			this.getTypeList()
 		},
 		methods: {
 			//  初始化数据
@@ -106,8 +105,9 @@
 				this.form.beginDate = ''
 				this.form.endDate = ''
 				this.$refs.uForm.resetFields()
-				this.$emit('refresh', {})
+				this.$emit('refresh', null)
 				this.isShow = false
+				this.clearTime()
 			},
 			//  清空收款方式
 			clearSettleStyle(){
@@ -116,26 +116,21 @@
 			},
 			// 收款方式  change
 			settleStyleChange(ind){
-				this.form.settleStyleSn = this.settleStyleList[ind].settleStyleSn || undefined
-				this.settleStyleName = this.settleStyleList[ind].name || ''
+				this.form.settleStyleSn = this.settleStyleList[ind].code || undefined
+				this.settleStyleName = this.settleStyleList[ind].dispName || ''
 			},
 			// 收款方式
 			getTypeList () {
-				settleStyleQueryAll({}).then(res => {
-					if (res.status == 200 && res.data) {
-						this.settleStyleList = res.data
-						// 收款方式有值时,匹配对应name
-						if(this.defaultParams.settleStyleSn || this.defaultParams.settleStyleSn==0){
-							this.settleStyleList.map(item => {
-								if(item.settleStyleSn == this.defaultParams.settleStyleSn){
-									this.settleStyleName = item.name
-								}
-							})
+				this.settleStyleList = this.$store.state.vuex_paymentTypeList
+				console.log(this.settleStyleList)
+				// 收款方式有值时,匹配对应name
+				if(this.defaultParams.settleStyleSn || this.defaultParams.settleStyleSn==0){
+					this.settleStyleList.map(item => {
+						if(item.code == this.defaultParams.settleStyleSn){
+							this.settleStyleName = item.dispName
 						}
-					} else {
-						this.settleStyleList = []
-					}
-				})
+					})
+				}
 			},
 			// 时间  change
 			dateChange(date){
@@ -159,6 +154,8 @@
 			isShow (newValue, oldValue) {
 				if (!newValue) {
 					this.$emit('close')
+				}else{
+					this.getTypeList()
 				}
 			}
 		}

+ 1 - 0
store/index.js

@@ -107,6 +107,7 @@ const store = new Vuex.Store({
 		vuex_lastBuleDevice: null,
 		vuex_OrderAddress: {}, // 地址
 		vuex_allLookUp: [],  //  数据字典
+		vuex_paymentTypeList: [], // 收款方式
 	},
 	mutations: {
 		$uStore(state, payload) {