- 比对
- 批量删除
+ 比对
+ 批量删除
@@ -120,8 +120,8 @@
- 查看
- 删除
+ 查看
+ 删除
- 上传
- 删除
@@ -106,13 +106,13 @@
- 获取文件
- 编辑
- 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
数据获取中
+
+
@@ -941,8 +1101,32 @@
name: "bzrkStep1",
data () {
return {
+ standardDrawer: false,
+ loadSarStandard: false,
+ verifySarStandard: false,
+ standardSearchForm: {
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent,
+ total: 0,
+ standType: 'INLAND',
+ standSort: '',
+ standName: '',
+ standEnName: '',
+ standNumber: ''
+ },
+ tableData: {
+ // 标准表格数据
+ standardData: [],
+ // 任务分解单数据
+ taskTableData: []
+ },
+ tableHeight: {
+ standardTableHeight: null
+ },
+ selectedList: [],
+ standardCheckedList: [],
activeName:'1',
- roleRow: {},
+ roleRow: {},
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
config: {
@@ -979,6 +1163,14 @@
children: 'children',
label: 'menuName'
},
+ defaultCodeProps: {
+ children: 'children',
+ label: 'code'
+ },
+ defaultModelProps: {
+ children: 'children',
+ label: 'model'
+ },
nodeList: [],
type: '',
defaultUserProps: {
@@ -1018,7 +1210,7 @@
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
- fbgbjbd: '', // 发布稿
+ FBGBJBD: '', // 发布稿
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
@@ -1120,6 +1312,8 @@
standNatureOptions: [], // 标准性质
standStateOptions: [], // 文本状态
standSystemOptions: [], // 标准体系
+ busVppsOptions: [], // 车系体系架构
+ modelOptions: [], // 模块体系架构
applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
@@ -1132,6 +1326,59 @@
ListForm: {}, // 新增数据
}
},
+ watch:{
+ 'form.standInData': {
+ handler: function() {
+ this.verifySarStandard = false
+ this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+ },
+ },
+ 'standardSearchForm.standType': {
+ handler: function() {
+ this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1'
+ },
+ },
+ 'form.standNumber': {
+ handler: function() {
+ this.standardSearchForm.standNumber = this.form.standNumber
+ },
+ },
+ 'standardSearchForm.standNumber': {
+ handler: function() {
+ this.form.standNumber = this.standardSearchForm.standNumber
+ },
+ },
+ 'form.standSort': {
+ handler: function() {
+ this.standardSearchForm.standSort = this.form.standSort
+ },
+ },
+ 'standardSearchForm.standSort': {
+ handler: function() {
+ this.form.standSort = this.standardSearchForm.standSort
+ },
+ },
+ 'form.standName': {
+ handler: function() {
+ this.standardSearchForm.standName = this.form.standName
+ },
+ },
+ 'standardSearchForm.standName': {
+ handler: function() {
+ this.form.standName = this.standardSearchForm.standName
+ },
+ },
+ 'form.standEnName': {
+ handler: function() {
+ this.standardSearchForm.standEnName = this.form.standEnName
+ },
+ },
+ 'standardSearchForm.standEnName': {
+ handler: function() {
+ this.form.standEnName = this.standardSearchForm.standEnName
+ },
+ },
+ },
components: {
ProcessHeader,
ProcessFooter,
@@ -1139,6 +1386,179 @@
TreeSelect
},
methods: {
+ clearFormData(data){
+ this.form = {
+ // 基础信息
+ textStatus: '', // 文本状态
+ standYear: '', // 标准年份
+ standInData: data.standInData ? data.standInData : '0', // 标准类型
+ standSort: data.standSort ? data.standSort : '', // 标准类别
+ standNumber: data.standNumber ? data.standNumber : '', // 标准编号
+ standNature: data.standNature ? data.standNature : '', // 标准性质
+ standEnName: data.standEnName ? data.standEnName : '', // 英文名称
+ standName: data.standName ? data.standName : '', // 中文名称
+ signFlag: data.signFlag ? data.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: '', // 引用标准
+ byybj: '', // 被引用标准
+ glwj: '', // 关联文件
+ xglc: '', // 相关流程
+ chjl: '', // 参会记录
+ } // 标准信息
+ },
+ handleProcessStandardNext(status) {
+ switch (status) {
+ // 新增
+ case 1:
+ this.selectedList = []
+ this.standardCheckedList = []
+ this.standardDrawer = false
+ this.verifySarStandard = true
+ this.clearFormData(this.form)
+ break
+ // 带入
+ case 2:
+ if (this.standardCheckedList.length === 1) {
+ const bringData = this.standardCheckedList[0]
+ bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
+ bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
+ console.log(bringData)
+ const json = Object.assign(bringData, bringData.attrInfoCaseMap);
+ this.form = JSON.parse(JSON.stringify(json))
+ this.defaultCheckedKeys = [this.form.standSystem];
+ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+ this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+ this.form.prcNum = this.prcNum
+ this.form.prcName = this.prcName
+ this.form['id'] = bringData.id
+ this.standardDrawer = false
+ this.verifySarStandard = true
+ } else if (this.standardCheckedList.length > 1) {
+ this.$message.warning('最多可以带入一条标准信息')
+ } else {
+ this.$message.warning('请选择要带入的标准信息')
+ }
+ break
+ // 取消
+ case 3:
+ this.selectedList = []
+ this.standardCheckedList = []
+ this.standardDrawer = false
+ break
+ }
+ },
+ handleStandardPageChange (page) {
+ this.standardSearchForm.page = page
+ this.handleSearchStandard()
+ },
+ handleStandardPageSizeChange (pageSize) {
+ this.standardSearchForm.pageSize = pageSize
+ this.handleSearchStandard()
+ },
+ standSelectChange (data) {
+ this.selectedList = []
+ for (let i = 0; i < data.length; i++) {
+ this.selectedList.push(data[i].id)
+ }
+ this.standardCheckedList = data
+ },
+ handleResetSearch() {
+ this.standardSearchForm.standType = 'INLAND'
+ this.standardSearchForm.standNumber = ''
+ this.standardSearchForm.standSort = ''
+ this.standardSearchForm.standName = ''
+ this.standardSearchForm.standEnName = ''
+ setTimeout(() => {
+ this.handleSearchStandard()
+ }, 100)
+ },
+ /**
+ * 关闭修订 Drawer 的监听
+ * @param done
+ */
+ handleReviseDrawerClose (done) {
+ done()
+ },
+ getDomesticStandardTable () {
+ this.loadSarStandard = true
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.standardSearchForm, {}, res => {
+ this.loadSarStandard = false
+ if (res.ok) {
+ this.tableData.standardData = res.data.list
+ this.standardSearchForm.total = res.data.count
+ }
+ }, e => {
+ this.loadSarStandard = false
+ })
+ },
+ handleSearchStandard () {
+ if (this.form.standType === '') {
+ this.$message.warning('请选择标准来源')
+ } else {
+ this.standardDrawer = true
+ this.$nextTick(() => {
+ // 动态设置表格高度
+ this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+ window.onresize = () => {
+ this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+ }
+ })
+ this.getDomesticStandardTable()
+ }
+ },
saveUserInfo () {
if (this.userType === 'zrUserId') {
this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
@@ -1436,6 +1856,27 @@
this.form.standSystemName = checkedData.menuName
console.log(this.sarStandardsInfoEO.standSystem);
},
+ popoverHideBusVs (checkedIds, checkedData) {
+ console.log(checkedIds);
+ console.log(checkedData);
+ this.form.cycvppsbm = checkedData.code
+ this.form.cycvppscn = checkedData.chineseName
+ console.log(this.sarStandardsInfoEO.standSystem);
+ },
+ popoverHideCarVs (checkedIds, checkedData) {
+ console.log(checkedIds);
+ console.log(checkedData);
+ this.form.kccvppsbm = checkedData.code
+ this.form.kccvppscn = checkedData.chineseName
+ console.log(this.sarStandardsInfoEO.standSystem);
+ },
+ popoverHideModel (checkedIds, checkedData) {
+ console.log(checkedIds);
+ console.log(checkedData);
+ this.form.dybxh = checkedData.model
+ this.form.dymc = checkedData.name
+ console.log(this.sarStandardsInfoEO.standSystem);
+ },
closeDrawer() {
this.ListModel = false
},
@@ -1515,7 +1956,21 @@
this.$message.warning('请检查基础信息表单是否填写完整')
}
})
- }
+ },
+ busVsFunc(){
+ this.$http.get('sarVppsTree/list', '', {
+ _this: this
+ }, res => {
+ this.busVppsOptions = res.data
+ })
+ },
+ modelFunc(){
+ this.$http.get('sarModelTree/list', '', {
+ _this: this
+ }, res => {
+ this.modelOptions = res.data
+ })
+ },
},
mounted () {
this.getTree()
@@ -1535,6 +1990,8 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
})
+ this.busVsFunc()
+ this.modelFunc()
}
}
@@ -1591,4 +2048,24 @@
}
}
}
+ .standard-content {
+ height: 100%;
+ padding: 10px 0 0;
+ .content {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ padding: 0 10px;
+ .standard-table-wrap {
+ flex: auto;
+ overflow-y: auto;
+ }
+ .pagination {
+ position: static;
+ /deep/ .pagination-slot {
+ padding: 0;
+ }
+ }
+ }
+ }
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index f1a9cb9f2..a2db959df 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -24,7 +24,7 @@
-
+
国内标准入库
海外标准入库
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 99355c242..5641ccae3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -24,7 +24,7 @@
-
+
国内标准入库
海外标准入库
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 4c459acc8..daf0be040 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -25,7 +25,7 @@
-
+
国内标准入库
海外标准入库
From fe64b291642a008b4b2dd3f5a03befba2559c9a7 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Thu, 15 Jul 2021 19:38:46 +0800
Subject: [PATCH 3/4] commit
---
.../pages/creatProcess/bzjd/step1.vue | 3 +-
.../pages/creatProcess/bzjd/step2.vue | 186 +++++++++++++-----
.../pages/creatProcess/bzjd/step3.vue | 63 +++++-
3 files changed, 192 insertions(+), 60 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 194ae0752..b6d86c38e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -136,7 +136,7 @@
@@ -526,6 +526,7 @@
},
choiceZRRS (row, type, index) {
if (type === 1) {
+ this.nodeList2 = []
this.zrIndex= index
this.zrType = type
this.nodeList2.push(row)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index e7904ad72..52ddae196 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -9,7 +9,7 @@
-
+
+ 拆分信息
+
+
+ 批量编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
数据获取中
@@ -76,28 +120,29 @@
>
+ ref="tree2">
-
@@ -113,18 +158,22 @@
name: "bzjdStep2",
data() {
return {
- commentText: '',
- taskIds: this.$route.query.taskIds,
- pId: this.$route.query.prcId,
- roleRow: {},
- nodeList: [],
- type: '',
+ zxIndex: '',
+ zxType: '',
+ zxIdList: [],
+ modalshowflag2: false,
+ treeData: [],
+ nodeList2: [],
defaultProps: {
children: 'children',
label: 'name'
},
- treeData: [], // 人员数据
- modalshowflag: false, // drawer开关
+ loading: false,
+ commentText: '',
+ taskIds: this.$route.query.taskIds,
+ pId: this.$route.query.prcId,
+ roleRow: {},
+ type: '',
drawerTitle: '', //drawer标题
textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关
@@ -142,7 +191,8 @@
{ required: true, message: '请选择执行人', trigger: 'change' },
]
},
- json: {}
+ json: {},
+ itemList: []
}
},
components: {
@@ -151,10 +201,37 @@
ProcessTitle
},
methods: {
- saveUserInfo () {
+ drawerCheck2 (data) {
+ var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
+ if(getlist.length == 1) {
+ this.roleRow = getlist[0]
+ }else {
+ this.$refs.tree2.setCheckedKeys([data.id]);
+ this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
+ }
+ },
+ choiceZRRS (row, type, index) {
+ if (type === 1) {
+ this.nodeList2 = []
+ this.zxIndex= index
+ this.zxType = type
+ this.nodeList2.push(row)
+ this.modalshowflag2 = true
+ } else {
+ // 批量
+ if (this.zxIdList.length > 0) {
+ this.zxType = type
+ this.nodeList2 = []
+ this.modalshowflag2 = true
+ } else {
+ this.$message.warning('请选择要编辑的数据')
+ }
+ }
+ },
+ saveUserInfo2 () {
var idList = ''
var nameList = ''
- this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+ this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
@@ -162,19 +239,23 @@
idList += item.id
nameList += item.name
})
- this.form.zxUserId = idList
- this.form.zxUserIdName = nameList
- this.modalshowflag = false
- },
- cancleUserInfo () {
- this.modalshowflag = false
- },
- choiceZRR () {
- this.nodeList = []
- if (this.form.zxUserId.length > 0) {
- this.nodeList = this.form.zxUserId.split(',')
+ if (this.zxType == 1) {
+ this.itemList[this.zxIndex].zxUserId = idList
+ this.itemList[this.zxIndex].zxUserIdName = nameList
+ } else {
+ this.itemList.forEach( item => {
+ this.zxIdList.forEach( items => {
+ if (item.id === items) {
+ item.zxUserId = idList
+ item.zxUserIdName = nameList
+ }
+ })
+ })
}
- this.modalshowflag = true
+ this.modalshowflag2 = false
+ },
+ cancleUserInfo2 () {
+ this.modalshowflag2 = false
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -189,16 +270,8 @@
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
var json = this.json
+ json.itemList = this.itemList
json.commentText = this.commentText
- var arr = this.form.zxUserId.split(',')
- var newArr = []
- arr.forEach(item => {
- var json1 = {}
- json1.id = item
- newArr.push(json1)
- })
- json.zxUserId = newArr
- json.zxUserIdName = this.form.zxUserIdName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -214,6 +287,12 @@
}
})
},
+ handleSelectionChange (val){
+ this.zxIdList = []
+ val.forEach( item => {
+ this.zxIdList.push(item.id)
+ })
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -224,6 +303,13 @@
this.form.number = data.number
this.form.name = data.name
this.json = data
+ var arr = []
+ arr = JSON.parse(data.itemList)
+ arr.forEach(item => {
+ item.zxUserId = ''
+ item.zxUserIdName = ''
+ })
+ this.itemList = arr
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index d0da3fac1..1a0e8ddb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -9,7 +9,7 @@
-
+
+ 拆分信息
+
+
+ 批量编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
数据获取中
@@ -113,6 +154,8 @@
name: "bzjdStep3",
data() {
return {
+ itemList: [],
+ loading: false,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
@@ -151,6 +194,7 @@
ProcessTitle
},
methods: {
+ handleSelectionChange () {},
saveUserInfo () {
var idList = ''
var nameList = ''
@@ -224,6 +268,7 @@
this.form.number = data.number
this.form.name = data.name
this.json = data
+ this.itemList = JSON.parse(data.itemList)
}).catch(e => {
})
})
From 2d933ec9fef7ac28c3a60abc6d9766b4b2e0bb40 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Thu, 15 Jul 2021 19:52:48 +0800
Subject: [PATCH 4/4] commit
---
.../processCenter/pages/creatProcess/bzjd/step2.vue | 9 +++++++++
.../processCenter/pages/creatProcess/bzjd/step3.vue | 6 ------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 52ddae196..0e2f2b4f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -269,6 +269,15 @@
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
+ let b = 0
+ for (let a = 0; a < this.itemList.length; a++) {
+ if (!this.itemList[a].zxUserId) {
+ b++
+ }
+ }
+ if (b > 0) {
+ this.$message.warning('请选择执行人')
+ }
var json = this.json
json.itemList = this.itemList
json.commentText = this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 1a0e8ddb8..cbc3b1ac8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -85,12 +85,6 @@
prop="zrUserIdName"
align="center">
-
-
数据获取中