From bd7f9985d283a7950c2a29f4d8a2d027f8b45b9d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 26 十一月 2025 14:09:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyWarehouse/gyWarehouse.vue | 51 +++++++++++++++++----------------------------------
1 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index 8f1489d..89904cf 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -360,12 +360,8 @@
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
}}</span>
- <el-button
- type="text"
- @click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '浠撳簱浠ｇ爜'"
- >{{ row.浠撳簱浠ｇ爜 }}</el-button
- >
+ <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
+ v-else-if="column.property == '浠撳簱浠ｇ爜'">{{ row.浠撳簱浠ｇ爜 }}</el-button>
<span v-else>{{ row[column.label] }}</span>
</div>
</template>
@@ -394,24 +390,11 @@
/>
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog
- title="缂栬緫浠撳簱"
- :visible.sync="openEdit"
- width="1480px"
- append-to-body
- class="xsckdBox"
- :before-close="close"
- @close="editBeforeCloseHandle"
- >
- <edit
- :OperationType="OperationType"
- :linterid="this.rowForm.HItemID"
- :HSouceBillType="this.rowForm.HSourceBillType"
- :copyType="copyType"
- @editCloseGy="editGyClose"
- v-if="editShow"
- ref="editRef"
- />
+ <el-dialog title="缂栬緫浠撳簱" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+ :before-close="close" @close="editBeforeCloseHandle">
+ <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
+ :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow"
+ ref="editRef" />
</el-dialog>
<el-dialog
:title="upload.title"
@@ -1057,16 +1040,16 @@
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
- if (this.checkIsIframe()) {
- // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
- window.parent.iframeWareHouseCallBack(row);
- return;
- }
this.OperationType = 3;
if (this.openPage) {
this.$emit("deptEmitDb", row, 2);
} else {
- this.handleEdit();
+ if (this.checkIsIframe) {
+ // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
+ window.parent.iframeWareHouseCallBack(row);
+ return;
+ }
+ this.handleEdit();
}
},
// 澶氶�夋閫変腑鏁版嵁
@@ -1387,8 +1370,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.Message +
- "</div>",
+ response.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1417,8 +1400,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
--
Gitblit v1.9.1