市场秩序

pages/breakwords-clue/breakwords-clue.vue

@@ -258,7 +258,7 @@
 			<view class="middle view planout-block-item">
 				<view class="text-block">
 					<text class="middle-date">产品名称</text>
-					<text class="middle-date-des">{{productByBarcode.productId}}</text>
+					<text class="middle-date-des">{{productByBarcode.name}}</text>
 				</view>
 				<view class="text-block">
 					<text class="middle-date">物流码</text>
@@ -284,16 +284,35 @@
 				</view>
 				<view class="text-block no-border">
 					<text class="middle-date">事发战区及货源相关信息</text>
-					<text class="middle-date-des"></text>
 				</view>
-				<view class="text-block no-border">
+				<view class="text-block no-border" v-if="happenSalesDetail.happenSalesAreaName">
 					<text class="middle-date">事发战区</text>
-					<text class="middle-date-des">{{distributerByBarcode.productDisSalesAreaName}}</text>
+					<text class="middle-date-des">{{happenSalesDetail.happenSalesAreaName}}</text>
 				</view>
-				<view class="text-block no-border">
+				<view class="text-block no-border" v-if="happenSalesDetail.happenSubSalesAreaName">
 					<text class="middle-date">事发基地</text>
+					<text class="middle-date-des">{{happenSalesDetail.happenSubSalesAreaName}}</text>
+				</view>
+				<view class="text-block no-border" v-if="distributerByBarcode.productChannelName">
+					<text class="middle-date">货源渠道</text>
+					<text class="middle-date-des">{{distributerByBarcode.productChannelName}}</text>
+				</view>
+				<view class="text-block no-border" v-if="distributerByBarcode.productDisSalesAreaName">
+					<text class="middle-date">货源经销商战区</text>
+					<text class="middle-date-des">{{distributerByBarcode.productDisSalesAreaName}}</text>
+				</view>
+				<view class="text-block no-border" v-if="distributerByBarcode.productDisSubSalesAreaName">
+					<text class="middle-date">货源经销商基地</text>
 					<text class="middle-date-des">{{distributerByBarcode.productDisSubSalesAreaName}}</text>
 				</view>
+				<view class="text-block no-border" v-if="distributerByBarcode.productDistributerName">
+					<text class="middle-date">货源经销商</text>
+					<text class="middle-date-des">{{distributerByBarcode.productDistributerName}}</text>
+				</view>
+				<view class="text-block no-border" v-if="distributerByBarcode.productDisChaManagerName">
+					<text class="middle-date">货源经销商渠道经理</text>
+					<text class="middle-date-des">{{distributerByBarcode.productDisChaManagerName}}</text>
+				</view>
 			</view>
 
 			<view class="middle view">
@@ -353,7 +372,8 @@
 		apiGetDictionary,
 		apiClueSubmit,
 		apiGetClueProduct,
-		apiGetClueDistributer
+		apiGetClueDistributer,
+		apiGetClueDistributerInfo
 	} from '@/servers/breakwords.js'
 
 	import {
@@ -415,6 +435,7 @@
 				},
 				productByBarcode: {},
 				distributerByBarcode: {},
+				happenSalesDetail: {},
 			}
 		},
 		computed: {
@@ -449,6 +470,8 @@
 			// 事发渠道
 			this.getDictionary('ChannelType')
 			this.getProvinceCode('provincecode')
+			// 事发基地
+			this.addDistributerByBarcodeInfo()
 		},
 		mounted() {
 			console.log('监听到事件来自 update');
@@ -570,6 +593,18 @@
 				}
 
 			},
