前端 小程序 sdy

common/helper.js

@@ -11,9 +11,13 @@ const isArray = Array.isArray || function (obj) {
 };  
 const getListByUserId = function(){
 	let baseUrlNew = config.def().baseUrlNew
+	var userInfo = uni.getStorageSync("userInfo")
 	uni.request({
 	    url: baseUrlNew + '/roleMenu/query/getListByUserId',
-	    method: 'GET',
+	    data: {
+	    	userId: userInfo.id
+	    },
+		method: 'GET',
 	    success: (res) => {			
 	    	if (res.statusCode === 200) {
 				uni.setStorageSync("jurisdiction", res.data.data)

config/index.js

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

manifest.json

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

pages/erp/exWarehousing/exWarehousing.vue

@@ -91,13 +91,18 @@
 				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
-			<view v-if='detailData.outType=="集装箱船"||detailData.outType=="火运"' class="row row-bottom">
+			<view v-if='detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">箱号</view>
 				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
 				<u-picker v-model="show9" mode="selector" range-key="name" :range="multiSelector1" @confirm='usestartChange($event)'>
 				</u-picker> -->
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">车厢号</view>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入车厢号"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>
@@ -319,6 +324,12 @@
 			this.handler()
 		},
 		methods: {
+			toUpperCase(val){
+				this.detailData.boxNo = val.detail.value.toUpperCase()
+			},
+			toUpperCase1(val){
+				this.detailData.boxNoOther = val.detail.value.toUpperCase()
+			},
 			usestartChange(e){
 				this.usestart=this.multiSelector1[e].name
 			},

pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -24,10 +24,14 @@
 					<view class="left">{{item.updateDate}}</view>
 					<view>{{item.backOffice}}</view>
 				</view>
-				<view v-if="item.outType=='火运'||item.outType=='集装箱船'" style='color:#878C9C;font-size:14px;' class="row">
+				<view v-if="item.outType=='集装箱船'" style='color:#878C9C;font-size:14px;' class="row">
 					<view v-if='item.boxNo' class="left">箱号：{{item.boxNo}}</view>
 					<view v-if='item.boxNoOther'>箱号2：{{item.boxNoOther}}</view>
 				</view>
+				<view v-if="item.outType=='火运'" style='color:#878C9C;font-size:14px;' class="row">
+					<view v-if='item.boxNo' class="left">车厢号：{{item.boxNo}}</view>
+					<view v-if='item.boxNoOther'>车厢号2：{{item.boxNoOther}}</view>
+				</view>
 				<view v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
 					<view v-if='item.binNo' class="left">仓位号：{{item.binNo}}</view>
 				</view>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -92,10 +92,15 @@
 				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
-			<view v-if='detailData.outType=="集装箱船"||detailData.outType=="火运"' class="row row-bottom">
+			<view v-if='detailData.outType=="集装箱船"' class="row row-bottom">
 				<view class="left">箱号</view>
-				<input v-model='detailData.boxNo' class="right-bottom" placeholder="请输入箱号"></input>
-				<input v-model='detailData.boxNoOther' class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1"  class="right-bottom" placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">车厢号</view>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1"  class="right-bottom" placeholder="请输入车厢号"></input>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row row-bottom">
 				<view class="left">仓位号</view>
@@ -297,6 +302,12 @@
 			this.handler()
 		},
 		methods: {
+			toUpperCase(val){
+				this.detailData.boxNo = val.detail.value.toUpperCase()
+			},
+			toUpperCase1(val){
+				this.detailData.boxNoOther = val.detail.value.toUpperCase()
+			},
 			outtypeChange(e){
 				this.detailData.outType=this.multiSelector[e].name
 				console.log(e)

pages/erp/improvedWrehousing/improvedWrehousing.vue

@@ -40,6 +40,17 @@
 					<view class="left">{{item.updateDate}}</view>
 					<view>{{item.backOffice}}</view>
 				</view>
+				<view v-if="item.outType=='集装箱船'" style='color:#878C9C;font-size:14px;' class="row">
+					<view v-if='item.boxNo' class="left">箱号：{{item.boxNo}}</view>
+					<view v-if='item.boxNoOther'>箱号2：{{item.boxNoOther}}</view>
+				</view>
+				<view v-if="item.outType=='火运'" style='color:#878C9C;font-size:14px;' class="row">
+					<view v-if='item.boxNo' class="left">车厢号：{{item.boxNo}}</view>
+					<view v-if='item.boxNoOther'>车厢号2：{{item.boxNoOther}}</view>
+				</view>
+				<view v-if="item.outType=='散船'" style='color:#878C9C;font-size:14px;' class="row">
+					<view v-if='item.binNo' class="left">仓位号：{{item.binNo}}</view>
+				</view>
 			</view>
 		</view>
 	</view>

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -90,12 +90,35 @@
 					v-model="show5" mode="selector">
 				</u-picker>
 			</view>
+			<view class="row">
+				<view class="left">入库方式</view>
+				<view @click='show8=true'>{{detailData.outType?detailData.outType:'汽运'}}</view>
+				<u-picker v-model="show8" mode="selector" range-key="name" :range="multiSelector" @confirm='outtypeChange($event)'>
+				</u-picker>
+			</view>
 			<view class="row row-bottom">
 				<view class="left">车牌号</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 v-if='detailData.outType=="集装箱船"' class="row row-bottom">
+				<view class="left">箱号</view>
+				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
+				<u-picker v-model="show9" mode="selector" range-key="name" :range="multiSelector1" @confirm='usestartChange($event)'>
+				</u-picker> -->
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">车厢号</view>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入车厢号"></input>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row row-bottom">
+				<view class="left">仓位号</view>
+				<input v-model='detailData.binNo' class="right-bottom" placeholder="请输入仓位号"></input>
+			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
 				<input type="number" v-if="detailData.inOutType=='采购入库'" v-model='detailData.cost' class="right-bottom"
@@ -194,7 +217,13 @@
 				isEditYF: true,
 				warehouseName: '',
 				binNumber: '',
-				
+				multiSelector:[
+					{name:'汽运',value:'0'},
+					{name:'火运',value:'1'},
+					{name:'集装箱船',value:'2'},
+					{name:'散船',value:'3'},
+				],
+				show8:false,
 				typeList: [{
 						type: "干粮"
 					},
@@ -224,6 +253,7 @@
 				netWeight: 0,
 				inOutDate1: "",
 				detailData: {
+					outType:'汽运',
 					contractNo: "请选择合同编号",
 					carNo: '',
 					type: "干粮",
@@ -319,6 +349,19 @@
 			},
 		},
 		methods: {
+			toUpperCase(val){
+				this.detailData.boxNo = val.detail.value.toUpperCase()
+			},
+			toUpperCase1(val){
+				this.detailData.boxNoOther = val.detail.value.toUpperCase()
+			},
+			usestartChange(e){
+				this.usestart=this.multiSelector1[e].name
+			},
+			outtypeChange(e){
+				this.detailData.outType=this.multiSelector[e].name
+				console.log(e)
+			},
 			getContractNoList() {
 				// this.imgUrl = []
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
@@ -425,7 +468,7 @@
 				}
 			},
 			calculate() {
-				this.netWeight = this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight
+				this.netWeight = (this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight).toFixed(2)
 			},
 			getImgUrl(res) {
 				this.detailData.addressUrl = res
@@ -861,7 +904,7 @@
 
 			// border: 0;
 			.right-bottom {
-				width: 300rpx;
+				width: 280rpx;
 				text-align: right;
 			}
 		}

pages/erp/index.vue

@@ -257,7 +257,7 @@
 			},
 			init(compId) {
 				console.log(this.userInfo)
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
 					compId: compId,
 				}).then(res => {
 					if (res.data.data.length != 0) {

pages/erp/warehousing/warehousing.vue

@@ -89,12 +89,35 @@
 					v-model="show5" mode="selector">
 				</u-picker>
 			</view>
+			<view class="row">
+				<view class="left">入库方式</view>
+				<view @click='show8=true'>{{detailData.outType?detailData.outType:'汽运'}}</view>
+				<u-picker v-model="show8" mode="selector" range-key="name" :range="multiSelector" @confirm='outtypeChange($event)'>
+				</u-picker>
+			</view>
 			<view class="row row-bottom">
 				<view class="left">车牌号</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 v-if='detailData.outType=="集装箱船"' class="row row-bottom">
+				<view class="left">箱号</view>
+				<!-- <view @click='show9=true'>{{usestart?usestart:'汽运'}}</view>
+				<u-picker v-model="show9" mode="selector" range-key="name" :range="multiSelector1" @confirm='usestartChange($event)'>
+				</u-picker> -->
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入箱号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入箱号"></input>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">车厢号</view>
+				<input v-model='detailData.boxNo' @input="toUpperCase" class="right-bottom" placeholder="请输入车厢号"></input>
+				<input v-model='detailData.boxNoOther' @input="toUpperCase1" class="right-bottom" placeholder="请输入车厢号"></input>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row row-bottom">
+				<view class="left">仓位号</view>
+				<input v-model='detailData.binNo' class="right-bottom" placeholder="请输入仓位号"></input>
+			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">成本（元/吨）</view>
 				<input type="number" v-model='detailData.cost' class="right-bottom"
@@ -195,6 +218,12 @@
 				warehouseName: '',
 				binNumber: '',
 				contractNoList: [],
+				multiSelector:[
+					{name:'汽运',value:'0'},
+					{name:'火运',value:'1'},
+					{name:'集装箱船',value:'2'},
+					{name:'散船',value:'3'},
+				],
 				typeList: [{
 						type: "干粮"
 					},
@@ -215,6 +244,7 @@
 						grade: "等外"
 					}
 				],
+				show8:false,
 				handlerList: [],
 				warehousingTypeList: [{constValue:'移库入库'},{constValue:'退库'}],
 				action: this.$uploadUrl,
@@ -338,6 +368,19 @@
 			},
 		},
 		methods: {
+			toUpperCase(val){
+				this.detailData.boxNo = val.detail.value.toUpperCase()
+			},
+			toUpperCase1(val){
+				this.detailData.boxNoOther = val.detail.value.toUpperCase()
+			},
+			usestartChange(e){
+				this.usestart=this.multiSelector1[e].name
+			},
+			outtypeChange(e){
+				this.detailData.outType=this.multiSelector[e].name
+				console.log(e)
+			},
 			selectType(){
 				if(this.isSelectType) return
 				this.show5 = true
@@ -416,7 +459,7 @@
 				}
 			},
 			calculate() {
-				this.netWeight = this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight
+				this.netWeight = (this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight).toFixed(2)
 			},
 			getImgUrl(res) {
 				this.detailData.addressUrl = res
@@ -855,7 +898,7 @@
 
 			// border: 0;
 			.right-bottom {
-				width: 300rpx;
+				width: 280rpx;
 				text-align: right;
 			}
 		}

pages/grain_pulse/home.vue

@@ -153,6 +153,8 @@
 			}
 		 },
 		onShow(val) {
+			this.isLoadMore = false
+			this.currentPage = 1
 			uni.hideKeyboard()
 			uni.getStorage({
 				key: 'setLocaltion',

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -56,7 +56,7 @@
 							<view class="right">{{retreatList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">重量(吨)</view>
+							<view class="left">数量</view>
 							<view class="right">{{retreatList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -116,7 +116,7 @@
 							<view class="right">{{OutList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">重量(吨)</view>
+							<view class="left">数量</view>
 							<view class="right">{{OutList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -189,7 +189,7 @@
 							<view class="right">{{EnterList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">重量(吨)</view>
+							<view class="left">数量</view>
 							<view class="right">{{EnterList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -422,6 +422,9 @@
 
 				list.compId = sessionStorage.getItem('ws-pf_compId')
 				list.publisher = this.userInfo.userName
+				uni.showLoading({
+					title:"审核中"
+				})
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
 						this.$api.doRequest('post', '/workflow/api/handle', {
@@ -430,12 +433,51 @@
 							auditMind: '34',
 							needReapply: false
 						}).then(res => {
+							uni.hideLoading()
 							if (res.data.code == 200) {
 								this.$api.msg('审核成功！')
 								setTimeout(function() {
 									uni.navigateBack()
 								}, 1000);
+							}else{
+								this.$api.msg('审核失败！')
+							}
+						}).catch(res => {
+							uni.hideLoading()
+							if(res.message){
+								uni.showToast({
+									title: res.message,
+									icon: 'none',
+									duration: 2000
+								})
 							}
+							else{
+								uni.showToast({
+									title: "系统异常，请联系管理员",
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+						
+					}
+					else{
+						this.$api.msg('审核失败！')
+					}
+				}).catch(res => {
+					uni.hideLoading()
+					if(res.message){
+						uni.showToast({
+							title: res.message,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
 						})
 					}
 				})

pages/task/audit/freight_setting_approval.vue

@@ -84,7 +84,7 @@
 							var that = this
 							var tranProcessInfo = {}
 							tranProcessInfo.id = this.list.id
-							tranProcessInfo.flag = "1"
+							tranProcessInfo.flag = "2"
 							tranProcessInfo.tranPriceIng = this.list.tranPriceIng
 							tranProcessInfo.reviewer = this.userInfo.userName
 							this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo)
@@ -97,6 +97,7 @@
 									}
 								})
 						}
+
 					}
 				})
 

pages/task/audit/warehouse_details.vue

@@ -71,7 +71,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='fanHui' type="success" class="btn2">通过</u-button>
+			<u-button  @click='fanHui' type="success" class="btn2">返回</u-button>
 		</view>
 	</view>
 </template>

pages/user/depotMonitoring.vue

@@ -81,7 +81,6 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			debugger
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {