diff --git a/src/assets/icon/iconfont.css b/src/assets/icon/iconfont.css
index 753b9d24..cf4980ef 100644
--- a/src/assets/icon/iconfont.css
+++ b/src/assets/icon/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4236293 */
- src: url('iconfont.woff2?t=1694676864246') format('woff2'),
- url('iconfont.woff?t=1694676864246') format('woff'),
- url('iconfont.ttf?t=1694676864246') format('truetype');
+ src: url('iconfont.woff2?t=1698661297049') format('woff2'),
+ url('iconfont.woff?t=1698661297049') format('woff'),
+ url('iconfont.ttf?t=1698661297049') format('truetype');
}
.iconfont {
@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-wenjian-tianjia:before {
+ content: "\e68d";
+}
+
.icon-a-iconfontgerenzhongxin1:before {
content: "\e609";
}
diff --git a/src/assets/icon/iconfont.js b/src/assets/icon/iconfont.js
index b9b69fb3..883fc77f 100644
--- a/src/assets/icon/iconfont.js
+++ b/src/assets/icon/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4236293='',function(l){var c=(c=document.getElementsByTagName("script"))[c.length-1],a=c.getAttribute("data-injectcss"),c=c.getAttribute("data-disable-injectsvg");if(!c){var h,i,o,t,e,v=function(c,a){a.parentNode.insertBefore(c,a)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}h=function(){var c,a=document.createElement("div");a.innerHTML=l._iconfont_svg_string_4236293,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(c=document.body).firstChild?v(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=l.document,e=!1,n(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,s())})}function s(){e||(e=!0,o())}function n(){try{t.documentElement.doScroll("left")}catch(c){return void setTimeout(n,50)}s()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_4236293='',function(l){var a=(a=document.getElementsByTagName("script"))[a.length-1],c=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,e,v=function(a,c){c.parentNode.insertBefore(a,c)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_4236293,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?v(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=l.document,e=!1,n(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,s())})}function s(){e||(e=!0,o())}function n(){try{t.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}s()}}(window);
diff --git a/src/assets/icon/iconfont.json b/src/assets/icon/iconfont.json
index fd2b1988..ac8e428c 100644
--- a/src/assets/icon/iconfont.json
+++ b/src/assets/icon/iconfont.json
@@ -5,6 +5,13 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "34115754",
+ "name": "文件-添加",
+ "font_class": "wenjian-tianjia",
+ "unicode": "e68d",
+ "unicode_decimal": 59021
+ },
{
"icon_id": "37368834",
"name": "iconfontgerenzhongxin 1",
diff --git a/src/assets/icon/iconfont.ttf b/src/assets/icon/iconfont.ttf
index 09d7270d..47486fa0 100644
Binary files a/src/assets/icon/iconfont.ttf and b/src/assets/icon/iconfont.ttf differ
diff --git a/src/assets/icon/iconfont.woff b/src/assets/icon/iconfont.woff
index b9de0863..6758b457 100644
Binary files a/src/assets/icon/iconfont.woff and b/src/assets/icon/iconfont.woff differ
diff --git a/src/assets/icon/iconfont.woff2 b/src/assets/icon/iconfont.woff2
index d3cfe4c0..acb6f7be 100644
Binary files a/src/assets/icon/iconfont.woff2 and b/src/assets/icon/iconfont.woff2 differ
diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index 85dd6d5f..44043d82 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -82,7 +82,8 @@ module.exports = {
originHeadOfMainDraftingUnit: '原起草单位负责人',
typeOfRevision: '制修订类型',
scopeOfApplication: '标准适用范围',
- pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划'
+ pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划',
+ pleaseSelectLeastTwoExpert: '请至少选择两位专家'
},
// 年度制修订计划
revisionPlanActivelyReport: {
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 9bf3603b..e5813e46 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -82,7 +82,8 @@ module.exports = {
originHeadOfMainDraftingUnit: '原起草单位负责人',
typeOfRevision: '制修订类型',
scopeOfApplication: '标准适用范围',
- pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划'
+ pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划',
+ pleaseSelectLeastTwoExpert: '请至少选择两位专家'
},
// 年度制修订计划
revisionPlanActivelyReport: {
@@ -146,6 +147,7 @@ module.exports = {
releaseDate: '发布日期',
implementationDate: '实施日期'
},
+ // 企标更改流程
enStandardChange: {
releaseDate: '发布日期',
materialDate: '实施日期',
diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue
index 103af4b0..4c929074 100644
--- a/src/components/ProcessDetailList.vue
+++ b/src/components/ProcessDetailList.vue
@@ -56,11 +56,13 @@
-
- {{ text || text === 0 ? text : global.emptyLine }}
- {{ text }}
- {{ global.emptyLine }}
-
+ {{ $t('view') }}
+ {{ global.emptyLine }}
+
+
+
+
+
@@ -73,6 +75,7 @@
+
@@ -85,6 +88,7 @@ import { downloadFile, getFileAccessHttpUrl, getAction } from '../api/manage.js'
import { previewPdf } from '../utils/previewPdf.js'
import { Base64 } from 'js-base64'
import FlowChartModal from './FlowChartModal.vue'
+import UploadFile from './UploadFile'
// 支持预览的文件后缀
const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'mp3', 'mp4', 'flv']
@@ -93,7 +97,7 @@ const FILE_TYPE_PDF = 'pdf'
export default {
name: 'ProcessDetailList',
- components: { JTable, FlowChartModal },
+ components: { UploadFile, JTable, FlowChartModal },
mixins: [JeroListMixin],
props: {
// 需要有list属性，用于混入里的接口获取
@@ -169,8 +173,7 @@ export default {
{
dataIndex: 'commitText',
title: this.$t('workCenter.processDetail.opinionContent'),
- width: 120,
- scopedSlots: { customRender: 'projectName' }
+ width: 120
},
// 附件
{
@@ -181,7 +184,7 @@ export default {
},
// 状态
{
- dataIndex: 'nameWorkNo',
+ dataIndex: 'finishFlag_dictText',
title: this.$t('status'),
width: 100
}
@@ -203,6 +206,9 @@ export default {
const params = this.getQueryParams()// 查询条件
if (this.$route.query.processInstanceId) {
params.processInstanceId = this.$route.query.processInstanceId
+ } else {
+ // 没有流程实例id，那就是新增，不用查
+ return
}
this.loading = true
getAction(this.url.list, params).then((res) => {
@@ -222,6 +228,10 @@ export default {
this.loading = false
})
},
+ // 附件列的查看点击
+ fileLook (record) {
+ this.$refs.uploadFile.open(record.commitFile)
+ },
handleUrge () {
},
/**
diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue
index eaa90446..4f48a53a 100644
--- a/src/views/workCenter/processCenter/table/TodoList.vue
+++ b/src/views/workCenter/processCenter/table/TodoList.vue
@@ -88,7 +88,7 @@ export default {
title: this.$t('workCenter.processCenter.processNumber'),
align: 'center',
width: 180,
- dataIndex: 'prcNum',
+ dataIndex: 'id',
scopedSlots: { customRender: 'text' }
},
{ // 流程类型
@@ -131,24 +131,23 @@ export default {
url: {
list: '/workCenter/getTodoList'
},
- currentTurnTo: {} // 当前转办
+ currentTurnTo: {}, // 当前转办
+
}
},
methods: {
// 办理
handleTransact (record) {
+ let path = ''
// 跳转到对应流程页面
- // todo 暂时没有流程类型字段
- let path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow'
- // switch (record.processType) {
- // case '':
- // path = ''
- // }
+ switch (record.prcType + '') {
+ case '7':
+ path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow'
+ }
this.$router.push({
path: path,
query: {
taskName: record.taskName,
- processId: record.id, // 流程id
taskId: record.taskId, // 任务id
processInstanceId: record.processInstanceId // 流程实例id，必须传人员信息右侧表格查询需要用
}