添加开通业务

pages/erp/index.vue

@@ -1,39 +1,45 @@
 <template>
 	<view class="wrap">
-		<view class="comp" @click='show0=true'>
-			<view>{{compName}}</view>
-			<u-icon name="arrow-right" color=""></u-icon>
-			<u-picker @confirm="compChange" range-key='compName' mode="selector" v-model="show0"
-				:range="compList"></u-picker>
-		</view>
-		<view class='title'>仓库管理</view>
-		<view class="dropdown">
-			<view class="left" @click='show1=true'>
-				<view>{{warehouseName}}</view>
-				<u-icon name="arrow-right" color=""></u-icon>
-				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show1"
-					:range="warehouseList"></u-picker>
+		<view v-if="!isShowAlert">
+			<view class="comp" @click='show0=true'>
+				<view>{{compName}}</view>
+				<u-icon name="arrow-right" color="" v-if="compList.length>1"></u-icon>
+				<u-picker @confirm="compChange" range-key='compName' mode="selector" v-model="show0"
+					:range="compList" v-if="compList.length>1"></u-picker>
 			</view>
-			<view class="right" @click='show2=true'>
-				<view>{{binNumber}}仓位</view>
-				<u-icon name="arrow-right" color=""></u-icon>
-				<u-picker @confirm="warehouseCWchange" range-key='binNumber' mode="selector" v-model="show2"
-					:range="warehouseCWList"></u-picker>
+			<view class='title'>仓库管理</view>
+			<view class="dropdown">
+				<view class="left" @click='show1=true'>
+					<view>{{warehouseName}}</view>
+					<u-icon name="arrow-right" color=""></u-icon>
+					<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show1"
+						:range="warehouseList"></u-picker>
+				</view>
+				<view class="right" @click='show2=true'>
+					<view>{{binNumber}}仓位</view>
+					<u-icon name="arrow-right" color=""></u-icon>
+					<u-picker @confirm="warehouseCWchange" range-key='binNumber' mode="selector" v-model="show2"
+						:range="warehouseCWList"></u-picker>
+				</view>
 			</view>
-		</view>
-
-		<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
-			<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)"
-				v-if="index<gridCol*2">
-				<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-					<image :src="item.src" class="sign"></image>
+			
+			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
+				<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)"
+					v-if="index<gridCol*2">
+					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
+						<image :src="item.src" class="sign"></image>
+					</view>
+			
+					<text>{{item.name}}</text>
 				</view>
-
-				<text>{{item.name}}</text>
 			</view>
 		</view>
-		<u-modal v-model="isShowAlert" confirm-color='#22C572' confirm-text='立即开通' title='您尚未开通ERP业务'
-			:content="content"></u-modal>
+		
+		<u-modal v-model="isShowAlert"
+		 :title-style="{fontSize: '18px',fontWeight:'500'}" 
+		 :content-style="{fontSize: '14px',fontWeight:'400'}" 
+		 confirm-color='#22C572' confirm-text='立即开通' title='您尚未开通ERP业务'
+		 :content="content" @confirm="goOpenService"></u-modal>
 	</view>
 </template>
 <script>
@@ -51,11 +57,8 @@ import helper from '@/common/helper.js';
 				show1: false,
 				show2: false,
 				isShowAlert: false,
-				compName:'黑龙江中天昊元贸易有限公司',
-				compList:[{
-						compName:'黑龙江中天昊元贸易有限公司'
-				}
-				],
+				compName:'',
+				compList:[],
 				content: '易粮易运ERP系统包含合同管理、仓库管理、运输管理、结算管理等多个模块，可为粮企提供粮食贸易的全流程服务，平台诚邀您的加入。',
 				warehouseName: '暂无仓库',
 				binNumber: '暂无',
@@ -170,8 +173,29 @@ import helper from '@/common/helper.js';
 					})
 				}
 			})
