2121

pages/teamLeader/components/report/otherInfor6.vue

@@ -158,9 +158,18 @@
 						<view class="row">
 							<text>购物店名称</text>
 						</view>
-						<view class="inputBoxRight row" @click="showOptionVisible(i,1)">
-							<text>{{item.ShopStr?item.ShopStr:'选择购物店名称'}}</text>
-							<u-icon class="iconRight" name="arrow-down" color="#BBBBBB" size="42" />
+						<!--日本线选择购物店-->
+						<view v-if="data&&data.IsSelectShop">
+							<view class="inputBoxRight row" @click="showOptionVisible(i,1)">
+								<text>{{item.ShopName?item.ShopName:'选择购物店名称'}}</text>
+								<u-icon class="iconRight" name="arrow-down" color="#BBBBBB" size="42" />
+							</view>
+						</view>
+						<!--其他线路填写购物店-->
+						<view v-else>
+							<view class="inputBoxRight">
+								<input class="text-right" type="text" v-model="item.ShopName" />
+							</view>
 						</view>
 					</view>
 					<view class="inputBox row justify-between">
@@ -274,7 +283,7 @@
 					x.EnterTime = x.EnterTime ? this.$utils.formatDates(new Date(x.EnterTime), 'yyyy-MM-dd') :
 						null
 					let findIndex = this.options.findIndex(y => y.id == x.ShopId)
-					if (findIndex != -1) x.ShopStr = this.options[findIndex].name
+					if (findIndex != -1) x.ShopName = this.options[findIndex].name
 					let findIndex2 = this.currencyList.findIndex(y => y.id == x.CurrencyId)
 					if (findIndex2 != -1) x.CurrencyName = this.currencyList[findIndex2].name
 				})
@@ -310,7 +319,7 @@
 				if (this.optionType == 1) {
 					this.optionList = this.options
 					this.optionObj = {
-						name: this.LeaderShopList[this.ReimIndex].ShopStr,
+						name: this.LeaderShopList[this.ReimIndex].ShopName,
 						id: this.LeaderShopList[this.ReimIndex].ShopId,
 					}
 				} else {
@@ -330,7 +339,7 @@
 				let findIndex = this.optionList.findIndex(x => x.id == value)
 				this.optionObj = this.optionList[findIndex]
 				if (this.optionType == 1) {
-					this.LeaderShopList[this.ReimIndex].ShopStr = this.optionObj.name
+					this.LeaderShopList[this.ReimIndex].ShopName = this.optionObj.name
 					this.LeaderShopList[this.ReimIndex].ShopId = this.optionObj.id
 				} else {
 					this.LeaderShopList[this.ReimIndex].CurrencyName = this.optionObj.name
@@ -359,7 +368,7 @@
 					...this.ReimDatas,
 					Id: 0,
 					ShopId: null,
-					ShopStr: '',
+					ShopName: '', //购物店名称
 					CurrencyName: '',
 					CurrencyId: 0,
 					ShopMoney: 0,