前端添加所属名头，修改入库车牌号显示

config/index.js

@@ -3,7 +3,7 @@ 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.9:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 baseUrlNew: 'http://192.168.110.82:8090/',

pages/erpbusiness/add_quality_testing.vue

@@ -123,12 +123,19 @@
 			</view>
 			<view v-if='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
-				<view class="con-list">
-					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
+				<view class="con-list" v-if='tranCarInfoList.length==0&&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 @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
+				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
+					v-model="show9" mode="selector">
+				</u-picker>
+				
+				</view>
 			</view>
 			<view v-if="gridList.outType=='汽运'&&typevalue==1 ||gridList.outType == '集装箱船'&&typevalue==1" class="c-row ">
 				<view class="title">箱号-1</view>
@@ -186,12 +193,19 @@
 			</view>
 			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")' class="c-row ">
 				<view class="title">车牌号</view>
-				<view class="con-list">
+				<view class="con-list" v-if='tranCarInfoList.length==0'>
 					<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 @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
+				<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
+					v-model="show9" mode="selector">
+				</u-picker>
+				
+				</view>
 			</view>
 			<!-- <view v-if="gridList.paramType != '1'&&utils.getCurrectRoles('acquisitionQuality.initial')" class="c-row ">
 				<view class="title">扣重比</view>
@@ -412,6 +426,7 @@
 				show5: false,
 				show6: false,
 				show7: false,
+				show9:false,
 				edit: true,
 				goodsdisabled: false,
 				freighttext: '手动填写',
@@ -523,13 +538,13 @@
 				warehouseList: [],
 				warehouseCount: '',
 				commonWarehouseNo: '',
-				tranCarInfoList: [],
 				warehouseTradeCount: 0,
 				showTran: true,
 				companyId: 1,
 				contractNolist: [],
 				current: 4,
 				taskNolist: [],
+				tranCarInfoList:[],
 				fleetNameList: [],
 				multiSelector: [{
 				  name: '汽运',
@@ -750,6 +765,28 @@
 			}
 		},
 		methods: {
+			carNopicker(e){
+				this.gridList.carNumber=this.tranCarInfoList[e[0]].carNo
+				 for (let i = 0; i < this.tranCarInfoList.length; i++) {
+				        if (i == e[0]) {
+				          this.gridList.carNo = this.tranCarInfoList[i].carNo
+				          this.gridList.carNoCopy = this.tranCarInfoList[i].carNo + '(' + this.tranCarInfoList[i].tranCarNo +
+				            ')'
+				          this.gridList.tranCarNo = this.tranCarInfoList[i].tranCarNo
+				          this.gridList.carId = this.tranCarInfoList[i].id
+				          this.gridList.freight = Math.round(
+				            this.tranCarInfoList[i].tranPrice
+				          )
+				          if (this.gridList.inOutType == '移库入库') {
+				            if (!this.gridList.cost) {
+				              this.gridList.cost = this.tranCarInfoList[i].cost
+				            }
+				            this.gridList.loadNetWeight =
+				              this.tranCarInfoList[i].loadNetWeight
+				          }
+				        }
+				      }
+			},
 			obtainPrice(){//根据容重获取价格
 				if (this.gridList.goodsName && this.cangid && this.gridList.bulkDensity) {
 					// if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
@@ -1011,10 +1048,18 @@
 							this.carstatus = false
 						}
 						if (this.contractNolist[i].tranCarInfoList) {
+							for (var q = 0; q < this.contractNolist[i].tranCarInfoList.length; q++) {
+								if(this.contractNolist[i].tranCarInfoList.tranCarNo){
+									this.contractNolist[i].tranCarInfoList[q].carNo1=this.contractNolist[i].tranCarInfoList.carNo+'（'+this.contractNolist[i].tranCarInfoList.tranCarNo+'）'
+								}else{
+									this.contractNolist[i].tranCarInfoList[q].carNo1=this.contractNolist[i].tranCarInfoList.carNo
+								}
+								
+							}
 							this.tranCarInfoList = this.contractNolist[i].tranCarInfoList
 							// this.carstatus = true
 						} else {
-							this.options2 = []
+							this.tranCarInfoList = []
 						}
 						this.fleetNameList = this.contractNolist[i].tranCarInfoList1
 					}

pages/reimbursement/request_funds.vue

@@ -42,6 +42,17 @@
 					<input v-model='detailData.payerHeader' maxlength='25' placeholder="输入付款方名头"></input>
 				</view>
 			</view>
+			<view v-if="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:"请选择所属名头"}}
+						<u-icon name="arrow-right" color=""></u-icon>
+					</view>
+				</view>
+			</view>
+			<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>
 				<view class="con-list">
@@ -138,6 +149,7 @@
 					totalDistribution: '0',
 				},
 				fileList1: [],
+				show1:true,
 				warehouseType: '1',
 				typeRemark: 'textarea',
 				border: true,
@@ -155,6 +167,35 @@
 						purpose: "经营性费用"
 					},
 				],
+				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: "",
 				warehouseInfo: {},
@@ -283,6 +324,9 @@
 				}
 				console.log(this.detailData)
 			},
+			confirmname(e) {
+				this.detailData.belongName = this.namelist[e[0]].name
+			},
 			selectCon() {
 				uni.navigateTo({
 					url: '/pages/reimbursement/selectContract'

pages/task/audit/leave_approve.vue

@@ -128,6 +128,14 @@
 					
 					}
 				})
+				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+					businessCode: 'QINGJIA-APPROVE',
+					tmpCompId: uni.getStorageSync('pcUserInfo').compId
+				}).then(res1 => {
+					this.$api.doRequest('get', '/commonUser/getHis', {
+						workflowId: res1.data.data[0].id,
+						businessKey: this.id
+					}).then(response => {})})
 			},
 			close() {
 				this.show = false

pages/task/audit/salecontract.vue

@@ -470,7 +470,8 @@
 							}).then(res1 => {
 								this.$api.doRequest('get', '/commonUser/getHis', {
 									workflowId: res1.data.data[0].id,
-									businessKey: this.id
+									businessKey: this.id,
+									branch:this.list.jointVentureParties
 								}).then(response => {
 									uni.hideLoading()
 									for (let i = 0; i < response.data.data.length; i++) {