前端 sdy

config/index.js

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

pages/erp/exWarehousing/exWarehousing.vue

@@ -7,7 +7,7 @@
 		<view class="content">
 			<view class="row">
 				<view class="left">任务编号</view>
-				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</view>
+				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "暂未获取到任务编号"}}</view>
 				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow"
 					mode="selector">
 				</u-picker>
@@ -280,7 +280,7 @@
 				binNumber: '',
 				detailData: {
 					outType: '汽运',
-					contractNo: "请选择合同编号或移库任务编号",
+					contractNo: "",
 					type: "干粮",
 					grade: "请输入品级",
 					agent: "请选择经办人",
@@ -315,7 +315,6 @@
 		},
 		onShow() {
 			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
-			console.log("当前合同", _data)
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			this.detailData.goodsName = _data.goodsName;
@@ -331,9 +330,9 @@
 			} else if (this.detailData.inOutType == '采购出库') {
 				this.detailData.inOutTypeKey = 6
 			}
-			if (_data.contractNo) {
-				this.detailData.contractNo = _data.contractNo;
-			}
+			// if (_data.contractNo) {
+			// 	this.detailData.contractNo = _data.contractNo;
+			// }
 			this.detailData.goodsNameKey = _data.goodsNameKey;
 			if (!_data.tranCarInfoList) {
 				this.isPC = false
@@ -378,7 +377,9 @@
 		methods: {
 			inOutNo() {
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
-					flag: 1
+					flag: 1,
+					warehouseName:this.warehouseName,
+					agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
@@ -392,18 +393,18 @@
 					this.detailData.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
 				})
-				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
-					this.contractNoList = res.data.data
-					for (var i = 0; i < this.contractNoList.length; i++) {
-						if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
-							if (this.detailData.inOutType == '销售出库') {
-								this.detailData.tips = '买方' + this.contractNoList[i].buyer
-							} else if (this.detailData.inOutType == '移库出库') {
-								this.detailData.tips = '入货库' + this.inOutNoList[0].warehouseName
-							}
-						}
-					}
-				})
+				// this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
+				// 	this.contractNoList = res.data.data
+				// 	for (var i = 0; i < this.contractNoList.length; i++) {
+				// 		if (this.contractNoList[i].contractNo == this.detailData.contractNo) {
+				// 			if (this.detailData.inOutType == '销售出库') {
+				// 				this.detailData.tips = '买方' + this.contractNoList[i].buyer
+				// 			} else if (this.detailData.inOutType == '移库出库') {
+				// 				this.detailData.tips = '入货库' + this.inOutNoList[0].warehouseName
+				// 			}
+				// 		}
+				// 	}
+				// })
 			},
 			inOutChange(e) {
 				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -7,7 +7,7 @@
 		<view class="content">
 			<view class="row">
 				<view class="left">任务编号</view>
-				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "请选择任务编号"}}</view>
+				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo : "暂未获取到任务编号"}}</view>
 				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow"
 					mode="selector">
 				</u-picker>
@@ -257,7 +257,7 @@
 				binNumber: '',
 				detailData: {
 					outType: '汽运',
-					contractNo: "请选择合同编号或移库任务编号",
+					contractNo: "",
 					type: "请选择类型",
 					grade: "请输入品级",
 					agent: "请选择经办人",
@@ -313,9 +313,9 @@
 			} else if (this.detailData.inOutType == '采购出库') {
 				this.detailData.inOutTypeKey = 6
 			}
-			if (!this.detailData.contractNo) {
-				this.detailData.contractNo = '请选择合同编号'
-			}
+			// if (!this.detailData.contractNo) {
+			// 	this.detailData.contractNo = '请选择合同编号'
+			// }
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}
@@ -347,7 +347,9 @@
 		methods: {
 			inOutNo() {
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
-					flag: 1
+					flag: 1,
+					warehouseName:this.warehouseName,
+						agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -286,6 +286,9 @@
 				 inOutNoList:[],
 			}
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		onLoad(options) {
 			this.detailData =JSON.parse(options.data)
 			this.netWeight = this.detailData.netWeight
@@ -364,7 +367,9 @@
 		},
 		methods: {
 			inOutNo(){
-				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {flag:2}).then(res => {
+				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', 
+				{flag:2,warehouseName:this.warehouseName,
+					agentKey : this.userInfo.id}).then(res => {
 					this.inOutNoList = res.data.data
 					this.inOutNoList = res.data.data
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo

pages/erp/warehousing/warehousing.vue

@@ -7,7 +7,7 @@
 		<view class="content">
 			<view class="row">
 				<view class="left">任务编号</view>
-				<view @click='inOutShow=true'>{{detailData.inOutTaskNo}}</view>
+				<view @click='inOutShow=true'>{{detailData.inOutTaskNo ? detailData.inOutTaskNo:"未获取到任务编号"}}</view>
 				<u-picker :range="inOutNoList" range-key="inOutTaskNo" @confirm='inOutChange' v-model="inOutShow"
 					mode="selector">
 				</u-picker>
@@ -407,13 +407,19 @@
 				this.pureWeightCount()
 			},
 		},
+		computed: {
+			...mapState(['hasLogin','userInfo']),
+		},
 		methods: {
 			inOutNo() {
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
-					flag: 2
+					flag: 2,
+					warehouseName:this.warehouseName,
+					agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
-					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
+					if(this.inOutNoList.length > 0){
+						this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					this.detailData.agent = this.inOutNoList[0].agent
 					if (this.inOutNoList[0].contractNo) {
 						this.detailData.contractNo = this.inOutNoList[0].contractNo
@@ -423,6 +429,8 @@
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
 					this.detailData.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					}
+					
 				})
 				this.$api.doRequest('get', 'warehouseBaseInfo/selectContractNoList', ).then(res => {
 					this.contractNoList = res.data.data