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

config/index.js

@@ -1,9 +1,9 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.122:8090/',
+	baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
 	// baseUrlNew: 'https://apitest.eliangeyun.com/',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/bill/index.vue

@@ -229,7 +229,7 @@
 						searchKeyWord: this.searchKeyWord,
 						searchType: this.searchType,
 						managementType:1,
-						// customerPhone:this.userInfo.phone,
+						customerPhone:this.userInfo.phone,
 						// pcFlag:1
 						// warehouseName:'',
 					}).then(res => {

pages/erp/exWarehousing/exWarehousing.vue

@@ -11,13 +11,15 @@
 			</view>
 			<view class="row">
 				<view class="left">货名</view>
-				<view class="right">{{detailData.goodsName}}</view>
+				<view class="right">{{detailData.goodsName ? detailData.goodsName : "选择合同，自动获取"}}
+				</view>
 			</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">
+					<view class="">{{detailData.type}}</view>
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
@@ -35,62 +37,70 @@
 				<input @input='calculate' v-model='detailData.grossWeight' 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  v-model='detailData.grossWeight' 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  v-model='detailData.grossWeight' 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  v-model='detailData.grossWeight' 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"
+				<input v-model='detailData.grossWeight' class="right-bottom"
 					placeholder="不可编辑,自动计算"></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="type" @confirm='pjPicker($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="name" @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='show7=true'>{{detailData.inOutDate}}</view>
+				<u-picker v-model="show7" 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">
+				<u-picker :range="warehousingTypeList" range-key="type" @confirm='warehousingTypePicker($event)'
+					v-model="show5" mode="selector">
 				</u-picker>
 			</view>
 			<view class="row">
 				<view class="left">车牌号</view>
 				<view @click='slectCarNo'>{{detailData.carNo}}</view>
 			</view>
-			<view class="row row-bottom has-btn">
+			<!-- <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>
+				<u-button class="edit-btn">编辑</u-button>
 			</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>
-			</view>
+				<u-button class="edit-btn">编辑</u-button>
+			</view> -->
 		</view>
 		<view class="content2">
 			<view class="left">上传磅单</view>
@@ -104,12 +114,12 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">质检员</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input v-model='detailData.grossWeight' 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  v-model='detailData.grossWeight' class="right-bottom"
 					placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom" style="border: 0;">
@@ -118,22 +128,22 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">热损伤（%）</view>
-				<input @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
+				<input v-model='detailData.grossWeight' 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 v-model='detailData.grossWeight' 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 v-model='detailData.grossWeight' 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  v-model='detailData.grossWeight' class="right-bottom"
 					placeholder="输入不完善粒占比"></input>
 			</view>
 		</view>
@@ -160,6 +170,7 @@
 				show4: false,
 				show5: false,
 				show6: false,
+				show7: false,
 				contractNoList: [{
 					contractNo: "123"
 				}],
@@ -171,13 +182,13 @@
 					}
 				],
 				pjList: [{
-						type: "一等"
+						type: "一等品"
 					},
 					{
-						type: "二等"
+						type: "二等品"
 					},
 					{
-						type: "三等"
+						type: "三等品"
 					},
 					{
 						type: "等外"
@@ -214,13 +225,25 @@
 				btnLoading: false, //防止重复点击
 				isAdd: true,
 				detailData: {
-					contractNo: "123",
-					carNo:'辽H12345',
+					contractNo: "请选择合同编号或移库任务编号",
+					carNo: '辽H12345',
 					name: "",
-					goodsName: "123",
+					type: "请选择类型",
+					grade: "请输入品级",
+					agent: "请选择经办人",
+					inOutDate: "请选择出库日期",
 					qualityInspectionManagement: {}
-				}
+				},
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true
+				},
 			}
+		
 		},
 		onLoad(options) {
 			this.id = options.id
@@ -232,16 +255,16 @@
 		methods: {
 			contractNopicker(e) {},
 			typePicker(e) {
-				console.log(e)
+				this.detailData.type = this.typeList[e].type
 			},
 			pjPicker(e) {
-				console.log(e)
+				this.detailData.grade = this.pjList[e].type
 			},
 			handlerPicker(e) {
-				console.log(e)
+				this.detailData.agent = this.handlerList[e].name
 			},
-			dateChange(e){
-				console.log(e)
+			dateChange(e) {
+				this.detailData.inOutDate = e.year + "-" + e.month + "-" + e.day
 			},
 			warehousingTypePicker(e) {
 				console.log(e)
@@ -340,14 +363,14 @@
 					}
 				})
 			},
-			slectcontractNo(){
+			slectcontractNo() {
 				uni.navigateTo({
-					url:'/pages/erp/exWarehousing/selectContractNo'
+					url: '/pages/erp/warehousing/selectContractNo?compId=' + this.compId
 				})
 			},
-			slectCarNo(){
+			slectCarNo() {
 				uni.navigateTo({
-					url:'/pages/erp/exWarehousing/selectCarNo'
+					url: '/pages/erp/exWarehousing/selectCarNo'
 				})
 			},
 		}
@@ -428,17 +451,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;

pages/erp/index.vue

@@ -94,7 +94,7 @@ import helper from '@/common/helper.js';
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/erp/shougouzhijian@3x.png',
 						tips: 0,
-						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
+						url: `/pages/erp/openService/openService`,
 						show: true
 					},
 					{
@@ -103,7 +103,7 @@ import helper from '@/common/helper.js';
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/erp/shougouzhijian@3x.png',
 						tips: 0,
-						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
+						url: `/pages/erp/contactCustomerService/contactCustomerService`,
 						show: true
 					}
 				],

pages/erp/openService/openService.vue

@@ -36,7 +36,7 @@
 				value: '',
 				type: 'textarea',
 				border: true,
-				height: 100,
+				height: 150,
 				autoHeight: true,
 			}
 		},

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -65,6 +65,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -112,6 +115,9 @@
 					}
 				});
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		onPullDownRefresh() {
 			this.currentPage=1
 			this.gridList=[]
@@ -128,7 +134,8 @@
 		methods: {
 			loadData() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: ''
+					compId: '',
+					personCharge:this.userInfo.phone
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -69,6 +69,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	import helper from '@/common/helper.js'; 
 	export default {
 		data() {
@@ -85,6 +88,9 @@
 				cangId:''
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
 		onShow() {
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 					if (res.data.data == "INVALID") {
@@ -135,7 +141,8 @@
 			},
 			loadData() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: ''
+					compId: '',
+					personCharge:this.userInfo.phone
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data

pages/grain_pulse/enter.vue

@@ -269,9 +269,16 @@
 				this.deptList.licenseAddress = res
 			},
 			singleClick(item) {
-				if (this.mainBusinessType.indexOf(item) == -1) {
+				if (this.mainBusinessType.indexOf(item.name) == -1) {
 					this.mainBusinessType.push(item.name)
 					item.checked = true
+				}else{
+					for (var i = 0; i < this.mainBusinessType.length; i++) {
+						if(this.mainBusinessType[i]==item.name){
+							this.mainBusinessType.splice(i,1)
+						}
+					}
+					item.checked = false
 				}
 			},
 			filterFileType(index, lists) {
@@ -287,6 +294,13 @@
 				}
 			},
 			navBack() {
+				uni.setStorage({
+					key: 'setPosition',
+					data:{},
+					success: (res) => {
+					}
+				
+				})
 				uni.navigateBack()
 			},
 			// navBack1() {
@@ -574,10 +588,10 @@
 	}
 	.companyProfilewrap{
 		position:relative;
-		width:100%;
+		width:90%;
 	}
 	.companyProfile{
-		width:90%;height:138px;
+		width:100%;height:138px;
 		background:#F9F9FA;
 		font-size:13px;
 		padding:13px;
@@ -586,7 +600,7 @@
 	.companyProfilecontent{
 		position:absolute;
 		bottom:10px;
-		right:15px;
+		right:0px;
 		font-size:13px;
 	}
 </style>

pages/grain_pulse/home.vue

@@ -274,7 +274,7 @@
 				this.$api.doRequest('get', '/settledCompanyInfo/selectSettledCompanyInfo', {
 					mainBusinessType: this.mainBusinessType,
 					pageSize: this.pageSize,
-					currentPage: 1,
+					currentPage: this.currentPage,
 					pcFlag: 2,
 					searchType: 2,
 					location:that.position.cityname
@@ -306,6 +306,7 @@
 				} else {
 					this.mainBusinessType = ''
 				}
+				this.currentPage=1
 				this.getInfo()
 				this.mainBusinessTypeKey = item.value
 			},

pages/grain_pulse/my_grain_pulse.vue

@@ -163,12 +163,21 @@
 				}
 			},
 			del(item){
-				this.$api.doRequest('post','/settledCompanyInfo/api/deleteSettledCompanyInfo',{id:item.id}).then(res => {
-					if(res.data.code==200){
-						this.$api.msg('删除成功')
-					}else{
-						this.$api.msg('删除失败')
-					}
+				uni.showModal({
+					content: "确定删除该企业？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							this.$api.doRequest('post','/settledCompanyInfo/api/deleteSettledCompanyInfo',{id:item.id}).then(res => {
+								if(res.data.code==200){
+									this.$api.msg('删除成功')
+								}else{
+									this.$api.msg('删除失败')
+								}
+							})
+						}
+					},
 				})
 			},
 			edit(item){

pages/grain_pulse/perfect.vue

@@ -24,7 +24,7 @@
 				<view class="addinput addlabel flex" v-if="inputShow">
 					<u-input class='label' v-model="value" type="type" border focus v-if="inputShow"
 					 placeholder="请输入标签内容，不超过6个字" />
-					<u-button :type="types" class="inputOk" shape="circle" @click="addinput">确定</u-button>
+					<u-button :type="types" class="inputOk" :class="{active:value.length>0}" shape="circle" @click="addinput">确定</u-button>
 				</view>
 			</view>
 			<view style='padding-bottom:10px;' class="modular">
@@ -298,6 +298,9 @@
 	padding-right:40px;
 	line-height: 52rpx;
 	margin-bottom:10px;
+}
+.inputOk.active{
+	background:#22C572;
 }
 	.inputOk {
 		width: 100rpx;