Prechádzať zdrojové kódy

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

zhongtianhaoyuan 3 rokov pred
rodič
commit
0072018f30

+ 34 - 9
pages/erp/contactCustomerService/contactCustomerService.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,10 +34,16 @@
 		},
 		data() {
 			return {
-				value: '',
+				personInfo: {
+					name: '',
+					mobilePhone: '',
+					message: '',
+					type: 1
+
+				},
 				type: 'textarea',
 				border: true,
-				height: 100,
+				height: 150,
 				autoHeight: true,
 			}
 		},
@@ -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 => {
+					
+					if (res.data.code == 200) {
+						this.$refs.uToast.show({
+							title: '提交成功,客服人员会及时与您取得联系。!',
+							type: 'success',
+							back: true
+						})
+					}
 				})
+
 			}
 		}
 	}

+ 0 - 1
pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -73,7 +73,6 @@
 			confirmWarehouse() {},
 			confirmPositon() {},
 			goDetail(val) {
-				debugger
 				
 				uni.navigateTo({
 					// /pages/erp/warehousing/selectContractNo

+ 46 - 24
pages/erp/improvedWrehousing/improvedWrehousing.vue

@@ -16,10 +16,22 @@
 		</view>
 		<view class="content2">
 			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
-				<view class="item-style">{{item.contractNo}}</view>
-				<view class="item-style">{{item.carNo}}</view>
-				<view class="item-style">{{item.inOutDate}}</view>
-				<view class="item-style">{{item.backOffice}}</view>
+				<view class="row">
+					<view class="left">合同编号</view>
+					<view>{{item.contractNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">车牌号</view>
+					<view>{{item.carNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">暂存时间</view>
+					<view>{{item.inOutDate}}</view>
+				</view>
+				<view class="row no-boder">
+					<view class="left">提交人</view>
+					<view>{{item.backOffice}}</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -60,11 +72,11 @@
 		methods: {
 			getList() {
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectWarehouseInOutInfo', {
-					positionId: this.positionId,
+					positionId: helper.erpWarehouse.positionId,
 					baseId: helper.erpWarehouse.warehouseId,
 					currentPage: this.currentPage,
 					pageSize: this.pageSize,
-					inOutFlag: 1
+					inOutFlag: 2
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.dataList = res.data.data.records
@@ -75,8 +87,7 @@
 			confirmPositon() {},
 			goDetail(val) {
 				uni.navigateTo({
-					// /pages/erp/warehousing/selectContractNo
-					url: '/pages/erp/improvedExWaehousing/improvedExWaehousingDetail?data=' + JSON.stringify(val),
+					url: '/pages/erp/improvedWrehousing/improvedWrehousingDetail?data=' + JSON.stringify(val),
 				})
 			}
 
@@ -102,24 +113,35 @@
 		border-radius: 10rpx;
 		background: #FFFFFF;
 	}
-
+	
 	.content2 {
-		// padding: 20rpx;
-		margin: 20rpx;
-		// border-bottom: 1px solid #ccc;
-		background: #FFFFFF;
-		border-radius: 10rpx;
-
-		.content2-item {
-			padding: 20rpx;
-			margin-bottom: 10rpx;
-			border-bottom: 1px solid #ccc;
-			// padding-bottom: 10px;
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
 		}
-
-		.item-style {
-			display: inline-block;
-			width: 50%;
+	
+		.row-bottom {
+			.right-bottom {
+				width: 300rpx;
+				text-align: right;
+			}
 		}
 	}
+	.content2-item{
+		background: white;
+		margin:0 20rpx 20rpx 20rpx;
+		padding: 10rpx;
+		border-radius: 15rpx;
+	}
+	.no-boder{
+		    border-bottom: none!important;
+	}
 </style>

+ 210 - 90
pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="warp">
 		<view class="top">
-			<view class="top-left">鲅鱼圈一号库</view>
-			<view>102仓位</view>
+			<view class="top-left">{{warehouseName}}</view>
+			<view>{{binNumber}}仓位</view>
 		</view>
 		<view class="content">
 			<view class="row">
@@ -15,7 +15,7 @@
 			</view>
 			<view class="row">
 				<view class="left">类型</view>
-				<view @click='show1=true'>请选择类型</view>
+				<view @click='show1=true'>{{detailData.type}}</view>
 				<u-picker :range="typeList" range-key="type" @confirm='typePicker($event)' v-model="show1"
 					mode="selector">
 				</u-picker>
@@ -27,82 +27,95 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">皮重(吨)</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
-					placeholder="输入皮重"></input>
+				<input @input='calculate' v-model='detailData.tare' 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" placeholder="0"></input>
+				<input @input='calculate' v-model='detailData.deductionWeight' 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"
-					placeholder="不可编辑,自动计算"></input>
+				<input @input='' v-model='netWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+					:disabled="true"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣款(元/吨)</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="0"></input>
+				<input @input='' v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">扣重比</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入扣重比"></input>
+				<input @input='' v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"
+					@input="pureWeightCount"></input>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">干粮水分(%)</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入干粮水分占比"></input>
+				<input @input='' v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"
+					@input="pureWeightCount"></input>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">潮粮水分(%)</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom" placeholder="输入潮粮水分占比"></input>
+				<input @input='' v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"
+					@input="pureWeightCount"></input>
 			</view>
-			<view class="row row-bottom">
+			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">纯重(吨)</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
-					placeholder="不可编辑,自动计算"></input>
+				<input @input='calculate' v-model='detailData.pureWeight' class="right-bottom" placeholder="不可编辑,自动计算"
+					:disabled="true"></input>
 			</view>
 			<view class="row">
 				<view class="left">品级</view>
-				<view @click='show3=true'>请选择品级</view>
-				<u-picker :range="pjList" range-key="name" @confirm='handlerPicker($event)' v-model="show3" mode="selector">
+				<view @click='show3=true'>{{detailData.grade}}</view>
+				<u-picker :range="pjList" range-key="grade" @confirm='handlerPicker($event)' v-model="show3"
+					mode="selector">
 				</u-picker>
 			</view>
 			<view class="row">
 				<view class="left">经办人</view>
-				<view @click='show6=true'>请选择经办人</view>
-				<u-picker :range="handlerList" range-key="name" @confirm='handlerPicker($event)' v-model="show6" mode="selector">
+				<view @click='show6=true'>{{detailData.agent}}</view>
+				<u-picker :range="handlerList" range-key="staffName" @confirm='handlerPicker($event)' v-model="show6"
+					mode="selector">
 				</u-picker>
 			</view>
 			<view class="row">
 				<view class="left">入库日期</view>
-				<view @click='show4=true'>请选择日期</view>
-				<u-calendar v-model="show4" mode="date" @change='dateChange'></u-calendar>
+				<view @click='show4=true'>{{detailData.inOutDate}}</view>
+				<u-picker v-model="show4" mode="time" @confirm='dateChange($event)' :params="params">
+					<!-- <view >{{detailData.inOutDate ? detailData.inOutDate:"请选择日期" }}</view> -->
+				</u-picker>
+				<!-- <u-calendar v-model="show4" mode="date" @change='dateChange'></u-calendar> -->
 			</view>
 			<view class="row">
 				<view class="left">入库类型</view>
-				<view @click='show5=true'>请选择入库类型</view>
-				<u-picker :range="warehousingTypeList" range-key="type" @confirm='warehousingTypePicker($event)' v-model="show5" mode="selector">
+				<view @click='show5=true'>{{detailData.inOutType}}</view>
+				<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
+					v-model="show5" mode="selector">
 				</u-picker>
 			</view>
-			<view class="row">
+			<view class="row row-bottom">
 				<view class="left">车牌号</view>
-				<view @click='slectCarNo'>{{detailData.carNo}}</view>
+				<input v-if="!isPC" @input='' v-model='detailData.carNo' class="right-bottom"
+					placeholder="请输入车牌号"></input>
+				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本(元/吨)</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
-					placeholder="自动获取"></input>
-					<u-button class="edit-btn">编辑</u-button>
+				<input v-if="detailData.inOutType=='采购入库'" v-model='detailData.unitContractPrice' class="right-bottom"
+					placeholder="自动获取" :disabled="isEditCB"></input>
+				<input v-if="detailData.inOutType!='采购入库'" 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='calculate' v-model='detailData.grossWeight' 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">
 			<view class="left">上传磅单</view>
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imgUrl"
 				:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
 		</view>
@@ -112,49 +125,54 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">质检员</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input @input='' v-model='detailData.warehouseInOutDetail.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='' v-model='detailData.warehouseInOutDetail.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.warehouseInOutDetail.bulkDensity' 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='' v-model='detailData.warehouseInOutDetail.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='' v-model='detailData.warehouseInOutDetail.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='' v-model='detailData.warehouseInOutDetail.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='' v-model='detailData.warehouseInOutDetail.imperfectGrain' class="right-bottom"
 					placeholder="输入不完善粒占比"></input>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="submit">暂存</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="submit">提交</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="submit(1)">暂存</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="submit(2)">提交</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	import upload from '@/components/upload.vue';
+	import helper from '@/common/helper.js';
 	export default {
 		components: {
 			upload
@@ -168,6 +186,19 @@
 				show4: false,
 				show5: false,
 				show6: false,
+				isPC: true,
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true
+				},
+				isEditCB: 'false',
+				isEditYF: 'false',
+				warehouseName: '',
+				binNumber: '',
 				contractNoList: [{
 					contractNo: "123"
 				}],
@@ -179,80 +210,143 @@
 					}
 				],
 				pjList: [{
-						type: "一等"
+						grade: "一等品"
 					},
 					{
-						type: "二等"
+						grade: "二等品"
 					},
 					{
-						type: "三等"
+						grade: "三等品"
 					},
 					{
-						type: "等外"
+						grade: "等外"
 					}
 				],
 				handlerList: [{
-						name: "张三"
-					},
-					{
-						name: "二等"
-					},
-					{
-						name: "三等"
-					},
-					{
-						name: "等外"
-					}
-				],
-				warehousingTypeList: [{
-						type: "采购入库"
+						agent: "张三"
 					},
 					{
-						type: "采购入库"
+						agent: "二等"
 					},
 					{
-						type: "采购入库"
+						agent: "三等"
 					},
 					{
-						type: "采购入库"
+						agent: "等外"
 					}
 				],
+				warehousingTypeList: [],
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
+				netWeight: 0,
+				inOutDate1: "",
 				detailData: {
-					contractNo: "123",
-					carNo:'辽H12345',
-					name: "",
+					contractNo: "请选择合同编号",
+					carNo: '辽H12345',
+					type: "干粮",
 					goodsName: "123",
-					qualityInspectionManagement: {}
-				}
+					inOutDate: '请输入入库日期',
+					grade: "一等品",
+					agent: '请选择经办人',
+					inOutType: '请选择入库类型',
+					deductionWeight: 0,
+					grossWeight: 0,
+					tare: 0,
+					deductionAmount: 0,
+					netWeight: 0,
+					warehouseInOutDetail: {}
+				},
+				imgUrl: []
 			}
 		},
 		onLoad(options) {
-			this.id = options.id
-			this.cangId = options.cangId
+			this.detailData = JSON.parse(options.data)
+			this.binNumber = helper.erpWarehouse.binNumber
+			this.warehouseName = helper.erpWarehouse.warehouseName
+			this.compId = helper.erpWarehouse.compId
+			if(this.detailData.addressUrl){
+				this.imgUrl.push({
+					url: this.detailData.addressUrl.split(",")[0]
+				})
+			}
+			console.log(this.imgUrl)
+			console.log(helper.erpWarehouse)
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			// this.getWeighingManagement()
+			if (this.detailData.inOutType == '采购入库') {
+				this.detailData.freight = 0
+			}
+			if (!this.detailData.tranCarInfoList) this.detailData.tranCarInfoList = []
+			if (!this.detailData.contractNo) {
+				this.detailData.contractNo = '请选择合同编号'
+			} else {
+				if (this.detailData.tranCarInfoList.length == 0) {
+					this.isPC = false
+				}
+			}
+			if (!this.detailData.goodsName) {
+				this.detailData.goodsName = '货名'
+			}
+			// 获取入库类型
+			this.getrkType()
+			//获取经办人
+			this.getPerson()
+			console.log(this.detailData)
+		},
+		watch: {
+			netWeight: function(v) {
+				this.pureWeightCount()
+			},
 		},
 		methods: {
+			//计算纯重
+			pureWeightCount() {
+				if (this.netWeight && this.detailData.buckleWeightRatio && this.detailData.solidGrainWater && this
+					.detailData.tidalGrainWater) {
+					// 纯重=净重x[100-(潮粮水分-干粮水分)x扣重比]/100
+					this.detailData.pureWeight = 100 - (this.detailData.tidalGrainWater - this.detailData
+						.solidGrainWater) * this.netWeight * this.detailData.buckleWeightRatio / 100
+					this.detailData.pureWeight = this.detailData.pureWeight.toFixed(3)
+				}
+			},
+			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'
+				}).then(res => {
+					this.warehousingTypeList = res.data.data
+				})
+			},
 			contractNopicker(e) {},
 			typePicker(e) {
 				console.log(e)
+				this.detailData.type = this.typeList[e].type
 			},
 			pjPicker(e) {
 				console.log(e)
 			},
 			handlerPicker(e) {
 				console.log(e)
+				this.detailData.agent = this.handlerList[e].staffName
 			},
-			dateChange(e){
+			dateChange(e) {
 				console.log(e)
+				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
+				this.inOutDate1 = e.year + "-" + e.month + "-" + e.day + " " + e.hour + ":" + e.minute 
 			},
 			warehousingTypePicker(e) {
-				console.log(e)
+				this.detailData.inOutType = this.warehousingTypeList[e].constValue
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -267,7 +361,7 @@
 				}
 			},
 			calculate() {
-				this.detailData.netWeight = this.detailData.grossWeight - this.detailData.tare
+				this.netWeight = this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight
 			},
 			getImgUrl(res) {
 				this.detailData.addressUrl = res
@@ -315,11 +409,13 @@
 				console.log(e)
 			},
 			onRemove(index) {},
-			submit() {
-				if (!this.detailData.grossWeight) {
-					this.$api.msg('毛重不能为空')
-					return
-				}
+			editCB() {
+				this.isEditCB = false
+			},
+			editYF() {
+				this.isEditYF = false
+			},
+			submit(num) {
 				if (isNaN(this.detailData.grossWeight) ||
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
@@ -331,15 +427,36 @@
 					this.$api.msg('毛重输入错误!')
 					return
 				}
+				this.detailData.baseId = helper.erpWarehouse.warehouseId
+				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
+				this.detailData.positionId = helper.erpWarehouse.positionId
+				this.detailData.binNumber = this.binNumber
+				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
+				this.detailData.compId = helper.erpWarehouse.compId
+				this.detailData.netWeight = this.netWeight
+				this.detailData.backOffice = this.userInfo.userName
+				this.detailData.backOfficeId = this.userInfo.id
+				this.detailData.inOutFlag = 2
+				this.detailData.taskType = "入库任务"
+				this.detailData.pcFlag = 0
+				let title = ""
+				if (num == 1) {
+					this.detailData.statusFlag = 1
+					this.detailData.inOutDate = this.inOutDate1
+					title = "暂存成功"
+				} else if (num == 2) {
+					this.detailData.statusFlag = 3
+					title = "提交成功"
+				}
 				let that = this
 				uni.showModal({
-					content: "确定提交检斤信息?",
+					content: "确定提交入库库信息?",
 					success(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/weighingManagement/api/editGrossWeight',
+							that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
 								that.detailData).then(res => {
 								if (res.data.code == 200) {
-									that.$api.msg('提交成功')
+									that.$api.msg(title)
 									uni.navigateBack()
 								}
 							})
@@ -347,14 +464,14 @@
 					}
 				})
 			},
-			slectcontractNo(){
+			slectcontractNo() {
 				uni.navigateTo({
-					url:'/pages/erp/warehousing/selectContractNo'
+					url: '/pages/erp/warehousing/selectContractNo?compId=' + this.compId
 				})
 			},
-			slectCarNo(){
+			slectCarNo() {
 				uni.navigateTo({
-					url:'/pages/erp/warehousing/selectCarNo'
+					url: '/pages/erp/warehousing/selectCarNo'
 				})
 			},
 		}
@@ -435,17 +552,20 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
-	.edit-btn{
+
+	.edit-btn {
 		background: #22C572;
 		width: 100rpx;
 		height: 50rpx;
 		margin: 0;
 		color: white;
 	}
-	.has-btn{
+
+	.has-btn {
 		align-items: center;
 	}
-	.bottom-btn{
+
+	.bottom-btn {
 		width: 92%;
 		position: fixed;
 		bottom: 40rpx;

+ 0 - 1
pages/erp/openService/openService.vue

@@ -125,7 +125,6 @@
 					})
 				}
 				this.$api.doRequest('post', '/openServiceInfo/api/addInfo', this.personInfo).then(res => {
-					debugger
 					if (res.data.code == 200) {
 						this.$refs.uToast.show({
 							title: '提交成功,客服人员会及时与您取得联系。!',

+ 0 - 1
pages/erp/warehousing/selectCarNo.vue

@@ -32,7 +32,6 @@
 			}
 		},
 		onShow() {
-			debugger
 			this.newList = uni.getStorageSync('erpContractNo').tranCarInfoList
 			this.contractNo = uni.getStorageSync('erpContractNo').contractNo
 		},

+ 1 - 1
pages/erp/warehousing/selectContractNo.vue

@@ -65,7 +65,7 @@
 			}
 		},
 		methods: {
-			confirm(item){debugger
+			confirm(item){
 				let _list = uni.getStorageSync('erpContractNoList');
 				if(_list==''){
 					_list=[]

+ 4 - 3
pages/erp/warehousing/warehousing.vue

@@ -66,7 +66,7 @@
 			<view class="row">
 				<view class="left">品级</view>
 				<view @click='show3=true'>{{detailData.grade}}</view>
-				<u-picker :range="pjList" range-key="grade" @confirm='handlerPicker($event)' v-model="show3"
+				<u-picker :range="pjList" range-key="grade" @confirm='pjPicker($event)' v-model="show3"
 					mode="selector">
 				</u-picker>
 			</view>
@@ -336,6 +336,8 @@
 			},
 			pjPicker(e) {
 				console.log(e)
+				this.detailData.gradeKey = e[0]
+				    this.detailData.grade = this.pjList[e].grade
 			},
 			handlerPicker(e) {
 				console.log(e)
@@ -417,7 +419,6 @@
 				this.isEditYF = false
 			},
 			submit(num) {
-				debugger
 				if (isNaN(this.detailData.grossWeight) ||
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
@@ -431,7 +432,7 @@
 				}
 				this.detailData.baseId = helper.erpWarehouse.warehouseId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
-				this.detailData.positionId = helper.erpWarehouse.baseId
+				this.detailData.positionId = helper.erpWarehouse.positionId
 				this.detailData.binNumber = this.binNumber
 				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
 				this.detailData.compId = helper.erpWarehouse.compId

+ 1 - 1
pages/erpbusiness/sm/sm.vue

@@ -158,7 +158,7 @@
 						}
 					});
 			},
-			submit() {debugger
+			submit() {
 				if(this.flag) return
 				let _isAllCheck = false
 				for (let i = 0; i < this.grainMerchantList.length; i++) {

+ 0 - 1
pages/grain_pulse/home.vue

@@ -259,7 +259,6 @@
 					}
 					uni.hideLoading()
 				}).catch(res => {
-							debugger
 					that.isLoadMore=false
 					that.loadStatus = 'nomore'
 					if(that.currentPage>1){that.currentPage=1}