From 5ff329dd6a651a054dd8033424530e3e4e0f4b91 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 20 十一月 2025 14:49:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue | 62 +++++++++++++++---------------
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue | 23 +++++++++--
2 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
index 98a6022..6e9bc8b 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
@@ -445,7 +445,7 @@
}}</span>
<el-button
type="text"
- @click="handleEdit(row, (OperationType = 3))"
+ @click="handleDblclick1"
v-else-if="column.property == '鍗曟嵁鍙�'"
>{{ row.鍗曟嵁鍙� }}</el-button
>
@@ -660,7 +660,7 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
+ user: sessionStorage["HUserName"],
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -752,6 +752,17 @@
this.getList();
},
methods: {
+ handleDblclick1(){
+ // 寤惰繜鎵ц绗竴涓嚱鏁�
+ setTimeout(() => {
+ this.handleRowClick();
+ });
+
+ // 寤惰繜鎵ц绗簩涓嚱鏁帮紙鍙互璁剧疆鐩稿悓鎴栦笉鍚岀殑寤惰繜鏃堕棿锛�
+ setTimeout(() => {
+ this.handleDblclick();
+ }, 300);
+ },
BillSync() {
axios.get(`${this.baseURL}/Kf_ICStockBillMain/GetCStockBillList`, {
params: { BillNo: this.form.HBillno2, BillType: 1403 },
@@ -1340,14 +1351,15 @@
//閫�鍑�
close() {
this.tableShow = true;
+ this.editShow = false;
this.openEdit = false;
this.getList();
},
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.hmainid = 0
- this.editShow = true
this.openEdit = true
+ this.editShow = true
},
//鎵撳紑淇敼缁勪欢寮圭獥
handleEdit() {
@@ -1358,10 +1370,13 @@
this.$modal.msgError("璇烽�夋嫨瑕佺紪杈戠殑鏁版嵁!");
return;
}
- this.openEdit = true;
this.editShow = true;
+ this.openEdit = true;
+
});
},
+ // 鎵撳紑淇敼缁勪欢寮圭獥
+
//鍏抽棴缂栬緫椤甸潰
editGyClose(val) {
this.editShow = false;
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
index 876016f..34bd751 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
@@ -723,37 +723,37 @@
this.form.HExplanation =data.鎽樿
this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
- //瀛愯〃 璧嬪��
- // for (var i = 0; i < result.data.length; i++) {
- // this.editData.push(
- // {
- // "HMaterID": result.data[i].HMaterID
- // , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
- // , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
- // , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
- // , "HUnitID": result.data[i].HUnitID
- // , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
- // , "HQtyMust": result.data[i].搴旀敹鏁伴噺
- // , "HQty": result.data[i].瀹炴敹鏁伴噺
- // , "HRemark": result.data[i].琛ㄤ綋澶囨敞
- // , "HPrice": result.data[i].鍗曚环
- // , "HMoney": result.data[i].閲戦
- // , "HOrderPrice": result.data[i].閲囪喘閲戦
- // , "HWHID": result.data[i].HWHID
- // , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
- // , "HSPID": result.data[i].HSPID
- // , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
- // , "HBatchNo": result.data[i].鎵规
- // , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿 //婧愬崟鍙�
- // , "HSourceBillType": result.data[i].婧愬崟绫诲瀷 //婧愬崟绫诲瀷
- // , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮� //婧愬崟涓诲唴鐮�
- // , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
- // , "HTaxRate": result.data[i].绋庣巼
- // , "HTaxPrice": result.data[i].鍚◣鍗曚环
- // , "HlineTotal": result.data[i].鍚◣閲戦
- // }
- // )
- // }
+ // 瀛愯〃 璧嬪��
+ for (var i = 0; i < result.data.length; i++) {
+ this.editData.push(
+ {
+ "HMaterID": result.data[i].HMaterID
+ , "鐗╂枡浠ｇ爜": result.data[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
+ , "HUnitID": result.data[i].HUnitID
+ , "璁￠噺鍗曚綅": result.data[i].璁￠噺鍗曚綅
+ , "HQtyMust": result.data[i].搴旀敹鏁伴噺
+ , "HQty": result.data[i].瀹炴敹鏁伴噺
+ , "HRemark": result.data[i].琛ㄤ綋澶囨敞
+ , "HPrice": result.data[i].鍗曚环
+ , "HMoney": result.data[i].閲戦
+ , "HOrderPrice": result.data[i].閲囪喘閲戦
+ , "HWHID": result.data[i].HWHID
+ , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
+ , "HSPID": result.data[i].HSPID
+ , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
+ , "HBatchNo": result.data[i].鎵规
+ , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿 //婧愬崟鍙�
+ , "HSourceBillType": result.data[i].婧愬崟绫诲瀷 //婧愬崟绫诲瀷
+ , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮� //婧愬崟涓诲唴鐮�
+ , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
+ , "HTaxRate": result.data[i].绋庣巼
+ , "HTaxPrice": result.data[i].鍚◣鍗曚环
+ , "HlineTotal": result.data[i].鍚◣閲戦
+ }
+ )
+ }
if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
--
Gitblit v1.9.1