修改参数清单变更扩展

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

@@ -601,7 +601,8 @@ module.exports = {
   selectSplitListDisplay: 'Please select whether to split the document list for display',
   selectDisplayList: 'Please select whether to display in list',
   documentSplitDisplay: 'Document splitting module display',
-  VirtualListName: 'Market Regulation List',
+  VirtualListName: 'Market Regulation List Name',
+  marketCertificationListName:'Market Certification List Name',
   CertificationListName:'Homologation List',
   listStatus: 'List Status',
   creater: 'Created by',
@@ -1925,4 +1926,5 @@ module.exports = {
   processInitiationOne:'Process Initiation',
   taskHandlingOne:'Task Handling',
   taskReview:'Task Review',
+  maintenanceTemplate:'Maintenance template',
 }

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

@@ -612,6 +612,7 @@ module.exports = {
   selectDisplayList: '请选择是否列表展示',
   documentSplitDisplay: '文档拆分模块展示',
   VirtualListName: '市场法规清单名称',
+  marketCertificationListName: '市场认证清单名称',
   CertificationListName: '认证清单名称',
   VirtualList: '市场清单',
   listStatus: '清单状态',
@@ -3881,4 +3882,5 @@ module.exports = {
   processInitiationOne:'任务发起',
   taskHandlingOne:'任务办理',
   taskReview:'任务审查',
+  maintenanceTemplate:'维护模板',
 }

jero-web/src/components/CollectionType/index.vue

@@ -5,7 +5,7 @@
       <div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class="add_flex">
         <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
-               style="display: inline-block" class="valflex">
+               style="display: inline-block" class="valflexOne">
             <div class="textClass" v-if='itemval.type==="text"'>
               <!--            文本校验  分情况-->
               <!--            1 无-->
@@ -124,7 +124,7 @@
       <div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class="add_flex">
         <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
-               style="display: inline-block" class="valflex">
+               style="display: inline-block" class="valflexOne">
             <div class="textClass" v-if='itemval.type==="text"'>
               <!--            文本校验  分情况-->
               <!--            1 无-->
@@ -164,7 +164,7 @@
       <div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class="add_flex">
         <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
-               style="display: inline-block" class="valflex">
+               style="display: inline-block" class="valflexOne">
             <div class="textClass" v-if='itemval.type === "pull"'>
               <a-select v-model="itemval.dataValue" @change="selectChange"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -196,7 +196,7 @@
         <div v-for="(item,index) in keyIndex()" :key="index" style="flex: 1"
              class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
-               style="display: inline-block;" class="valflex"
+               style="display: inline-block;" class="valflexOne"
                :class="{'multiple':itemval.type==='pull_more'?true:false}">
             <div class="textClass" v-if='itemval.type==="pull_more"'>
               <a-select v-model="itemval.dataValue"
@@ -229,12 +229,12 @@
         <div v-for="(item,index) in keyIndex()" :key="index" style="flex: 1"
              class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
-               style="display: inline-block" class="valflex">
+               style="display: inline-block" class="valflexOne">
             <div class="textClass" v-if='itemval.type==="file"'>
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
               </a-button>
             </div>
           </div>
@@ -255,7 +255,7 @@
       <div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class="add_flex">
         <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
-               style="display: inline-block" class="valflex">
+               style="display: inline-block" class="valflexTwo">
             <div class="textClass" v-if='itemval.type==="pull"'>
               <a-select v-model="itemval.dataValue"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -388,7 +388,7 @@
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block"
                :class="{'multiple':itemval.type==='pull_more'?true:false}"
-               class="valflex">
+               class="valflexTwo">
             <div class="textClass" v-if='itemval.type==="pull_more"'>
               <a-select v-model="itemval.dataValue"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -519,7 +519,7 @@
       <div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class="add_flex">
         <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
-               style="display: inline-block" class="valflex">
+               style="display: inline-block" class="valflexTwo">
             <div class="textClass" v-if='itemval.type==="text"'>
               <!--            文本校验  分情况-->
               <!--            1 无-->
@@ -624,7 +624,7 @@
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
               </a-button>
             </div>
           </div>
@@ -645,7 +645,7 @@
       <div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class="add_flex">
         <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]"
-               :key="index1" style="display: inline-block" class="valflex">
+               :key="index1" style="display: inline-block" class="valflexTwo">
             <!--            <div v-for='(itemval,val) in val' :key='val'>-->
             <div class="textClass" v-if='itemval.type==="pull"'>
               <a-select v-model="itemval.dataValue"
@@ -663,7 +663,7 @@
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
               </a-button>
             </div>
             <!--            </div>-->
@@ -687,7 +687,7 @@
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block"
                :class="{'multiple':itemval.type==='pull_more'?true:false}"
-               class="valflex">
+               class="valflexTwo">
             <!--            <div v-for='(itemval,val) in val' :key='val'>-->
             <div class="textClass" v-if='itemval.type==="pull_more"'>
               <a-select v-model="itemval.dataValue"
@@ -705,7 +705,7 @@
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
               </a-button>
             </div>
             <!--            </div>-->
@@ -728,7 +728,7 @@
         <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <!--        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>-->
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
-               style="display: inline-block" class="valflex">
+               style="display: inline-block" class="valflexThere">
             <!--            <div v-for='(itemval,val) in val' :key='val'>-->
             <div class="textClass" v-if='itemval.type==="pull"'>
               <a-select v-model="itemval.dataValue"
@@ -846,7 +846,7 @@
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles') }}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne') }}
               </a-button>
             </div>
           </div>
