修改文档详情的查看文件时的标准分解单

jero-web/src/common/lang/en-us.js

@@ -656,5 +656,10 @@ module.exports = {
   dehicleDevelopmentPlan: 'Vehicle development plan',
   certificationProgram: 'certificationProgram',
   DocumentStandard: 'Document standard',
-  standardName:'标准名称',
+  standardName: 'standard Name',
+  initiateListConfirmation: 'Initiate list confirmation',
+  initiateTaskConfirmation: 'Initiate task confirmation',
+  alteration: 'alteration',
+  fixedPlate: 'Fixed plate',
+  taskAffirmStatus: 'task Affirm Status'
 }

jero-web/src/common/lang/zh-cn.js

@@ -660,5 +660,10 @@ module.exports = {
   dehicleDevelopmentPlan: '整车开发计划',
   certificationProgram: '认证计划',
   DocumentStandard: '文档标准',
-  standardName:'Standard name',
+  standardName: '标准名称',
+  initiateListConfirmation: '发起清单确认',
+  initiateTaskConfirmation:'发起任务确认',
+  alteration:'变更',
+  fixedPlate:'定版',
+  taskAffirmStatus:'任务发布状态',
 }

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -222,6 +222,35 @@
         </span>
       </a-table>
     </a-modal>
+    <a-modal
+      :title="'查看文件'"
+      :width="600"
+      :visible="visibleFile"
+      :maskClosable="false"
+      @ok="visibleFile = false"
+      @cancel="visibleFile = false"
+    >
+      <a-table
+        class="table"
+        :columns="columnsFile"
+        :pagination="false"
+        :scroll="{x:500,y: 400}"
+        :data-source="dataSourceFile"
+        :loading="loading"
+      >
+        <span slot="fileOperation" slot-scope="record">
+          <a class="text" @click="pdfPreview(record)">
+                {{$t('See')}}
+          </a>
+          <a class="text" @click="download(record)">
+                {{$t('download')}}
+          </a>
+          <a class="text" @click="breakdown(record)">
+                {{$t('StandardBreakdown')}}
+          </a>
+        </span>
+      </a-table>
+    </a-modal>
     <uploadFile ref="uploadFile" :isUploadFile="true" :disabled="true"></uploadFile>
   </div>
 </template>
@@ -241,15 +270,31 @@
           getInfo: 'document/bussDocumentLibraryEO/getInfoById',
           list: 'log/bussLogEO/page'
         },
