MES-WEB-VUEUI.git

			@@ -164,10 +164,10 @@
			<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
			@click="set_ConfirmBill">供应商确认</el-button>
			</el-col>
			<el-col :span="1.5">
			<el-col :span="1.5">
			<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
			@click="hanleCarOrDriver(form = rowForm)">分配车辆和司机</el-button>
			</el-col>
			</el-col>
			<el-col :span="1.5">
			<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
			@click="openDataDialog(14, form = rowForm)">分配车辆</el-button>
			@@ -263,8 +263,8 @@
			</el-dialog>
			<!-- 打印 -->
			<el-dialog title="打印模板选择" :visible.sync="openPrintList" width="800px" append-to-body>
			<PrintList :linterid=this.rowForm.HInterID :MyMsg=this.rowForm.HInterID :Type='HBillType'
			:HModName="HModName" @rowEditClose="rowSetClose" v-if="printListShow" />
			<PrintList :linterid='printIds' :MyMsg='printIds' :Type='HBillType' :HModName="HBillType"
			@rowEditClose="rowSetClose" v-if="printListShow" />
			<!-- <div>111</div> -->
			</el-dialog>

			@@ -274,7 +274,8 @@
			<el-input v-model="formVolume.单据号" placeholder="请输入单据号" disabled />
			</el-form-item>
			<el-form-item label="零单占用体积">
			<el-input-number v-model="formVolume.currentVolume" :placeholder="`零担体积: ${formVolume.零担体积 \|\| 0}`" />
			<el-input-number v-model="formVolume.currentVolume"
			:placeholder="`零担体积: ${formVolume.零担体积 \|\| 0}`" />
			</el-form-item>
			</el-form>
			<div slot="footer" class="dialog-footer">
			@@ -344,7 +345,7 @@
			baseURL: process.env.VUE_APP_BASE_API, //后端接口前缀(后端服务器ip地址)

			HModName: "Cg_ContractTransportBillMainList",
			HBillType: "Cg_ContractTransportBillMainList",
			HBillType: "WL_YayBill",
			OperationType: null, //保存类型（新增1修改3）
			copyType: 0, //复制标记。打开编辑组件时，用于区分编辑还是复制
			HInterID: null,
			@@ -445,6 +446,7 @@
			totalNameList: [], // 需要设置合计行的列数组
			tableData: [], // 列表数据。用于table监听事件
			ids: [], // 选中行的hmainid数组
			printIds: '', //打印选择Id字段
			single: true, // 当选中的行数不为1时为true。用于禁用相关操作
			multiple: true, // 当选中的行数为0时为true。用于禁用相关操作
			lastSelectedRowIndex: null, // 用于记录上次点击的行索引
			@@ -860,7 +862,7 @@
			HInterID: 0,
			HEntryID0: 0,
			currentVolume: 0,


			单据号: ''
			}
			},
			@@ -1175,29 +1177,13 @@

			//#region 打印
			get_PrintReport() {
			if (this.ids.length != 1) {
			this.$modal.msgError("请选择一行数据")
			} else if (this.rowForm.单据状态 != "已审核" && !this.defaintOperationByCompanyName()) {
			this.$modal.msgError("打印失败!原因：单据状态不为'已审核'状态!!");
			if (this.ids.length == 0) {
			this.$modal.msgError("请至少选择一行数据")
			} else {
			axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
			params: { "HInterID": this.rowForm.HInterID }
			}).then(response => {
			var result = response.data
			if (result.count == 1) {
			this.printListShow = true
			this.openPrintList = true
			// this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
			} else {
			this.$modal.msgError(result.code + result.Message)
			}
			}).catch(error => {
			this.$modal.msgError("接口请求失败!");
			});


			this.printIds = this.ids.join(',')
			this.printListShow = true
			this.openPrintList = true
			}
			// var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
			},
			//#endregion

			@@ -1356,7 +1342,7 @@
			axios({
			method: 'GET',
			url: this.baseURL + "WLYayBillController/selectDriver1",
			params: {
			params: {
			"CarHNumber": this.carDriverForm.CarHNumber,
			"CarHName": this.carDriverForm.CarHName,
			"DriverHName": this.carDriverForm.DriverHName,