@@ -1188,12 +1188,21 @@ export default {
   flex-direction: column;
 }
 
-.valflex {
+.valflexOne {
+  width: calc(100% - 16px);
+  margin-right: 6px;
+  margin-bottom: 6px;
+}
+.valflexTwo {
+  width: calc(50% - 16px);
+  margin-right: 6px;
+  margin-bottom: 6px;
+}
+.valflexThere {
   width: calc(33% - 16px);
   margin-right: 6px;
   margin-bottom: 6px;
 }
-
 .iconRow, .valflex {
   display: flex;
 }

jero-web/src/components/CollectionTypeDisabled/index.vue

@@ -5,7 +5,7 @@
       <div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class='add_flex'>
         <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
-               style="display: inline-block" class='valflex'>
+               style="display: inline-block" class='valflexOne'>
             <div class="textClass" v-if='itemval.type==="text"'>
               <!--            文本校验  分情况-->
               <!--            1 无-->
@@ -112,7 +112,7 @@
       <div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class='add_flex'>
         <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
-               style="display: inline-block" class='valflex'>
+               style="display: inline-block" class='valflexOne'>
             <div class="textClass" v-if='itemval.type==="text"'>
               <!--            文本校验  分情况-->
               <!--            1 无-->
@@ -148,7 +148,7 @@
       <div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class='add_flex'>
         <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
-               style="display: inline-block" class='valflex'>
+               style="display: inline-block" class='valflexOne'>
             <div class="textClass" v-if='itemval.type === "pull"'>
               <a-select v-model="itemval.dataValue" @change='selectChange'
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -177,7 +177,7 @@
         <div v-for='(item,index) in keyIndex()' :key='index' style='flex: 1'
              class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
-               style="display: inline-block;" class='valflex'
+               style="display: inline-block;" class='valflexOne'
                :class="{'multiple':itemval.type==='pull_more'?true:false}">
             <div class="textClass" v-if='itemval.type==="pull_more"'>
               <a-select v-model="itemval.dataValue"
@@ -207,12 +207,12 @@
         <div v-for='(item,index) in keyIndex()' :key='index' style='flex: 1'
              class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
-               style="display: inline-block" class='valflex'>
+               style="display: inline-block" class='valflexOne'>
             <div class="textClass" v-if='itemval.type==="file"'>
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
               </a-button>
             </div>
           </div>
@@ -230,7 +230,7 @@
       <div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class='add_flex'>
         <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
-               style="display: inline-block" class='valflex'>
+               style="display: inline-block" class='valflexTwo'>
             <div class="textClass" v-if='itemval.type==="pull"'>
               <a-select v-model="itemval.dataValue"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -351,7 +351,7 @@
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block"
                :class="{'multiple':itemval.type==='pull_more'?true:false}"
-               class='valflex'>
+               class='valflexTwo'>
             <div class="textClass" v-if='itemval.type==="pull_more"'>
               <a-select v-model="itemval.dataValue"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -470,7 +470,7 @@
       <div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class='add_flex'>
         <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
-               style="display: inline-block" class='valflex'>
+               style="display: inline-block" class='valflexTwo'>
             <div class="textClass" v-if='itemval.type==="text"'>
               <!--            文本校验  分情况-->
               <!--            1 无-->
@@ -566,7 +566,7 @@
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
               </a-button>
             </div>
           </div>
@@ -584,7 +584,7 @@
       <div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class='add_flex'>
         <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]'
