diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 78cdfd35b..d8f30a6fe 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -12,10 +12,10 @@
{{ item.label }}
@@ -40,42 +40,26 @@
{{ !child.value || child.value === 'null' ? '-' : child.value }} {{ child.value || '-' }}

@@ -290,55 +274,55 @@ || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'"> {{ file.oldFileName }} - + 上传时间:{{ dateFormat(file.modifyTime) }}

- - - - - - + + + + + +
{{ !child.value || child.value === 'null' ? '-' : child.value }} {{ child.value || '-' }}

@@ -388,20 +372,20 @@ || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'"> {{ file.oldFileName }} - + - + 上传时间:{{ dateFormat(file.modifyTime) }} @@ -409,26 +393,27 @@

标准分解单 @@ -450,12 +435,12 @@
@@ -464,10 +449,10 @@ @@ -481,10 +466,10 @@
+ v-model="standItemSearch.XCXSSRQ" + type="date" + value-format="yyyy-MM-dd" + placeholder="新车实施日期">
@@ -492,29 +477,29 @@
+ v-model="standItemSearch.ZCCSSRQ" + type="date" + value-format="yyyy-MM-dd" + placeholder="在产车实施日期">
+ :loading="searching" + icon="el-icon-search" + type="primary" + size="mini" + class="common-button-primary" + @click="searchSarStandItems"> + class="common-button-default" + icon="el-icon-refresh-left" + @click="clearAllSearch" + size="mini"> @@ -527,53 +512,53 @@ 导出 关联条款
+ @selection-change="selectAllStand"> + show-overflow-tooltip + align="center" + prop="comparedWithPrevious" + label="基于上一版本差异" + width="150"> + prop="xccssrq" + label="新车型实施日期(文本)" + width="180"> + prop="zccssrq" + label="在产车实施日期(文本)" + width="170"> + prop="responsibleUnit" + label="责任部门"> + prop="dutyEngineer" + label="责任工程师" + width="100"> + show-overflow-tooltip + label="符合性状态" + width="100"> + show-overflow-tooltip + prop="complianceState" + label="合规性分析" + width="100"> diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index c38f276c2..1626963b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -287,6 +288,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 6d8361871..00767eaed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -266,6 +267,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 75e5877e6..b57526027 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -306,6 +307,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index d644b0050..54bebf7ab 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -290,6 +291,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 1c4e90e8d..ca9b26a70 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -287,6 +288,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 121eab04b..7df9e4741 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -287,6 +288,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 581a7d366..1b6a68ca8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -48,6 +48,7 @@
{{ item.fileName }} + 下载
@@ -287,6 +288,9 @@ export default { ProcessTitle }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue index 5b2b323fb..1503278e3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue @@ -15,7 +15,7 @@ 隐藏基础信息 展开基础信息
+ + + + + + + + + + + + + + +
@@ -360,7 +381,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process"; export default { name: "xmpgStep1-7", @@ -373,6 +394,11 @@ export default { return { //折叠的标志,true为折叠,false为不折叠 foldFormFlag: false, + nodeList:[], + drawerTitle:'', + isTransfer: false, + // 调整处理人抽屉状态 + drawerModal: false, detailData: [], sarProStateTableHeight: null, // 项目列表高度 // 当前流程类型(1待办/2已办) @@ -451,6 +477,47 @@ export default { foldForm() { this.foldFormFlag = !this.foldFormFlag }, + //确认转办 + checkedTransferRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res => { + this.isTransfer = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.$router.push("/processCenter"); + this.processNum() + } else { + this.$message.warning(res.message) + } + }) + }, + // 请求转换流程图 + processNum (row) { + axios.request({ + url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), + responseType: 'blob', + method: 'get', + params: { + prcNum: this.$route.query.prcNum + } + }).then(res => { + // let blob = new Blob([res.data], {type: 'image/jpg'}) + // let url = window.URL.createObjectURL(res.data) + this.processStep = window.URL.createObjectURL(res.data) + }) + }, + //转办事件 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row + }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, @@ -517,35 +584,31 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { - 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.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; - this.listForm.dataList = this.dataList - const json = JSON.stringify(this.listForm); - this.isSubmit = true - 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') - } - this.isSubmit = false - }, e => { + 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.standId = this.listForm.standId; + this.listForm.fenFlag = "1"; + this.listForm.dataList = this.dataList + const json = JSON.stringify(this.listForm); + this.isSubmit = true + 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') + } + this.isSubmit = false + }, e => { - }); - } + }); }, //标准表格选择框改变 selectStandChange(data) { @@ -580,7 +643,6 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 54453b4f5..5ec52be90 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -113,7 +113,7 @@ @selection-change="selectStandChange" height="56%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> + fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 07eff91c6..63016166a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -113,7 +113,7 @@ @selection-change="selectStandChange" height="55%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> + fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } > diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 04a2c6d9b..4a07183ba 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -113,7 +113,7 @@ @selection-change="selectStandChange" height="55%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> + fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 3d8169ec3..f5258a732 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -111,9 +111,9 @@ style="width: 100%" border @selection-change="selectStandChange" - height="55%" + height="52%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> + fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index ba3f729f0..6b92f296e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -49,7 +49,7 @@ height="70%" border :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold'}" > .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 42ee80131..4342f13f5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -49,7 +49,7 @@ height="70%" border :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold'}" > .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 6129cbca3..17a656598 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -49,7 +49,7 @@ height="70%" border :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold'}" > .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index f5ba8d935..0cea001ee 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -49,7 +49,7 @@ height="70%" border :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold'}" > .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index d5d1f6c90..59fd39824 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -56,7 +56,7 @@ border @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold'}" > .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index d0f81fbdf..709a05580 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -49,7 +49,7 @@ height="70%" border :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold'}" > .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 4c1f58735..84550855c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -49,7 +49,7 @@ height="70%" border :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold'}" > .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index af43983f0..761e6fadf 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -49,7 +49,7 @@ height="70%" border :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" + fontWeight: 'bold'}" > .cell{ + font-size: 12px; + } + /deep/.el-table thead.is-group th{ + padding: 0px; + } } diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 0118fab41..a11b88d1f 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -28,14 +28,17 @@

- - {{ file.name }} - - +

+
+ {{ file.name }} + 下载 +
+
+ -

@@ -222,6 +225,9 @@ export default { } }, methods: { + downloadFile (attId) { + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({