前端

config/index.js

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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.40",
-    "versionCode" : 1140,
+    "versionName" : "1.1.44",
+    "versionCode" : 1144,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -195,6 +195,7 @@
         },
         "statusbar" : {
             "immersed" : false
-        }
+        },
+        "nativePlugins" : {}
     }
 }

pages/erp/exWarehousing/exWarehousing.vue

@@ -15,7 +15,7 @@
 			<view class="row row-bottom">
 				<view class="left">合同编号</view>
 				<!-- <view @click='slectcontractNo'>{{detailData.contractNo}}</view> -->
-				<input v-model='detailData.contractNo' class="right-bottom" placeholder="暂未获取到合同编号" disabled=""></input>
+				<input v-model='detailData.contractNo' style="width: 200px;" class="right-bottom" placeholder="暂未获取到合同编号" disabled=""></input>
 			</view>
 			<view class="row">
 				<view class="left">提示</view>
@@ -26,14 +26,14 @@
 				<view class="right">{{detailData.goodsName ? detailData.goodsName : "选择合同，自动获取"}}
 				</view>
 			</view>
-			<view class="row">
+			<!-- <view class="row">
 				<view class="left">类型</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> -->
 			<view class="row row-bottom">
 				<view class="left">毛重（吨）</view>
 				<input type="digit" @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
@@ -367,7 +367,7 @@
 			// if (_data.contractNo) {
 			// 	this.detailData.contractNo = _data.contractNo;
 			// }
-			this.detailData.goodsNameKey = _data.goodsNameKey ? _data.goodsNameKey : '';
+			// this.detailData.goodsNameKey = _data.goodsNameKey ? _data.goodsNameKey : '';
 			if (!_data.tranCarInfoList) {
 				this.isPC = false
 				_data.tranCarInfoList = []
@@ -437,29 +437,34 @@
 					warehouseName: this.warehouseName,
 					agentKey: this.userInfo.id
 				}).then(res => {
-					this.inOutNoList = res.data.data
-					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo ? this.inOutNoList[0]
-						.inOutTaskNo : ''
-					this.detailData.agent = this.inOutNoList[0].agent
-					if (this.inOutNoList[0].contractNo) {
-						this.detailData.contractNo = this.inOutNoList[0].contractNo
-					} else {
-						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
-					}
-					this.detailData.goodsName = this.inOutNoList[0].goodsName
-					this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey
-					this.detailData.grade = this.inOutNoList[0].grade
-					this.detailData.inOutType = this.inOutNoList[0].inOutType
-					if (this.detailData.inOutType == '销售出库') {
-						this.detailData.inOutTypeKey = 1
-					} else if (this.detailData.inOutType == '移库出库') {
-						this.detailData.inOutTypeKey = 3
-					} else if (this.detailData.inOutType == '暂存出库') {
-						this.detailData.inOutTypeKey = 4
-					} else if (this.detailData.inOutType == '贸易服务出库') {
-						this.detailData.inOutTypeKey = 5
-					} else if (this.detailData.inOutType == '采购出库') {
-						this.detailData.inOutTypeKey = 6
+					if(res.data.data.length == 0){
+						this.$api.msg('暂无出库任务')
+					}else{
+						this.inOutNoList = res.data.data
+					    this.detailData.goodsNameKey = res.data.data[0].goodsNameKey
+						this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo ? this.inOutNoList[0]
+							.inOutTaskNo : ''
+						this.detailData.agent = this.inOutNoList[0].agent
+						if (this.inOutNoList[0].contractNo) {
+							this.detailData.contractNo = this.inOutNoList[0].contractNo
+						} else {
+							this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
+						}
+						this.detailData.goodsName = this.inOutNoList[0].goodsName
+						this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey
+						this.detailData.grade = this.inOutNoList[0].grade
+						this.detailData.inOutType = this.inOutNoList[0].inOutType
+						if (this.detailData.inOutType == '销售出库') {
+							this.detailData.inOutTypeKey = 1
+						} else if (this.detailData.inOutType == '移库出库') {
+							this.detailData.inOutTypeKey = 3
+						} else if (this.detailData.inOutType == '暂存出库') {
+							this.detailData.inOutTypeKey = 4
+						} else if (this.detailData.inOutType == '贸易服务出库') {
+							this.detailData.inOutTypeKey = 5
+						} else if (this.detailData.inOutType == '采购出库') {
+							this.detailData.inOutTypeKey = 6
+						}
 					}
 					console.log(this.detailData.inOutType)
 					//查询所有的合同  进行获取车牌号
@@ -474,7 +479,7 @@
 									if (this.detailData.inOutType == '销售出库') {
 										this.detailData.tips = '买方' + res.data.data[i].buyer
 									} else if (this.detailData.inOutType == '移库出库') {
-										this.detailData.tips = '入货库' + this.inOutNoList[0].warehouseName
+										this.detailData.tips = '入货库' + this.inOutNoList[0].receiveWarehouse
 									}
 									//如果查到该合同
 									res.data.data[i].deliverType  = !res.data.data[i].deliverType?'1':res.data.data[i].deliverType  
@@ -485,6 +490,9 @@
 									}
 									
 									if (res.data.data[i].tranCarInfoList) {
+										for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
+										   res.data.data[i].tranCarInfoList[num].carNo = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+										}
 										this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
 									}
 								}