-               :key='index1' style="display: inline-block" class='valflex'>
+               :key='index1' style="display: inline-block" class='valflexTwo'>
             <!--            <div v-for='(itemval,val) in val' :key='val'>-->
             <div class="textClass" v-if='itemval.type==="pull"'>
               <a-select v-model="itemval.dataValue"
@@ -602,7 +602,7 @@
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
               </a-button>
             </div>
             <!--            </div>-->
@@ -623,7 +623,7 @@
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block"
                :class="{'multiple':itemval.type==='pull_more'?true:false}"
-               class='valflex'>
+               class='valflexTwo'>
             <!--            <div v-for='(itemval,val) in val' :key='val'>-->
             <div class="textClass" v-if='itemval.type==="pull_more"'>
               <a-select v-model="itemval.dataValue"
@@ -641,7 +641,7 @@
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
               </a-button>
             </div>
             <!--            </div>-->
@@ -661,7 +661,7 @@
         <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <!--        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>-->
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
-               style="display: inline-block" class='valflex'>
+               style="display: inline-block" class='valflexThere'>
             <!--            <div v-for='(itemval,val) in val' :key='val'>-->
             <div class="textClass" v-if='itemval.type==="pull"'>
               <a-select v-model="itemval.dataValue"
@@ -770,7 +770,7 @@
               <a-button type="primary" class="button-text inputWid"
                         @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
-                itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+                itemval.dataValue == null) ? $t('clickUpload') : $t('viewFileOne')}}
               </a-button>
             </div>
           </div>
@@ -1060,7 +1060,17 @@
     flex-direction: column;
   }
 
-  .valflex {
+  .valflexOne {
+    width: calc(100% - 16px);
+    margin-right: 6px;
+    margin-bottom: 6px;
+  }
+  .valflexTwo {
+    width: calc(50% - 16px);
+    margin-right: 6px;
+    margin-bottom: 6px;
+  }
+  .valflexThere {
     width: calc(33% - 16px);
     margin-right: 6px;
     margin-bottom: 6px;

jero-web/src/components/tableCollection/index.vue

@@ -804,7 +804,7 @@
                     align: 'left',
                     ellipsis: true,
                     sorter: res.sort,
-                    width: 600
+                    width: 300
                   })
                   num++
                   this.content.push(res)
@@ -879,7 +879,7 @@
               })
               this.columns = [...this.columns]
               this.colIndexs.forEach((item) => {
-                this.minWidthColumns.push([this.columns[item], 500])
+                this.minWidthColumns.push([this.columns[item], 300])
               })
               this.$emit('getcustomizeList', checkedList)
               this.$forceUpdate()
@@ -905,7 +905,7 @@
                         align: 'left',
                         ellipsis: true,
                         sorter: res.sort,
-                        width: 600
+                        width: 300
                       })
                       num++
                       this.content.push(res)
@@ -971,7 +971,7 @@
                   })
                   this.columns = [...this.columns]
                   this.colIndexs.forEach((item) => {
-                    this.minWidthColumns.push([this.columns[item], 500])
+                    this.minWidthColumns.push([this.columns[item], 300])
                   })
                   this.$emit('getcustomizeList', checkedList)
                   this.$forceUpdate()
@@ -1256,6 +1256,24 @@
   .textData {
     font-family: cursive;
   }
+  .nio-drag-handler {
+    position: absolute;
+    right: 0;
+    top: 0;
+    height: 100%;
+    width: 5px;
+    z-index: 1;
+    border-right: 1px #e8e8e8 solid;
+  }
+  .nio-drag-handler:hover,
+  .nio-drag-handler:focus{
+    cursor: col-resize!important;
+    border-right: 2px solid #0bd9d9!important;
+  }
+  .nio-header-th {
+    position: relative;
+    isolation: isolate;
+  }
 </style>
 <style scoped lang="less">
   @import '~@assets/less/common.less';

jero-web/src/components/tableCollection/index1.vue

@@ -595,7 +595,7 @@
                       align: 'left',
                       ellipsis: true,
                       sorter: res.sort,