+			async addDistributerByBarcodeInfo() {
+				const params = {
+					distributerId: '4000021900'
+				}
+				const res = await apiGetClueDistributerInfo(params)
+				this.happenSalesDetail = {
+					'happenSalesAreaCode': res.data.salesAreaId,
+					'happenSalesAreaName': res.data.salesAreaName,
+					'happenSubSalesAreaCode': res.data.subSalesAreaId,
+					'happenSubSalesAreaName': res.data.subSalesAreaName
+				}
+			},
 			deleteProductByBarcode() {
 				this.productByBarcode = {}
 				this.distributerByBarcode = {}
@@ -586,14 +621,17 @@
 					'cityName': this.condition.cityName,
 					'doorPicUrl': this.condition.doorPicUrl,
 					'entries': [this.productByBarcode],
-					'happenSalesAreaCode': this.distributerByBarcode.productDisSalesAreaId,
-					'happenSalesAreaName': this.distributerByBarcode.productDisSalesAreaName,
-					'happenSubSalesAreaCode': this.distributerByBarcode.productDisSubSalesAreaId,
-					'happenSubSalesAreaName': this.distributerByBarcode.productDisSubSalesAreaName,
 					'happenChannelId': this.condition.happenChannelId,
 					'invoicePicUrl': this.condition.invoicePicUrl,
-					'productChannelId': this.condition.productChannelId,
-					'productChannelName': this.condition.productChannelName,
+					
+					// 战区
+					'happenSalesAreaCode': this.happenSalesDetail.happenSalesAreaCode,
+					'happenSalesAreaName': this.happenSalesDetail.happenSalesAreaName,
+					'happenSubSalesAreaCode': this.happenSalesDetail.happenSubSalesAreaCode,
+					'happenSubSalesAreaName': this.happenSalesDetail.happenSubSalesAreaName,
+					// 战区下面五个字段
+					'productChannelId': this.distributerByBarcode.productChannelId,
+					'productChannelName': this.distributerByBarcode.productChannelName,
 					'productDisChaManagerId': this.distributerByBarcode.productDisChaManagerId,
 					'productDisChaManagerName': this.distributerByBarcode.productDisChaManagerName,
 					'productDisSalesAreaId': this.distributerByBarcode.productDisSalesAreaId,
@@ -602,6 +640,7 @@
 					'productDisSubSalesAreaName': this.distributerByBarcode.productDisSubSalesAreaName,
 					'productDistributerId': this.distributerByBarcode.productDistributerId,
 					'productDistributerName': this.distributerByBarcode.productDistributerName,
+					
 					'productPicUrl': this.condition.productPicUrl,
 					'provinceCode': this.condition.provinceCode,
 					'provinceName': this.condition.provinceName,
@@ -722,9 +761,8 @@
 	}
 
 	.middle-date {
-		flex: 2;
+		flex: 3;
 		font-size: 28rpx;
-		line-height: 96rpx;
 		color: #999;
 		margin-bottom: 8rpx;
 	}
@@ -732,11 +770,10 @@
 	.middle-date-des {
 		display: flex;
 		align-items: center;
-		flex: 7;
+		flex: 4;
 		font-size: 28rpx;
 		color: $text-base-color;
 		height: 96rpx;
-		line-height: 96rpx;
 	}
 
 	.middle-date-buttons {}

pages/breakwords-market/breakwords-market.nvue

@@ -28,7 +28,7 @@
 					</view>
 					<view class="search-input-block">
 						<input class="search-input" type="text" placeholder-class="uni-combox__input-plac"
-							@blur="getClueList" v-model="condition.productId" placeholder="请输入产品ID" />
+							@blur="getClueList" v-model="condition.productId" placeholder="请输入产品名称" />
 						<image @click="getClueList" class="icon-search" src="@/static/image/search_b@3x.png" mode="">
 						</image>
 					</view>
@@ -282,6 +282,7 @@
 			bindPickerTypesChange(e) {
 				console.log('bindPickerTypesChange', e.detail.value)
 				this.viloationTypeSelected = this.violationTypeData[e.detail.value]
+				this.getClueList(true)
 			},
 			checkTab(i) {
 				this.activeTabIndex = i

pages/home/home.vue

@@ -286,7 +286,7 @@
 		},
 		
 		created() {
-			this.getHomeStatistics()
+			// this.getHomeStatistics()
 			this.queryProducts()
 			this.queryUnique()
 			this.pointsAndCashSummary()

pages/produce-material/produce-material.nvue

@@ -41,7 +41,7 @@
 				</view>
 			</uni-cell>
 		</uni-list>
-		<no-data v-if="isNoData" @retry="loadMore"></no-data>
+		<no-data :style="listTop" v-if="isNoData" @retry="loadMore"></no-data>
 	</view>
 </template>
 

pages/purchase-plan/purchase-plan.nvue

@@ -12,8 +12,8 @@
 						<view class="uni-list-cell">
 							<view class="uni-list-cell-db">
 								<picker class="picker-block" @change="bindPickerYearChange" mode="date"
-									:value="condition.RT_GJAHR[0].LOW" fields='year'>
-									<text class="uni-input-text">{{condition.RT_GJAHR[0].LOW}}</text>
+									:value="condition.GJAHR[0].LOW" fields='year'>
+									<text class="uni-input-text">{{condition.GJAHR[0].LOW}}</text>
 								</picker>
 							</view>
 						</view>
@@ -88,6 +88,7 @@
 					<view class="planout-block-item__last"> </view>
 				</list>
 			</scroll-view>
+			<no-data v-if="lists.length === 0"></no-data>
 		</view>
 	</view>
 </template>
@@ -106,7 +107,7 @@
 	} from '@/servers/purchasePlan.js'
 
 	import timeFormat from '@/uview-ui/libs/function/timeFormat.js'
