From 3a5240f19dcfa39fd6cf98fcff6cf6230b748e20 Mon Sep 17 00:00:00 2001
From: wangchao01 <wangchao@seaskysh.com>
Date: Wed, 22 Jun 2022 14:24:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/Flow/conpoments/Return.vue | 14 ++++--
.../src/components/Flow/conpoments/Submit.vue | 17 ++-----
.../financial-adjust/components/detail.vue | 20 ++++++++
.../financial-adjust/components/list.vue | 6 +--
.../project-adjust/components/detail.vue | 22 ++++++++-
.../views/project-adjust/components/list.vue | 6 +--
.../views/quota-adjust/components/detail.vue | 16 +++++++
.../views/quota-adjust/components/list.vue | 6 +--
.../views/subject-split/components/detail.vue | 48 +++++++++++++++++++
9 files changed, 120 insertions(+), 35 deletions(-)
diff --git a/WebSite/src/components/Flow/conpoments/Return.vue b/WebSite/src/components/Flow/conpoments/Return.vue
index e37ba726..9434a554 100644
--- a/WebSite/src/components/Flow/conpoments/Return.vue
+++ b/WebSite/src/components/Flow/conpoments/Return.vue
@@ -33,15 +33,14 @@
label="鍥為€€澶囨敞"
style="width: 100%;"
prop="remake"
- :rules="[
- { required: true, message: '璇峰～鍐欏洖閫€澶囨敞', trigger: 'blur' }
- ]"
+ :rules="[{ required: true }]"
>
<el-input
type="textarea"
:rows="2"
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="flowOutput.remake"
+ maxlength="200"
>
</el-input>
</el-form-item>
@@ -62,6 +61,7 @@
<script>
import { reactive, toRefs, watch, ref } from 'vue';
+import { ElMessage } from 'element-plus';
export default {
name: 'Return',
props: {
@@ -99,8 +99,12 @@ export default {
cxt.emit('update:visible', false);
};
const handleConfirm = () => {
- cxt.emit('handle-confirm', state.flowOutput);
- cxt.emit('update:visible', false);
+ if (state.flowOutput.remake) {
+ cxt.emit('handle-confirm', state.flowOutput);
+ cxt.emit('update:visible', false);
+ } else {
+ ElMessage.error('澶囨敞涓嶈兘涓虹┖');
+ }
};
return {
...toRefs(state),
diff --git a/WebSite/src/components/Flow/conpoments/Submit.vue b/WebSite/src/components/Flow/conpoments/Submit.vue
index dc8009b2..0d3f06f2 100644
--- a/WebSite/src/components/Flow/conpoments/Submit.vue
+++ b/WebSite/src/components/Flow/conpoments/Submit.vue
@@ -14,12 +14,7 @@
label-position="top"
size="large"
>
- <el-form-item
- label="鎻愪氦鑷�"
- style="width: 100%;"
- prop="target"
- :rules="[{ required: true, message: '閫夋嫨', trigger: 'blur' }]"
- >
+ <el-form-item label="鎻愪氦鑷�" style="width: 100%;" prop="target">
<el-select v-model="flowOutput.nodeIds" placeholder="璇烽€夋嫨">
<el-option
v-for="item in flowModel"
@@ -29,19 +24,13 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="鎻愪氦澶囨敞"
- style="width: 100%;"
- prop="remake"
- :rules="[
- { required: true, message: '鎻愪氦澶囨敞涓嶈兘涓虹┖', trigger: 'blur' }
- ]"
- >
+ <el-form-item label="鎻愪氦澶囨敞" style="width: 100%;" prop="remake">
<el-input
type="textarea"
:rows="2"
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="flowOutput.remake"
+ maxlength="200"
>
</el-input>
</el-form-item>
diff --git a/WebSite/src/views/financial-adjust/components/detail.vue b/WebSite/src/views/financial-adjust/components/detail.vue
index 6c7d55f0..7f807569 100644
--- a/WebSite/src/views/financial-adjust/components/detail.vue
+++ b/WebSite/src/views/financial-adjust/components/detail.vue
@@ -685,6 +685,26 @@ export default {
return moneyFormat(n, 2, ',');
};
const addAdjustFund = () => {
+ if (!data.detailData.projectCode) {
+ ElMessage.error('璋冨嚭椤圭洰鍚嶇О涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.sourceSubjectCode) {
+ ElMessage.error('璋冨嚭棰濆害涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.adjustMoney) {
+ ElMessage.error('璋冨噺棰濆害涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.targetProjectCode) {
+ ElMessage.error('璋冨叆椤圭洰鍚嶇О涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.targetSubjectCode) {
+ ElMessage.error('璋冨叆棰濆害涓嶈兘涓虹┖');
+ return;
+ }
data.detailform.adjustPlanId = new Date().getTime();
// eslint-disable-next-line no-unused-vars
let totalAmount = 0;
diff --git a/WebSite/src/views/financial-adjust/components/list.vue b/WebSite/src/views/financial-adjust/components/list.vue
index d2149ebe..77b44dda 100644
--- a/WebSite/src/views/financial-adjust/components/list.vue
+++ b/WebSite/src/views/financial-adjust/components/list.vue
@@ -55,11 +55,7 @@
</el-form>
</el-card>
<el-card>
- <el-table
- :data="tableData"
- @selection-change="getSelectData"
- max-height="500"
- >
+ <el-table :data="tableData" @selection-change="getSelectData">
<el-table-column type="selection" width="55" />
<el-table-column label="骞翠唤" prop="year"></el-table-column>
<el-table-column label="娴佹按鍙�" prop="businessNumber"></el-table-column>
diff --git a/WebSite/src/views/project-adjust/components/detail.vue b/WebSite/src/views/project-adjust/components/detail.vue
index 674c734e..1a4fee2a 100644
--- a/WebSite/src/views/project-adjust/components/detail.vue
+++ b/WebSite/src/views/project-adjust/components/detail.vue
@@ -599,7 +599,7 @@ export default {
filterControlCode: '',
leaderPersonNo: '',
projectCode: projectCode,
- filterControlZeroMoney: false
+ addAdjustFund: false
});
const resData = await quotaAdjust.queryTargetDeptFundList({
deptNo: '',
@@ -644,6 +644,26 @@ export default {
}
};
const addAdjustFund = () => {
+ if (!data.detailData.projectCode) {
+ ElMessage.error('璋冨嚭椤圭洰鍚嶇О涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.sourceSubjectCode) {
+ ElMessage.error('璋冨嚭棰濆害涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.adjustMoney) {
+ ElMessage.error('璋冨噺棰濆害涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.targetProjectCode) {
+ ElMessage.error('璋冨叆椤圭洰鍚嶇О涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.targetSubjectCode) {
+ ElMessage.error('璋冨叆棰濆害涓嶈兘涓虹┖');
+ return;
+ }
data.detailform.adjustPlanId = new Date().getTime();
// eslint-disable-next-line no-unused-vars
let totalAmount = 0;
diff --git a/WebSite/src/views/project-adjust/components/list.vue b/WebSite/src/views/project-adjust/components/list.vue
index b95a0170..1b8d719e 100644
--- a/WebSite/src/views/project-adjust/components/list.vue
+++ b/WebSite/src/views/project-adjust/components/list.vue
@@ -55,11 +55,7 @@
</el-form>
</el-card>
<el-card>
- <el-table
- :data="tableData"
- @selection-change="selectChange"
- max-height="500"
- >
+ <el-table :data="tableData" @selection-change="selectChange">
<el-table-column type="selection" width="55" />
<el-table-column label="骞翠唤" prop="year"></el-table-column>
<el-table-column label="娴佹按鍙�" prop="businessNumber"></el-table-column>
diff --git a/WebSite/src/views/quota-adjust/components/detail.vue b/WebSite/src/views/quota-adjust/components/detail.vue
index 481abc9d..04a33692 100644
--- a/WebSite/src/views/quota-adjust/components/detail.vue
+++ b/WebSite/src/views/quota-adjust/components/detail.vue
@@ -473,6 +473,22 @@ export default {
});
};
const addAdjustFund = () => {
+ if (!data.detailform.targetProjectCode) {
+ ElMessage.error('椤圭洰鍚嶇О涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.sourceSubjectCode) {
+ ElMessage.error('璋冨嚭棰濆害涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.adjustMoney) {
+ ElMessage.error('璋冨噺棰濆害涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.detailform.targetSubjectCode) {
+ ElMessage.error('璋冨叆棰濆害涓嶈兘涓虹┖');
+ return;
+ }
data.detailform.adjustPlanId = new Date().getTime();
data.detailform.targetProjectName = data.detailform.projectName;
// eslint-disable-next-line no-unused-vars
diff --git a/WebSite/src/views/quota-adjust/components/list.vue b/WebSite/src/views/quota-adjust/components/list.vue
index 9e76c377..18e8a434 100644
--- a/WebSite/src/views/quota-adjust/components/list.vue
+++ b/WebSite/src/views/quota-adjust/components/list.vue
@@ -55,11 +55,7 @@
</el-form>
</el-card>
<el-card>
- <el-table
- :data="tableData"
- @selection-change="getSelectData"
- max-height="500"
- >
+ <el-table :data="tableData" @selection-change="getSelectData">
<el-table-column type="selection" width="55" />
<el-table-column label="骞翠唤" prop="year"></el-table-column>
<el-table-column label="娴佹按鍙�" prop="businessNumber"></el-table-column>
diff --git a/WebSite/src/views/subject-split/components/detail.vue b/WebSite/src/views/subject-split/components/detail.vue
index d981df9b..2a22be7a 100644
--- a/WebSite/src/views/subject-split/components/detail.vue
+++ b/WebSite/src/views/subject-split/components/detail.vue
@@ -184,6 +184,7 @@
<el-select
v-model="formData.ownerCode"
filterable
+ clearable
remote
popper-class="select-user"
:loading="selectUserLoading"
@@ -630,6 +631,48 @@ export default {
data.detailDialog = false;
};
const saveData = () => {
+ console.log('data.formData', data.formData);
+ if (!data.formData.ownerCode) {
+ ElMessage.error('涓荤璐熻矗浜轰笉鑳戒负绌�');
+ return;
+ }
+ if (!data.formData.targetProjectName) {
+ ElMessage.error('椤圭洰鍚嶇О涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.formData.targetDepartmentCode) {
+ ElMessage.error('鎵€灞為儴闂ㄤ笉鑳戒负绌�');
+ return;
+ }
+ if (
+ !data.formData.projectFundList ||
+ data.formData.projectFundList.length === 0
+ ) {
+ ElMessage.error('鎷嗗垎棰濆害淇℃伅涓嶈兘涓虹┖');
+ return;
+ }
+ if (
+ data.formData.projectFundList &&
+ data.formData.projectFundList.length > 0
+ ) {
+ for (let i = 0; i < data.formData.projectFundList.length; i++) {
+ if (!data.formData.projectFundList[i].sourceSubjectCode) {
+ ElMessage.error('璋冨嚭棰濆害鍚嶇О涓嶈兘涓虹┖');
+ return;
+ }
+ if (!data.formData.projectFundList[i].targetSubjectCode) {
+ ElMessage.error('璋冨叆棰濆害鍚嶇О涓嶈兘涓虹┖');
+ return;
+ }
+ if (
+ !data.formData.projectFundList[i].adjustMoney ||
+ data.formData.projectFundList[i].adjustMoney <= 0
+ ) {
+ ElMessage.error('鍒嗛厤閲戦蹇呴』澶т簬0');
+ return;
+ }
+ }
+ }
data.formData.sumAdjustMoney = 0;
data.formData.projectFundList.forEach(item => {
data.formData.sumAdjustMoney =
@@ -880,6 +923,7 @@ export default {
const selectVisibleChange = visible => {
if (visible) {
console.log('鎵撳紑');
+ selectLoadmore('');
const SELECTWRAP_DOM = document.querySelector(
'.select-user .el-select-dropdown__wrap.el-scrollbar__wrap'
);
@@ -937,6 +981,7 @@ export default {
data.selectUserLoading = false;
} catch (_) {
data.selectUserLoading = false;
+ data.userList = [];
}
};
//璐熻矗浜轰笅鎷夋杈撳叆妯＄硦鏌ヨ
@@ -1008,6 +1053,7 @@ export default {
data.selectUserLoading2 = false;
} catch (_) {
data.selectUserLoading2 = false;
+ data.deptList = [];
}
};
//璐熻矗浜轰笅鎷夋杈撳叆妯＄硦鏌ヨ
@@ -1018,6 +1064,7 @@ export default {
const selectVisibleChange3 = visible => {
if (visible) {
console.log('鎵撳紑');
+ selectLoadmore('');
const SELECTWRAP_DOM = document.querySelector(
'.select-user3 .el-select-dropdown__wrap.el-scrollbar__wrap'
);
@@ -1059,6 +1106,7 @@ export default {
const selectVisibleChange4 = visible => {
if (visible) {
console.log('鎵撳紑');
+ selectLoadmore('');
const SELECTWRAP_DOM = document.querySelector(
'.select-user4 .el-select-dropdown__wrap.el-scrollbar__wrap'
);
--
GitLab
From 4d1eb465d921cb26003e8a5cb0a0d1305af6b94a Mon Sep 17 00:00:00 2001
From: wangchao01 <wangchao@seaskysh.com>
Date: Wed, 22 Jun 2022 14:29:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../financial-adjust/components/detail.vue | 20 +++++++++----------
.../project-adjust/components/detail.vue | 20 +++++++++----------
.../views/quota-adjust/components/detail.vue | 20 +++++++++----------
.../views/subject-split/components/detail.vue | 20 -------------------
4 files changed, 30 insertions(+), 50 deletions(-)
diff --git a/WebSite/src/views/financial-adjust/components/detail.vue b/WebSite/src/views/financial-adjust/components/detail.vue
index 7f807569..3a6a556d 100644
--- a/WebSite/src/views/financial-adjust/components/detail.vue
+++ b/WebSite/src/views/financial-adjust/components/detail.vue
@@ -501,16 +501,16 @@ export default {
getManger(outdata[0].璋冨嚭椤圭洰缂栧彿, 'out');
outdata.forEach(item => {
const form = {};
- data.detailData.projectCode = item.璋冨嚭椤圭洰缂栧彿.trim();
- data.detailData.projectName = item.璋冨嚭椤圭洰鍚嶇О.trim();
- form.adjustMoney = item.璋冨叆閲戦.trim();
- form.targetProjectName = item.璋冨叆椤圭洰鍚嶇О.trim();
- form.targetSubjectName = item.璋冨叆棰濆害鍚嶇О.trim();
- form.targetSubjectCode = item.璋冨叆棰濆害缂栧彿.trim();
- form.adjustMoney = item.璋冨嚭閲戦.trim();
- form.targetProjectCode = item.璋冨叆椤圭洰缂栧彿.trim();
- form.sourceSubjectName = item.璋冨嚭棰濆害鍚嶇О.trim();
- form.sourceSubjectCode = item.璋冨嚭棰濆害缂栧彿.trim();
+ data.detailData.projectCode = item.璋冨嚭椤圭洰缂栧彿;
+ data.detailData.projectName = item.璋冨嚭椤圭洰鍚嶇О;
+ form.adjustMoney = item.璋冨叆閲戦;
+ form.targetProjectName = item.璋冨叆椤圭洰鍚嶇О;
+ form.targetSubjectName = item.璋冨叆棰濆害鍚嶇О;
+ form.targetSubjectCode = item.璋冨叆棰濆害缂栧彿;
+ form.adjustMoney = item.璋冨嚭閲戦;
+ form.targetProjectCode = item.璋冨叆椤圭洰缂栧彿;
+ form.sourceSubjectName = item.璋冨嚭棰濆害鍚嶇О;
+ form.sourceSubjectCode = item.璋冨嚭棰濆害缂栧彿;
data.detailData.adjustFundList.push(form);
});
}
diff --git a/WebSite/src/views/project-adjust/components/detail.vue b/WebSite/src/views/project-adjust/components/detail.vue
index 1a4fee2a..046a01df 100644
--- a/WebSite/src/views/project-adjust/components/detail.vue
+++ b/WebSite/src/views/project-adjust/components/detail.vue
@@ -540,16 +540,16 @@ export default {
getManger(outdata[0].璋冨嚭椤圭洰缂栧彿, 'out');
outdata.forEach(item => {
const form = {};
- data.detailData.projectCode = item.璋冨嚭椤圭洰缂栧彿.trim();
- data.detailData.projectName = item.璋冨嚭椤圭洰鍚嶇О.trim();
- form.adjustMoney = item.璋冨叆閲戦.trim();
- form.targetProjectName = item.璋冨叆椤圭洰鍚嶇О.trim();
- form.targetSubjectName = item.璋冨叆棰濆害鍚嶇О.trim();
- form.targetSubjectCode = item.璋冨叆棰濆害缂栧彿.trim();
- form.adjustMoney = item.璋冨嚭閲戦.trim();
- form.targetProjectCode = item.璋冨叆椤圭洰缂栧彿.trim();
- form.sourceSubjectName = item.璋冨嚭棰濆害鍚嶇О.trim();
- form.sourceSubjectCode = item.璋冨嚭棰濆害缂栧彿.trim();
+ data.detailData.projectCode = item.璋冨嚭椤圭洰缂栧彿;
+ data.detailData.projectName = item.璋冨嚭椤圭洰鍚嶇О;
+ form.adjustMoney = item.璋冨叆閲戦;
+ form.targetProjectName = item.璋冨叆椤圭洰鍚嶇О;
+ form.targetSubjectName = item.璋冨叆棰濆害鍚嶇О;
+ form.targetSubjectCode = item.璋冨叆棰濆害缂栧彿;
+ form.adjustMoney = item.璋冨嚭閲戦;
+ form.targetProjectCode = item.璋冨叆椤圭洰缂栧彿;
+ form.sourceSubjectName = item.璋冨嚭棰濆害鍚嶇О;
+ form.sourceSubjectCode = item.璋冨嚭棰濆害缂栧彿;
data.detailData.adjustFundList.push(form);
});
}
diff --git a/WebSite/src/views/quota-adjust/components/detail.vue b/WebSite/src/views/quota-adjust/components/detail.vue
index 04a33692..fd1deb78 100644
--- a/WebSite/src/views/quota-adjust/components/detail.vue
+++ b/WebSite/src/views/quota-adjust/components/detail.vue
@@ -443,16 +443,16 @@ export default {
}
outdata.forEach(item => {
const form = {};
- data.detailData.projectCode = item.璋冨嚭椤圭洰缂栧彿.trim();
- data.detailData.projectName = item.璋冨嚭椤圭洰鍚嶇О.trim();
- form.adjustMoney = item.璋冨叆閲戦.trim();
- form.targetProjectName = item.璋冨叆椤圭洰鍚嶇О.trim();
- form.targetSubjectName = item.璋冨叆棰濆害鍚嶇О.trim();
- form.targetSubjectCode = item.璋冨叆棰濆害缂栧彿.trim();
- form.adjustMoney = item.璋冨嚭閲戦.trim();
- form.targetProjectCode = item.璋冨叆椤圭洰缂栧彿.trim();
- form.sourceSubjectName = item.璋冨嚭棰濆害鍚嶇О.trim();
- form.sourceSubjectCode = item.璋冨嚭棰濆害缂栧彿.trim();
+ data.detailData.projectCode = item.璋冨嚭椤圭洰缂栧彿;
+ data.detailData.projectName = item.璋冨嚭椤圭洰鍚嶇О;
+ form.adjustMoney = item.璋冨叆閲戦;
+ form.targetProjectName = item.璋冨叆椤圭洰鍚嶇О;
+ form.targetSubjectName = item.璋冨叆棰濆害鍚嶇О;
+ form.targetSubjectCode = item.璋冨叆棰濆害缂栧彿;
+ form.adjustMoney = item.璋冨嚭閲戦;
+ form.targetProjectCode = item.璋冨叆椤圭洰缂栧彿;
+ form.sourceSubjectName = item.璋冨嚭棰濆害鍚嶇О;
+ form.sourceSubjectCode = item.璋冨嚭棰濆害缂栧彿;
data.detailData.adjustFundList.push(form);
});
}
diff --git a/WebSite/src/views/subject-split/components/detail.vue b/WebSite/src/views/subject-split/components/detail.vue
index 0fe2b37d..a4170373 100644
--- a/WebSite/src/views/subject-split/components/detail.vue
+++ b/WebSite/src/views/subject-split/components/detail.vue
@@ -567,26 +567,6 @@ export default {
.replace(/鎷嗗悗棰濆害缂栧彿/g, 'targetSubjectCode')
.replace(/鍒嗛厤閲戦/g, 'adjustMoney')
);
- // outdata.forEach(item => {
- // item.targetProjectCode = item.targetProjectCode;
- // item.targetProjectName = item.targetProjectName.trim();
- // item.ownerName = item.ownerName.trim();
- // item.ownerCode = item.ownerCode.trim();
- // item.oneOwnerName = item.oneOwnerName.trim();
- // item.oneOwnerCode = item.oneOwnerCode.trim();
- // item.secondOwnerName = item.secondOwnerName.trim();
- // item.secondOwnerCode = item.secondOwnerCode.trim();
- // item.targetDepartmentName = item.targetDepartmentName.trim();
- // item.targetDepartmentCode = item.targetDepartmentCode.trim();
- // item.projectFundList = [];
- // });
- // list.forEach(item => {
- // item.sourceSubjectName = item.sourceSubjectName.trim();
- // item.sourceSubjectCode = item.sourceSubjectCode.trim();
- // item.targetSubjectName = item.targetSubjectName.trim();
- // item.targetSubjectCode = item.targetSubjectCode.trim();
- // item.adjustMoney = item.adjustMoney.trim();
- // });
console.log(outdata);
for (var i = 0; i < outdata.length; i++) {
for (var j = 0; j < list.length; j++) {
--
GitLab