@@ -533,7 +541,7 @@
 				} else if (this.detailData.inOutType == '移库出库') {
 					this.weightbills.buyer = this.inOutNoList[e[0]].receiveWarehouse
 					this.weightbills.seller = uni.getStorageSync('compName')
-					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].warehouseName
+					this.detailData.tips = '入货库' + this.inOutNoList[e[0]].receiveWarehouse
 				}
 			},
 			toUpperCase(val) {
@@ -641,6 +649,7 @@
 			carPicker(e) {
 				// this.detailData.gradeKey = e[0] + 1
 				this.detailData.carNo = this.carList[e].carNo
+				this.detailData.tranCarNo = this.carList[e].tranCarNo
 				this.detailData.carId = this.carList[e].id
 			},
 			onProgress(e) {},
@@ -648,6 +657,10 @@
 				this.detailData.addressUrl = ""
 			},
 			submit(num) {
+				if (!this.detailData.inOutTaskNo) {
+					this.$api.msg('暂无出库任务')
+					return
+				}
 				if (!this.detailData.contractNo) {
 					this.$api.msg('合同编号不能为空')
 					return
@@ -888,7 +901,6 @@
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
 				this.detailData.positionId = helper.erpWarehouse.positionId
 				this.detailData.binNumber = this.binNumber
-				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNoCK').goodsNameKey;
 				this.detailData.compId = helper.erpWarehouse.compId
 				this.detailData.netWeight = this.netWeight
 				this.detailData.inOutFlag = 1

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -22,13 +22,13 @@
 				<view class="right">{{detailData.goodsName ? detailData.goodsName : "选择合同，自动获取"}}
 				</view>
 			</view>
-			<view class="row">
+			<!-- <view class="row">
 				<view class="left">类型</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>
-			</view>
+			</view> -->
 			<view class="row row-bottom">
 				<view class="left">毛重（吨）</view>
 				<input type="digit" @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
@@ -374,6 +374,7 @@
 						agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
+					
 					// this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					// this.detailData.agent = this.inOutNoList[0].agent
 					// this.detailData.contractNo = this.inOutNoList[0].contractNo
@@ -395,6 +396,9 @@
 									this.showCar = false
 								}
 								if(res.data.data[i].tranCarInfoList){
+									for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
+									   res.data.data[i].tranCarInfoList[num].carNo = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+									}
 									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
 								}
 							 }
