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

pages/erpbusiness/add_quality_testing.vue

@@ -123,13 +123,13 @@
 			</view>
 			<view v-if='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
-				<view class="con-list" v-if='tranCarInfoList.length==0&&gridList.inOutType!="移库入库"'>
+				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
 				<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
-				<view class="con-list" v-else>
+				<view class="con-list" v-show='gridList.inOutType=="移库入库"'>
 				<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 					v-model="show9" mode="selector">
@@ -193,13 +193,13 @@
 			</view>
 			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">车牌号</view>
-				<view class="con-list" v-if='tranCarInfoList.length==0'>
+				<view class="con-list" v-show='gridList.inOutType!="移库入库"'>
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
-				<view class="con-list" v-if='tranCarInfoList.length>0'>
+				<view class="con-list" v-show='gridList.inOutType=="移库入库"'>
 				<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 					v-model="show9" mode="selector">
@@ -495,10 +495,79 @@
 						reImpurity: '',
 						jiaorenli: '',
 						reJiaorenli: '',
-					 bulkDensity: '',
+						bulkDensity: '',
 						reBulkDensity: '',
 						mildewGrain: '',
-					 reMildewGrain: '',
+						reMildewGrain: '',
+					},
+					disablednotarize: false,
+					deductionAmount: 0,
+					deductionWeight: 0,
+					grossWeight: 0,
+					tare: 0,
+					grade: '',
+					// inOutDate: new Date().toISOString().slice(0, 10),
+					netWeight: 0,
+					pureWeight: 0,
+					deductionWeight: 0,
+					waterContent: '',
+					reWaterContent: '',
+					reGrade: '',
+					imperfectGrain: '',
+					reImperfectGrain: '',
+					impurity: '',
+					reImpurity: '',
+					jiaorenli: '',
+					reJiaorenli: '',
+					bulkDensity: '',
+					reBulkDensity: '',
+					reMemo: '',
+					storageTagNo: '',
+					mildewGrain: '',
+					reMildewGrain: '',
+					boxNo: '',
+					boxNoOther: '',
+					titleNo: '',
+					titleNoOther: '',
+					statusFlag: 1
+				},
+				gridListInit: {
+					natureOfGrainPurchase: '贸易粮',
+					type: '',
+					tidalGrainPrice: '',
+					dryGrainPrice: '',
+					buckleMiscellaneous: '',
+					carNumber: '',
+					customerName: '',
+					customerPhone: '',
+					bulkDensity: "",
+					imperfectGrain: "",
+					waterContent: "",
+					jiaorenli: "",
+					impurity: "",
+					mildewGrain: "",
+					compName: "",
+					type: '',
+					freight: 0,
+					cost: '',
+					addressUrl: '',
+					tidalGrainPrice: 0,
+					buckleWeightRatio: 0,
+					buckleMiscellaneous: 0,
+					paramType: 1,
+					warehouseInOutDetail: {
+						grade: '',
+						reGrade: '',
+						imperfectGrain: '',
+						reImperfectGrain: '',
+						impurity: '',
+						reImpurity: '',
+						jiaorenli: '',
+						reJiaorenli: '',
+						bulkDensity: '',
+						reBulkDensity: '',
+						mildewGrain: '',
+						reMildewGrain: '',
 					},
 					disablednotarize: false,
 					deductionAmount: 0,
@@ -685,6 +754,7 @@
 					// }
 				}
 			})
