-
-
- 标准入库流程
- 发起流程
-
-
-
-
-
-
- 基础信息
-
-
-
-
-
-
- 国内标准入库
- 海外标准入库
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 标准入库流程
+ 发起流程
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+ 国内标准入库
+ 海外标准入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 根据类别、编号、中英文名称查询
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 实施日期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 文本信息
+
+
+
+
+
+
+
+
-
- 实施日期
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
- 文本信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
- 适用范围
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
- 关联信息
-
-
-
-
-
-
- {{'手动查找'}}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 适用范围
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关联信息
+
+
+
+
+
+
+ {{ '手动查找' }}
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{'手动查找'}}
-
-
-
- {{'手动查找'}}
-
-
-
- {{'手动查找'}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- 流程发起人
-
-
-
-
-
-
-
-
-
- 会签责任人
-
-
-
-
-
-
-
-
-
- 修订申请人
-
-
-
-
-
-
-
-
-
- 标准法规业务经理
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ '手动查找' }}
+
+
+
+
+ {{ '手动查找' }}
+
+
+
+
+ {{ '手动查找' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
- 清空
-
-
-
-
-
流程发起人
+
+
+
+
+
+
+
+
+
+ 会签责任人
+
+
+
+
+
+
+
+
+
+
+ 修订申请人
+
+
+
+
+
+
+
+
+
+ 标准法规业务经理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+ 清空
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
- 清空
-
-
-
-
-
-
-
数据获取中
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
新增
+ type="primary"
+ class="common-button-primary"
+ size="mini"
+ style="margin-left: 5px"
+ @click="handleSearchStandard">
+ 查询
+
确认
- 取消
-
-
-
+ class="common-button-default"
+ size="mini"
+ @click="handleResetSearch">
+ 清空
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 5a2c9613e..5d795dcb9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -443,7 +443,7 @@
>
- {{form.wssmr}}
+ {{form.wssmr}}
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 6297e79dc..f897487fb 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -68,16 +68,16 @@
-
-
-
-
-
-
-
-
-
-
+
提交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
责任部门
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -805,10 +811,10 @@
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -916,7 +922,6 @@
-
-
-
-
-
-
-
-
-
-
-
+
责任部门
责任工程师
-
-
-
-
-
-
-
-
+
Date: Mon, 27 Dec 2021 16:36:52 +0800
Subject: [PATCH 04/36] =?UTF-8?q?=E6=B8=85=E5=8D=95=20-=20=E6=B8=85?=
=?UTF-8?q?=E5=8D=95=E6=9D=A1=E7=9B=AE=20-=20=E6=B2=A1=E6=9C=89=E5=9B=9E?=
=?UTF-8?q?=E6=98=BE=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/addEdit.vue | 6 ++
.../pages/otherAddEit.vue | 83 +++++++++++++++++++
.../pages/projectAddEit.vue | 6 +-
3 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index f5a470933..52a5786b6 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1165,6 +1165,7 @@ export default {
//判断是否是清单类型
if (this.selectedAccInfoSearchList.length > 0) {
// 追加字段
+ console.log('1168',this.selectedAccInfoSearchList)
this.selectedAccInfoSearchList.map(item => {
let addList;
addList = this.sarAccessInfoList.findIndex(items => {
@@ -1472,6 +1473,7 @@ export default {
this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+ console.log('1476',res.data.list)
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
@@ -1479,6 +1481,10 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
+ item.zrbm = item.attrInfoCaseMap.zrbm
+ item.sycpx = item.attrInfoCaseMap.sycpx
+ item.typeApplicable = item.attrInfoMap.CLLX
+ item.nylx = item.attrInfoMap.NYLX
})
this.drawerTotal = res.data.count
}, e => {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 1cbe14f95..c09d2d974 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1229,19 +1229,102 @@ export default {
}
})
},
+ // 字段转化
+ changeText(val) {
+ val.forEach(item => {
+ // 责任部门转换
+ if (item.zrbm !== null || item.zrbm !== "") {
+ let k = (item.zrbm || "").split(',')
+ for (let i in this.zrbmOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.zrbmOptions[i].value === k[m]) {
+ k[m] = this.zrbmOptions[i].label
+ }
+ item.zrbm = k.join(',')
+ }
+ }
+ }
+ // 能源类型转换
+ if (item.nylx !== null) {
+ let k = (item.nylx || "").split(',')
+ for (let i in this.categoryOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.categoryOptions[i].value === k[m]) {
+ k[m] = this.categoryOptions[i].label
+ }
+ item.nylx = k.join(',')
+ }
+ }
+ }
+ // 适用车型转换
+ if (item.typeApplicable !== null) {
+ let k = (item.typeApplicable || "").split(',')
+ for (let i in this.CycxOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.CycxOptions[i].value === k[m]) {
+ k[m] = this.CycxOptions[i].label
+ }
+ item.typeApplicable = k.join(',')
+ }
+ }
+ }
+ // s适用产品线转换
+ if (item.sycpx !== null) {
+ let k = (item.sycpx || "").split(',')
+ for (let i in this.sycpxOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.sycpxOptions[i].value === k[m]) {
+ k[m] = this.sycpxOptions[i].label
+ }
+ item.sycpx = k.join(',')
+ }
+ }
+ }
+ // 适用认证转换
+ if (item.syrz !== null) {
+ let k = (item.syrz || "").split(',')
+ for (let i in this.syrzOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.syrzOptions[i].value === k[m]) {
+ k[m] = this.syrzOptions[i].label
+ }
+ item.syrz = k.join(',')
+ }
+ }
+ }
+ })
+ },
pageInfo() {
this.sarAccessInfoSearch.pageNo = 1
this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
+ console.log('1476',res.data.list)
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
+ item.zrbm = item.attrInfoCaseMap.zrbm
+ item.sycpx = item.attrInfoCaseMap.sycpx
+ item.typeApplicable = item.attrInfoMap.CLLX
+ // 适用车型转换
+ if (item.typeApplicable !== null) {
+ let k = (item.typeApplicable || "").split(',')
+ for (let i in this.CycxOptions) {
+ for (let m = 0; m < k.length; m++) {
+ if (this.CycxOptions[i].value === k[m]) {
+ k[m] = this.CycxOptions[i].label
+ }
+ item.typeApplicable = k.join(',')
+ }
+ }
+ }
+ item.nylx = item.attrInfoMap.NYLX
})
+ this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.count
}, e => {
})
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 83dca2e39..32d789d79 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1306,7 +1306,7 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
-
+ console.log('1476',res.data.list)
//为空转换
for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
//适用车型为空
@@ -1324,6 +1324,10 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
+ item.zrbm = item.attrInfoCaseMap.zrbm
+ item.sycpx = item.attrInfoCaseMap.sycpx
+ item.typeApplicable = item.attrInfoMap.CLLX
+ item.nylx = item.attrInfoMap.NYLX
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.count
From 666a462f01fd59ec6042c671a5acd7ab1b1ca054 Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Mon, 27 Dec 2021 16:38:11 +0800
Subject: [PATCH 05/36] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 94 +------------------
1 file changed, 5 insertions(+), 89 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 045f04913..e91711e2c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1616,12 +1616,6 @@ export default {
issueTime: [
{required: false, message: '请选择标准发布日期', trigger: 'change'}
],
- // qcdw: [
- // { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
- // ],
- // cysd: [
- // { required: true, message: '请选择我司参与深度', validator: validateCysd, trigger: 'change' }
- // ],
},
zrUserIds: [], // 选择多个会签责任人
userType: '', // 选择用户ID判断
@@ -1825,9 +1819,14 @@ export default {
// 标准来源改变事件
standInChange(val) {
this.verifySarStandard = false
+
+ /** val === '1' (国外) val === '0'（ 国内 ）*/
+ // 国内英文名称不必填 国外必填 ，标准性质国内不体现
if (val === '1') {
this.rules.standEnName[0].required = true;
+ this.rules.standNature[0].required = false
} else {
+ this.rules.standNature[0].required = true
this.rules.standEnName[0].required = false;
}
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
@@ -1934,7 +1933,6 @@ export default {
// this.modalshowflag2 = true
// },
checkedRole2(data) {
- console.log('1712', this.drawerTitle)
let idList = ''
let nameList = ''
data.forEach(item => {
@@ -2421,87 +2419,6 @@ export default {
})
},
dataSourceChange(val) {
- /* this.verifySarStandard = false
- // 国内英文名称不必填 国外必填
- if (this.form.standInData === '1') {
- this.rules.standEnName[0].required = true;
- } else {
- this.rules.standEnName[0].required = false;
- }
- //切换清空表单
- this.form = {
- // 基础信息
- country: '',
- textStatus: '', // 文本状态
- standYear: '', // 标准年份
- standInData: val, // 标准类型
- standSort: '', // 标准类别
- standNumber: '', // 标准编号
- standNature: '', // 标准性质
- standEnName: '', // 英文名称
- standName: '', // 中文名称
- signFlag: '1', // 是否需要会签
- issueTime: '', // 发布时间
- isRelateAccess: '', // 是否纳入认证清单
- standSystem: '',// 标准体系
- standSystemName: '',// 标准体系名称
- gxhbq: '', // 标签
- // 实施日期
- ssrq: '', // 实施日期(标准文本)
- xcxssrq: '', // 新车型实施日期(标准文本)
- zccssrq: '', // 在产车实施日期(标准文本)
- ssrqgj: '', // 实施日期(国际)
- xcxssrqgj: '', // 新车型实施日期(国际)
- zccssrqgj: '', // 在产车实施日期(国际)
- // 文本信息
- ca: '', // 草案
- FBGBJBD: '', // 发布稿
- xgd: '', // 修改单
- bpg: '', // 报批稿
- ssg: '', // 送审稿
- zqyjg: '', // 征求意见稿
- jdwj: '', // 解读文件
- zbjbd: '', // 增补件
- kwj: '', // 勘 误件
- caName: '', // 草案
- fbgbjbdName: '', // 发布稿
- xgdName: '', // 修改单
- bpgName: '', // 报批稿
- ssgName: '', // 送审稿
- zqyjgName: '', // 征求意见稿
- jdwjName: '', // 解读文件
- zbjbdName: '', // 增补件
- kwjName: '', // 勘误件
- glwjName: '', // 关联文件
- // 适用范围
- txlb: '', // 体系类别
- gkdw: '', // 归口管理部门
- qcdw: '', // 起草单位
- wssmr: '', // 我司署名人
- cysd: '', // 我司参与深度
- cllx: '', // 适用车型
- nylx: '',// 能源类型
- sycpx: '',// 适用产品线
- syrz: '', // 适用认证
- zrbm: '', // 责任部门
- zrgcs: '', // 责任工程师
- cycvppsbm: '', // 关联模块--乘用车VPPS编码
- cycvppscn: '', // 关联模块--乘用车vpps中文名称
- kccvppsbm: '', // 关联模块--卡车VPPS编码
- kccvppscn: '', // 关联模块--卡车vpps中文名称
- dybxh: '', // 模块结构单元变型号
- dymc: '', // 模块结构单元名称
- // 关联信息
- dtbjh: '', // 代替标准号
- cbbh: '', // 采标编号
- cbcd: '', // 采标程度
- yybj: '', // 引用标准
- bfbdtbzh: '', // 部分代替标准号
- byybj: '', // 被引用标准
- glwj: '', // 关联文件
- xglc: '', // 相关流程
- chjl: '', // 参会记录
- }*/
},
handleChange(event) {
// const value = event.target.value
@@ -2957,7 +2874,6 @@ export default {
},
popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
- console.log(checkedData)
if (checkedData.length > 0) {
this.form.dybxh = checkedData.map(item => item.model).join(",")
this.form.dymc = checkedData.map(item => item.name).join(",")
From ad0559555b960535cc985fb061524d8f1921a0f3 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 16:46:38 +0800
Subject: [PATCH 06/36] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?=
=?UTF-8?q?=20=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E4=BC=9A=E7=AD=BE=20-?=
=?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E5=90=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 045f04913..52c903008 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1843,7 +1843,7 @@ export default {
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
- signFlag: '1', // 是否需要会签
+ signFlag: '2', // 是否需要会签
issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单
standSystem: '',// 标准体系
From 276a64a1127879da1ad94a0a95696e66f2e6b1ae Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 16:52:22 +0800
Subject: [PATCH 07/36] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?=
=?UTF-8?q?=20=E5=9B=BD=E5=86=85=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=20-=20=E6=8E=92=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b4b2768a8..1265919c1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -759,6 +759,17 @@
>
+
+
+
+
+
@@ -1543,6 +1554,7 @@ export default {
qcdw: '', // 起草单位
wssmr: '', // 我司署名人
cysd: '', // 我司参与深度
+ cyzbpm:[],// 我司参与制标排名
cllx: '', // 适用车型
nylx: '',// 能源类型
sycpx: '',// 适用产品线
@@ -1642,6 +1654,7 @@ export default {
options: []
}, // 适用认证
cysdOptions: [], // 我司参与深度
+ cyzbpmOptions:[], // 我司参与制标排名
cbcdOptions: [], // 采标程度
wssmrOptions: [], // 我司署名人
sycpxOptions: {
@@ -3085,6 +3098,7 @@ export default {
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
+ this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门
From 7bea314779019a0e8470530e3fd230084a22696e 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 16:56:08 +0800
Subject: [PATCH 08/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/jrbzhxh/step2.vue | 19 +++++++++++++------
.../pages/creatProcess/xmpg/step1-1.vue | 1 +
.../pages/creatProcess/xmpg/step1.vue | 1 +
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index 0836ca2e6..6fec2b2d0 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -135,24 +135,36 @@
width="180"
label="职务"
align="center">
+
+
+
+
+
+
+
+
+
+
+
+
{
let mes = JSON.parse(res.mes);
- console.log(mes);
this.wbbzform = mes.form
this.associationData = mes.form.associationData
this.getFileInfo();
@@ -475,7 +486,6 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
- console.log(item);
this.$nextTick(() => {
if(!item.directorUser){
this.wbbzform = JSON.parse(JSON.stringify(item));
@@ -503,7 +513,6 @@ export default {
this.$message.warning('请勿重复添加参与人')
return
}else{
- console.log(items);
}
})
})
@@ -577,7 +586,6 @@ export default {
this.wbbzform.participantsData = this.participantsData
this.wbbzform.associationData = this.associationData
let json = JSON.stringify( this.wbbzform)
- console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -606,7 +614,7 @@ export default {
},
//添加参与人信息
addPeople(){
- var list =[]
+ let list =[]
this.participantsData.push(list)
},
//批量删除参与人信息
@@ -669,7 +677,6 @@ export default {
},
// 上传之前钩子
beforeUpload(file) {
- console.log(file);
var filename = file.name;
var index1 = filename.lastIndexOf(".");
var index2 = filename.length;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index 779be09ba..2196af865 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -779,6 +779,7 @@ export default {
}
});
this.selectList = [];
+ this.$refs.selection.clearSelection()
}).catch(() => {
});
}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index a9b8e2959..c6c5f1476 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -774,6 +774,7 @@ export default {
}
});
this.selectList = [];
+ this.$refs.selection.clearSelection()
}).catch(() => {
});
}
From 7442c1edcbf62dec155fa3217508bdb67c61b602 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 17:01:29 +0800
Subject: [PATCH 09/36] commit
---
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 2835e2d62..c73ea50ae 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -832,7 +832,6 @@ export default {
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
this.isSubmit = true
- return
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
From e9dcc4f56c1dda84193081f170825d36b12e2f60 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 17:05:26 +0800
Subject: [PATCH 10/36] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?=
=?UTF-8?q?=20=E5=9B=BD=E5=86=85=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=20-=20=E6=8E=92=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step2.vue | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 0602efbc4..382880a85 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -548,6 +548,17 @@
>
+
+
+
+
+
@@ -186,7 +186,7 @@ export default {
passInfo: 0,
detailData: [],
loading: false,
- commentText: '', // 意见
+ textarea: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
nonSearch: {
@@ -266,6 +266,7 @@ export default {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[0].standardInfoList
this.standardInfoList = this.dataList
+ this.textarea = JSON.parse(JSON.stringify(item)).textarea
}
}
} else {
@@ -274,6 +275,7 @@ export default {
if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
this.dataList = fileData[i].standardInfoList
this.standardInfoList = this.dataList
+ this.textarea = JSON.parse(JSON.stringify(item)).commentText
}
}
}
@@ -311,12 +313,12 @@ export default {
},
// 退回按钮
handleSubmitNo() {
- if (this.commentText) {
+ if (this.textarea) {
var json = {
passInfo: 1,
actionFlag: 1,
- commentText: this.commentText,
+ commentText: this.textarea,
standardInfoList: this.standardInfoList,
}
const params = new FormData();
@@ -370,7 +372,7 @@ export default {
_formData.append('json', JSON.stringify({
// roleForm: this.roleForm,
dockUserList: list,
- commentText: this.commentText
+ textarea: this.textarea
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -411,7 +413,7 @@ export default {
let json = {
passInfo: this.passInfo,
responUserList: list,
- commentText: this.commentText,
+ commentText: this.textarea,
actionFlag: 0
}
if(flag)return;
From 972c220d740a7f86d787099abb7120ad0f8f3712 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 17:29:55 +0800
Subject: [PATCH 12/36] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?=
=?UTF-8?q?=20=E6=B5=B7=E5=A4=96=E7=AC=AC=E4=BA=8C=E6=AD=A5=20-=20?=
=?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processCenter/pages/creatProcess/bzrk/step2.vue | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 382880a85..cea06b1d8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -365,6 +365,14 @@
- -
+ {{value.name}}
+
+
+ - -
+
+
@@ -808,6 +816,7 @@
zqyjgFileMap: [],
jdwjFileMap: [],
kwjFileMap: [],
+ xdbFileMap: [],
glwjFileMap: [],
caFileMap: [],
zbjbdFileMap: [],
@@ -1150,6 +1159,8 @@
// jdwjFileMap: {},
this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName);
// kwjFileMap: {},
+ this.xdbFileMap=this.assemble(processForm.xdb,processForm.xdbName);
+ // xdbFileMap: {},
this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName);
// glwjFileMap: {},
this.caFileMap=this.assemble(processForm.ca,processForm.caName);
From 787e4053cf5d0608c33b34278a149ac3697b67ad Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Mon, 27 Dec 2021 17:45:54 +0800
Subject: [PATCH 13/36] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 1265919c1..a5b345fb9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2125,14 +2125,15 @@ export default {
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
- this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : ''
- this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : ''
- this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : ''
- this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : ''
- this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : ''
- this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : ''
- this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : ''
- this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : ''
+ console.log(this.form)
+ this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : ''
+ this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : ''
+ this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : ''
+ this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm : ''
+ this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz : ''
+ this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx : ''
+ this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx : ''
+ this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx : ''
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
@@ -2143,10 +2144,9 @@ export default {
this.key3++
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
- console.log(this.form)
- this.form.ssrq = this.form.ssrq ? this.$moment(this.form.ssrq).format("YYYY-MM-DD") : null
- this.form.zccssrq = this.form.zccssrq ? this.$moment(this.form.zccssrq).format("YYYY-MM-DD") : null
- this.form.xcxssrq = this.form.xcxssrq ? this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") : null
+ // this.form.ssrq = this.form.ssrq ? this.$moment(this.form.ssrq).format("YYYY-MM-DD") : null
+ // this.form.zccssrq = this.form.zccssrq ? this.$moment(this.form.zccssrq).format("YYYY-MM-DD") : null
+ // this.form.xcxssrq = this.form.xcxssrq ? this.$moment(this.form.xcxssrq).format("YYYY-MM-DD") : null
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = bringData.id
From 3975851225387a28652516d99129fb1942438989 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 17:47:56 +0800
Subject: [PATCH 14/36] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?=
=?UTF-8?q?=20=E5=AE=A1=E6=A0=B8=20-=20=E9=A9=B3=E5=9B=9E=E4=B9=8B?=
=?UTF-8?q?=E5=90=8E=E6=84=8F=E8=A7=81=E8=A6=81=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 53882e2c9..6eccc8ad3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -2374,7 +2374,7 @@ export default {
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
- this.commentText = processForm.commentText
+ // this.commentText = processForm.commentText
if (processForm.form === undefined) {
this.getFormFieldList(processForm)
} else {
From c302d80e4823151f640ae2d5ba675acdcf68a73e Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Mon, 27 Dec 2021 18:08:08 +0800
Subject: [PATCH 15/36] commit
---
.../components/EnterpriseStandardDatabase.vue | 1 -
.../enterpriseStandardPlan/index.vue | 313 ++++++++++++++++--
2 files changed, 284 insertions(+), 30 deletions(-)
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 4de7326ed..c8d3c6477 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -4566,7 +4566,6 @@ export default {
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
this.standSystemOptions = res.data.TXLBBUSS // 标准体系
- console.log(this.standSystemOptions);
this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 2d6ec22f6..702f7c6aa 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -263,40 +263,42 @@
v-model="addForm.unit">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -361,6 +363,128 @@
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
+
+
+
+
+
+
@@ -371,9 +495,28 @@
components: {},
data() {
return {
+ TXJGList: [],
+ TXJGmodal: false,
+ standSystemOptions: [],
+ defaultProps: {
+ children: 'children',
+ label: 'menuName'
+ },
+ QYBZShow: false,
+ QYBZList: [],
modalshowflagZRBM: false,
nodeListZRBM: [],
-
+ QYBZformSelect: [],
+ QYBZmodal: false,
+ QYBZform: {
+ page: 1,
+ pageSzie: this.$store.getters.userInfo.configContent,
+ validFlag: '0',
+ userId: this.$store.getters.userInfo.userId,
+ standCode: '',
+ standName: '',
+ total: 0,
+ },
QCDWmodal: false,
QCDWValue: [],
QCDWList: [],
@@ -390,6 +533,10 @@
DrawerType: '',
ids: [],
addForm: {
+ tsJson: '',
+ tsJsonName: '',
+ rqbJson: '',
+ rqbName: '',
unit: '', // 单位
unitName: '',
esName: '', // 企标名称
@@ -450,6 +597,83 @@
props: {},
watch: {},
methods: {
+ TXJGcloseDrawer () {
+ this.TXJGmodal = false
+ },
+ TXJGenterDrawer () {
+ let list = this.$refs.TXJGTree.getCheckedNodes()
+ let id = ''
+ let name = ''
+ list.map(item => {
+ if (id.length > 0) {
+ id += ','
+ id += item.id
+ name += ','
+ name += item.menuName
+ } else {
+ id = item.id
+ name = item.menuName
+ }
+ })
+ this.addForm.tsJson = id
+ this.addForm.tsJsonName = name
+ this.TXJGmodal = false
+ },
+ choiceTXJG (id) {
+ if (id) {
+ this.TXJGList = id.split(',')
+ } else {
+ this.TXJGList = []
+ }
+ this.TXJGmodal = true
+ },
+ QYBZcloseDrawer () {
+ this.clearQYBZ()
+ },
+ QYBZenterDrawer () {
+ if (this.QYBZformSelect.length > 1) {
+ this.$message.warning('请选择一条标准')
+ } else if (this.QYBZformSelect.length < 1){
+ this.$message.warning('请选择要带入的标准')
+ } else {
+ this.addForm.rqbJson = this.QYBZformSelect[0].id
+ this.addForm.rqbName = this.QYBZformSelect[0].standName
+ this.clearQYBZ()
+ this.QYBZmodal = false
+ }
+ },
+ handleSelectionQYBZ (val) {
+ this.QYBZformSelect = val
+ },
+ QYBZpageChange (page) {
+ this.QYBZform.page = page
+ this.QYBZget()
+ },
+ QYBZpageSizeChange (pageSize) {
+ this.QYBZform.pageSize = pageSize
+ this.QYBZget()
+ },
+ QYBZget () {
+ this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
+ _this: this, loading: 'QYBZShow'
+ }, res => {
+ this.QYBZList = res.data.list
+ this.QYBZform.total = res.data.count
+ }, e => {
+ })
+ },
+ clearQYBZ () {
+ this.QYBZform = {
+ page: 1,
+ standCode: '',
+ standName: '',
+ }
+ },
+ choiceQYBZ (id) {
+ this.QYBZformSelect = []
+ this.QYBZget()
+ this.QYBZmodal = true
+ },
drawerCheckZRBM (data) {
let list = ''
let listName = ''
@@ -718,6 +942,7 @@
_this: this
}, res => {
this.QCDWList = res.data.QCDW // 起草单位
+ this.standSystemOptions = res.data.TXLBBUSS // 体系结构
}, e => {
})
},
@@ -730,6 +955,36 @@
#enterpriseStandardPlan {
height: 100%;
background: #fff;
+ .standardForComments {
+ height: calc(~'100% - 56px');
+ background: #fff;
+ flex-direction: column;
+ .action-bar {
+ margin-bottom: 5px;
+ padding: 0;
+ }
+
+ .content {
+ flex: auto;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+
+ .table-wrap {
+ flex: auto;
+ overflow: hidden;
+ position: relative;
+ }
+ }
+
+ & > .pagination {
+ position: static;
+
+ /deep/ .pagination-slot {
+ padding: 0;
+ }
+ }
+ }
/deep/.table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;
From e0f1652dba762d1bc1083f7ca30442d986e98d6b Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Mon, 27 Dec 2021 19:18:22 +0800
Subject: [PATCH 16/36] =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E5=8F=8D?=
=?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../details/otherStandardDetails/index.vue | 47 +++++--------------
1 file changed, 12 insertions(+), 35 deletions(-)
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 6d73b5859..f9bb2931d 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3722,41 +3722,18 @@ export default {
}, {
_this: this
}, res => {
- // displayLocation.map(item => {
- // if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
- // item.child.forEach(items =>{
- // let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry"));
- // if (accessCountry.country === undefined) {
- // accessCountry.country = '文本'
- // }
- // if(items.attrField === 'SSRQ') {
- // items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':'
- // if (accessCountry.ssrq !== undefined) {
- // item.value = accessCountry.ssrq
- // }
- // } else if (items.attrField === 'ZCCSSRQ') {
- // items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':'
- // if (accessCountry.zccssrqgj !== undefined) {
- // item.value = accessCountry.zccssrqgj
- // }
- // } else if(items.attrField === 'XCXSSRQ') {
- // items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':'
- // if (accessCountry.xcxssrqgj !== undefined) {
- // item.value = accessCountry.xcxssrqgj
- // }
- //
- // }
- // })
- // for (let key in res.data) {
- // item.one.push({
- // attrName: key,
- // value: res.data[key].join(','),
- // isShowImp: '0',
- // id: key
- // })
- // }
- // }
- // })
+ displayLocation.map(item => {
+ if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
+ for (let key in res.data) {
+ item.one.push({
+ attrName: key,
+ value: res.data[key].join(','),
+ isShowImp: '0',
+ id: key
+ })
+ }
+ }
+ })
this.dynamicFormField = displayLocation
})
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
From 482c09aa38537fa0fda482728dedc8365b8c1b58 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Mon, 27 Dec 2021 20:25:26 +0800
Subject: [PATCH 17/36] commit
---
.../pages/creatProcess/bzdy/step3.vue | 30 ++++++++---------
.../pages/creatProcess/bzdy/step9.vue | 2 +-
.../pages/creatProcess/bzzqyj/step1-1.vue | 32 ++++++++++++++-----
.../pages/creatProcess/bzzqyj/step1.vue | 32 ++++++++++++++-----
4 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index cf40474f6..aa295f91c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -127,19 +127,19 @@