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

config/index.js

@@ -3,14 +3,14 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.9:9888/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/add_quality_testing.vue

@@ -1119,23 +1119,30 @@
 				console.log(this.gridList, 111111111111)
 			},
 			outtypepicker(e, status) {
+				console.log(e,status)
 				if (status == 0) {
 					this.gridList.outType = this.multiSelector[e[0]].name
 				} else {
-					if (this.multiSelector[e[0]].name == '他运') {
+					if (this.multiSelector1[e[0]].name == '他运') {
 						this.goodsdisabled = false
 						this.gridList.outType = this.multiSelector1[e[0]].name
 					} else {
 						this.gridList.outType = '自运'
 						this.goodsdisabled = true
-						this.outType = this.multiSelector[e[0]].name
+						this.outType = this.multiSelector1[e[0]].name
 						this.gridList.contractNo = this.multiSelector1[i].contractNo
-						for (let i = 0; i < this.contractNolist.length; i++) {
-							if (this.gridList.contractNo == this.contractNolist[i].contractNo) {
-								this.gridList.goodsName = this.outContractNo[q].goodsName
-								this.gridList.goodsNameKey = this.outContractNo[q].goodsNameKey
-							}
-						}
+						// if (this.gridList.contractNo == this.contractNolist[i].contractNo) {
+						// 	this.gridList.goodsName = this.outContractNo[q].goodsName
+						// 	this.gridList.goodsNameKey = this.outContractNo[q].goodsNameKey
+						// }
+						this.$api.doRequest('get', '/contractManagementInfo/getInContract', {
+							contractNo: this.gridList.contractNo,
+							compId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res => {
+							this.contractNolist = res.data.data
+							this.gridList.goodsName = this.contractNolist.goodsName
+							this.gridList.goodsNameKey = this.contractNolist.goodsNameKey
+						})
 						this.waterContentChange()
 					}
 				}

pages/erpbusiness/customer.vue

@@ -13,7 +13,7 @@
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
 		</view>
-		<view class="content">
+		<!-- <view class="content">
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>近期客户</view>
 
 			<view v-for='item in gridList'>
@@ -27,7 +27,7 @@
 					{{item.customerName}}({{item.bankCard}})
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="content content1">
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>登记客户</view>
 

pages/reimbursement/request_funds.vue

@@ -22,10 +22,13 @@
 					</view>
 				</view>
 			</view>
-			<view class="c-row" v-if="detailData.purpose == '库点费用'&&reType == 2">
+			<view class="c-row" v-if="(detailData.purpose == '库点费用'&&reType == 2) || (detailData.purpose == '库点费用'&&expensesType == 2)">
 				<view class="title">仓储费</view>
 				<view class="con-list">
-					<view @click='show3=true'>{{detailData.flag}}
+					<view @click='show3=true' v-if="detailData.storageFeeFlag == 1">是
+						<u-icon name="arrow-right" color=""></u-icon>
+					</view>
+					<view @click='show3=true' v-else>否
 						<u-icon name="arrow-right" color=""></u-icon>
 					</view>
 				</view>
@@ -41,8 +44,7 @@
 					</view>
 				</view>
 			</view>
-			<u-picker :range="typeList" range-key="value" @confirm='typeCheck($event)' v-model="show2"
-				mode="selector">
+			<u-picker :range="typeList" range-key="value" @confirm='typeCheck($event)' v-model="show2" mode="selector">
 			</u-picker>
 			<view class="c-row" v-if="detailData.purpose == '合同费用'">
 				<view class="title">合同编号</view>
@@ -64,7 +66,8 @@
 					<input v-model='detailData.payerHeader' maxlength='25' placeholder="输入付款方名头"></input>
 				</view>
 			</view>
-			<view v-show="reType == 2&&detailData.purpose=='经营性费用' || expensesType == '2'&&detailData.purpose=='经营性费用'" class="c-row">
+			<view v-show="reType == 2&&detailData.purpose=='经营性费用' || expensesType == '2'&&detailData.purpose=='经营性费用'"
+				class="c-row">
 				<view class="title">所属名头</view>
 				<view class="con-list">
 					<view @click='show1=true'>{{detailData.belongName?detailData.belongName:"请选择所属名头"}}
@@ -72,8 +75,7 @@
 					</view>
 				</view>
 			</view>
-			<u-picker :range="namelist" range-key="name" @confirm='confirmname($event)' v-model="show1"
-				mode="selector">
+			<u-picker :range="namelist" range-key="name" @confirm='confirmname($event)' v-model="show1" mode="selector">
 			</u-picker>
 			<view class="c-row">
 				<view class="title">金额（元）</view>
@@ -115,7 +117,7 @@
 			</view>
 		</view>
 		<view v-if="reType == 2 || expensesType == '2'" class='wrap margin-bottom'>
-			<view class="xinxi"  style="font-size: 28rpx; ">收款账户信息</view>
+			<view class="xinxi" style="font-size: 28rpx; ">收款账户信息</view>
 			<view class="c-row">
 				<view class="title">收款方</view>
 				<view class="con-list">
@@ -154,13 +156,13 @@
 		data() {
 			return {
 				show: false,
-				show2:false,
+				show2: false,
 				showWare: false,
 				detailData: {
-					flag:'否',
+					storageFeeFlag: 0,
 					purpose: '库点费用',
 					remark: "",
-					wareExpenseType:'杂费',
+					wareExpenseType: '杂费',
 					warehouseName: '选择仓库',
 					expenseName: '',
 					amountMoney: '',
@@ -174,11 +176,11 @@
 					totalDistribution: '0',
 				},
 				fileList1: [],
-				show1:false,
+				show1: false,
 				warehouseType: '1',
 				typeRemark: 'textarea',
 				border: true,
-				show3:false,
+				show3: false,
 				imglist: [], //存
 				imglist2: [], //展示
 				height: 150,
@@ -193,44 +195,109 @@
 						purpose: "经营性费用"
 					},
 				],
-				typeList1:[
-					{value: "是"},
-					{value: "否"},
+				typeList1: [{
+						value: "是",
+						key: 1
+					},
+					{
+						value: "否",
+						key: 0
+					},
 				],
-				typeList:[
-					{value: "杂费"},
-					{value: "电费"},
-					{value: "煤费"},
-					{value: "人工费"},
+				typeList: [{
+						value: "杂费"
+					},
+					{
+						value: "电费"
+					},
+					{
+						value: "煤费"
+					},
+					{
+						value: "人工费"
+					},
 				],
-				namelist:[
-					{name: "黑龙江中天昊元贸易有限公司"},
-					{name: "中天昊元-建发合营"},
-					{name: "中天昊元-六水香合营"},
-					{name: "中天昊元-昊友合营"},
-					{name: "黑龙江中天昊元贸易有限公司辽宁分公司"},
-					{name: "黑龙江众利合粮食贸易有限公司"},
-					{name: "黑龙江欣洋粮食贸易有限公司"},
-					{name: "黑龙江启兴粮食贸易有限公司"},
-					{name: "黑龙江鑫满仓粮食贸易有限公司"},
-					{name: "黑龙江谷香粮食贸易有限公司"},
-					{name: "黑龙江益储益运粮食贸易有限公司"},
-					{name: "黑龙江海天粮食农业发展有限公司"},
-					{name: "黑龙江中天绿粮供应链管理有限公司"},
-					{name: "中天昊元（海南）国际贸易有限公司"},
-					{name: "克东县嘉达建筑装潢有限责任公司"},
-					{name: "克东县金博粮食有限公司"},
-					{name: "克东县安正商贸有限公司"},
-					{name: "克东县万祥农业科技开发有限公司"},
-					{name: "克东县万润运输有限公司"},
-					{name: "黑龙江大金仓农业科技有限公司"},
-					{name: "克东县华祥通讯管线工程有限公司"},
-					{name: "黑龙江峰海粮食贸易有限公司(季度报 增值税季度）"},
-					{name: "黑龙江鑫宝仓粮食贸易有限公司"},
-					{name: "黑龙江中仓粮食贸易有限公司"},
-					{name: "黑龙江晟鸿泰粮食贸易有限公司"},
-					{name: "黑龙江新粮仓粮食贸易有限公司"},
-					{name: "齐齐哈尔米林设备制造有限公司"},
+				namelist: [{
+						name: "黑龙江中天昊元贸易有限公司"
+					},
+					{
+						name: "中天昊元-建发合营"
+					},
+					{
+						name: "中天昊元-六水香合营"
+					},
+					{
+						name: "中天昊元-昊友合营"
+					},
+					{
+						name: "黑龙江中天昊元贸易有限公司辽宁分公司"
+					},
+					{
+						name: "黑龙江众利合粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江欣洋粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江启兴粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江鑫满仓粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江谷香粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江益储益运粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江海天粮食农业发展有限公司"
+					},
+					{
+						name: "黑龙江中天绿粮供应链管理有限公司"
+					},
+					{
+						name: "中天昊元（海南）国际贸易有限公司"
+					},
+					{
+						name: "克东县嘉达建筑装潢有限责任公司"
+					},
+					{
+						name: "克东县金博粮食有限公司"
+					},
+					{
+						name: "克东县安正商贸有限公司"
+					},
+					{
+						name: "克东县万祥农业科技开发有限公司"
+					},
+					{
+						name: "克东县万润运输有限公司"
+					},
+					{
+						name: "黑龙江大金仓农业科技有限公司"
+					},
+					{
+						name: "克东县华祥通讯管线工程有限公司"
+					},
+					{
+						name: "黑龙江峰海粮食贸易有限公司(季度报 增值税季度）"
+					},
+					{
+						name: "黑龙江鑫宝仓粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江中仓粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江晟鸿泰粮食贸易有限公司"
+					},
+					{
+						name: "黑龙江新粮仓粮食贸易有限公司"
+					},
+					{
+						name: "齐齐哈尔米林设备制造有限公司"
+					},
 				],
 				reType: "",
 				flag: "",
@@ -241,10 +308,10 @@
 		onLoad(options) {
 			this.reType = options.reType
 			this.expensesType = options.expensesType
-			if(this.reType==2||this.expensesType==2){
+			if (this.reType == 2 || this.expensesType == 2) {
 				uni.setNavigationBarTitle({
-						title: '请款'
-					});
+					title: '请款'
+				});
 			}
 			this.id = options.id
 			if (this.id) {
@@ -266,13 +333,13 @@
 				this.$api.doRequest('get', 'customerInfo/getPayeeInfo', {
 					contractNo: this.detailData.contractNo
 				}).then(res => {
-					this.detailData.payee=res.customerType=="企业客户"?res.compName:res.customerName
-					this.detailData.accountNumber=res.bankCard
-					this.detailData.bank=res.bankDeposit
-					this.detailData.bankBranch=res.bankDepositBranch
+					this.detailData.payee = res.customerType == "企业客户" ? res.compName : res.customerName
+					this.detailData.accountNumber = res.bankCard
+					this.detailData.bank = res.bankDeposit
+					this.detailData.bankBranch = res.bankDepositBranch
 					this.$forceUpdate()
 				})
-				
+
 			}
 		},
 		watch: {
@@ -288,11 +355,11 @@
 			}
 		},
 		methods: {
-			typeCheck(e){
-				this.detailData.wareExpenseType=this.typeList[e[0]].value
+			typeCheck(e) {
+				this.detailData.wareExpenseType = this.typeList[e[0]].value
 			},
-			typeCheck1(e){
-				this.detailData.flag=this.typeList1[e[0]].value
+			typeCheck1(e) {
+				this.detailData.storageFeeFlag = this.typeList1[e[0]].key
 			},
 			afterRead(e) {
 				console.log(e)
@@ -300,58 +367,58 @@
 			async uploadClick() {
 				let baseUrlNew = config.def().baseUrlNew
 				let pcUserInfo = uni.getStorageSync('pcUserInfo')
-				console.log('baseUrlNew',baseUrlNew)
-				if(!pcUserInfo){
+				console.log('baseUrlNew', baseUrlNew)
+				if (!pcUserInfo) {
 					uni.showToast({
-						title:"登录已失效，请重新登录"
+						title: "登录已失效，请重新登录"
 					})
-					return 
+					return
 				}
 				uni.chooseImage({
-					count:10,
+					count: 10,
 					success: (chooseImageRes) => {
-						console.log('chooseImageRes',chooseImageRes)
+						console.log('chooseImageRes', chooseImageRes)
 						let files = []
 						for (let item of chooseImageRes.tempFiles) {
 							files.push({
 								name: 'fileName',
-								url : item.path
+								url: item.path
 							});
 						}
 						console.log(files)
 						for (let i = 0; i < files.length; i++) {
 							uni.uploadFile({
-							url: baseUrlNew + 'appendix/api/uploadFiles',
-							// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
-							// files: files[i],
-							filePath:files[i].url,
-							name:files[i].name,
-							formData: {
-								// fileName: chooseImageRes.tempFiles[0],
-								companyId: pcUserInfo.compId,
-								modelId: '',
-								vesselId: '',
-							},
-							success: (uploadFileRes) => {
-								console.log(JSON.parse(uploadFileRes.data))
-								var data = JSON.parse(uploadFileRes.data).data
-								data.compId = pcUserInfo.compId
-								this.$api.doRequest('post', '/appendix/api/saveFilesApp', {
-									newAppendixs: [data],
-									oldAppendixIds: ""
-								}).then(res => {
-									this.imglist.push(res.data.data[0])
-									console.log(res)
-								})
-								console.log(uploadFileRes.data);
-							},
-							fail(res) {
-								
-								console.log(res);
-							}
-						});
+								url: baseUrlNew + 'appendix/api/uploadFiles',
+								// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
+								// files: files[i],
+								filePath: files[i].url,
+								name: files[i].name,
+								formData: {
+									// fileName: chooseImageRes.tempFiles[0],
+									companyId: pcUserInfo.compId,
+									modelId: '',
+									vesselId: '',
+								},
+								success: (uploadFileRes) => {
+									console.log(JSON.parse(uploadFileRes.data))
+									var data = JSON.parse(uploadFileRes.data).data
+									data.compId = pcUserInfo.compId
+									this.$api.doRequest('post', '/appendix/api/saveFilesApp', {
+										newAppendixs: [data],
+										oldAppendixIds: ""
+									}).then(res => {
+										this.imglist.push(res.data.data[0])
+										console.log(res)
+									})
+									console.log(uploadFileRes.data);
+								},
+								fail(res) {
+
+									console.log(res);
+								}
+							});
 						}
-						
+
 					}
 				});
 			},
@@ -377,10 +444,10 @@
 					this.detailData.expensesPurpose = "5"
 					delete this.detailData.warehouseName
 					delete this.detailData.contractNo
-					if(this.reType == 2){
+					if (this.reType == 2) {
 						this.show1 = true
 					}
-					
+
 				}
 				console.log(this.detailData)
 			},
@@ -411,7 +478,7 @@
 					return
 				}
 				if (this.expensesType == '2') {
-					if(!this.detailData.payerHeader){
+					if (!this.detailData.payerHeader) {
 						this.$api.msg('付款方不能为空')
 						return
 					}
@@ -444,6 +511,7 @@
 							that.detailData.agent = uni.getStorageSync('userInfo').userName
 							that.detailData.identification = that.detailData.identification
 							that.detailData.costType = that.detailData.costType
+							that.detailData.flag = 4
 							that.detailData.expensesType = that.reType
 							that.detailData.fieldName = uni.getStorageSync('userInfo').userName
 							that.detailData.totalDistribution = that.detailData.totalDistribution
@@ -642,7 +710,8 @@
 		display: flex;
 		justify-content: center;
 	}
-	.margin-bottom{
-		margin-bottom:84px;
+
+	.margin-bottom {
+		margin-bottom: 84px;
 	}
 </style>