From 291708e71a5edc8bd7f4d8741f7602187bf7df62 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 20:05:23 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E9=9C=80=E6=B1=82=E5=BE=81=E9=9B=86"=E4=B8=93?=
=?UTF-8?q?=E9=A1=B9=E8=B5=84=E9=87=91=E5=90=8D=E7=A7=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project-demand/requirement/add.vue | 46 +++++++++++++-------
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 93c11e1..74fbbc6 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -38,10 +38,12 @@
{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
- {{ selectedCompanyList }}
+ {{ getName(selectedCompanyList) }}
{{ getName(selectedCompanyList) }}
{{ showExpendText }}
+ @click="handleExpend">
+ {{ showExpendText }}
+
@@ -54,7 +56,7 @@
-
+
重新提交
返回
-
+
@@ -222,24 +225,16 @@ const showExpendClass = (showMoreCompany) => {
if (!showMoreCompany) {
if (selectedCompanyList.value.length === 0) {
showExpendText.value = ''
- return ''
- } else if (selectedCompanyList.value.length>14) {
+ return ''
+ } else if (selectedCompanyList.value.length > 14) {
showExpendText.value = '展开'
- return 'company-style'
+ return 'company-style'
}
} else {
showExpendText.value = '收缩'
- return ''
+ return ''
}
}
-const getCompanyOptionItem = (val) => {
- if (val !== undefined) {
- val.forEach(item => {
- matterTree(companyNameArray.value, companyOption.value, item)
- })
- }
- return companyNameArray.value.join('，');
-}
const getName = (list) => {
return list.map(item => item.label).join('，')
}
@@ -405,6 +400,25 @@ const handleResubmit = () => {
}
})
}
+
+const getCompanyOptionItem = (val) => {
+ let newObj = {}
+ let newArray = []
+ if (val !== undefined) {
+ val.forEach(item => {
+ matterTree(companyNameArray.value, companyOption.value, item)
+ companyNameArray.value.forEach(companyItem => {
+ newObj = {
+ label: companyItem,
+ value: item
+ }
+ newArray.push(newObj)
+ })
+ })
+ }
+
+ return newArray;
+}
const getDetailInfo = async () => {
getFormInfo(route.query.id).then(res => {
if (res.code === 1000) {
From efd06e0da77baaad1e0ca0143f82a2a10510aeef Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 20:15:58 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E9=9C=80?=
=?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project-demand/summary/add.vue | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 1170283..8d88b2b 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -1,14 +1,14 @@
-
+
-
+
是
@@ -16,7 +16,7 @@
-
+
{{ formData.specialFund }}
@@ -33,7 +33,7 @@
-
+
-
+
@@ -64,7 +64,7 @@
-
+
-
+
-
+
-
+
-
+
@@ -214,7 +214,7 @@
-
+
@@ -225,7 +225,7 @@
-
+
From 84fb6838fbad233bef15a343de58b7defdf19525 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 20:16:24 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E6=89=80?=
=?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DetailComponent/CompanyPicker.vue | 50 +++++++++----------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index 61cedf2..2b97236 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -135,24 +135,14 @@ const checkBoxChange = (val) => {
isExpand.value = '展开'
}
}
-const matterTree = (list, flag) => {
- list.forEach(item => {
- if (!flag) {
- tree.value.setChecked(item, false)
- }
- if (item.children !== undefined) {
- matterTree(item.children, false)
- }
- })
-}
const getList = () => {
getSubCompOpt().then(res => {
dataList.value = [
{
- label: "全选",
+ label: "所有公司",
value: -1,
- children: res.data
- }
+ },
+ ...res.data
]
});
};
@@ -167,24 +157,34 @@ const filterNode = (value, data) => {
const show = () => {
//用于弹开部门选择
visible.value = true;
- if(selectList.value.length==0){
- selectList.value=[]
- defaultChecked.value =[]
- }else {
- selectList.value = _value.value
- defaultChecked.value = _value.value.map(item => item.value)
- }
+ console.log('_value.value', _value.value, selectList.value)
+ // if(selectList.value.length==0){
+ // selectList.value=[]
+ // defaultChecked.value =[]
+ // }else {
+ selectList.value = _value.value
+ defaultChecked.value = _value.value.map(item => item.value)
+ // }
getList()
};
+
+const updateTreeCheck = (item, flag) => {
+ // list.forEach(item => {
+ tree.value.setChecked(item, flag)
+ if (item.children !== undefined) {
+ updateTreeCheck(item.children, flag)
+ }
+ // })
+}
const handleChange = (data, checked) => {
if (data.value == -1) {
if(checked){
- checkStrictly.value = false
- const index = checkList.value.indexOf('2')
- if (index != -1) {
- checkList.value.splice(index, 1)
+ for (const item of dataList.value) {
+ if (item.value !== -1) {
+ console.log('item',item)
+ updateTreeCheck(item, false)
+ }
}
- matterTree(dataList.value[0].children, false)
tree.value.setChecked(data,true);
}
}
From fc034cc65315337243f0175cffb0f0de62112015 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 28 Jun 2024 20:22:23 +0800
Subject: [PATCH 4/8] =?UTF-8?q?feat=20:=20=E9=9C=80=E6=B1=82=E5=BE=81?=
=?UTF-8?q?=E9=9B=86=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/project-demand/requirement/add.vue | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 74fbbc6..890e780 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -9,8 +9,8 @@
-
-
+
+
-
+
-
+
- {{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
+ {{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
{{ getName(selectedCompanyList) }}
From 377509b62a3ec373ae2635f3bd79f12f373ffc7d Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 28 Jun 2024 21:41:24 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat=20:=20=E5=88=86=E6=91=8A=E6=B1=87?=
=?UTF-8?q?=E6=80=BB=E5=B0=8F=E8=AE=A1=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D?=
=?UTF-8?q?=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/DetailComponent/AllocationSummaryDetail.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index ccd1b78..51af440 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -24,7 +24,7 @@
-
+
{{ scope.row.afterTax }}
@@ -33,7 +33,6 @@
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index c95f922..dded12f 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -11,7 +11,12 @@
:class="stepClass(index)"
@click="handleStep(item.key, index)"
- />
+ >
+
+
+
+
+
@@ -311,4 +316,10 @@ watchEffect(() => {
.step-error {
cursor: not-allowed;
}
+.is-active {
+ color: #BEA266;
+}
+.is-end {
+ color: #67c23a;
+}
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index e12e82a..71fa18e 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -308,6 +308,7 @@ const search = (val) => {
}
const init = async () => {
const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
+ console.log("🚀 ~ init ~ data:", data)
if (data) {
tableData.value = data
baseForm.value.setValues(data)
diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index d74bf80..d8a138d 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -141,7 +141,7 @@ const handleSubmit = async () => {
}
const getBaseInfo = async () => {
const {code, data} = await getBaseInfoApi(route.query.id)
- tableForm.value.projectName = data.projectName
+ tableForm.value.projectName = data?.projectName || ''
}
getBaseInfo()
const init = async () => {
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index a42e83b..dded12f 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -11,7 +11,12 @@
:class="stepClass(index)"
@click="handleStep(item.key, index)"
- />
+ >
+
+
+
+
+
@@ -96,21 +101,21 @@ const schema = computed(() => {
label: '征集名称',
prop: 'requirementName',
colProps: {
- span: 24
+ span: 12
}
},
{
label: '所属公司',
prop: 'affiliatedCompany',
colProps: {
- span: 24
+ span: 12
}
},
{
label: '项目名称',
prop: 'projectName',
colProps: {
- span: 24
+ span: 12
}
}
@@ -311,4 +316,10 @@ watchEffect(() => {
.step-error {
cursor: not-allowed;
}
+.is-active {
+ color: #BEA266;
+}
+.is-end {
+ color: #67c23a;
+}