+			this.gridListInit = this.gridList
 		},
 		onShow() {
 			if (this.utils.getCurrectRoles('acquisitionQuality.initial') && !this.utils.getCurrectRoles(
@@ -820,6 +890,7 @@
 			},
 			groupChange(e) {
 				console.log(e)
+				this.gridList = JSON.parse(JSON.stringify(this.gridListInit))
 				this.gridList.serviceManagementType = e
 				if (e == 1) {
 					this.gridList.qualityNo = ''

pages/reimbursement/get_request_funds.vue

@@ -27,6 +27,18 @@
 					<view>{{detailData.expenseName}}</view>
 				</view>
 			</view>
+			<view class="c-row" v-if="detailData.expensesType == '2'">
+				<view class="title">付款方名头</view>
+				<view class="con-list">
+					<view>{{detailData.payerHeader}}</view>
+				</view>
+			</view>
+			<view class="c-row" v-if="detailData.purpose == '经营性费用' && detailData.expensesType == '2'">
+				<view class="title">所属名头</view>
+				<view class="con-list">
+					<view>{{detailData.belongName}}</view>
+				</view>
+			</view>
 			<view class="c-row">
 				<view class="title">金额（元）</view>
 				<view class="con-list">
@@ -74,6 +86,33 @@
 				</view>
 			</view>
 		</view>
+		<view v-if="detailData.expensesType == '2'" class='wrap margin-bottom'>
+			<view class="xinxi"  style="font-size: 28rpx; ">收款账户信息</view>
+			<view class="c-row">
+				<view class="title">收款方</view>
+				<view class="con-list">
+					<view>{{detailData.payee}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">账户</view>
+				<view class="con-list">
+					<view>{{detailData.accountNumber}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户行</view>
+				<view class="con-list">
+					<view>{{detailData.bank}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户支行</view>
+				<view class="con-list">
+					<view>{{detailData.bankBranch}}</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 

pages/reimbursement/request_funds.vue

@@ -149,7 +149,7 @@
 					totalDistribution: '0',
 				},
 				fileList1: [],
-				show1:true,
+				show1:false,
 				warehouseType: '1',
 				typeRemark: 'textarea',
 				border: true,
@@ -321,6 +321,7 @@
 					this.detailData.expensesPurpose = "5"
 					delete this.detailData.warehouseName
 					delete this.detailData.contractNo
+					this.show1 = true
 				}
 				console.log(this.detailData)
 			},

pages/task/audit/charge_against_revenue.vue

@@ -65,6 +65,14 @@
 				<view class="left">费用名称</view>
 				<view class="right">{{auditInfo.expenseName}}</view>
 			</view>
+			<view class="row" v-if='auditInfo.expensesType==2'>
+				<view class="left">付款方名头</view>
+				<view class="right">{{auditInfo.payerHeader}}</view>
+			</view>
+			<view class="row" v-if='auditInfo.expensesPurpose==5 && auditInfo.expensesType==2'>
+				<view class="left">所属名头</view>
+				<view class="right">{{auditInfo.belongName}}</view>
+			</view>
 			<view class="row">
 				<view class="left">金额（元）</view>
 				<view class="right">{{auditInfo.amountMoney}}</view>
@@ -109,6 +117,27 @@
 					placeholder="输入不完善粒占比"></input>
 			</view> -->
 		</view>
+		<view class="content1">
+			<view class="title ">
+				收款账户信息
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">收款方</view>
+				<view class="right">{{auditInfo.payee}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">账户</view>
+				<view class="right">{{auditInfo.accountNumber}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户行</view>
+				<view class="right">{{auditInfo.bank}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户支行</view>
+				<view class="right">{{auditInfo.bankBranch}}</view>
+			</view>
+		</view>
 		<view class="content1" v-if="url && url != 'ng'">
 			<view class="title ">
 				附件

pages/task/audit/charge_against_revenue_detail.vue

@@ -65,6 +65,14 @@
 				<view class="left">费用名称</view>
 				<view class="right">{{auditInfo.expenseName}}</view>
 			</view>
+			<view class="row" v-if='auditInfo.expensesType==2'>
+				<view class="left">付款方名头</view>
+				<view class="right">{{auditInfo.payerHeader}}</view>
+			</view>
+			<view class="row" v-if='auditInfo.expensesPurpose==5 && auditInfo.expensesType==2'>
+				<view class="left">所属名头</view>
+				<view class="right">{{auditInfo.belongName}}</view>
+			</view>
 			<view class="row">
 				<view class="left">金额（元）</view>
 				<view class="right">{{auditInfo.amountMoney}}</view>
@@ -109,6 +117,27 @@
 					placeholder="输入不完善粒占比"></input>
 			</view> -->
 		</view>
+		<view class="content1">
+			<view class="title ">
+				收款账户信息
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">收款方</view>
+				<view class="right">{{auditInfo.payee}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">账户</view>
+				<view class="right">{{auditInfo.accountNumber}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户行</view>
+				<view class="right">{{auditInfo.bank}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户支行</view>
+				<view class="right">{{auditInfo.bankBranch}}</view>
+			</view>
+		</view>
 		<view class="content1" v-if="url && url != 'ng'">
 			<view class="title ">
 				附件