+			this.$api.doRequest('get', '/openServiceInfo/selectCommonCompany',{
+				phone:this.userInfo.phone
+			}).then(res => {debugger
+				if (res.data.code == 200) {
+					debugger
+					if(res.data.data.length==0){
+						this.isShowAlert = true
+					}
+					this.isShowAlert = true
+					this.compList = res.data.data
+					this.compName = res.data.data[0].compName
+				}
+			})
 		},
 		methods: {
+			goOpenService(){debugger
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url: '/pages/erp/openService/openService'
+				})
+			},
 			/**
 			 * 统一跳转接口,拦截未登录路由
 			 * navigator标签现在默认没有转场动画，所以用view
@@ -370,4 +394,8 @@ import helper from '@/common/helper.js';
 		color: #333333;
 		margin-bottom: 20rpx;
 	}
+	 .-model__title{
+		background: red;
+		color: red;
+	}
 </style>

pages/erp/openService/openService.vue

@@ -3,17 +3,18 @@
 		<view class="content">
 			<view class="row row-bottom">
 				<view class="left">姓名</view>
-				<input @input='calculate' class="right-bottom" placeholder="请输入姓名"></input>
+				<input v-model="personInfo.name" class="right-bottom" placeholder="请输入姓名"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">电话</view>
-				<input @input='calculate' class="right-bottom" placeholder="请输入电话"></input>
+				<input class="right-bottom" v-model="personInfo.mobilePhone" placeholder="请输入电话"></input>
 			</view>
 			<view class="row no-boder">
 				<view class="left">留言</view>
 			</view>
 			<view class="row no-boder">
-				<u-input v-model="value" :type="type" :border="border" :height="height" :auto-height="autoHeight" />
+				<u-input v-model="personInfo.message" :type="type" :border="border" :height="height"
+					:auto-height="autoHeight" />
 			</view>
 			<view class="bottom">
 				<u-button type="primary" class="submit" hover-class="none" @click="submit">提交</u-button>
@@ -33,7 +34,13 @@
 		},
 		data() {
 			return {
-				value: '',
+				personInfo: {
+					name: '',
+					mobilePhone: '',
+					message: '',
+					type: 1
+
+				},
 				type: 'textarea',
 				border: true,
 				height: 150,
@@ -105,11 +112,29 @@
 			},
 			calculate() {},
 			submit() {
-				this.$refs.uToast.show({
-					title: '登录成功',
-					type: 'error',
-					url: '/pages/user/index'
+				if (!this.personInfo.name) {
+					this.$refs.uToast.show({
+						title: '姓名不能为空！',
+						type: 'error',
+					})
+				}
+				if (!this.personInfo.mobilePhone) {
+					this.$refs.uToast.show({
+						title: '电话号码不能为空！',
+						type: 'error',
+					})
+				}
+				this.$api.doRequest('post', '/openServiceInfo/api/addInfo', this.personInfo).then(res => {
+					debugger
+					if (res.data.code == 200) {
+						this.$refs.uToast.show({
+							title: '提交成功，客服人员会及时与您取得联系。！',
+							type: 'success',
+							back: true
+						})
+					}
 				})
+
 			}
 		}
 	}

pages/erp/warehousing/warehousing.vue

@@ -69,7 +69,7 @@
 			<view class="row">
 				<view class="left">经办人</view>
 				<view @click='show6=true'>{{detailData.agent}}</view>
-				<u-picker :range="handlerList" range-key="agent" @confirm='handlerPicker($event)' v-model="show6" mode="selector">
+				<u-picker :range="handlerList" range-key="staffName" @confirm='handlerPicker($event)' v-model="show6" mode="selector">
 				</u-picker>
 			</view>
 			<view class="row">
@@ -93,15 +93,15 @@
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
-				<input @input='' v-model='detailData.grossWeight' class="right-bottom"
-					placeholder="自动获取" disabled="isEditCB"></input>
-					<u-button class="edit-btn" @click="edit">编辑</u-button>
+				<input @input='' v-model='detailData.cost' class="right-bottom"
+					placeholder="自动获取" :disabled="isEditCB"></input>
+					<u-button class="edit-btn" hover-class="none" @click="editCB">编辑</u-button>
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">运费（元/吨）</view>
-				<input @input='' v-model='detailData.grossWeight' disabled="isEditYF" class="right-bottom"
+				<input @input='' v-model='detailData.freight' :disabled="isEditYF" class="right-bottom"
 					placeholder="自动获取"></input>
-					<u-button class="edit-btn">编辑</u-button>
+					<u-button class="edit-btn" hover-class="none" @click="editYF">编辑</u-button>
 			</view>
 		</view>
 		<view class="content2">
@@ -116,36 +116,36 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">质检员</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='calculate' v-model='detailData.qualityInspector' class="right-bottom"
 					placeholder="输入质检员姓名"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">水分（%）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='calculate' v-model='detailData.waterContent' class="right-bottom"
 					placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom" style="border: 0;">
 				<view class="left">容重（克/升）</view>
-				<input v-model='detailData.netWeight' class="right-bottom" disabled placeholder="输入容重"></input>
+				<input v-model='detailData.bulkDensity' class="right-bottom" disabled placeholder="输入容重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">热损伤（%）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='calculate' v-model='detailData.jiaorenli' class="right-bottom"
 					placeholder="输入热损伤占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">杂质（%）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='calculate' v-model='detailData.impurity' class="right-bottom"
 					placeholder="输入杂质占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">霉变粒（%）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='calculate' v-model='detailData.mildewGrain' class="right-bottom"
 					placeholder="输入霉变粒占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">不完善粒（%）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='calculate' v-model='detailData.imperfectGrain' class="right-bottom"
 					placeholder="输入不完善粒占比"></input>
 			</view>
 		</view>
@@ -233,7 +233,7 @@
 					goodsName: "123",
 					inOutDate:'请输入入库日期',
 					grade:"一等品",
-					agent:'张三',
+					agent:'请选择经办人',
 					inOutType:'请选择入库类型',
 					qualityInspectionManagement: {}
 				}
@@ -243,8 +243,6 @@
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			this.compId = helper.erpWarehouse.compId
-			//获取经办人
-			// this.detailData.agent = helper.erpWarehouse.agent
 			console.log(helper.erpWarehouse)
 		},
 		onShow() {
@@ -258,9 +256,18 @@
 			}
 			// 获取入库类型
 			this.getrkType()
+			//获取经办人
+			this.getPerson()
 			
 		},
 		methods: {
+			getPerson(){
+				this.$api.doRequest('get', '/staff/query/getStaffListByCompId', {
+				    compId: this.compId
+				   }).then(res => {
+				    this.handlerList = res.data.data
+				   })
+			},
 			getrkType(){
 				this.$api.doRequest('get', '/commonSysParameter/getInfo', {
 				    constId: 'CON5'
@@ -280,6 +287,7 @@
 			},
 			handlerPicker(e) {
 				console.log(e)
+				this.detailData.agent = this.handlerList[e].staffName
 			},
 			dateChange(e){
 				console.log(e)
@@ -349,6 +357,12 @@
 				console.log(e)
 			},
 			onRemove(index) {},
+			editCB(){
+				this.isEditCB = false
+			},
+			editYF(){
+				this.isEditYF = false
+			},
 			submit() {
 				if (!this.detailData.grossWeight) {
 					this.$api.msg('毛重不能为空')