From 5fa77e254003aea6060e3f70d64e5fd1bcdb4748 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期三, 19 十一月 2025 14:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gy/gyDepartment.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/basic/gy/gyDepartment.vue b/src/views/basic/gy/gyDepartment.vue
index 7cbf7bb..1ec9d23 100644
--- a/src/views/basic/gy/gyDepartment.vue
+++ b/src/views/basic/gy/gyDepartment.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px;position: relative;">
+ <div style="padding: 10px; position: relative;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="98px" class="searchBox">
<el-row>
<el-form-item label="閮ㄩ棬浠ｇ爜" prop="HNumber" style="margin-left: 100px;">
@@ -168,8 +168,7 @@
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫鐢熶骇璧勬枡" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
- @close="close">
+ <el-dialog title="缂栬緫閮ㄩ棬璧勬枡" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.HItemID :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editCloseGy="editGyClose" v-if="editShow" />
</el-dialog>
@@ -264,7 +263,7 @@
open: false,
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"] - 0,
HName: null,
HNumber: null,
Comparator1: '',
@@ -373,7 +372,6 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- this.queryParams.HOrgID = sessionStorage["OrganizationID"]-0
this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'"
//鐢熶骇璧勬枡鍒楄〃
axios.get(this.baseURL + '/Gy_Department/list', {
@@ -766,8 +764,9 @@
//閫�鍑�
close() {
this.tableShow = true
+ this.single = true
this.openEdit = false
- this.editShow= false
+ this.editShow = false
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -790,15 +789,16 @@
editGyClose(val) {
this.editShow = false
this.openEdit = false
- this.multiple = true,
- this.getList()
+ this.single = true
+ this.multiple = true
+ this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
if (!this.rowForm.瀹℃牳浜�) {
- axios.get(this.baseURL + "DeltetGy_Source", {
- params: { 'HItemID': this.rowForm.HItemID.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "DeltetGy_Department", {
+ params: { 'HItemID': this.rowForm.HItemID, 'user': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
@@ -818,7 +818,7 @@
set_CheckBill(num, form) {
var InterID = form.HItemID || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Gy_Source/AuditGy_Source", {
+ axios.get(this.baseURL + "/Gy_Department/AuditGy_Department", {
params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
--
Gitblit v1.9.1