前端

pages/erp/index.vue

@@ -440,7 +440,7 @@
 				this.init(this.compList[e[0]].compId)
 			},
 			init(compId) {
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfNew', {
 					compId: compId,
 				}).then(res => {
 					if (res.data.data.length != 0) {

pages/erpbusiness/add_quality_testing.vue

@@ -855,7 +855,7 @@
 				warehouseList: [],
 				warehouseCount: '',
 				commonWarehouseNo: '',
-				warehouseTradeCount: 0,
+				// warehouseTradeCount: 0,
 				showTran: true,
 				companyId: 1,
 				contractNolist: [],
@@ -951,12 +951,7 @@
 			var date = new Date()
 			console.log(this.cangid)
 			this.commonWarehouseNo = options.commonWarehouseNo
-			this.warehouseCount = Number(options.warehouseCount) + 1
-			this.warehouseTradeCount = Number(options.warehouseTradeCount) + 1
-			let number = '000' + this.warehouseCount
-			number = number.substring(number.length - 4, number.length)
 			this.gridList.warehouseName = options.warehouseName
-			// this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 			this.cangid = options.cangid
 			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
 				id: this.cangid
@@ -1615,8 +1610,7 @@
 						delete this.gridList.reColorLustre
 					}
 					if (this.gridList.inOutType == '采购入库') {
-						this.warehouseTradeCount = '000' + this.warehouseTradeCount
-						// this.gridList.qualityNo='CGRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
+					
 						if (!this.contractNolist.unitContractPrice) {
 							this.gridList.tips = '卖方' + this.contractNolist.seller
 						} else {
@@ -1627,8 +1621,6 @@
 						this.gridList.inOutTypeKey = 1
 						console.log("this.gridList.inOutTypeKey", 1)
 					} else if (this.gridList.inOutType == '移库入库') {
-						this.warehouseTradeCount = '000' + this.warehouseTradeCount
-						// this.gridList.qualityNo='YKRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
 						if (this.contractNolist.unitContractPrice) {
 							this.gridList.tips = '出货库' + data.sendWarehouse + ' （' + this.contractNolist
 								.unitContractPrice + '元/吨）'
@@ -1645,9 +1637,6 @@
 					} else if (this.contractNolist.inOutType == '退库') {
 						//退库有无运输任务标识
 						this.gridList.tranTaskFlag = this.contractNolist.tranTaskFlag
-						this.warehouseTradeCount = '000' + this.warehouseTradeCount
-						// this.gridList.qualityNo = 'CGRK' + this.getdate() + this.commonWarehouseNo + this
-						// .warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
 						if (this.contractNolist.contractNo) {
 							this.gridList.tips = '买方' + this.contractNolist.buyer
 						} else {

pages/erpbusiness/quality_testing.vue

@@ -270,7 +270,7 @@
 				this.cangid = uni.getStorageSync("cangid")
 			}
 			this.gridList = []
-			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
+			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfNew', {
 				compId: uni.getStorageSync('pcUserInfo').compId,
 				personCharge: this.userInfo.phone
 			}).then(res => {
@@ -280,9 +280,7 @@
 						if (that.cangid && that.cangid == list[i].id) {
 							that.warehouse = list[i]
 							that.warehouseName = list[i].warehouseName
-							that.warehouseCount = list[i].count
-							that.warehouseTradeCount = list[i].tradeCount
-							that.commonWarehouseNo = list[i].commonWarehouseNo
+							// that.commonWarehouseNo = list[i].commonWarehouseNo
 							// uni.setStorageSync('purchasePriceList',list[i].purchasePriceList)
 							break
 						}
@@ -291,9 +289,9 @@
 					if (that.selector.length > 0 && !that.cangid) {
 						that.warehouse = that.selector[0]
 						that.warehouseName = that.selector[0].warehouseName
-						that.warehouseCount = that.selector[0].count
-						that.warehouseTradeCount = that.selector[0].tradeCount
-						that.commonWarehouseNo = that.selector[0].commonWarehouseNo
+						// that.warehouseCount = that.selector[0].count
+						// that.warehouseTradeCount = that.selector[0].tradeCount
+						// that.commonWarehouseNo = that.selector[0].commonWarehouseNo
 						that.cangid = that.selector[0].id
 						uni.setStorageSync("cangid", that.cangid)
 						// uni.setStorageSync('purchasePriceList',that.selector[0].purchasePriceList)