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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.160",
-    "versionCode" : 21160,
+    "versionName" : "2.1.163",
+    "versionCode" : 21163,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages.json

@@ -16,7 +16,7 @@
 				"text": "资讯"
 			},
 			{
-				"pagePath": "pages/business/businessNew",
+				"pagePath": "pages/business/business",
 				"iconPath": "static/img/jiaoyi.png",
 				"selectedIconPath": "static/img/jiaoyi_check.png",
 				"text": "交易"

pages/erpbusiness/add_quality_testing.vue

@@ -52,7 +52,7 @@
 					{{gridList.tips?gridList.tips:'自动获取，不可编辑'}}
 				</view>
 			</view>
-			<view v-show='typevalue==1' class="c-row ">
+			<!-- <view v-show='typevalue==1' class="c-row ">
 				<view class="title">成本</view>
 				<view class="con-list">
 					<view v-show='!coststatus'>{{gridList.cost?gridList.cost:'自动获取，不可编辑'}}</view>
@@ -71,13 +71,13 @@
 					</view>
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changefreight">{{freighttext}}</button>
-			</view>
-			<view v-show='typevalue==1' class="c-row ">
+			</view> -->
+			<!-- <view v-show='typevalue==1' class="c-row ">
 				<view class="title">扣款</view>
 				<view class="con-list">
 					<input v-model='gridList.deductionAmount' placeholder="请输入扣款" name="input" type="digit"></input>
 				</view>
-			</view>
+			</view> -->
 			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">入库类型</view>
 				<view class="con-list">
@@ -103,6 +103,37 @@
 					</u-picker>
 				</view>
 			</view>
+			
+			<!-- <view v-show="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
+				<view class="title">扣重比</view>
+				<view class="con-list">
+					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
+				</view>
+			</view> -->
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
+				<view class="title">货名</view>
+				<view class="con-list">
+					<view>{{gridList.goodsName}}</view>
+					<!-- <view v-show='goodsdisabled'>{{gridList.goodsName}}</view> -->
+					<!-- <view v-show='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view> -->
+					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2"
+						mode="selector">
+					</u-picker>
+				</view>
+			</view>
+			
+			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+				<view class="title">购粮性质</view>
+				<view class="con-list">
+					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质" name="input"></input>
+				</view>
+			</view>
+			
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+				<view class="title">类型</view>
+				
+				<view class="con-list">{{gridList.type?gridList.type:'干粮'}}</view>
+			</view>
 			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
@@ -121,15 +152,16 @@
 					</u-picker>
 				</view>
 			</view>
+			
 			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
-				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType!="移库入库"||gridList.outType!="汽运"'>
 				<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
-				<view class="con-list" v-show='gridList.inOutType=="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"'>
 				<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 					v-model="show9" mode="selector">
@@ -137,47 +169,19 @@
 				
 				</view>
 			</view>
-			<view v-show="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
-				<view class="title">箱号-1</view>
-				<view class="con-list">
-					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
-				</view>
-			</view>
-			<view v-show="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
-				class="c-row ">
-				<view class="title">封号-1</view>
-				<view class="con-list">
-					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
-				</view>
-			</view>
-			<view v-show="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
-				<view class="title">箱号-2</view>
-				<view class="con-list">
-					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
-				</view>
-			</view>
-			<view v-show="gridList.outType== '汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1"
-				class="c-row ">
-				<view class="title">封号-2</view>
-				<view class="con-list">
-					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
-				</view>
-			</view>
-			<view v-show="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
-				<view class="title">扣重比</view>
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+				<view class="title">仓位号</view>
 				<view class="con-list">
-					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比" name="input" type="digit"></input>
+					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
+					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)'
+						v-model="show" mode="selector">
+					</u-picker>
 				</view>
 			</view>
-			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
-				<view class="title">货名</view>
+			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
+				<view class="title">囤位号（选填）</view>
 				<view class="con-list">
-					<view>{{gridList.goodsName}}</view>
-					<!-- <view v-show='goodsdisabled'>{{gridList.goodsName}}</view> -->
-					<!-- <view v-show='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view> -->
-					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2"
-						mode="selector">
-					</u-picker>
+					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
 			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
@@ -193,13 +197,13 @@
 			</view>
 			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">车牌号</view>
-				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType!="移库入库" ||gridList.outType!="汽运"'>
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard1" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard1" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
-				<view class="con-list" v-show='gridList.inOutType=="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"'>
 				<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 					v-model="show9" mode="selector">
@@ -222,62 +226,57 @@
 						name="input" type="digit"></input>
 				</view>
 			</view> -->
-			<view v-show='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
-				<view class="title">购粮性质</view>
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+				<view class="title">箱号-1</view>
 				<view class="con-list">
-					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质" name="input"></input>
+					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
-				<view class="title">仓位号</view>
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+				<view class="title">封号-1</view>
 				<view class="con-list">