+        visibleFile: false,
         columnsRelated: [
           {
-            title: '标准名称',
+            title: this.$t('standardName'),
             dataIndex: 'title',
             align: 'center',
             ellipsis: true,
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        columnsFile: [
+          {
+            title: this.$t('fileName'),
+            dataIndex: 'fileName',
+            align: 'center',
+            width: 260,
+            ellipsis: true
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            width: 130,
+            scopedSlots: { customRender: 'fileOperation' }
+          }
+        ],
         dataSourceRelated: [],
         detailList: [],
         visible: false,
@@ -261,6 +306,7 @@
         pageSize: 10,
         total: 0,
         visibleRelated: false,
+        dataSourceFile: [],
         columns: [
           {
             title: this.$t('ModificationContent'),
@@ -300,13 +346,15 @@
         })
       },
       clickButtonToUpload(item) {
-        this.$refs.uploadFile.perentHandleFunc()
+        this.loading = true
-        this.$refs.uploadFile.visible = true
+        this.visibleFile = true
         getAction('sys/common/getFileInfos', { id: item.join(',') }).then((res) => {
           if (res.success) {
-            this.$refs.uploadFile.perentHandleFunc(res.result)
+            this.dataSourceFile = res.result
+            this.loading = false
           } else {
-            this.$refs.uploadFile.perentHandleFunc()
+            this.dataSourceFile = []
+            this.loading = false
           }
         })
       },

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -29,6 +29,10 @@
             <a-icon type="container"/>
             任务参数收集
           </div>
+          <div class="Virtual-detail-left-text" @click="textClick(4,'未符合项')">
+            <a-icon type="container"/>
+            未符合项
+          </div>
         </div>
         <div class="Virtual-detail-right">
           <ProjectDetailsName v-if="textTitle === '项目详情'"/>

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -25,7 +25,7 @@
         </a-col>
         <a-col :md="6" :sm="8">
           <div class="box-title-text">
-            <div class="title-text" :title="$t('subtitle')">
+            <div class="title-text" style="width: 44px" :title="$t('subtitle')">
               <span>{{$t('subtitle')}}</span>
             </div>
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
@@ -41,13 +41,25 @@
       </a-row>
     </div>
     <div class="table-operator">
-      <div style="float: left;margin-bottom: 19px">
+      <div style="float: left;margin-bottom: 19px;margin-left: 20px">
-        <a-icon type="solution" title="发起清单确认" class="operator-text-left"/>
+        <div class="operator-text">
-        <a-icon type="file-protect" title="发起任务确认" class="operator-text-left"/>
+          <a-icon type="solution"/>
-        <a-icon type="file-search" title="变更" class="operator-text-left"/>
+          {{$t('initiateListConfirmation')}}
-        <a-icon type="bulb" title="定板" class="operator-text-left"/>
         </div>
-      <div style="float: right;margin-top: 4px">
+        <div class="operator-text">
+          <a-icon type="file-protect"/>
+          {{$t('initiateTaskConfirmation')}}
+        </div>
+        <div class="operator-text">
+          <a-icon type="file-search"/>
+          {{$t('alteration')}}
+        </div>
+        <div class="operator-text">
+          <a-icon type="bulb"/>
+          {{$t('fixedPlate')}}
+        </div>
+      </div>
+      <div style="float: right;margin-top: 1px">
         <div class="operator-text" v-has="'document:importZip'">
           <ImportFile :url="url"/>
         </div>
@@ -95,8 +107,8 @@
               </span>
       </a-table>
     </div>
-    <listAddModel ref="addModelRef"/>
+    <listAddModel :url="url" ref="addModelRef"/>
-    <listEditModel ref="editModelRef"/>
+    <listEditModel :url="url" ref="editModelRef"/>
   </a-card>
 </template>
 
@@ -104,6 +116,7 @@
   import ImportFile from '@/components/ImportFile/index'
   import listAddModel from './listAddModel'
   import listEditModel from './listEditModel'
+  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
 
   export default {
     name: 'listOfRegulations',
@@ -118,14 +131,17 @@
           {
             title: 'WVTA ID',
             align: 'center',
-            dataIndex: 'WVTAID',
+            dataIndex: 'wvtaId',
             width: 100,
+            ellipsis: true,
             fixed: 'left'
           },
           {
             title: this.$t('standard'),
             align: 'center',
-            dataIndex: 'standard',
+            dataIndex: 'serialNumber',
+            width: 180,
+            ellipsis: true,
             fixed: 'left'
           },
           {
@@ -133,6 +149,7 @@
             align: 'center',
             dataIndex: 'title',
             width: 100,
+            ellipsis: true,
             fixed: 'left'
           },
           {
@@ -140,84 +157,102 @@
             align: 'center',
             dataIndex: 'subtitle',
             width: 100,
+            ellipsis: true,
             fixed: 'left'
           },
-          {
+          // {
-            title: this.$t('taskReleaseStatus'),
+          //   title: this.$t('taskReleaseStatus'),
-            align: 'center',
+          //   align: 'center',
-            dataIndex: 'taskReleaseStatus'
+          //   dataIndex: 'taskReleaseStatus'
-          },
+          // },
           {
             title: this.$t('correspondingStandard'),
             align: 'center',
+            ellipsis: true,
             dataIndex: 'correspondingStandard'
           },
           {
             title: this.$t('implementationCategory'),
             align: 'center',
-            dataIndex: 'implementationCategory'
+            ellipsis: true,
+            dataIndex: 'implementType'
           },
           {
             title: this.$t('ImplementationDate'),
             align: 'center',
-            dataIndex: 'ImplementationDate'
+            ellipsis: true,
+            dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1'
           },
           {
             title: this.$t('vehicleInProductionDate'),
             align: 'center',
-            dataIndex: 'vehicleInProductionDate'
+            ellipsis: true,
+            dataIndex: 'implementTime'
           },
           {
             title: this.$t('certificationType'),
             align: 'center',
-            dataIndex: 'certificationType'
+            ellipsis: true,
+            dataIndex: 'attestationType_dictText'
           },
           {
             title: this.$t('certificationLevel'),
             align: 'center',
-            dataIndex: 'certificationLevel'
+            ellipsis: true,
+            dataIndex: 'attestationRank_dictText'
           },
+          //
           {
             title: this.$t('areaOfResponsibility'),
             align: 'center',
-            dataIndex: 'areaOfResponsibility'
+            ellipsis: true,
+            dataIndex: 'dutyTerritory_dictText'
           },
           {
             title: this.$t('regulatoryEngineer'),
             align: 'center',
-            dataIndex: 'regulatoryEngineer'
+            ellipsis: true,
+            dataIndex: 'regulationOwnerName'
+          },
+          {
+            title: this.$t('certifiedEngineer'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'homologationEngineerName'
           },
           {
             title: this.$t('engineeringInterfacePerson'),
             align: 'center',
-            dataIndex: 'engineeringInterfacePerson'
+            ellipsis: true,
+            dataIndex: 'engineeringInterfacePersonName'
           },
           {
             title: this.$t('remarks'),
             align: 'center',
-            dataIndex: 'remarks'
+            ellipsis: true,
+            dataIndex: 'remark'
           },
           {
             title: this.$t('confirmationOfDesignConformity'),
             children: [
               {
-                title: this.$t('task'),
+                title: this.$t('Deliverables'),
-                dataIndex: 'task',
+                dataIndex: 'designDeliverableTemplate',
                 align: 'center'
               },
               {
                 title: this.$t('Sponsor'),
-                dataIndex: 'Sponsor',
+                dataIndex: 'designInitiator',
                 align: 'center'
               },
               {
                 title: this.$t('personLiable'),
-                dataIndex: 'personLiable',
+                dataIndex: 'designDuty',
                 align: 'center'
               },
               {
                 title: this.$t('TaskCutOffTime'),
-                dataIndex: 'TaskCutOffTime',
+                dataIndex: 'designDueDate',
                 align: 'center'
               }
             ]
@@ -226,23 +261,23 @@
             title: this.$t('PrehomoConfirmation'),
             children: [
               {
-                title: this.$t('task'),
+                title: this.$t('Deliverables'),
-                dataIndex: 'task',
+                dataIndex: 'prehomoDeliverableTemplate',
                 align: 'center'
               },
               {
                 title: this.$t('Sponsor'),
-                dataIndex: 'Sponsor',
+                dataIndex: 'prehomoInitiator',
                 align: 'center'
               },
               {
                 title: this.$t('personLiable'),
-                dataIndex: 'personLiable',
+                dataIndex: 'prehomoDuty',
                 align: 'center'
               },
               {
                 title: this.$t('TaskCutOffTime'),
-                dataIndex: 'TaskCutOffTime',
+                dataIndex: 'prehomoDueDate',
                 align: 'center'
               }
             ]
@@ -251,27 +286,33 @@
             title: this.$t('verificationAndConformityconfirmation'),
             children: [
               {
-                title: this.$t('task'),
+                title: this.$t('Deliverables'),
-                dataIndex: 'task',
+                dataIndex: 'verifyDeliverableTemplate',
                 align: 'center'
               },
               {
                 title: this.$t('Sponsor'),
-                dataIndex: 'Sponsor',
+                dataIndex: 'verifyInitiator',
                 align: 'center'
               },
               {
                 title: this.$t('personLiable'),
-                dataIndex: 'personLiable',
+                dataIndex: 'verifyDuty',
                 align: 'center'
               },
               {
                 title: this.$t('TaskCutOffTime'),
-                dataIndex: 'TaskCutOffTime',
+                dataIndex: 'verifyDueDate',
                 align: 'center'
               }
             ]
           },
+          {
+            title: this.$t('taskAffirmStatus'),
+            align: 'center',
+            ellipsis: true,
+            dataIndex: 'taskAffirmStatusName'
+          },
           {
             title: this.$t('operation'),
             align: 'center',
@@ -282,12 +323,19 @@
         ],
         selectedRowKeys: [],
         queryParam: {},
-        url: {},
+        url: {
+          list: '/project/projectLawsInventoryEO/list',
+          add: 'project/projectLawsInventoryEO/add',
+          edit: '/project/projectLawsInventoryEO/edit',
+          deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
+          deleteOne: '/project/projectLawsInventoryEO/delete'
+        },
         loading: false,
         dataSource: []
       }
     },
     mounted() {
+      this.getList()
     },
     methods: {
       handleModule() {
@@ -306,22 +354,70 @@
         this.$refs.addModelRef.addModel()
       },
       handleDel() {
-        this.$refs.editModelRef.editModel()
+        if (this.selectedRowKeys.length > 0) {
+          let _this = this
+          this.$confirm({
+            content: _this.$t('ConfirmBatchDeletion'),
+            onOk() {
+              let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+              deleteAction(_this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {
+                if (res.success) {
+                  _this.$message.success(_this.$t('OperationSuccessful'))
+                  _this.selectedRowKeys = []
+                  _this.getList()
+                } else {
+                  _this.$message.warning(_this.$t('operationFailed'))
+                }
+              })
+            }
+          })
+        } else {
+          this.$message.warning(this.$t('selectLeastOne'))
+        }
       },
-      edit() {
+      edit(item) {
-
+        this.$refs.editModelRef.editModel(JSON.parse(JSON.stringify(item)))
       },
-      deleteLib() {
+      deleteLib(val) {
-
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            deleteAction(_this.url.deleteOne, { id: val.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.getList()
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+              }
+            })
+          }
+        })
       },
-      onSelectChange() {
+      onSelectChange(value) {
-
+        this.selectedRowKeys = value
       },
       searchQuery() {
-
+        this.getList()
       },
       searchReset() {
-
+        this.queryParam = {}
+        this.getList()
+      },
+      getList() {
+        let query = {
+          ...this.queryParam,
+          projectLibraryId: this.$route.query.id
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
       }
     }
   }
@@ -398,15 +494,14 @@
   }
 
   .title-text {
-    width: 20%;
+    width: 32px;
-    min-width: 110px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
     font-size: 14px;
     margin-right: 16px;
     margin-top: 3px;
-    text-align: right;
+    text-align: left;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;