-
+	import noData from '@/components/nodata.nvue';
 	export default {
 		data() {
 			return {
@@ -117,13 +118,13 @@
 				condition: {
 					MV_BP: '',
 					ROLE: 'WLY001',
-					RT_GJAHR: [{
+					GJAHR: [{
 						SIGN: 'I',
 						OPTION: 'EQ',
 						LOW: '',
 						HIGH: ''
 					}],
-					RT_PLAN_TYPE: [{
+					PLAN_TYPE: [{
 						SIGN: 'I',
 						OPTION: 'EQ',
 						LOW: '',
@@ -146,6 +147,9 @@
 				lists: [],
 			}
 		},
+		components: {
+			noData,
+		},
 		computed: {
 			...mapState(['sysinfo', 'userInfo']),
 			navHeight() {
@@ -174,7 +178,7 @@
 		// 	}, 600);
 		// },
 		created() {
-			this.condition.RT_GJAHR[0].LOW = timeFormat(new Date(), 'yyyy')
+			this.condition.GJAHR[0].LOW = timeFormat(new Date(), 'yyyy')
 			this.condition.MV_BP = this.userInfo.code
 			this.reset()
 			this.getSalesPlanTypes(true);
@@ -274,19 +278,19 @@
 				const res = await apiSalesPlanTypesSelect(params)
 				this.selectedSalePlanTypes = res.DATA
 				this.selectedSalePlan = this.selectedSalePlanTypes[this.typesIndex]
-				this.condition.RT_PLAN_TYPE[0].LOW = this.selectedSalePlanTypes[this.typesIndex].VALUE_ID
+				this.condition.PLAN_TYPE[0].LOW = this.selectedSalePlanTypes[this.typesIndex].VALUE_ID
 				this.getSalesPlan()
 			},
 			bindPickerTypesChange(e) {
 				console.log('bindPickerTypesChange', e.detail.value)
 				this.typesIndex = e.detail.value
-				this.condition.RT_PLAN_TYPE[0].LOW = this.selectedSalePlanTypes[this.typesIndex].VALUE_ID
-				this.getSalesPlan()
+				this.condition.PLAN_TYPE[0].LOW = this.selectedSalePlanTypes[this.typesIndex].VALUE_ID
+				this.getSalesPlan(true)
 			},
 			bindPickerYearChange(e) {
 				console.log('bindPickerYearChange', e.detail.value)
-				this.condition.RT_GJAHR[0].LOW = e.detail.value
-				this.getSalesPlan()
+				this.condition.GJAHR[0].LOW = e.detail.value
+				this.getSalesPlan(true)
 			},
 			handleClick(e, content, index) {
 				console.log('click当前索引：', e, content, index);
@@ -313,7 +317,6 @@
 		opacity: 0.72;
 		margin-top: -88rpx;
 	}
-
 	.header-bg-img {
 		width: 750rpx;
 	}

servers/breakwords.js

@@ -40,6 +40,16 @@ export async function apiGetClueDistributer(params) {
 	return res
 }
 
+/**
+ * 事发战区
+ * @param name 账户名
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function apiGetClueDistributerInfo(params) {
+	const res = await apiHelper.post('/wmdpwebservices/clue/distributer/info', params)
+	return res
+}
+
 /**
  * 线索提交
  * @param name 账户名