From 414190deffd5bcfb6878bd2d631737bbb1dab01d Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 14 一月 2026 08:45:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 6dd791a..abfe3b1 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -129,7 +129,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
+ @click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@@ -171,7 +171,7 @@
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
<span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
- <el-button type="text" @click="handleEdit(row, OperationType = 3)"
+ <el-button type="text" @click="handleEdit(row, OperationType = 2)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{
row.鍗曟嵁鍙�
}}</el-button>
@@ -256,7 +256,7 @@
HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
addBtnShow: false,
dialogTitle: '',
- OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+ OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API,
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -428,6 +428,8 @@
this.dataList = option
this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ }else{
+ this.$modal.msgError(response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -585,7 +587,7 @@
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
- this.OperationType = 3
+ this.OperationType = 2
this.handleEdit(row)
},
// 澶氶�夋閫変腑鏁版嵁
@@ -770,14 +772,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdOutBillController/GetSc_MouldProdOutBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
--
Gitblit v1.9.1