@@ -410,6 +414,7 @@
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
+				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey
 			},
 			toUpperCase(val) {
 				this.detailData.boxNo = val.detail.value.toUpperCase()
@@ -755,7 +760,7 @@
 				this.detailData.positionId = helper.erpWarehouse.positionId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
 				this.detailData.binNumber = this.binNumber
-				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
+				// this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
 				this.detailData.compId = helper.erpWarehouse.compId
 				this.detailData.netWeight = this.netWeight
 				this.detailData.inOutFlag = 1

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -421,6 +421,9 @@
 									this.showCar = false
 								}
 								if(res.data.data[i].tranCarInfoList){
+									for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
+									   res.data.data[i].tranCarInfoList[num].carNo = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+									}
 									this.carList = res.data.data[i].tranCarInfoList   //车牌号下拉列表
 								}
 							 }

pages/erp/warehousing/warehousing.vue

@@ -123,6 +123,12 @@
 					mode="selector">
 				</u-picker>
 			</view>
+		     <!-- 移库入库显示入库重量（） -->
+			<view class="row row-bottom" v-if="detailData.moveTaskNo">
+				<view class="left">入库重量（吨）</view>
+				<input type="digit" name="grossWeight" v-model='detailData.loadNetWeight'
+					class="right-bottom" placeholder="请输入入库重量"></input>
+			</view>
 			<view class="row row-bottom" v-if="detailData.outType=='火运'">
 				<view class="left">车号</view>
 				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车号"></input>
@@ -447,6 +453,9 @@
 					warehouseName: this.warehouseName,
 					agentKey: this.userInfo.id
 				}).then(res => {
+					if(res.data.data.length == 0){
+						this.$api.msg('暂无入库任务')
+					}
 					this.inOutNoList = res.data.data
 					if (this.inOutNoList.length > 0) {
 						this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
@@ -488,6 +497,9 @@
 											this.showCar = false
 										}
 										if (res.data.data[i].tranCarInfoList) {
+											for(var num = 0 ; num < res.data.data[i].tranCarInfoList.length; num++){
+											   res.data.data[i].tranCarInfoList[num].carNo = res.data.data[i].tranCarInfoList[num].carNo + '（'+res.data.data[i].tranCarInfoList[num].tranCarNo+'）'
+											}
 											this.carList = res.data.data[i].tranCarInfoList //车牌号下拉列表
 										}
 									}
@@ -615,6 +627,9 @@
 				// this.detailData.gradeKey = e[0] + 1
 				this.detailData.carNo = this.carList[e[0]].carNo
 				this.detailData.tranCarNo = this.carList[e[0]].tranCarNo
+				// this.detailData.carNo = this.carList[e].carNo
+				// this.detailData.tranCarNo = this.carList[e].tranCarNo
+				this.detailData.carId = this.carList[e[0]].id
 			},
 			handlerPicker(e) {
 				console.log(e)
@@ -715,6 +730,10 @@
 				this.isEditYF = false
 			},
 			submit(num) {
+				if (!this.detailData.inOutTaskNo) {
+					this.$api.msg('暂无入库任务')
+					return
+				}
 				if (!this.detailData.contractNo) {
 					this.$api.msg('合同编号不能为空')
 					return
@@ -871,6 +890,13 @@
 					this.$api.msg('车牌号输入有误！')
 					return
 				}
+				if(this.detailData.moveTaskNo){
+					if (this.detailData.loadNetWeight) {
+					this.$api.msg('入库重量不能为空！')
+					return
+				}
+				}
+				
 				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
@@ -1081,6 +1107,9 @@
 			font-weight: 600;
 			color: #333333;
 		}
+		.left{
+			width: 190rpx;
+		}
 
 		.row {
 			display: flex;

pages/erpbusiness/add_quality_testing.vue

@@ -230,7 +230,9 @@
 					tidalGrainPrice: '',
 					dryGrainPrice: '',
 					buckleMiscellaneous: '',
-					carNumber:''
+					carNumber:'',
+					customerName:'',
+					customerPhone:''
 				},
 				typeList: ['潮粮', '干粮'],
 				managementType: '',