-					<view @click='show=true'>{{gridList.binNumber?gridList.binNumber:'请选择仓位号'}}</view>
-					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)'
-						v-model="show" mode="selector">
-					</u-picker>
+					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
-				<view class="title">囤位号（选填）</view>
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+				<view class="title">箱号-2</view>
 				<view class="con-list">
-					<input type="digit" v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
+					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show='utils.getCurrectRoles("acquisitionQuality.initial")' class="c-row ">
-				<view class="title">类型</view>
-				<view v-show="!edit" class="con-list">
-					<view @click='show3=true'>{{gridList.type?gridList.type:'请选择类型'}}</view>
-					<u-picker :range="typeList" @confirm='typepicker($event)' v-model="show3" mode="selector">
-					</u-picker>
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+				<view class="title">封号-2</view>
+				<view class="con-list">
+					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
-				<view  v-show="edit" class="con-list">{{gridList.type?gridList.type:'请选择类型'}}</view>
 			</view>
-			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==1 " class="c-row ">
 				<view class="title">箱号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==1 "
+				class="c-row ">
 				<view class="title">封号-1</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==1 " class="c-row ">
 				<view class="title">箱号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+			<view v-show="typevalue==1 "
+				class="c-row ">
 				<view class="title">封号-2</view>
 				<view class="con-list">
 					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
 			
-			
 		</view>
 		<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
 			<view class='wrap'>
@@ -1082,14 +1081,23 @@
 						this.gridListInit.customerNumberCard = ''
 						this.$forceUpdate()
 				}
+				
 				// this.gridList = JSON.parse(JSON.stringify(this.gridListInit))
 				this.gridList = this.$u.deepClone(this.gridListInit)
 				this.gridList.serviceManagementType = e
 				if (e == 1) {
+					if(this.flag != 2){
+						this.gridList.inOutTaskNo = ''
+						this.gridList.contractNo = ''
+					}
 					this.gridList.qualityNo = ''
 					this.flag = 2
 					// this.contractFlag = 7
 				} else {
+					if(this.flag != 3){
+						this.gridList.inOutTaskNo = ''
+						this.gridList.contractNo = ''
+					}
 					this.flag = 3
 					// this.contractFlag = 10
 					// let number = '000' + this.warehouseCount
@@ -1198,7 +1206,7 @@
 								return item.goodsName == this.contractNolist.goodsName
 							})
 							 if(this.contractNolist.priceType == "定价收购" && this.inType == "收购入库"){
-							    this.gridList.dryGrainPrice = Number(this.contractNolist.unitContractPrice/1000).toFixed(2)
+							    this.gridList.dryGrainPrice = Number(this.contractNolist.unitContractPrice/1000).toFixed(3)
 							}
 							if (gooddata.length > 0) {
 								// 收购入库
@@ -1235,10 +1243,11 @@
 								this.gridList.mildewGrain=2
 								this.gridList.jiaorenli=1
 								if (this.contractNolist.priceType != '随行就市') {
-									this.gridList.dryGrainPrice = this.contractNolist.contractPrice
+									this.gridList.dryGrainPrice = Number(this.contractNolist.contractPrice/1000).toFixed(3)
+									
 								}
 								this.edit = true
-							} else if (this.gridList.goodsName == '玉米（潮粮）') {
+							} else if (this.gridList.goodsName.indexOf('潮粮')> -1) {
 								this.gridList.type = '潮粮'
 								this.edit = true
 								if (this.contractNolist.priceType != '随行就市') {
@@ -1257,7 +1266,7 @@
 								this.gridList.jiaorenli=1
 								this.edit = false
 								if (this.contractNolist.priceType != '随行就市') {
-									this.gridList.dryGrainPrice = this.contractNolist.contractPrice
+									this.gridList.dryGrainPrice = Number(this.contractNolist.contractPrice/1000).toFixed(3)
 								}
 							}
 						}
@@ -1406,7 +1415,7 @@
 						}
 					}
 				}
