-
-
- - +
- +
-
更多链接> @@ -19,36 +19,7 @@ export default { mixins: [], data() { return { - linkList: [ - { - newWebSite: 'http://www.sac.gov.cn/', - webName: '国家标准化管理委员会' - }, - { - newWebSite: 'http://std.samr.gov.cn/', - webName: '全国标准公共服务平台' - }, - { - newWebSite: 'http://www.catarc.org.cn/', - webName: '全国汽车标准化技术委员会' - }, - { - newWebSite: 'http://jtst.mot.gov.cn/news/', - webName: '交通运输标准化信息平台' - }, - { - newWebSite: 'http://www.miit-eidc.org.cn/', - webName: '工信部装备工业发展中心' - }, - { - newWebSite: 'http://www.mee.gov.cn/', - webName: '中华人民共和国生态环境部' - }, - // { - // newWebSite: '', - // webName: '更多链接>' - // } - ] + linkList: [], } }, computed: {}, @@ -67,13 +38,14 @@ export default { window.open('https://' + linkUri) } }, + // 获取链接数据 getLink () { - this.$http.get('sarUrl/tsUrl', {}, { + this.$http.get('sarUrl/tsUrl', { + }, { _this: this, loading: 'Loading' }, res=> { - this.data = res.data - console.log(data); + this.linkList = res.data }) } }, diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue index bb698179b..72814cde8 100644 --- a/src/pages/home1/components/todoList/index.vue +++ b/src/pages/home1/components/todoList/index.vue @@ -50,7 +50,6 @@ export default { this.$router.push(this.path) }, dealWith (row) { // 办理 - this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType switch(prcType) { case '1': diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index d58302118..e7c97df17 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -110,12 +110,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.standNameSplit }}
+ {{ scope.row.standName }}
+
+
+
+
+ {{ scope.row.standNumSplit }}
+ {{ scope.row.showNumber }}
+
+ 基础信息
-
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
@@ -39,19 +38,91 @@
clearable
>
-
+
+
+
+
+
+
+
+
+
@@ -76,28 +147,29 @@
>
+ ref="tree2">
-
@@ -113,18 +185,23 @@
name: "bzjdStep2",
data() {
return {
- commentText: '',
- taskIds: this.$route.query.taskIds,
- pId: this.$route.query.prcId,
- roleRow: {},
- nodeList: [],
- type: '',
+ sarType: '',
+ 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, // 新增编辑抽屉开关
@@ -132,17 +209,11 @@
isSubmit: false,
saveLoading: false,
form: {
- number: '', // 编号
- name: '', // 结束日期
- zxUserId: '',
- zxUserIdName: ''
+ number: '',
+ name: '',
},
- formRules: {
- zxUserId: [
- { required: true, message: '请选择执行人', trigger: 'change' },
- ]
- },
- json: {}
+ json: {},
+ itemList: []
}
},
components: {
@@ -151,10 +222,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 +260,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=> {
@@ -188,17 +290,18 @@
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
- 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 +317,12 @@
}
})
},
+ handleSelectionChange (val){
+ this.zxIdList = []
+ val.forEach( item => {
+ this.zxIdList.push(item.id)
+ })
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -223,7 +332,17 @@
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
+ this.form.number1 = data.number1
+ this.form.name1 = data.name1
+ this.sarType = data.standInData
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..16e4c64d7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -2,18 +2,17 @@
- 标准征求意见流程
- 对接人选择责任人
+ 标准解读流程
+ 填写解读分析
基础信息
-
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
@@ -39,19 +38,171 @@
clearable
>
-
+
+
+
+
+
+
+
+
+
@@ -76,26 +227,61 @@
>
-
-
-
+
+
@@ -48,7 +48,7 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
是
@@ -125,6 +145,7 @@
prop="code"
fixed="left"
width="180px"
+ align="center"
label="标准号">
@@ -182,7 +207,7 @@
-
+
+
+
+
+
+
+
@@ -233,6 +271,50 @@
+
+
+
@@ -617,6 +726,16 @@ export default {
},
data() {
return {
+ fileUrl: 'api/att/attFile/upload',
+ fileMadel: false,
+ searching: false,
+ // 查询相关参数
+ sarSarAccessEOSearch: {
+ countryArea: "",
+ detailedListName: "",
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent
+ },
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
@@ -686,7 +805,9 @@ export default {
listName: "", //清单名称
applyRegion: "", //适用区域
descriptionList: "", //清单说明
- fileId: "", //附件
+ fileId:'',
+ model: '', // 上传模板
+ modelName: '',
standId: "", //选择的清单的id
signFlag: "1", //是否会签 1为会签 2为不会签
inforlist: "", //用来存放标准列表的标准id
@@ -756,10 +877,13 @@ export default {
},
// //判断当前选中的是哪个清单
selectionList(type) {
+ type = this.listType
+ console.log(type);
if (type === "project") {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
pageSize: this.pageSize,
+ ...this.sarSarAccessEOSearch,
sortKey: 2
}, {
_this: this
@@ -772,6 +896,7 @@ export default {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
pageSize: this.pageSize,
+ ...this.sarSarAccessEOSearch,
sortKey: 3
}, {
_this: this
@@ -780,10 +905,11 @@ export default {
this.total = res.data.total;
}, e => {
});
- } else {
+ } else if(type === 'country') {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
pageSize: this.pageSize,
+ ...this.sarSarAccessEOSearch,
sortKey: 1
}, {
_this: this
@@ -794,13 +920,23 @@ export default {
});
}
},
+ clearSearch() {
+ this.sarSarAccessEOSearch = {
+ countryArea: "",
+ detailedListName: ""
+ };
+ this.selectionList();
+ },
//点击添加事件
addList() {
- this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+ this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+ page: this.pageNo,
+ pageSize: this.pageSizeNo
+ }, {
_this: this
}, res => {
this.standardData = res.data.list;
- this.totalNo = res.data.pageCount
+ this.totalNo = res.data.count
}, e => {
});
this.standModel = true;
@@ -856,12 +992,12 @@ export default {
},
//提交事件
handleSubmit() {
- // let json = this.listForm;
- let json = Object.assign(this.listForm, this.roleForm)
- json.zrUserId = this.$store.getters.userInfo.userId;
- json.jlUserId = this.$store.getters.userInfo.userId;
+ let json = this.listForm;
+ // let json = Object.assign(this.listForm, this.roleForm)
+ json.zrUserId = this.roleForm.dockUser; //会签人
+ json.jlUserId = this.roleForm.directorUser; //业务经理
// (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
- json.applyUpdUserId = this.$store.getters.userInfo.userId;
+ json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
json.approvalOpinion = "";
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -900,23 +1036,92 @@ export default {
},
// 删除上传的文件
delFileInfo(file, fileList) {
- // this.fileInfoList = fileList
+ this.fileInfoList = fileList
},
- // 上传文件成功回调
- uploadBackSuccess(res, file, fileList) {
- // if (res.ok) {
- // this.fileInfoList = fileList
- // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
- // this.$message.success('上传成功')
- // } else {
- // this.$message.error(res.message)
- // fileList.pop()
- // }
+ fileUpload () {
+ this.fileMadel = true
},
- //上传之前的钩子
- beforeUpload() {
-
+ // 点击查看
+ handlePreview (item) {
+ let routeUrl = this.$router.resolve({
+ name: 'OtherStandardDetails',
+ params: {
+ id: item.id,
+ pageType: 'INLAND_STAND'
+ }
+ })
+ window.open(routeUrl.href, '_blank')
},
+ // 导入标准数据成功后执行
+ importFileSuccess (response, file) {
+ if (response.ok) {
+ this.fileMadel = false
+ this.listForm.model = response.data.id
+ this.listForm.modelName = response.data.name
+ this.$message({
+ showClose: true,
+ message: response.message,
+ type: 'success'
+ })
+ }
+ },
+ // 导入按钮 上传之前的钩子
+ beginImportFile (file) {
+ var filename = file.name
+ var index1 = filename.lastIndexOf('.')
+ var index2 = filename.length
+ var fileSuffix = filename.substring(index1, index2)
+ // const fileSuffix = file.name.split('.')[1] // 后缀名
+ // 判断上传文件格式
+ if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+ || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+ || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' ||
+ fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.ppt'
+ || fileSuffix === '.pptx'|| fileSuffix === '.xls'|| fileSuffix === '.xlsx'
+ || fileSuffix === '.png'|| fileSuffix === '.jpg'|| fileSuffix === '.jpeg') {
+ return true
+ } else {
+ this.spinShow = false
+ this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+ return false
+ }
+ // 判断文件上传大小
+ // eslint-disable-next-line no-unreachable
+ if (file.size / 1024 / 1024 <= 200) {
+ return true
+ } else {
+ this.$message.error('文件' + file.name + '大小不超过200M')
+ return false
+ }
+ return true
+ },
+ // beginImportFile (file) {
+ // var filename = file.name
+ // var index1 = filename.lastIndexOf('.')
+ // var index2 = filename.length
+ // var fileSuffix = filename.substring(index1, index2)
+ // // const fileSuffix = file.name.split('.')[1] // 后缀名
+ // // 判断上传文件格式
+ // // 判断上传文件格式
+ // if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+ // || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+ // || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+ // return true
+ // } else {
+ // this.spinShow = false
+ // this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+ // return false
+ // }
+ // // 判断文件上传大小
+ // // eslint-disable-next-line no-unreachable
+ // if (file.size / 1024 / 1024 <= 200) {
+ // return true
+ // } else {
+ // this.$message.error('文件' + file.name + '大小不超过200M')
+ // return false
+ // }
+ // return true
+ // },
//选择清单取消事件
closeDrawer() {
this.ListModel = false;
@@ -1026,7 +1231,7 @@ export default {
this.selectionList();
},
pageChangeNo(page){
- this.page = page
+ this.pageNo = page
this.addList()
},
pageSizeChangeNo(pageSize){
@@ -1123,7 +1328,11 @@ export default {
}
}
}
-
+ .add-form-el-select{
+ /deep/ .el-select{
+ width: 210px;
+ }
+ }
.demo-drawer-content {
margin-top: 10px;
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index f6de56f6f..af82808bd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -9,7 +9,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -113,36 +299,33 @@
name: "bzjdStep3",
data() {
return {
+ plForm: {
+ technicalRequir: '', // 核心技术要求
+ changePoint: '', // 国内标准的差异点
+ complianceRequir: '1', // 符合性要求
+ complianceState: '', // 合规性分析
+ newData: '', // 新车型实施日期
+ onlineData: '', // 在产车实施日期
+ },
+ modalshowflag: false,
+ sarType: '',
+ itemList: [],
+ loading: false,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
- roleRow: {},
- nodeList: [],
- type: '',
- defaultProps: {
- children: 'children',
- label: 'name'
- },
- treeData: [], // 人员数据
- modalshowflag: false, // drawer开关
- drawerTitle: '', //drawer标题
textarea: '', // 意见
- ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
form: {
- number: '', // 编号
- name: '', // 结束日期
- zxUserId: '',
- zxUserIdName: ''
+ number: '',
+ name: '',
+ number1: '',
+ name1: ''
},
- formRules: {
- zxUserId: [
- { required: true, message: '请选择执行人', trigger: 'change' },
- ]
- },
- json: {}
+ json: {},
+ idList: []
}
},
components: {
@@ -152,33 +335,40 @@
},
methods: {
saveUserInfo () {
- var idList = ''
- var nameList = ''
- this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
- if (nameList.length > 0) {
- nameList += ','
- idList += ','
+ for( let a = 0; a < this.itemList.length; a++) {
+ for ( let b = 0; b < this.idList.length; b++) {
+ if (this.itemList[a].id === this.idList[b]) {
+ this.itemList[a].technicalRequir = this.plForm.technicalRequir
+ this.itemList[a].changePoint = this.plForm.changePoint
+ this.itemList[a].complianceRequir = this.plForm.complianceRequir
+ this.itemList[a].complianceState = this.plForm.complianceState
+ this.itemList[a].newData = this.plForm.newData
+ this.itemList[a].onlineData = this.plForm.onlineData
+ }
}
- 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.idList.length > 0) {
+ this.plForm.technicalRequir = ''
+ this.plForm.changePoint = ''
+ this.plForm.complianceRequir = '1'
+ this.plForm.complianceState = ''
+ this.plForm.newData = ''
+ this.plForm.onlineData = ''
+ this.modalshowflag = true
+ } else {
+ this.$message.warning('请选择要编辑的数据')
}
- this.modalshowflag = true
},
- getTree () {
- this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
- this.treeData = res.data
+ handleSelectionChange (val) {
+ this.idList = []
+ val.forEach( item => {
+ this.idList.push(item.id)
})
},
handleTabs(name) {
@@ -188,27 +378,53 @@
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
- var json = this.json
- 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,
- userId: this.$store.getters.userInfo.userId
- }, {}, res => {
- if (res.success) {
- this.$message.success('提交成功')
- this.$router.push('/processCenter')
+ let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0
+ for (let a = 0; a < this.itemList.length; a++) {
+ if (!this.itemList[a].technicalRequir) {
+ num1++
}
- })
+ if (!this.itemList[a].changePoint) {
+ num2++
+ }
+ if (!this.itemList[a].complianceRequir) {
+ num3++
+ }
+ if (!this.itemList[a].newData) {
+ num4++
+ }
+ if (!this.itemList[a].onlineData) {
+ num5++
+ }
+ }
+ if (num1 > 0) {
+ this.$message.warning('请输入核心技术要求')
+ } else if (num2 > 0) {
+ if (this.sarType === 'INLAND') {
+ this.$message.warning('请输入国内标准的差异点')
+ } else {
+ this.$message.warning('请输入基于上一版本差异')
+ }
+ } else if (num3 > 0) {
+ this.$message.warning('请输入符合性要求')
+ } else if (num4 > 0) {
+ this.$message.warning('请输入新车型实施日期')
+ } else if (num5 > 0) {
+ this.$message.warning('请输入在产车实施日期')
+ } else {
+ var json = this.json
+ json.commentText = this.commentText
+ json.itemList = this.itemList
+ this.$http.post('lawss/activiti/completeTask', {
+ json: JSON.stringify(json),
+ taskId: this.taskIds,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success('提交成功')
+ this.$router.push('/processCenter')
+ }
+ })
+ }
} else {
return this.$message.warning('请完善基础信息')
}
@@ -223,14 +439,29 @@
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
+ this.form.number1 = data.number1
+ this.form.name1 = data.name1
+ this.sarType = data.standInData
this.json = data
+ const itemList = JSON.parse(data.itemList)
+ itemList.forEach(item => {
+ item.unitDeptName = this.$store.getters.userInfo.orgName
+ item.onlineData = ''
+ item.newData = ''
+ item.complianceState = ''
+ item.oldNumber = ''
+ item.complianceRequir = '1'
+ item.changePoint = ''
+ item.technicalRequir = ''
+ item.itemsTitle = item.itermsConditions
+ })
+ this.itemList = itemList
}).catch(e => {
})
})
},
},
mounted () {
- this.getTree()
this.getData()
}
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 51fa5d16e..3e40ba328 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -1,13 +1,364 @@
-
+
+
+
+ 标准解读流程
+ 责任人审核
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index e5703d7c0..72c8cca77 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -1,13 +1,364 @@
-
+
+
+ 基础信息
+
+
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 符合
+ 不符合
+
+ {{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}
+
+ {{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}
+
+
+
+
+
+
+
+
+ 标准解读流程
+ 工程师审核
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 15b0a36dd..93d7edd9b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -1,13 +1,365 @@
-
+
+
+ 基础信息
+
+
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 符合
+ 不符合
+
+ {{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}
+
+ {{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}
+
+
+
+
+
+
+
+
+ 标准解读流程
+ 部长审批
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 06705c639..a3b48f73e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -39,7 +39,7 @@
clearable
>
-
+
+ 基础信息
+
+
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 符合
+ 不符合
+
+ {{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}
+
+ {{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}
+
+
+
+
+
+
+ {{ listForm.modelName }}
+
+
+
点击上传
-
-
会签人
@@ -195,6 +220,19 @@会签人
+
+
+
+
+
+
+
- 未发布
- 已发布
+ 未发布
+ 已发布
+ 审核中
- 未发布
- 已发布
+ 未发布
+ 已发布
+ 审核中
- 未发布
- 已发布
+ 未发布
+ 已发布
+ 审核中
@@ -598,6 +689,24 @@
取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
+ 点击或拖拽上传文件
+基础信息
审批历史
+
基础信息
@@ -53,15 +53,15 @@
clearable
>
-
+
@@ -135,7 +135,7 @@
-
+
@@ -175,7 +175,7 @@
-
+
{
+ console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -363,6 +364,9 @@ export default {
this.listForm['id'] = item.id
this.listForm.dataList = item.dataList
this.dataList = item.dataList
+ this.listForm.applyUpdUserId = item.applyUpdUserId
+ this.listForm.jlUserId = item.jlUserId
+ this.listForm.zrUserId = item.zrUserId
})
},
@@ -373,10 +377,11 @@ export default {
},
//提交事件
handleSubmit() {
+ this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+ this.listForm.zrUserId = this.listForm.zrUserId;
+ this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index f98995dff..691b0232f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -9,7 +9,7 @@
-
基础信息
审批历史
+
基础信息
@@ -51,9 +51,9 @@
clearable
>
-
+
@@ -139,7 +139,7 @@
-
+
基础信息
-
审批历史
+
基础信息
@@ -53,16 +53,16 @@
clearable
>
-
+
@@ -136,7 +136,7 @@
-
+
{
+ console.log(res.data);
this.sarAccessListDatas = res.data.list;
- this.total = res.pageCount;
+ this.total = res.data.count;
}, e => {
});
}
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 635db2de4..81daee6cb 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -613,7 +613,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '4') {
+ } else if (row.taskInfo === '责任人审核') {
this.$router.push({
name: 'bzjdStep4',
query: {
@@ -624,7 +624,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '5') {
+ } else if (row.taskInfo === '工程师审核') {
this.$router.push({
name: 'bzjdStep5',
query: {
@@ -635,7 +635,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '6') {
+ } else if (row.taskInfo === '部长审批') {
this.$router.push({
name: 'bzjdStep6',
query: {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 98aed73cb..138c08178 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -285,7 +285,6 @@ export default {
detailedListName: ""
};
this.searchSarAccess();
-
},
// 新增相关
openModal(row, optType) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index db8cb5e14..16f7f8735 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -12,36 +12,36 @@
@@ -49,27 +49,27 @@
-
+
点击上传
@@ -89,77 +89,77 @@
+ type="primary"
+ class="common-button-primary"
+ size="small"
+ @click="searchLawsStands">
查询
清空
+ class="common-button-default"
+ size="small"
+ @click="clearSearchLaws">清空
@@ -172,122 +172,116 @@
+ prop="code"
+ fixed="left"
+ width="180px"
+ label="标准号">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ prop="issueTime"
+ sortable
+ label="发布日期">
+ prop="xcxssrq"
+ sortable
+ label="新车型实施日期">
+ show-overflow-tooltip
+ prop="zccssrq"
+ sortable
+ label="在产车实施日期">
+ show-overflow-tooltip
+ prop="textStatus"
+ width="120px"
+ label="文本状态">
+ type="selection"
+ width="55"
+ align="center">
+ prop="countryArea"
+ label="国家/地区"
+ align="center">
+ prop="detailedListName"
+ label="清单名称"
+ align="center">
+ prop="modifyTime"
+ label="更新时间"
+ align="center">
+ prop="uname"
+ label="更新人"
+ align="center">
清单条目
+ type="selection"
+ width="55"
+ align="center">
+ width="180px"
+ fixed="left"
+ label="标准号">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ prop="issueTime"
+ sortable
+ label="发布日期">
+ prop="xcxssrq"
+ sortable
+ label="新车型实施日期">
+ show-overflow-tooltip
+ prop="zccssrq"
+ sortable
+ label="在产车实施日期">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ show-overflow-tooltip
+ prop="textStatus"
+ width="120px"
+ label="文本状态">
上移
下移
@@ -455,13 +393,13 @@
+
{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
@@ -1071,30 +1009,29 @@ export default {
*/
addSarAccess () {
//判断是否是清单类型
- if (this.selectedAccInfoSearchList.length > 0) {
- // 追加字段
- this.selectedAccInfoSearchList.map(item => {
- let addList;
- addList = this.sarAccessInfoList.findIndex(items => {
- return items.id == item.id
- })
- if(addList > -1){
- this.$message.warning('请勿添加重复数据')
- this.$refs.accessTypeSelect.clearSelection()
- this.$refs.entryTable.clearSelection()
- this.$refs.searchTable.clearSelection()
- } else{
- this.sarAccessInfoList.push(item)
- this.$refs.accessTypeSelect.clearSelection()
- this.$refs.entryTable.clearSelection()
- this.$refs.searchTable.clearSelection()
- }
+ if (this.selectedAccInfoSearchList.length > 0) {
+ // 追加字段
+ this.selectedAccInfoSearchList.map(item => {
+ let addList;
+ addList = this.sarAccessInfoList.findIndex(items => {
+ return items.id == item.id
})
- } else {
- this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
- }
+ if(addList > -1){
+ this.$message.warning('请勿添加重复数据')
+ this.$refs.accessTypeSelect.clearSelection()
+ this.$refs.entryTable.clearSelection()
+ this.$refs.searchTable.clearSelection()
+ } else{
+ this.sarAccessInfoList.push(item)
+ this.$refs.accessTypeSelect.clearSelection()
+ this.$refs.entryTable.clearSelection()
+ this.$refs.searchTable.clearSelection()
+ }
+ })
+ } else {
+ this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+ }
},
-
// 上移 事件
moveUp (index, row) {
if (index === 0) {
@@ -1136,36 +1073,35 @@ export default {
* 删除不想添加的AccessInfo信息
*/
deleteSelectSarAccessInfo () {
- if (this.sarAccessInfoListArry.length > 0) {
- this.$confirm('确认删除选中数据？', '确认删除', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- confirmButtonClass: 'common-button-primary',
- roundButton: true,
- type: 'warning'
- }).then(() => {
- // i 全部对象数组的下标
- // s 选中对象数组的下标
- for (var s in this.sarAccessInfoListArry) {
- for (var i in this.sarAccessInfoList) {
- if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
- this.sarAccessInfoList.splice(i, 1)
- }
+ if (this.sarAccessInfoListArry.length > 0) {
+ this.$confirm('确认删除选中数据？', '确认删除', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ confirmButtonClass: 'common-button-primary',
+ roundButton: true,
+ type: 'warning'
+ }).then(() => {
+ // i 全部对象数组的下标
+ // s 选中对象数组的下标
+ for (var s in this.sarAccessInfoListArry) {
+ for (var i in this.sarAccessInfoList) {
+ if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
+ this.sarAccessInfoList.splice(i, 1)
}
}
- this.sarAccessInfoListArry = []
- this.$refs.entryTable.clearSelection()
- }).catch(() => {})
- } else {
- this.$message.error('请选择需要删除的清单条目!')
- }
+ }
+ this.sarAccessInfoListArry = []
+ this.$refs.entryTable.clearSelection()
+ }).catch(() => {})
+ } else {
+ this.$message.error('请选择需要删除的清单条目!')
+ }
},
// 清单条目 table select事件
sarAccessInfoSelect (selectData) {
this.sarAccessInfoListArry = selectData
let sarAccessInfoListArryId = []
for(let i=0; i {
if (valid) {
- let rowlist = []
- for (let i = 0; i < this.sarAccessInfoList.length; i++) {
- rowlist.push(this.sarAccessInfoList[i].id)
- }
- rowlist = rowlist.join(',')
- let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
- sarAccessEO.inforlist = JSON.stringify(rowlist)
- sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
- sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
- // 判断是否有附件
- if (this.fileInfoList.length > 0) {
- let relateFile = []
- this.fileInfoList.map(item => {
- relateFile.push(item.id)
- })
- sarAccessEO.relateFile = relateFile.join(',')
- }
- if (!sarAccessEO.id) {
- // 新增
- sarAccessEO.state = '1'
- sarAccessEO.version = 0
- this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
- _this: this,
- loading: 'loadData'
- }, res => {
- if (res.ok) {
- this.isNext = true
- this.$router.push({
- name: 'AccessStandardsAndRegulations'
- })
- }
- }, e => {
- })
- } else {
- // 编辑
- this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
- _this: this,
- loading: 'loadData'
- }, res => {
- if (res.ok) {
- this.isNext = true
- this.$router.push({
- name: 'AccessStandardsAndRegulations'
- })
- }
- }, e => {
- })
- }
+ let rowlist = []
+ for (let i = 0; i < this.sarAccessInfoList.length; i++) {
+ rowlist.push(this.sarAccessInfoList[i].id)
+ }
+ rowlist = rowlist.join(',')
+ let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+ sarAccessEO.inforlist = JSON.stringify(rowlist)
+ sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+ sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+ // 判断是否有附件
+ if (this.fileInfoList.length > 0) {
+ let relateFile = []
+ this.fileInfoList.map(item => {
+ relateFile.push(item.id)
+ })
+ sarAccessEO.relateFile = relateFile.join(',')
+ }
+ if (!sarAccessEO.id) {
+ // 新增
+ sarAccessEO.state = '1'
+ sarAccessEO.version = 0
+ this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+ _this: this,
+ loading: 'loadData'
+ }, res => {
+ if (res.ok) {
+ this.isNext = true
+ this.$router.push({
+ name: 'AccessStandardsAndRegulations'
+ })
+ }
+ }, e => {
+ })
+ } else {
+ // 编辑
+ this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+ _this: this,
+ loading: 'loadData'
+ }, res => {
+ if (res.ok) {
+ this.isNext = true
+ this.$router.push({
+ name: 'AccessStandardsAndRegulations'
+ })
+ }
+ }, e => {
+ })
+ }
}else {
this.$message.error('请检查表单是否填写正确')
}
@@ -1236,10 +1172,8 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
_this: this
}, res =>{
- console.log(res.data.list);
this.sarAccessInfoSearchList = res.data.list
}, e => {
-
})
},
// 数据搜索table判断checked状态
@@ -1261,7 +1195,6 @@ export default {
this.sarAccessInfoSearch.page = this.drawerPage
this.selectLawsStands()
},
-
// 数据搜索table分页条数改变回调
drawerPageSizeChange () {
this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
@@ -1279,7 +1212,7 @@ export default {
if (this.sarAccessInfoListArry.length > 0) {
exportList = this.sarAccessInfoListArry
} else {
- exportList = this.sarAccessInfoList
+ exportList = this.sarAccessInfoList
}
if (exportList != null && exportList.length > 0) {
let accIdAndrestype = []
@@ -1331,8 +1264,8 @@ export default {
}
if (response.data.length > 0) {
for (let i = 0; i < response.data.length; i++) {
- this.sarAccessInfoList.push(response.data[i])
- }
+ this.sarAccessInfoList.push(response.data[i])
+ }
}
a = response.data.length
}
@@ -1384,25 +1317,25 @@ export default {
// 请求部门结构树
getOrgTreeSource () {
this.$http.get('sys/org/getTree', {}, {_this: this},
- res => {
- if (res.ok) {
- let treeNode = []
- res.data.map((item, index) => {
- let treeItem = {}
- for (let key in item) {
- if (key === 'orgName') {
- treeItem.name = item[key]
- } else {
- treeItem[key] = item[key]
+ res => {
+ if (res.ok) {
+ let treeNode = []
+ res.data.map((item, index) => {
+ let treeItem = {}
+ for (let key in item) {
+ if (key === 'orgName') {
+ treeItem.name = item[key]
+ } else {
+ treeItem[key] = item[key]
+ }
}
- }
- treeNode[index] = treeItem
- })
- this.depNode = treeNode
- this.depFONode = treeNode
- this.depRoleNode = treeNode
- }
- })
+ treeNode[index] = treeItem
+ })
+ this.depNode = treeNode
+ this.depFONode = treeNode
+ this.depRoleNode = treeNode
+ }
+ })
},
// 新增提交事件
saveOrUpdateStands () {
@@ -1440,18 +1373,18 @@ export default {
nowstandinfo.askNature = nowstandinfo.askNature.join(',')
// 判断新增还是编辑
if (this.editAddType === 1) {
- this.sarAccessInfoList.push(nowstandinfo)
- this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number
- this.number++
+ this.sarAccessInfoList.push(nowstandinfo)
+ this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number
+ this.number++
this.isSubmit = false
this.$message.success('添加成功')
} else {
- this.sarAccessInfoList.map((item, index) => {
- if (item.uuid === nowstandinfo.uuid) {
- // this.sarAccessInfoList[index] = nowstandinfo
- this.$set(this.sarAccessInfoList, index, nowstandinfo)
- }
- })
+ this.sarAccessInfoList.map((item, index) => {
+ if (item.uuid === nowstandinfo.uuid) {
+ // this.sarAccessInfoList[index] = nowstandinfo
+ this.$set(this.sarAccessInfoList, index, nowstandinfo)
+ }
+ })
this.isSubmit = false
this.$message.success('编辑成功')
}
@@ -1537,17 +1470,17 @@ export default {
getAddFormFieldList (ruKu) {
return new Promise((resolve, reject) => {
this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this},
- res => {
- if (res.ok) {
- // const { data: { STAND: data } } = res
- const { data = {} } = res
- this.formFieldListData = data[ruKu] || []
- // this.resolveFormFieldList()
- resolve()
- }
- }, e => {
- reject(e)
- })
+ res => {
+ if (res.ok) {
+ // const { data: { STAND: data } } = res
+ const { data = {} } = res
+ this.formFieldListData = data[ruKu] || []
+ // this.resolveFormFieldList()
+ resolve()
+ }
+ }, e => {
+ reject(e)
+ })
})
},
resolveFormFieldList (isEdit) {
@@ -1645,11 +1578,11 @@ export default {
// 新增、编辑标准时验证标准编号是否重复
validCode (rule, value, callback) {
let find = 0
- this.sarAccessInfoList.map(item => {
- if (item.code === value) {
- find++
- }
- })
+ this.sarAccessInfoList.map(item => {
+ if (item.code === value) {
+ find++
+ }
+ })
if (find > 1 && this.editAddType === 2) {
return callback(new Error('标准编号已存在'))
} else if (find > 0 && this.editAddType === 1) {
@@ -1683,7 +1616,6 @@ export default {
let askTypeName = this.askNatureOptions.filter(item => {
return val.indexOf(item.value) > -1
}).map(item => item.label)
-
return askTypeName.join(',')
},
onChecked () {
@@ -1697,10 +1629,8 @@ export default {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
_this: this
}, res => {
- console.log(res.data);
this.sarAccessInfoList = res.data
}, e => {
-
})
}
},
@@ -1775,67 +1705,67 @@ export default {
}
+ .el-tag {
+ margin: 2px;
+ }
+}
+
\ No newline at end of file
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index b2d956dcc..72c7cc762 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1777,9 +1777,7 @@ export default {
})
},
popoverHide (checkedIds, checkedData) {
- console.log(checkedData)
this.sarStandardsInfoEO.standSystem = checkedData.id
- console.log(this.sarStandardsInfoEO.standSystem);
},
closeModal () {
this.productModal = false
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessFooter.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessFooter.vue
new file mode 100644
index 000000000..7afe67ada
--- /dev/null
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessFooter.vue
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessHeader.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessHeader.vue
new file mode 100644
index 000000000..c48fa575c
--- /dev/null
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessHeader.vue
@@ -0,0 +1,89 @@
+
+
+
-
-
- 数据获取中
-
-
+
+
+ 数据获取中
+
+
+
@@ -227,7 +225,7 @@
-
-
+.demo-drawer-content {
+ margin-top: 10px;
+}
+
\ No newline at end of file
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 2f0b17269..67456cdbd 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -204,7 +204,11 @@
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessTitle.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessTitle.vue
new file mode 100644
index 000000000..30951677b
--- /dev/null
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessTitle.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+ 流程中心 ——
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index e0e122a87..8fe0f3fb0 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1460,28 +1460,6 @@ export default {
this.reletionSelectNum = []
this.showModelRelation = false
},
- // 删除
- handleDelete (row) {
- this.$confirm('此操作将永久删除这条数据, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- confirmButtonClass: 'common-button-primary',
- roundButton: true,
- type: 'warning'
- }).then(() => {
- this.$http.post('lawss/sarProductInfo/deleteLocalProducts',
- {
- ids: row.id
- }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.getLocalProductTable()
- }
- })
- }).catch(() => {
- })
- },
// 分页点击后方法
pageChange (page) {
this.localProTableSearch.page = page
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 4783a3960..221351fb2 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -9,216 +9,214 @@
-
- 产品平台: {{ localProEO.projectPlatfor}}
- 项目编号: {{ localProEO.projectNumber }}
- 项目名称: {{ localProEO.projectName }}
-
- 项目分类:{{ localProEO.projectClassification }}
-
-
- 项目状态: {{ localProEO.projectStatus }}
- 项目群: {{ localProEO.projectGroup }}
- 当前节点: {{ localProEO.currentNode }}
- 项目级别: {{ localProEO.projectLevel }}
-
-
- 项目经理: {{ localProEO.projectManager }}
- 项目计划开始时间: {{ localProEO.projectStartDate}}
- 项目计划完成时间: {{localProEO.projectEndDate }}
-
+
+ 产品平台: {{ localProEO.projectPlatfor}}
+ 项目编号: {{ localProEO.projectNumber }}
+ 项目名称: {{ localProEO.projectName }}
+
+ 项目分类:{{ localProEO.projectClassification }}
+
+
+ 项目状态: {{ localProEO.projectStatus }}
+ 项目群: {{ localProEO.projectGroup }}
+ 当前节点: {{ localProEO.currentNode }}
+ 项目级别: {{ localProEO.projectLevel }}
+
+
+ 项目经理: {{ localProEO.projectManager }}
+ 项目计划开始时间: {{ localProEO.projectStartDate}}
+ 项目计划完成时间: {{localProEO.projectEndDate }}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.eopPutTime !== null && scope.row.eopPutTime !== 'N/A' && scope.row.eopPutTime !== 'TBD'
- && scope.row.eopPutTime !== '已实施' ? $moment(scope.row.eopPutTime).format('YYYY-MM-DD') : scope.row.eopPutTime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- 
-
-
-
-
-
- 
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.standSortShow }} {{ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
+ {{ scope.row.standSortShow }}
+ {{ scope.row.standNumber }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 导出
+ 导出
取消