@@ -314,23 +316,23 @@
 			this.managementType = options.managementType
 			let that = this
 			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
-			if (uni.getStorageSync('checkcustomer')) {
+			// if (uni.getStorageSync('checkcustomer')) {
 			
-				let _customerInfo = uni.getStorageSync('checkcustomer')
-				if (_customerInfo.shipperName) {
-					this.gridList.identityId = _customerInfo.id
-					//点击登记客户
-					this.gridList.customerName = _customerInfo.shipperName
-					this.gridList.customerPhone = _customerInfo.shipperPhone
-					this.gridList.carNumber=_customerInfo.carNo
-				} else {
-					//点击搜索客户
-					this.gridList.customerName = _customerInfo.customerName
-					this.gridList.customerPhone = _customerInfo.customerPhone
-				}
+			// 	let _customerInfo = uni.getStorageSync('checkcustomer')
+			// 	if (_customerInfo.shipperName) {
+			// 		this.gridList.identityId = _customerInfo.id
+			// 		//点击登记客户
+			// 		this.gridList.customerName = _customerInfo.shipperName
+			// 		this.gridList.customerPhone = _customerInfo.shipperPhone
+			// 		this.gridList.carNumber=_customerInfo.carNo
+			// 	} else {
+			// 		//点击搜索客户
+			// 		this.gridList.customerName = _customerInfo.customerName
+			// 		this.gridList.customerPhone = _customerInfo.customerPhone
+			// 	}
 			
-				this.gridList.customerNumberCard = _customerInfo.customerNumberCard
-			}
+			// 	this.gridList.customerNumberCard = _customerInfo.customerNumberCard
+			// }
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
 			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
@@ -363,6 +365,25 @@
 				}
 			})
 		},
