From 3bfd5e9e8937b929c774e79913c051841492c9fc Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 05 七月 2023 10:12:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 2 ++
Source/UBCS-WEB/src/components/template/SetPersonnel.vue | 2 +-
Source/UBCS-WEB/vue.config.js | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index a7232ee..dd31f9a 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -199,6 +199,7 @@
code: "",
type: "PUBLIC",
template: "",
+ codeClassifyOid:""
},
visibleFlow: false,
transferData: [],
@@ -258,6 +259,7 @@
codeClassifyOid: {
handler(newval, oldval) {
this.codeClassifyOid = newval;
+ this.parameter.codeClassifyOid=newval
},
deep: true,
},
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index f637e5f..60d037f 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -135,7 +135,7 @@
return this.initFrom.findIndex(i => i.taskId === arr1)
},
async apiInit() {
- const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code] })
+ const response = await personnelInit({ type: this.parameter[this.parameterKeys.type], templateId: this.parameter[this.parameterKeys.code],ids:this.parameter.ids, codeClassifyOid:this.parameter.codeClassifyOid})
if (response.status === 200) {
console.log(response)
this.initFrom = response.data.data.user
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 4124c7c..63a88c9 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -27,8 +27,8 @@
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
// target: 'http://localhost:37000',
- target: 'http://192.168.1.51:37000',
- // target: 'http://192.168.1.46:37000',
+ // target: 'http://192.168.1.51:37000',
+ target: 'http://192.168.1.46:37000',
// target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
--
Gitblit v1.9.3