-                      width: 500
+                      width: 300
                     })
                     num++
                     this.content.push(res)
@@ -660,7 +660,7 @@
                   this.isTrue = true
                   this.columns = [...this.columns]
                   this.colIndexs.forEach((item)=>{
-                    this.minWidthColumns.push([this.columns[item],500])
+                    this.minWidthColumns.push([this.columns[item],300])
                     this.$emit('getcustomizeList',checkedList)
                   })
                 },300)
@@ -685,7 +685,7 @@
                           align: 'left',
                           ellipsis: true,
                           sorter: res.sort,
-                          width: 500
+                          width: 300
                         })
                         num++
                         this.content.push(res)
@@ -759,7 +759,7 @@
                       this.isTrue = true
                       this.columns = [...this.columns]
                       this.colIndexs.forEach((item)=>{
-                        this.minWidthColumns.push([this.columns[item],500])
+                        this.minWidthColumns.push([this.columns[item],300])
                         this.$emit('getcustomizeList',checkedList)
                       })
                     },300)

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

@@ -23,8 +23,8 @@
         <div class="Virtual-detail-content">
           <div class="box-title-text-add">
             <div class="title-text-add">
-              <span class="text-left" :title="$t('regulatoryListTemplate')">
+              <span class="text-left" :title="$t('VirtualListName')">
-                  {{$t('regulatoryListTemplate')}}
+                  {{$t('VirtualListName')}}
               </span>
               <span class="text-right" style="margin-right: 100px" :title="$route.query.name">
                 {{$route.query.name}}

jero-web/src/views/parameter/ParameterTemplate/index.vue

@@ -69,10 +69,12 @@
            {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }}
         </span>
         <span slot="operation" slot-scope="text,record">
+          <a class="text-operation" v-has="'params:template:edit'" @click="edit(record)">{{$t('edit')}}</a>
             <a class="text-operation"
-               v-has="'params:template:edit'"
+               v-has="'params:template:publish'"
                @click="withdrawOrRelease(record)">{{record.status && record.status == '1'? $t('withdraw') : $t('release')}}</a>
-            <a class="text-operation" v-has="'params:template:edit'" @click="edit(record)">{{$t('edit')}}</a>
+            <a class="text-operation" v-has="'params:template:maintenanceTemplate'"
+               @click="maintenanceTemplateClick(record)">{{$t('maintenanceTemplate')}}</a>
             <a class="text-operation" v-has="'params:template:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
       </a-table>
@@ -318,7 +320,13 @@ export default {
           }
         }
       })