+		onShow(){
+			if (uni.getStorageSync('checkcustomer')) {
+			
+				let _customerInfo = uni.getStorageSync('checkcustomer')
+				if (_customerInfo.shipperName) {
+					this.gridList.identityId = _customerInfo.id
+					//点击登记客户
+					this.gridList.customerName = _customerInfo.shipperName
+					this.gridList.customerPhone = _customerInfo.shipperPhone
+					this.gridList.carNumber=_customerInfo.carNo
+				} else {
+					//点击搜索客户
+					this.gridList.customerName = _customerInfo.customerName
+					this.gridList.customerPhone = _customerInfo.customerPhone
+				}
+			
+				this.gridList.customerNumberCard = _customerInfo.customerNumberCard
+			}
+		},
 		methods: {
 			change(e){
 				if(e){

pages/erpbusiness/jjsendCommand.vue

@@ -160,6 +160,17 @@
 				var canvasHeight = that.canvasHeight
 				var command = esc.jpPrinter.createNew()
 				command.init()
+				//编号
+				command.bold(3); //加粗
+				command.setFontSize(36); //字体大小
+				command.setSelectJustification(1) //居中
+				command.rowSpace(10);
+				// command.rowSpace(10);
+				command.setText(that.gridList.number.substring(that.gridList.number.length - 3));
+				command.setPrint();
+				command.rowSpace(60);
+				command.bold(0); //取消加粗
+				command.setFontSize(0); //正常字体
 				// 标题
 				command.bold(1); //加粗
 				command.setFontSize(16); //字体大小

pages/erpbusiness/sendCommand.vue

@@ -162,6 +162,17 @@
 				var canvasHeight = that.canvasHeight
 				var command = esc.jpPrinter.createNew()
 				command.init()
+				//编号
+				command.bold(3); //加粗
+				command.setFontSize(36); //字体大小
+				command.setSelectJustification(1) //居中
+				command.rowSpace(200);
+				// command.rowSpace(10);
+				command.setText(that.gridList.qualityNo.substring(that.gridList.qualityNo.length - 3));
+				command.setPrint();
+				command.rowSpace(60);
+				command.bold(0); //取消加粗
+				command.setFontSize(0); //正常字体
 				// 标题
 				command.bold(1); //加粗
 				command.setFontSize(16); //字体大小

pages/sale/information.vue

@@ -32,7 +32,7 @@
 				<view class='Regular' style='color:#B2B3BB;' @click='more("/pages/sale/plant")'>更多</view>
 			</view>
 			<swiper class="screen-swiper header-swiper" :autoplay="true" interval="6000" duration="500" :circular="true"
-				:acceleration="true" style="min-height: 700rpx;">
+				:acceleration="true" style="min-height: 820rpx;">
 				<swiper-item class="" v-for="(item1,index) in factoryPriceData.list" :key="index">
 					<view class=' guess-section-wrap-item clearfix' v-for='(item,index1) in item1' :key="index1">
 						<view class='factory'>{{item.factory}}</view>

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -44,7 +44,7 @@
 							<view class="right">{{retreatList.inOutType}}</view>
 						</view>
 						<view class='row' v-if="retreatList.inOutType == '移库出库'">
-							<view class="left">移库任务编号</view>
+							<view class="left" style="width: 180rpx;">移库任务编号</view>
 							<view class="right">{{retreatList.moveTaskNo}}</view>
 						</view>
 						<view class='row' v-if="retreatList.inOutType != '移库出库'">
@@ -108,7 +108,7 @@
 							<view class="right">{{OutList.inOutType}}</view>
 						</view>
 						<view class='row' v-if="OutList.inOutType == '移库出库'">
-							<view class="left">移库任务编号</view>
+							<view class="left" style="width: 180rpx;">移库任务编号</view>
 							<view class="right">{{OutList.moveTaskNo}}</view>
 						</view>
 						<view class='row' v-if="OutList.inOutType != '移库出库'">
@@ -184,7 +184,7 @@
 							<view class="right">{{EnterList.inOutType}}</view>
 						</view>
 						<view class='row' v-if="EnterList.inOutType == '移库入库'">
-							<view class="left">移库任务编号</view>
+							<view class="left" style="width: 180rpx;">移库任务编号</view>
 							<view class="right">{{EnterList.moveTaskNo}}</view>
 						</view>
 						<view class='row' v-if="EnterList.inOutType != '移库入库'">

pages/task/audit/Issueandreceipt_task_details.vue

@@ -41,7 +41,7 @@
 							<view class="right">{{retreatList.inOutType}}</view>
 						</view>
 						<view class='row' v-if="retreatList.inOutType == '移库出库'">
-							<view class="left">移库任务编号</view>
+							<view class="left" style="width: 180rpx;">移库任务编号</view>
 							<view class="right">{{retreatList.moveTaskNo}}</view>
 						</view>
 						<view class='row' v-if="retreatList.inOutType != '移库出库'">
@@ -103,7 +103,7 @@
 							<view class="right">{{OutList.inOutType}}</view>
 						</view>
 						<view class='row' v-if="OutList.inOutType == '移库出库'">
-							<view class="left">移库任务编号</view>
+							<view class="left" style="width: 180rpx;">移库任务编号</view>
 							<view class="right">{{OutList.moveTaskNo}}</view>
 						</view>
 						<view class='row' v-if="OutList.inOutType != '移库出库'">
@@ -159,7 +159,6 @@
 							<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" disabled/>
 						</u-form-item>
 					</view>
-
 				</view>
 				<view v-if="EnterList.judge == 2 && EnterList">
 					<view class="uForm_item">
@@ -178,7 +177,7 @@
 							<view class="right">{{EnterList.inOutType}}</view>
 						</view>
 						<view class='row' v-if="EnterList.inOutType == '移库入库'">
-							<view class="left">移库任务编号</view>
+							<view class="left" style="width: 180rpx;">移库任务编号</view>
 							<view class="right">{{EnterList.moveTaskNo}}</view>
 						</view>
 						<view class='row' v-if="EnterList.inOutType != '移库入库'">