diff --git a/src/assets/images/shangqi/img/mechanism.png b/src/assets/images/shangqi/img/mechanism.png new file mode 100644 index 000000000..1b352cf29 Binary files /dev/null and b/src/assets/images/shangqi/img/mechanism.png differ diff --git a/src/assets/images/shangqi/img/personnel.png b/src/assets/images/shangqi/img/personnel.png new file mode 100644 index 000000000..02b17a844 Binary files /dev/null and b/src/assets/images/shangqi/img/personnel.png differ diff --git a/src/assets/images/shangqi/img/process1.png b/src/assets/images/shangqi/img/process1.png new file mode 100644 index 000000000..47e17ec65 Binary files /dev/null and b/src/assets/images/shangqi/img/process1.png differ diff --git a/src/assets/images/shangqi/img/process2.png b/src/assets/images/shangqi/img/process2.png new file mode 100644 index 000000000..d6aab687e Binary files /dev/null and b/src/assets/images/shangqi/img/process2.png differ diff --git a/src/assets/images/shangqi/img/process3.png b/src/assets/images/shangqi/img/process3.png new file mode 100644 index 000000000..2790a3d42 Binary files /dev/null and b/src/assets/images/shangqi/img/process3.png differ diff --git a/src/assets/images/shangqi/img/process4.png b/src/assets/images/shangqi/img/process4.png new file mode 100644 index 000000000..8ca436b95 Binary files /dev/null and b/src/assets/images/shangqi/img/process4.png differ diff --git a/src/assets/images/shangqi/img/process5.png b/src/assets/images/shangqi/img/process5.png new file mode 100644 index 000000000..48bbb5a63 Binary files /dev/null and b/src/assets/images/shangqi/img/process5.png differ diff --git a/src/assets/images/shangqi/img/process6.png b/src/assets/images/shangqi/img/process6.png new file mode 100644 index 000000000..b29f37c35 Binary files /dev/null and b/src/assets/images/shangqi/img/process6.png differ diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index 34d3fea50..32e75bb19 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -909,3 +909,4 @@ tr.el-table__row{ .button-list { padding: 5px 0px; } + diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 0a4ecebb4..322ac2238 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -255,7 +255,7 @@ export default { uploadSuccess(res, file, fileList) { if (res.ok) { // this.value += res.data.id + ',' - this.$emit('input', this.value + res.data.id + ',') + this.$emit('input', this.value ? this.value + ',' : this.value+ res.data.id + ',') this.$emit('success') this.$message({ message: '文件上传成功', diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index fa5a0597e..d2603ea18 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -5,7 +5,7 @@ :visible.sync="isVisible2" :wrapperClosable="false" @close="handleTreeDrawerCancel" - size="800px"> + size="400px"> + + + {{ node.label }} + + + + {{ node.label }} +
@@ -297,7 +296,7 @@ export default { saveLoading: false, //表单的数据 listForm: { - BZFlag: " ", //1审批通过 其他为驳回 + jgFlag: " ", //1审批通过 其他为驳回 projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 @@ -359,42 +358,50 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.BZFlag = "2"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.jgFlag = "2"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.BZFlag = "1"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); - } + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.jgFlag = "1"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 19cfdb36d..5ab76b5c5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -359,42 +358,50 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.BZFlag = "2"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.gcFlag = "2"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.BZFlag = "1"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); - } + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.gcFlag = "1"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 3ac149a2f..320976806 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -4,34 +4,165 @@

标准法规管理流程
-
标准调研流程
-
标准入库流程
-
标准征求意见流程
- - -
标准清单发布/更新流程
-
项目合规评估流程-标准
-
项目合规评估流程-项目
-
未符合项整改流程
-
标准解读流程
+ + +
+
+
+ +
+
+
标准入库流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
标准调研流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
标准征求意见流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
标准清单发布/更新流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
项目合规评估流程-标准
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
未符合项整改流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
标准解读流程
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ + + + +
+
+
+ +
+
+
项目合规评估流程-项目
+
+
+
+
+ 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。 +
+
+ +

政策管理流程
-

企标管理流程
-

工作组会议管理流程
-
@@ -42,10 +173,28 @@ export default { name: 'NewProcess', data () { return { - type: '' + type: '', + size: true } }, methods: { + getImg (num) { + var url = '' + if (num == 0) { + url = require('@/assets/images/shangqi/img/process1.png') + } else if (num == 1) { + url = require('@/assets/images/shangqi/img/process2.png') + } else if (num == 2) { + url = require('@/assets/images/shangqi/img/process3.png') + } else if (num == 3) { + url = require('@/assets/images/shangqi/img/process4.png') + } else if (num == 4) { + url = require('@/assets/images/shangqi/img/process5.png') + } else if (num == 5) { + url = require('@/assets/images/shangqi/img/process6.png') + } + return url + }, // 新建流程 handleCreateProcess (prcType) { this.$store.commit('setDetailMap', this.$route.path) @@ -176,6 +325,12 @@ export default { } }, mounted () { + let width = document.body.clientWidth + if (width > 1900) { + this.size = true + } else { + this.size = false + } this.type = this.$route.params.type } } @@ -186,17 +341,81 @@ export default { //height: 100%; padding: 15px 15px 0; background: #ffffff; + /deep/.el-card__body { + padding: 0; + } + .el-card { + margin: 25px; + border-radius: 10px; + } + .card-box { + .card-top { + width: 100%; + background: #2d8cf0; + height: 120px; + display: flex; + justify-content: space-between; + .card-top-left { + img { + margin: 10px; + width: 100px; + height: 100px; + } + } + .card-top-right { + width: 200px; + .card-top-right-text { + margin: 40px 0 5px 0; + color: #e6e6e6; + font-size: 18px; + } + .card-top-right-line { + height: 3px; + width: 200px; + background: #e6e6e6; + } + } + } + .card-bottom { + width: calc(~'100% - 60px'); + color: #c1c1c1; + margin: 10px 30px; + line-height: 20px; + font-size: 14px; + height: 100px; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 5; + overflow: hidden; + } + } + .card-box:hover { + .card-top { + .card-top-right { + .card-top-right-text { + color: rgb(247, 186, 42); + } + .card-top-right-line { + background: rgb(247, 186, 42); + } + } + } + .card-bottom { + color: #2d8cf0; + } + } .process-box{ margin-left: -5px; margin-right: -5px; padding-top: 20px; padding-bottom: 20px; .process-name{ - width: 260px; - padding: 10px 0; + width: 300px; + padding: 40px 0; margin-bottom: 10px; text-align: center; border: 1px dashed #ddd; + border-radius: 5px; background: #fdfdfd; font-size: 18px; font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif; @@ -205,6 +424,12 @@ export default { margin-left: 5px; margin-right: 5px; } + .process-name:hover { + transform:translateY(-5px); + border: 1px dashed #2d8cf0; + background: #c6e2ff; + color: #2d8cf0; + } } } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 8d81c22bc..853fa1c92 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -973,8 +973,8 @@ export default { return false } // 判断文件上传大小 - if (file.size / 1024 / 1024 > 300) { - this.$message.warning('文件' + file.name + '大小不能超过300M') + if (file.size / 1024 / 1024 > 200) { + this.$message.warning('文件' + file.name + '大小不能超过200M') return false } return true @@ -1403,7 +1403,7 @@ export default { this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) } }) - this.drawerTotal = res.data.list.length + 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 df8f46aec..52da71b0b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1369,7 +1369,7 @@ export default { this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) } }) - this.drawerTotal = res.data.list.length + 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 fc4bc99ef..4dfcc1846 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1368,7 +1368,7 @@ export default { this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) } }) - this.drawerTotal = res.data.list.length + this.drawerTotal = res.data.count }, e => { }) }, diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index a4a42d0cf..59bd2bd9f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -995,7 +995,8 @@