From 7570f18ad0164dcb9bb71808f68e89053aaa2bbf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 14 十一月 2025 16:14:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyEmployee/gyEmployeeEdit.vue | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/views/basic/gyEmployee/gyEmployeeEdit.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
index 3836c5f..5908024 100644
--- a/src/views/basic/gyEmployee/gyEmployeeEdit.vue
+++ b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
@@ -869,17 +869,6 @@
copyType: { type: Number },
HOrgID: { type: Number },
},
- computed: {
- CheckBillDisabled: {
- get() {
- if (!this.form["HCheckEmp"]) {
- return false;
- }
-
- return true;
- },
- },
- },
data() {
return {
formShow: false,
@@ -912,6 +901,7 @@
zuzhiId: 0,
organizationList: [], //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+ CheckBillDisabled: true,
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
@@ -1112,15 +1102,26 @@
console.log(selection);
},
fetchData() {
- this.zuzhiId = sessionStorage["OrganizationID"]; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.user = sessionStorage["HUserName"];
+ //鐧诲綍鐢ㄦ埛淇℃伅
axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
+ .get(
+ "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
+ )
.then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- this.getdata();
- }
+ let data = response.data.data[0];
+ this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+ this.user = data.Czymc;
+ axios
+ .get(this.baseURL + "/Web/GetOrganizations", {})
+ .then((response) => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data; //缁勭粐鍒楄〃
+ this.getdata();
+ }
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
})
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -1280,10 +1281,7 @@
HOverPayRate: data.瓒呴姣旂巼,
HStopflag: data.绂佺敤鏍囪,
HRemark: data.澶囨敞,
- HCheckEmp: data["瀹℃牳浜�"],
});
-
- console.log(this.form.HCheckEmp);
if (this.OperationType == 3) {
// 缂栬緫鏃惰幏鍙栨枃浠跺垪琛�
@@ -1520,6 +1518,7 @@
this.formShow = false;
this.subDisabled = false;
this.formLoading = true;
+ this.CheckBillDisabled = true;
this.activeName = "first";
this.resetForm("form");
},
@@ -1554,9 +1553,11 @@
console.log(response);
if (response.data.count == 1) {
this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.CheckBillDisabled = false;
this.$modal.msgSuccess(response.data.Message);
} else {
this.$modal.msgError(response.data.Message);
+ this.CheckBillDisabled = false;
this.subDisabled = false; //璁剧疆淇濆瓨鎸夐挳鍙敤
}
})
@@ -1600,15 +1601,14 @@
var InterID = form.HItemID || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Employee/AuditGy_Employee", {
+ .get(this.baseURL + "/Gy_Source/AuditGy_Source", {
params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
})
.then((response) => {
let result = response.data;
if (result.code == 1) {
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- // this.CheckBillDisabled = true;
- this.getdata();
+ this.CheckBillDisabled = true;
} else {
this.$modal.msgError("閿欒:" + result.code + result.Message);
}
@@ -1628,7 +1628,7 @@
this.classTimePrjShow = false;
this.dutyShow = false;
this.groupShow = false;
- this.dormShow = false;
+ this.dormShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
--
Gitblit v1.9.1