From e12d6ed93cff2a302ad45ccfd189ea123d9f4b7f Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 15 一月 2026 15:40:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index 5a3780a..1870ecd 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -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>
@@ -864,6 +868,51 @@
});
}).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
--
Gitblit v1.9.1