-				if(this.inType != "收购入库"){ //收购入库  价格取自合同
+				if(this.inType != "收购入库"){ //非收购入库  价格取自合同
 					return
 				}
 				if (this.gridList.goodsName && this.cangid) {
@@ -1788,7 +1797,7 @@
 				if (this.goodsList[e[0]].goodsName == '玉米') {
 					this.gridList.type = '干粮'
 					this.edit = true
-				} else if (this.goodsList[e[0]].goodsName == '玉米（潮粮）') {
+				} else if (this.goodsList[e[0]].goodsName.indexOf('潮粮')> -1) {
 					this.gridList.type = '潮粮'
 					this.edit = true
 				} else {

pages/erpbusiness/edit_quality_testing.vue

@@ -444,8 +444,8 @@
 				</view>
 				<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==1&&flag!=3" class="c-row">
 					<view class="title">干粮单价（元/公斤）</view>
-					<view class="con-list">
-						{{gridList.dryGrainPrice}}
+					<view class="con-list">						
+					<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' type="digit"  @blur='inputprice' placeholder="请输入干粮单价" name="input"></input>
 					</view>
 				</view>
 			</view>

pages/erpbusiness/quality_testing.vue

@@ -270,7 +270,7 @@
 			}
 			this.gridList = []
 			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
-				compId: '',
+				compId: uni.getStorageSync('pcUserInfo').compId,
 				personCharge: this.userInfo.phone
 			}).then(res => {
 				if (res.data.data) {
@@ -376,7 +376,7 @@
 						statusType:this.statusType,
 						managementType: this.managementType,
 						warehouseName: this.warehouseName,
-						compId: '',
+						compId: uni.getStorageSync('pcUserInfo').compId,
 						// pcFlag:1
 					}).then(res => {
 						uni.hideLoading()

pages/reimbursement/request_funds.vue

@@ -299,7 +299,14 @@
 			},
 			async uploadClick() {
 				let baseUrlNew = config.def().baseUrlNew
+				let pcUserInfo = uni.getStorageSync('pcUserInfo')
 				console.log('baseUrlNew',baseUrlNew)
+				if(!pcUserInfo){
+					uni.showToast({
+						title:"登录已失效，请重新登录"
+					})
+					return 
+				}
 				uni.chooseImage({
 					count:10,
 					success: (chooseImageRes) => {
@@ -321,14 +328,15 @@
 							name:files[i].name,
 							formData: {
 								// fileName: chooseImageRes.tempFiles[0],
-								companyId: "2710b21efc1e4393930c5dc800010dc4",
+								companyId: pcUserInfo.compId,
 								modelId: '',
 								vesselId: '',
 							},
 							success: (uploadFileRes) => {
 								console.log(JSON.parse(uploadFileRes.data))
 								var data = JSON.parse(uploadFileRes.data).data
-								this.$api.doRequest('post', '/appendix/api/saveFiles', {
+								data.compId = pcUserInfo.compId
+								this.$api.doRequest('post', '/appendix/api/saveFilesApp', {
 									newAppendixs: [data],
 									oldAppendixIds: ""
 								}).then(res => {

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -897,7 +897,13 @@
 				uni.showLoading({
 					title: "审核中"
 				})
-				list.compId = '2710b21efc1e4393930c5dc800010dc4'
+				let pcUserInfo = uni.getStorageSync('pcUserInfo')
+				if(pcUserInfo){
+					list.compId = pcUserInfo.compId
+				}
+				else{
+					list.compId = '2710b21efc1e4393930c5dc800010dc4'
+				}
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {

pages/task/audit/collection_business_approval.vue

@@ -286,7 +286,14 @@
 				uni.showLoading({
 					title: "审核中"
 				})
-				list.compId = '2710b21efc1e4393930c5dc800010dc4'
+				let pcUserInfo = uni.getStorageSync('pcUserInfo')
+				if(pcUserInfo){
+					list.compId = pcUserInfo.compId
+				}
+				else{
+					list.compId = '2710b21efc1e4393930c5dc800010dc4'
+				}
+				// list.compId = '2710b21efc1e4393930c5dc800010dc4'
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {

pages/universalityAudit/addaduit.vue

@@ -81,6 +81,13 @@
 			async uploadClick() {
 				let baseUrlNew = config.def().baseUrlNew
 				console.log('baseUrlNew',baseUrlNew)
+				let pcUserInfo = uni.getStorageSync('pcUserInfo')
+				if(!pcUserInfo){
+					uni.showToast({
+						title:"登录已失效，请重新登录"
+					})
+					return 
+				}
 				uni.chooseImage({
 					count:10,
 					success: (chooseImageRes) => {
@@ -98,14 +105,15 @@
 							files: files,
 							formData: {
 								// fileName: chooseImageRes.tempFiles[0],
-								companyId: "2710b21efc1e4393930c5dc800010dc4",
+								companyId: pcUserInfo.compId,
 								modelId: '',
 								vesselId: '',
 							},
 							success: (uploadFileRes) => {
 								console.log(JSON.parse(uploadFileRes.data))
 								var data = JSON.parse(uploadFileRes.data).data
-								this.$api.doRequest('post', '/appendix/api/saveFiles', {
+								data.compId = pcUserInfo.compId
+								this.$api.doRequest('post', '/appendix/api/saveFilesApp', {
 									newAppendixs: [data],
 									oldAppendixIds: ""
 								}).then(res => {

pages/user/user.vue

@@ -562,6 +562,7 @@
 						if (res.data.code == 200) {
 							console.log("userInfo", res.data.data)
 							uni.setStorageSync('userInfo', res.data.data)
+							uni.removeStorageSync("cangid")
 							this.$api.doRequest('post', '/commonUser/api/loginQuickly', {
 								mobilePhone: this.userInfo.phone,
 								companyName: this.companyList[e[0]].compName,