布局任务清单

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

@@ -752,4 +752,7 @@ module.exports = {
   notEvaluated:'Not evaluated',
   cannotExceed:'cannot exceed',
   Characters:'Characters',
+  standardInformation:'standardInformation',
+  VirtualList:'VirtualList',
+  importTemplate:'import template',
 }

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

@@ -580,6 +580,7 @@ module.exports = {
   selectDisplayList: '请选择是否列表展示',
   documentSplitDisplay: '文档拆分模块展示',
   VirtualListName: '虚拟清单名称',
+  VirtualList:'虚拟清单',
   listStatus: '清单状态',
   creater: '创建人',
   withdraw: '撤回',
@@ -757,4 +758,6 @@ module.exports = {
   notEvaluated:'未评估',
   cannotExceed:'不能超出',
   Characters:'个字符',
+  standardInformation:'标准信息',
+  importTemplate:'导入模板',
 }

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -138,7 +138,7 @@
                    <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
               </span>
               <span slot="titleName" slot-scope="text,record" :title="text">
-                  {{text && text.length > 20 ? text.slice(0,19)+'...':text}}
+                  {{text && text.length > 10 ? text.slice(0,9)+'...':text}}
               </span>
               <span slot="designDeliverableTemplateName" slot-scope="text,record">
           <span>{{record.designDeliverableType_dictText}}</span><br v-if="record.designDeliverableType_dictText">
@@ -568,7 +568,7 @@
       },
       //模板下载
       handleModule() {
-        downloadFile(this.url.exportTemplate, '模板下载.xls', {})
+        downloadFile(this.url.exportTemplate, this.$t('VirtualList')+this.$t('importTemplate')+'.xls', {})
       },
       //导出
       handleExport() {
@@ -579,7 +579,7 @@
           ids: selectedRowKeys.join(','),
           dummyInventoryBaseId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.$route.query.name + '虚拟清单.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList')+'.zip', query, this.Deselect)
       },
       Deselect() {
         this.selectedRowKeys = []

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

@@ -43,14 +43,57 @@
     <div style="width: 100%">
       <a-table
         ref="table"
+        bordered
         :loading="loading"
         :pagination="false"
         :scroll="{x: true}"
-        rowKey="id"
         :data-source="dataSource"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
+        <div slot="standardInformation" slot-scope="text,result" class="box-left">
+          <div class="content">
+            <a class="box-content">GB-7258-2017</a><br/>
+            <a>及东盟火车大师傅但是</a>
+          </div>
+
+        </div>
+        <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
+          <div class="content">
+            <span class="box-content">1212sdfdsf</span><br/>
+            <span>责任领土</span>
+          </div>
+        </div>
+        <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
+          <div class="content">
+            <span class="box-content">截止时间: 2022-06-01</span><br/>
+            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content-color">待追踪</span>
+          </div>
+        </div>
+        <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
+          <div class="content">
+            <span class="box-content">截止时间: 2022-06-01</span><br/>
+            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content-color">待追踪</span>
+          </div>
+        </div>
+        <div slot="verificationAndConformityconfirmation" slot-scope="text,result" class="box-left">
+          <div class="content">
+            <span class="box-content">截止时间: 2022-06-01</span><br/>
+            <span class="box-content">流程状态: 待审核</span><br/>
+            <span class="box-content-color">待追踪</span>
+          </div>
+        </div>
+        <div slot="CertificationProgress" slot-scope="text,result">
+             <span class="box-content-color">
+                  实验通过
+             </span>
+        </div>
+        <div slot="CurrentProjectStatusEvaluation" slot-scope="text,result">
+          <div class="Current-color">
+            <div class="Current-color-box"></div>
+          </div>
+        </div>
       </a-table>
     </div>
     <certificationDirectory :url="url" ref="certificationDirectoryRef"/>
@@ -59,9 +102,10 @@
 
 <script>
   import certificationDirectory from './certificationDirectory'
+
   export default {
     name: 'TaskList',
-    components:{
+    components: {
       certificationDirectory
     },
     data() {
@@ -70,105 +114,52 @@
           {
             title: this.$t('serialNumber'),
             align: 'center',
-            width: 100,
+            width: 80,
-            fixed: 'left'
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            }
           },
           {
-            title: this.$t('standard'),
+            title: this.$t('standardInformation'),
             align: 'center',
             dataIndex: 'standard',
-            fixed: 'left'
+            scopedSlots: { customRender: 'standardInformation' }
           },
           {
             title: this.$t('areaOfResponsibility'),
             align: 'center',
             dataIndex: 'areaOfResponsibility',
-            fixed: 'left'
+            scopedSlots: { customRender: 'areaOfResponsibility' }
           },
           {
             title: this.$t('confirmationOfDesignConformity'),
-            children: [
+            align: 'center',
-              {
+            dataIndex: 'confirmationOfDesignConformity',
-                title: this.$t('TaskRequirements'),
+            scopedSlots: { customRender: 'confirmationOfDesignConformity' }
-                dataIndex: 'TaskRequirements',
-                align: 'center'
-              },
-              {
-                title: this.$t('Sponsor'),
-                dataIndex: 'Sponsor',
-                align: 'center'
-              },
-              {
-                title: this.$t('TaskCutOffTime'),
-                dataIndex: 'TaskCutOffTime',
-                align: 'center'
-              },
-              {
-                title: this.$t('status'),
-                dataIndex: 'status',
-                align: 'center'
-              }
-            ]
           },
           {
             title: this.$t('PrehomoConfirmation'),
-            children: [
+            align: 'center',
-              {
+            dataIndex: 'PrehomoConfirmation',
-                title: this.$t('TaskRequirements'),
+            scopedSlots: { customRender: 'PrehomoConfirmation' }
-                dataIndex: 'TaskRequirements',
-                align: 'center'
-              },
-              {
-                title: this.$t('Sponsor'),
-                dataIndex: 'Sponsor',
-                align: 'center'
-              },
-              {
-                title: this.$t('TaskCutOffTime'),
-                dataIndex: 'TaskCutOffTime',
-                align: 'center'
-              },
-              {
-                title: this.$t('status'),
-                dataIndex: 'status',
-                align: 'center'
-              }
-            ]
           },
           {
             title: this.$t('verificationAndConformityconfirmation'),
-            children: [
+            align: 'center',
-              {
+            dataIndex: 'verificationAndConformityconfirmation',
-                title: this.$t('TaskRequirements'),
+            scopedSlots: { customRender: 'verificationAndConformityconfirmation' }
-                dataIndex: 'TaskRequirements',
-                align: 'center'
-              },
-              {
-                title: this.$t('Sponsor'),
-                dataIndex: 'Sponsor',
-                align: 'center'
-              },
-              {
-                title: this.$t('TaskCutOffTime'),
-                dataIndex: 'TaskCutOffTime',
-                align: 'center'
-              },
-              {
-                title: this.$t('status'),
-                dataIndex: 'status',
-                align: 'center'
-              }
-            ]
           },
           {
             title: this.$t('CertificationProgress'),
             align: 'center',
+            width: 150,
             dataIndex: 'CertificationProgress',
             scopedSlots: { customRender: 'CertificationProgress' }
           },
           {
             title: this.$t('CurrentProjectStatusEvaluation'),
             align: 'center',
+            width: 150,
             dataIndex: 'CurrentProjectStatusEvaluation',
             scopedSlots: { customRender: 'CurrentProjectStatusEvaluation' }
           }
@@ -177,7 +168,7 @@
         queryParam: {},
         url: {},
         loading: false,
-        dataSource: []
+        dataSource: [{}]
       }
     },
     mounted() {
@@ -254,6 +245,51 @@
     cursor: pointer;
     border-radius: 4px;
   }
+
+  .box-left {
+    float: left;
+    position: relative;
+    left: 50%
+  }
+
+  .content {
+    float: left;
+    position: relative;
+    left: -50%;
+    text-align: left;
+  }
+
+  .box-content {
+    margin-bottom: 8px;
+    display: inline-block;
+  }
+
+  .box-content-color {
+    padding: 6px 14px;
+    box-sizing: border-box;
+    background: #1ABBC4;
+    color: #2F8DF3;
+    border-radius: 4px;
+  }
+
+  .Current-color {
+    display: inline-block;
+    width: 26px;
+    height: 26px;
+    line-height: 32px;
+    text-align: center;
+    background: #fff;
+    border-radius: 50%;
+    border: 1px red solid;
+  }
+
+  .Current-color-box {
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    background: red;
+    border-radius: 50%;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {

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

@@ -603,7 +603,7 @@
     methods: {
       ...mapGetters(['userInfo']),
       handleModule() {
-        downloadFile(this.url.exportTemplate, '模板下载.xls', {})
+        downloadFile(this.url.exportTemplate, this.$t('listOfRegulations') + this.$t('importTemplate') + '.xls', {})
       },
       handleExport() {
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -613,7 +613,7 @@
           ...this.queryParamQuery,
           projectLibraryId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.$route.query.projectName + '法规清单.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect)
       },
       //复制
       copyClick() {