From 030fef30fc69c4a6ab69e28ca858e27e1d6abc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 27 Dec 2021 14:05:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzqdfb/step1-1.vue | 10 +++
.../pages/creatProcess/bzqdfb/step1.vue | 2 +
.../pages/creatProcess/bzqdfb/step3.vue | 2 +-
.../pages/addEdit.vue | 69 +++++++++----------
4 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 75225cd91..3d6f1cccd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -1315,6 +1315,14 @@ export default {
this.$message.warning("请勿重复添加数据");
} else {
this.dataList.push(item);
+ this.dataList.forEach(item => {
+ if(item.XCXSSRQ === null){
+ item.XCXSSRQ = ''
+ }
+ if(item.ZCCSSRQ === null){
+ item.ZCCSSRQ = ''
+ }
+ })
exits.push(item.id);
}
});
@@ -1368,11 +1376,13 @@ export default {
this.dataList.forEach(item => {
if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){
item.xcxssrqgj = ''
+ this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}
if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
item.zccssrqgj = ''
+ this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}else{
this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 61f2e77f2..412e435de 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1308,11 +1308,13 @@ export default {
this.dataList.forEach(item => {
if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){
item.xcxssrqgj = ''
+ this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj)
}
if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
item.zccssrqgj = ''
+ this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}else{
this.$set(item, "ZCCSSRQ", item.zccssrqgj)
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 9fd6c6eb4..8dfd0b84c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -815,7 +815,7 @@ export default {
this.listForm.commentText = this.commentText
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
- this.isSubmit = true
+ // this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 195afb22c..f5a470933 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -454,18 +454,20 @@
+ clearable
+ v-model.trim="editRowData.zccssrqgj"
+ type="dates"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期">
+ clearable
+ v-model.trim="editRowData.xcxssrqgj"
+ type="dates"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期">
@@ -1162,46 +1164,25 @@ export default {
addSarAccess() {
//判断是否是清单类型
if (this.selectedAccInfoSearchList.length > 0) {
-
- //为空转换
- for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
- //适用车型为空
- if (this.selectedAccInfoSearchList[i].typeApplicable === "[]"){
- this.selectedAccInfoSearchList[i].typeApplicable = null
- }
- //能源类型为空
- if (this.selectedAccInfoSearchList[i].nylx === "[]"){
- this.selectedAccInfoSearchList[i].nylx = null
- }
- //责任部门为空
- if (this.selectedAccInfoSearchList[i].zrbm === "[]"){
- this.selectedAccInfoSearchList[i].zrbm = null
- }
- //试用产品线为空
- if (this.selectedAccInfoSearchList[i].sycpx === "[]"){
- this.selectedAccInfoSearchList[i].sycpx = null
- }
- }
-
// 追加字段
this.selectedAccInfoSearchList.map(item => {
let addList;
addList = this.sarAccessInfoList.findIndex(items => {
- return items.id === item.id
- })
+ return items.id === item.id;
+ });
if (addList > -1) {
// this.$refs.accessTypeSelect.clearSelection()
- this.$refs.entryTable.clearSelection()
+ this.$refs.entryTable.clearSelection();
this.$refs.searchTable.clearSelection()
this.$message.warning('请勿添加重复数据')
} else {
this.sarAccessInfoList.push(item)
this.sarAccessInfoList.forEach(item => {
- this.$set(item, 'xcxssrqgj', item.xcxssrq)
- this.$set(item, 'zccssrqgj', item.zccssrq)
- if(item.attrInfoCaseMap !== undefined){
- this.$set(item, 'typeApplicable', item.attrInfoCaseMap.cllx)
- this.$set(item, 'nylx', item.attrInfoCaseMap.nylx)
+ this.$set(item, "xcxssrqgj", item.xcxssrq);
+ this.$set(item, "zccssrqgj", item.zccssrq);
+ if (item.attrInfoCaseMap !== undefined) {
+ this.$set(item, "typeApplicable", item.attrInfoCaseMap.cllx);
+ this.$set(item, "nylx", item.attrInfoCaseMap.nylx);
}
// 能源类型转换
if (item.nylx !== null) {
@@ -1231,6 +1212,20 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
+ this.sarAccessInfoList.forEach(item => {
+ if(item.nylx === '[]'){
+ item.nylx = ''
+ }
+ if(item.typeApplicable === '[]'){
+ item.typeApplicable = ''
+ }
+ if(item.zrbm === '[]'){
+ item.zrbm = ''
+ }
+ if(item.sycpx === '[]'){
+ item.sycpx = ''
+ }
+ })
}
})
} else {