diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 045f04913..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: '',// 适用产品线
@@ -1616,12 +1628,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判断
@@ -1648,6 +1654,7 @@ export default {
options: []
}, // 适用认证
cysdOptions: [], // 我司参与深度
+ cyzbpmOptions:[], // 我司参与制标排名
cbcdOptions: [], // 采标程度
wssmrOptions: [], // 我司署名人
sycpxOptions: {
@@ -1825,9 +1832,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'
@@ -1843,7 +1855,7 @@ export default {
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
- signFlag: '1', // 是否需要会签
+ signFlag: '2', // 是否需要会签
issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单
standSystem: '',// 标准体系
@@ -1934,7 +1946,6 @@ export default {
// this.modalshowflag2 = true
// },
checkedRole2(data) {
- console.log('1712', this.drawerTitle)
let idList = ''
let nameList = ''
data.forEach(item => {
@@ -2421,87 +2432,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 +2887,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(",")
@@ -3169,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 // 责任部门
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 470c43081..0602efbc4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1252,6 +1252,7 @@
console.log("shibai");
this.$message.warning("驳回成功")
this.isSubmit = false
+ this.formTongGuo.commentText = ''
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}else{
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(() => {
});
}
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,
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