Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master

src/components/task/mounTaskComponents/auditNoticeTab.vue

@@ -860,9 +860,13 @@
         let unit = this.allUnits.find(
           (item) => item.unitId === this.document.enterpriseId
         )
-        let documenName = this.getDocumentType({
-          documentId: this.document.documentId,
-        })
+        this.costDocumentTemplateFiles = this.costDocumentTemplateFiles.filter(
+          (row) => row.pinyin !== 'ChengBenXiangMu' && row.pinyin !== 'XingCi'
+        )
+        let document = this.documentData.documentTypes.find(
+          (item) => item.id == row.documentId
+        )
+        let documenName = document.documentTypeName || documentName || ''
         this.costDocumentTemplateFiles.forEach((item) => {
           if (item.pinyin.includes('BeiJianShenDanWei')) {
             item.dataValue = unit.unitName

src/components/task/mounTaskComponents/index.js

@@ -160,15 +160,10 @@ export const taskMixin = {
             },
           },
           {
-            prop: 'userName',
+            prop: 'mainUserName',
             label: '办理人员',
             minWidth: 100,
             align: 'left',
-            formatter: (row) => {
-              return row.mainUserName
-                ? row.mainUserName + ',' + row.userName || ''
-                : row.userName || ''
-            },
           },
 
           {

src/components/task/mounTaskComponents/workflowTab.vue

@@ -293,13 +293,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="16" style="margin-top: 10px">
-        <el-col :span="12">
-          办理人员：{{
-            detailRow.mainUserName
-              ? detailRow.mainUserName + ',' + detailRow.userName || ''
-              : detailRow.userName || '-'
-          }}
-        </el-col>
+        <el-col :span="12">办理人员：{{ detailRow.mainUserName }}</el-col>
       </el-row>
       <el-row :gutter="16" style="margin-top: 10px">
         <el-col :span="24">办理意见：{{ detailRow.actRemarks || '-' }}</el-col>

src/components/task/taskComponents/workflowTab.vue

@@ -294,7 +294,7 @@
       </el-row>
       <el-row :gutter="16" style="margin-top: 10px">
         <el-col :span="24">
-          办理人员：{{ detailRow.actUserNames || '-' }}
+          办理人员：{{ detailRow.mainUserName || '-' }}
         </el-col>
       </el-row>
       <el-row :gutter="16" style="margin-top: 10px">
@@ -421,7 +421,7 @@
             },
           },
           {
-            prop: 'actUserNames',
+            prop: 'mainUserName',
             label: '办理人员',
             minWidth: 150,
             align: 'left',

src/views/costAudit/auditInfo/auditManage/auditDocumentsMain.vue

@@ -835,9 +835,13 @@
         let unit = this.allUnits.find(
           (item) => item.unitId === this.document.enterpriseId
         )
-        let documenName = this.getDocumentType({
-          documentId: this.document.documentId,
-        })
+        this.costDocumentTemplateFiles = this.costDocumentTemplateFiles.filter(
+          (row) => row.pinyin !== 'ChengBenXiangMu' && row.pinyin !== 'XingCi'
+        )
+        let document = this.documentData.documentTypes.find(
+          (item) => item.id == row.documentId
+        )
+        let documenName = document.documentTypeName || documentName || ''
         this.costDocumentTemplateFiles.forEach((item) => {
           if (item.pinyin.includes('BeiJianShenDanWei')) {
             item.dataValue = unit.unitName

src/views/costAudit/auditInfo/auditManage/taskDetail.vue

@@ -363,7 +363,7 @@
               width="80"
             />
             <el-table-column
-              prop="handler"
+              prop="mainUserName"
               label="办理人员"
               align="center"
               width="120"

src/views/costAudit/baseInfo/statistics/components/auditNoticeTab.vue

@@ -860,9 +860,13 @@
         let unit = this.allUnits.find(
           (item) => item.unitId === this.document.enterpriseId
         )
-        let documenName = this.getDocumentType({
-          documentId: this.document.documentId,
-        })
+        this.costDocumentTemplateFiles = this.costDocumentTemplateFiles.filter(
+          (row) => row.pinyin !== 'ChengBenXiangMu' && row.pinyin !== 'XingCi'
+        )
+        let document = this.documentData.documentTypes.find(
+          (item) => item.id == row.documentId
+        )
+        let documenName = document.documentTypeName || documentName || ''
         this.costDocumentTemplateFiles.forEach((item) => {
           if (item.pinyin.includes('BeiJianShenDanWei')) {
             item.dataValue = unit.unitName

src/views/costAudit/projectInfo/auditTaskManage/taskCustomizedRelease/auditNoticeTab.vue

@@ -722,9 +722,13 @@
         let unit = this.allUnits.find(
           (item) => item.unitId === this.document.enterpriseId
         )
-        let documenName = this.getDocumentType({
-          documentId: this.document.documentId,
-        })
+        this.costDocumentTemplateFiles = this.costDocumentTemplateFiles.filter(
+          (row) => row.pinyin !== 'ChengBenXiangMu' && row.pinyin !== 'XingCi'
+        )
+        let document = this.documentData.documentTypes.find(
+          (item) => item.id == row.documentId
+        )
+        let documenName = document.documentTypeName || documentName || ''
         this.costDocumentTemplateFiles.forEach((item) => {
           if (item.pinyin.includes('BeiJianShenDanWei')) {
             item.dataValue = unit.unitName