MES-WEB-VUEUI.git

			@@ -131,13 +131,17 @@
			<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
			@click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
			</el-col>
			<el-col :span="1.5">
			<el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更
			</el-button>
			</el-col>
			<!-- <el-col :span="1.5">
			<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
			@click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
			</el-col> -->
			<el-col :span="1.5">
			<el-button type="primary" icon="el-icon-tickets" size="mini"
			@click="handlePush(row = rowForm, OperationType = 4)">下推（容器领用退库单）</el-button>
			@click="handlePush(row = rowForm, OperationType = 4)">下推（容器入库单）</el-button>
			</el-col>
			<el-col :span="1.5">
			<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除
			@@ -204,7 +208,7 @@
			:copyType="copyType" @editClose="editClose" v-if="editShow" />
			</el-dialog>
			<!-- 下推 -->
			<el-dialog title="下推容器领用退库单" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
			<el-dialog title="下推容器入库单" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
			<push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
			@editClose="pushClose" v-if="pushShow" />
			</el-dialog>
			@@ -413,7 +417,7 @@
			this.pageSize = 50
			}
			// 销售出库单列表
			axios.get(this.baseURL + '/Sc_MouldInRequestBillController/page', {
			axios.get(this.$baseUrl + '/Sc_MouldInRequestBillController/page', {
			params: {
			"sWhere": this.sWhere,
			"user": sessionStorage["HUserName"],
			@@ -466,7 +470,7 @@
			},
			DisPlay_HideColumn(HModName, user, option, dataOption) {
			this.totalNameList = []
			axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
			axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
			params: {
			"HModName": HModName,
			"user": user,
			@@ -850,7 +854,7 @@
			/** 删除按钮操作 */
			handleDelete() {
			this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
			axios.get(this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Delete_Json", {
			axios.get(this.$baseUrl + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Delete_Json", {
			params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
			}).then(response => {
			if (response.data.count == 1) {
			@@ -864,11 +868,56 @@
			});
			}).catch(() => { })
			},
			// 托数变更
			set_PalletChange() {
			if (this.rowList.length !== 1) {
			this.$modal.msgWarning('请选择一行数据进行托数变更！')
			return
			}

			const rowData = this.rowList[0]
			const currentPallet = rowData.托数 \|\| 0

			// 将"请输入新托数"作为输入框的placeholder
			this.$prompt(`当前托数：${currentPallet}`, {
			confirmButtonText: '保存',
			cancelButtonText: '取消',
			inputValue: currentPallet,
			inputType: 'number',
			inputValidator: (value) => {
			if (!value) return '请输入托数！'
			const num = parseInt(value)
			if (isNaN(num)) return '请输入有效的数字！'
			if (num.toString() !== value) return '托数不能为小数！'
			if (num <= 0) return '托数必须大于0！'
			return true
			}
			}).then(({ value }) => {
			const newPallet = parseInt(value)

			return axios.post(this.$baseUrl + '/Sc_MouldOutRequestBill/UpdatePallet', {
			hmainid: rowData.hmainid,
			newPallet: newPallet,
			operator: sessionStorage["HUserName"]
			})
			}).then(response => {
			if (response.data && response.data.count == 1) {
			this.$modal.msgSuccess('托数变更成功！')
			this.getList()
			} else {
			this.$modal.msgError('错误：' + (response.data.Message \|\| '保存失败'))
			}
			}).catch(error => {
			if (error !== 'cancel') {
			this.$modal.msgError('操作失败：' + error.message)
			}
			})
			},
			// 反审核/审核数据
			set_CheckBill(num, form) {
			var InterID = form.hmainid \|\| form.HInterID
			//逻辑审核方法
			axios.get(this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Check_Json", {
			axios.get(this.$baseUrl + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Check_Json", {
			params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
			}).then(response => {
			let result = response.data
			@@ -887,7 +936,7 @@
			// 批量反审核/审核数据
			set_CheckBillAll(num, ids) {
			//逻辑审核方法
			axios.get(this.baseURL + "/Sc_MouldInRequestBillController/CheckAll", {
			axios.get(this.$baseUrl + "/Sc_MouldInRequestBillController/CheckAll", {
			params: { "ids": ids, "Type": num, "HMaker": sessionStorage["HUserName"] }
			}).then(response => {
			let result = response.data
			@@ -916,7 +965,7 @@
			} else if (this.rowForm.状态 != "已审核" && !this.defaintOperationByCompanyName()) {
			this.$modal.msgError("打印失败!原因：单据状态不为'已审核'状态!!");
			} else {
			axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
			axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
			params: { "HInterID": this.rowForm.hmainid }
			}).then(response => {
			var result = response.data
			@@ -939,7 +988,7 @@
			//#region 获取公司名，根据公司进行定制化开发
			defaintOperationByCompanyName() {
			var result = false;
			axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
			axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
			var data1 = response.data
			if (data1.count == 1) {
			if (data1.data == "水务") {