-
+    },
+    maintenanceTemplateClick(item){
+      item.titleNameDesgin = 'maintenance'
+      this.$router.push({
+        path: '/ParameterTemplateList',
+        query: item
+      })
     },
     //批量删除
     handleDel() {
@@ -387,6 +395,7 @@ export default {
     },
     //虚拟清单名称事件
     entryNameClick(item) {
+      item.titleNameDesgin = 'view'
       this.$router.push({
         path: '/ParameterTemplateList',
         query: item

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -15,7 +15,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
                       :title="$t('NNiONumber')">{{$t('NNiONumber')}}</span>
                 </div>
@@ -30,11 +30,12 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('NRequired')">{{$t('NRequired')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="isMust">
-                  <a-select allowClear :placeholder="$t('PleaseSelect')+$t('NRequired')" v-model='formInline.isMust'>
+                  <a-select allowClear :disabled="disabled"
+                            :placeholder="$t('PleaseSelect')+$t('NRequired')" v-model='formInline.isMust'>
                     <a-select-option :key="'1'" :value="'1'">{{$t('yes')}}
                     </a-select-option>
                     <a-select-option :key="'0'" :value="'0'">{{$t('notOnlyRz')}}
@@ -48,7 +49,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                 <span class="Required">*</span>
+                 <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
                       :title="$t('Paraname')">{{$t('Paraname')}}</span>
                 </div>
@@ -84,7 +85,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('NareaOfResponsibility')">{{$t('NareaOfResponsibility')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="dutyTerritory">
@@ -101,7 +102,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
                       :title="$t('Parabatch')">{{$t('Parabatch')}}</span>
                 </div>
@@ -139,7 +140,7 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
                       :title="$t('NcertificationCategory')">{{$t('NcertificationCategory')}}</span>
                 </div>
@@ -159,13 +160,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
                       :title="$t('NcontrolType')">{{$t('NcontrolType')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="controlType">
                   <a-select :placeholder="$t('PleaseSelect')+$t('NcontrolType')"
                             @change="controlTypeChange"
+                            :disabled="disabled"
                             allowClear v-model="formInline.controlType">
                     <a-select-option v-for="(item, key) in controlType" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
@@ -180,11 +182,12 @@
             <a-col :span="12" v-if='this.formInline.controlType =="1" || this.formInline.controlType =="5" || this.formInline.controlType =="6" || this.formInline.controlType =="7" || this.formInline.controlType =="10"'>
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('NcontrolVerification')">{{$t('NcontrolVerification')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="controlVerify">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('NcontrolVerification')" allowClear v-model="formInline.controlVerify">
+                  <a-select :disabled="disabled"
+                            :placeholder="$t('PleaseSelect')+$t('NcontrolVerification')" allowClear v-model="formInline.controlVerify">
                     <a-select-option v-for="(item, key) in controlVerification" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
                       {{ item.label }}
@@ -197,7 +200,7 @@
             <a-col :span="12" v-else-if='this.formInline.controlType =="11"'>
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text"
                         :title="$t('DefaultValue')">{{$t('DefaultValue')}}</span>
                 </div>
@@ -217,7 +220,7 @@
             <a-col :span="12" v-if='this.formInline.controlType =="2" || this.formInline.controlType =="3" || this.formInline.controlType =="5" || this.formInline.controlType =="6" || this.formInline.controlType =="8" || this.formInline.controlType =="9" || this.formInline.controlType =="10"'>
               <div class="box-title-text">
                 <div class="title-text">
-                <span class="Required">*</span>
+                <span class="Required" v-if="!disabled">*</span>
                 <span class="title-text-text"
                       :title="$t('NcontrolAlternatives')">{{$t('NcontrolAlternatives')}}</span>
                 </div>
@@ -259,7 +262,7 @@
                     <a-col :span="12">
                       <div class="box-title-text">
                         <div class="title-text">
-                        <span class="Required">*</span>
+                        <span class="Required" v-if="!disabled">*</span>
                         <span class="title-text-text"
                               :title="$t('ParameterNo')">{{$t('ParameterNo')}}</span>
                         </div>
@@ -274,7 +277,7 @@
                     <a-col :span="12">
                       <div class="box-title-text">
                         <div class="title-text">
-                          <span class="Required">*</span>
+                          <span class="Required" v-if="!disabled">*</span>
                           <span class="title-text-text" :title="$t('NParameterName')">{{$t('NParameterName')}}</span>
                         </div>
                         <a-form-model-item class="itemModel">
@@ -314,7 +317,7 @@
       </a-spin>
       <div class="drawer-bootom-button">
         <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
-        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" v-if="!disabled" :loading="confirmLoading">{{$t('submit')}}</a-button>
       </div>
     </a-drawer>
     <uploadFileChange :isParameter="true" ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFileChange>
@@ -637,6 +640,7 @@ export default {
     },
     addModel() {
       this.visible = true
+      this.disabled = false
       this.flag = 1
       this.title = this.$t('newlyAdded')
       this.formInline = {}
@@ -651,6 +655,7 @@ export default {
       })
     },
     editModel(value) {
+      this.disabled = false
       this.contentList = []
       this.contentListed = []
       this.visible = true
@@ -684,6 +689,41 @@ export default {
         this.contentList = this.contentListed
       console.log(this.contentList)
     },
+    viewModel(value) {
+      this.disabled = true
+      this.contentList = []
+      this.contentListed = []
+      this.visible = true
+      // if(value.technologyTerritory.split(',').length === 1){
+      //   value.technologyTerritory = value.technologyTerritory
+      // } else {
+      //   value.technologyTerritory = value.technologyTerritory.split(',')
+      // }
+      this.formInline = value
+      // if(this.formInline.controlType == 11){
+      //   this.required = false
+      // }else{
+      //   this.required = true
+      // }
+      this.title = this.$t('view')
+      this.flag = 0
+      //  获取认证类别
+      this.getcontentListedEdit()
+      value.certCategoryParamsInfoEOList.map((item, index) => {
+        if(this.cut == 'cn'){
+          item.cut = 'cn'
+          this.contentListed.push(item)
+          item.text = item.certCategory_dictText
+        }else {
+          item.cut = 'en'
+          this.contentListed.push(item)
+          item.textEn = item.certCategory_dictText
+        }
+
+      })
+      this.contentList = this.contentListed
+      console.log(this.contentList)
+    },
     handleCancel() {
       this.visible = false
       this.$refs['ruleForm'].resetFields()
@@ -911,4 +951,7 @@ export default {
 .ant-input-disabled {
   color: rgba(0, 0, 0, 0.65) !important;
 }
+.ant-select-disabled{
+  color: rgba(0, 0, 0, 0.65) !important;
+}
 </style>

jero-web/src/views/parameter/parameterlist/index.vue

@@ -41,7 +41,7 @@
       </a-row>
       </a-form>
     </div>
-    <div class="table-operator">
+    <div class="table-operator" v-if="$route.query.titleNameDesgin == 'maintenance'">
       <div @click="handleAdd" class="operator-text" v-has="'params:paramsInfo:add'">
         <a-icon type="plus"/>
         {{$t('newlyAdded')}}
@@ -85,8 +85,12 @@
                   {{ text && text.length > 10 ? text.slice(0, 9) + '...' : text }}
         </span>
         <span slot="operation" slot-scope="text,record">
-            <a class="text-operation" v-has="'params:paramsInfo:edit'" @click="edit(record)">{{$t('edit')}}</a>
+            <a class="text-operation" v-has="'params:paramsInfo:edit'"
-            <a class="text-operation" v-has="'params:paramsInfo:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+               @click="edit(record)" v-if="$route.query.titleNameDesgin == 'maintenance'">{{$t('edit')}}</a>
+            <a class="text-operation" v-if="$route.query.titleNameDesgin == 'maintenance'"
+               v-has="'params:paramsInfo:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+            <a class="text-operation" v-has="'params:paramsInfo:view'"
+               @click="view(record)" v-if="$route.query.titleNameDesgin == 'view'">{{$t('view')}}</a>
         </span>
       </a-table>
     </div>
@@ -341,6 +345,17 @@ export default {
         }
       })
     },
+    view(item){
+      let _this = this
+      getAction(_this.url.queryById, { id: item.id }).then((res) => {
+        if (res.success) {
+          this.certCategoryParamsInfoEOList = res.result.certCategoryParamsInfoEOList
+          this.$refs.addModelRef.viewModel(JSON.parse(JSON.stringify(res.result)))
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     //删除
     deleteLib(val) {
       let _this = this

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

@@ -91,16 +91,27 @@
         syncReportpercentage: [],
         syncReportquantity: [],
         url: {
-          getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestData'
+          getProjectDetailsStatistics: '/project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestData',
-        }
+          queryById: 'project/projectLibraryBase/queryById',
+        },
+        queryForm:{},
       }
     },
     mounted() {
-      this.getoptions()
       this.getEcharts()
-
+      this.getForm()
     },
     methods: {
+      getForm() {
+        getAction(this.url.queryById, { id: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.queryForm = res.result[0] || {}
+          } else {
+            this.queryForm = {}
+          }
+          this.getoptions()
+        })
+      },
       getData(item) {
         getAction(this.url.getProjectDetailsStatistics, { paramsManifestId: item }).then((res) => {
           if (res.success) {
@@ -124,7 +135,7 @@
           id = this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id
           // id = this.$route.query.id
         }
-        getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', { id: id }).then((res) => {
+        getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', { id: id ,projectVersion:this.queryForm.projectVersion}).then((res) => {
           if (res.success) {
             this.options = res.result
             this.queryParam.ctype = this.options[0].value

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -20,8 +20,8 @@
         <div class="Virtual-detail-content">
           <div class="box-title-text-add">
             <div class="title-text-add">
-              <span class="text-left" :title="$t('CertificationListName')">
+              <span class="text-left" :title="$t('marketCertificationListName')">
-                  {{$t('CertificationListName')}}
+                  {{$t('marketCertificationListName')}}
               </span>
               <span class="text-right" style="margin-right: 100px" :title="$route.query.name">
                 {{$route.query.name}}
@@ -729,7 +729,7 @@
     font-weight: 400;
     color: #6F7385;
     display: inline-block;
-    width: 100px;
+    width: 130px;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;