[update] 联调企标计划立项变更流程

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'),
+  src: url('iconfont.woff2?t=1698661297049') format('woff2'),
-       url('iconfont.woff?t=1694676864246') format('woff'),
+       url('iconfont.woff?t=1698661297049') format('woff'),
-       url('iconfont.ttf?t=1694676864246') format('truetype');
+       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";
 }

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",

src/common/lang/workCenter/en.js

@@ -82,7 +82,8 @@ module.exports = {
     originHeadOfMainDraftingUnit: '原起草单位负责人',
     typeOfRevision: '制修订类型',
     scopeOfApplication: '标准适用范围',
-    pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划'
+    pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划',
+    pleaseSelectLeastTwoExpert: '请至少选择两位专家'
   },
   // 年度制修订计划
   revisionPlanActivelyReport: {

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: '实施日期',

src/components/ProcessDetailList.vue

@@ -56,11 +56,13 @@
 
           <!--附件-->
           <template v-slot:file="{text, record}">
-            <a-tooltip overlay-class-name="tooltip-style">
+            <a v-if="text" @click="fileLook(record)">{{ $t('view') }}</a>
-              <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
-              <div class="table-text can-click-table-text" v-if="text || text === 0" @click="handlePreview(record)">{{ text }}</div>
+            <!--<a-tooltip overlay-class-name="tooltip-style">-->
-              <div v-else class="table-text">{{ global.emptyLine }}</div>
+            <!--  <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>-->
-            </a-tooltip>
+            <!--  <div class="table-text can-click-table-text" v-if="text || text === 0" @click="handlePreview(record)">{{ text }}</div>-->
+            <!--  <div v-else class="table-text">{{ global.emptyLine }}</div>-->
+            <!--</a-tooltip>-->
           </template>
         </j-table>
       </div>
@@ -73,6 +75,7 @@
     </div>
 
     <flow-chart-modal ref="flowChartModal" />
+    <upload-file ref="uploadFile" disabled></upload-file>
   </div>
 </template>
 
@@ -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,
+          width: 120
-          scopedSlots: { customRender: 'projectName' }
         },
         // 附件
         {
@@ -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 () {
     },
     /**

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 暂时没有流程类型字段
+      switch (record.prcType + '') {
-      let path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow'
+        case '7':
-      // switch (record.processType) {
+          path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow'
-      //   case '':
+      }
-      //     path = ''
-      // }
       this.$router.push({
         path: path,
         query: {
           taskName: record.taskName,
-          processId: record.id, // 流程id
           taskId: record.taskId, // 任务id
           processInstanceId: record.processInstanceId // 流程实例id，必须传人员信息右侧表格查询需要用
         }