Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend'

# Conflicts: # jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
2022-10-24 10:09:49 +08:00
parent 7ebbe9c130 25e44bfe7f
commit 798a3b5161
77 changed files with 3287 additions and 1500 deletions
@@ -3,11 +3,11 @@ module.exports = {
  account: 'User Account',
  EnterAccountFuzzyQuery: 'Enter Account Fuzzy Search',
  Gender: 'Gender',
-  pleaseSelect: 'Please Select',
+  pleaseSelect: 'Please Select ',
  male: 'Male',
  female: 'Female',
  RealName: 'User Name',
-  pleaseEnter: 'Please Enter',
+  pleaseEnter: 'Please Enter ',
  phoneNumber: 'Phone Number',
  query: 'Search',
  userStatues: 'User Status',
@@ -193,8 +193,15 @@ module.exports = {
  OperationLog: 'Operation Log',
  SearchLog: 'Search Log',
  enterSearchKeyword: 'Please enter a search keyword',
+  enterSearchContent:'Please enter Search Content',
+  enterStandard:'Please enter Number',
+  entertitle:'Please enter Title',
  OperationType: 'Operation Type',
  selectOperationType: 'Please select Operation type',
+  selectProblemClassification:'Please select Problem Classification',
+  selectClassification:'Please select Classification',
+  selectTranslationResults:'Please select Translation results',
+  selectMarket:'Please select Market',
  RequestMethod: 'Request Method',
  RequestParameters: 'Request Parameters',
  logManagementPage: 'This is the log management page',
@@ -343,8 +350,8 @@ module.exports = {
  standard: 'Number',
  title: 'Title',
  TextStatus: 'Text Status',
-  PleaseEnter: 'Please enter',
-  PleaseSelect: 'Please select',
+  PleaseEnter: 'Please enter ',
+  PleaseSelect: 'Please select ',
  PleaseEnterOrSelect: 'Please Enter Or Select',
  ModificationTime: 'Modification Time',
  ModificationContent: 'Modification Content',
@@ -386,7 +393,7 @@ module.exports = {
  DocumentComparison: 'Doc Comparison',
  KnowledgeDatabase: 'Q&A Knowledge',
  StandardDetails: 'Standard Details',
-  whole: 'Whole',
+  whole: 'All',
  DocumentLibrary: 'Document Library',
  GeneralExportInformation: 'General export information',
  CustomizeExportInformation: 'Customize export information',
@@ -500,7 +507,7 @@ module.exports = {
  ProcessName: 'Process Name',
  ProcessType: 'Process Type',
  AddProcess: 'Add Process',
-  RelatedItems: 'Relevant Project',
+  RelatedItems: 'Project',
  Sponsor: 'Creator',
  CurrentProcessor: 'Current Processor',
  LastProcessor: 'Last Processor',
@@ -721,7 +728,7 @@ module.exports = {
  directoryName: 'Catalogue Name',
  batch: 'Batch',
  uploadTime: 'Upload Time',
-  enclosure: 'Enclosure',
+  enclosure: 'Attachments',
  // 认证
  // 认证状态
  timeOperation: 'You have permission to operate this button.',
@@ -917,7 +924,7 @@ module.exports = {
  deliveryHistory: 'Delivery History',
  projectDeliveryRequirements: 'Project delivery requirements',
  personLiableConfirm: 'PersonLiable Confirm',
-  complianceResults: 'Compliance Results',
+  complianceResults: 'Feedback',
  noData: 'No Data',
  confirmOperation: 'Confirm Operation',
  sponsorReview: 'Sponsor Review',
@@ -984,25 +991,25 @@ module.exports = {
  taskConfirmationResponsiblePerson: 'Task confirmation of responsible person',
  or: 'or',
  warningTime: 'Warning Time',
-  RegulationMonthlyManagement: 'Regulation Monthly Management',
-  RegulationMonthlyFill: 'Regulation Monthly Fill',
-  RegulationMonthlyName: 'Regulation monthly name',
-  monthlyLanguage: 'Monthly Language',
+  RegulationMonthlyManagement: 'Manage Monthly Report',
+  RegulationMonthlyFill: 'Fill in Monthly Report',
+  RegulationMonthlyName: 'Report Name',
+  monthlyLanguage: 'Language',
  releaseStatus: 'Release Status',
  uploadedBy: 'Uploaded By',
-  uploadMonthly: 'Upload Monthly',
-  chapterContents: 'Chapter Contents',
+  uploadMonthly: 'Upload Report',
+  chapterContents: 'Chapter',
  chineseTitle: 'Chinese Title',
  englishTitle: 'English Title',
-  regulatoryContact: 'Regulatory Contact',
+  regulatoryContact: 'Reg. Contact',
  exportStatus: 'Export Status',
-  monthlyTitleTemplate: 'Monthly Title Template',
-  monthlyIntegrationAndExport: 'Monthly integration and export',
+  monthlyTitleTemplate: 'Title Template',
+  monthlyIntegrationAndExport: 'Export Report',
  addContent: 'Add Content',
  editContent: 'Edit Content',
  viewContent: 'View Content',
-  fillInTheMonth: 'Fill in the month',
-  monthSelection: 'Month Selection',
+  fillInTheMonth: 'Filled in (Month)',
+  monthSelection: 'Select Month',
  bringInStandardInformation: 'Bring in standard Information',
  contentTemplate: 'Content Template',
  moveUp: 'Move Up',
@@ -1010,32 +1017,32 @@ module.exports = {
  vehicleType: 'Vehicle Type',
  usage: 'Usage',
  implementationModel: 'Implementation Model',
-  primaryCoverageCn: 'Primary Coverage (Cn)',
-  primaryCoverageEn: 'Primary Coverage (En)',
+  primaryCoverageCn: 'Description (Cn)',
+  primaryCoverageEn: 'Description (En)',
  workProgressCn: 'NIO Work Progress (Cn)',
  workProgressEn: 'NIO Work Progress (En)',
-  initiatingProcess: 'Initiating Process',
+  initiatingProcess: 'Initiate Process',
  collectResults: 'Collect Results',
  dateOfInitiation: 'Date Of Initiation',
-  closingDate: 'Closing Date',
+  closingDate: 'Due Date',
  viewProcess: 'View Process',
  evaluationResults: 'Evaluation Results',
  Assessor: 'Assessor',
  collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
  collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
-  feedbackInformation: 'Feedback Information',
-  relevantSections: 'Relevant Sections',
-  questionsSuggestions: 'Questions Or Suggestions',
+  feedbackInformation: 'Feedback',
+  relevantSections: 'Chapter',
+  questionsSuggestions: 'Questions/Suggestions',
  reason: 'Reason',
  proposedTime: 'Proposed Time',
  feedbackPoint: 'Feedback Point',
  link: 'Link',
  planNoChinese: 'Plan No.',
-  standardNameCn: 'Standard Name Cn',
-  standardNameEn: 'Standard Name En',
-  deadlineForComments: 'Deadline for comments',
+  standardNameCn: 'Standard Title Cn',
+  standardNameEn: 'Standard Title En',
+  deadlineForComments: 'Deadline for Comments',
  standardNo: 'Standard No',
-  implemenDate: 'Implementation Date',
+  implemenDate: 'Effective Date',
 //  上报库
  Enable: 'Enable',
  Latestupdatetime: 'Latest Update Time',
@@ -1116,7 +1123,7 @@ module.exports = {
  PreHomoNotification: 'Pre-Homo Notification',
  ValidationComplianceNotification: 'Validation Compliance Notification',
  RegulationTaskConfirmationNotification: 'Regulation Task Confirmation Notification',
-  evaluationMethod: 'Evaluation method',
+  evaluationMethod: 'Check Method',
  uploadRelevantMaterials: 'Upload relevant materials',
  processBackground: 'Process Background',
  selectedStandard: 'Selected Standard',
@@ -1124,13 +1131,13 @@ module.exports = {
  pleaseSelectStandardFirst: 'Please select a standard first',
  RelevantMaterials: 'RelevantMaterials',
  evaluatorFeedback: 'Evaluator Feedback',
-  nameTechnicalDocument: 'Name of technical document',
+  nameTechnicalDocument: 'Technical Document',
  chapter: 'Chapter',
  problemDescription: 'Problem Description',
  filingExternalOpinions: 'Filing of external opinions',
  regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results',
  initiateProcessForCurrentStandard: 'Initiate process for current standard',
-  engineerFeedbackResults: 'Engineer feedback results',
+  engineerFeedbackResults: 'Engineer Feedback',
  fileExport: 'File Export',
  feedbackTime: 'Feedback Time',
  regulatoryTechnologyAssessmentProcess: 'Regulatory technology assessment process',
@@ -1148,29 +1155,30 @@ module.exports = {
  releaseSituation: 'Release situation',
  comparisonResults: 'Comparison results',
  Published: 'Published',
-  initiateComparison: 'Initiate comparison',
+  initiateComparison: 'Initiate Comparison',
  translationLanguage: 'Translation language',
  translationResults: 'Translation results',
  conversionTime: 'Conversion time',
  category: 'Category',
  RegulatoryProcessEvaluationResults: 'Regulatory Process Evaluation Results',
  ViewConformanceResults: 'View Conformance Results',
-  CommentsCollectionResultsForReference: 'Comments Collection Results For',
-  TechnicalEvaluationResultsForReference: 'Technical Evaluation Results For',
+  CommentsCollectionResultsForReference: 'Opinion Collection Results',
+  TechnicalEvaluationResultsForReference: 'Technical Assessment Results',
  ComplianceConfirmationRecord: 'Compliance Confirmation Record',
  complianceConfirmation: 'Compliance Confirmation',
  noComparisonDocumentSelected: 'No comparison document selected',
  RemarkInfo: 'Remarks Info',
  initiateDocumentComparison: 'Initiate Document Comparison',
  comparativeComments: 'Comparative Comments',
-  viewTheComparisonResults: 'View The Comparison Results',
-  addFullTextComment: 'Add Full Text Comment',
-  turnOffAutomaticMatching: 'Turn Off Automatic Matching',
-  Deriveconformanceresults: 'Derive Conformance Results',
+  viewTheComparisonResults: 'View Results',
+  addFullTextComment: 'Full Text Comment',
+  turnOffAutomaticMatching: 'Turn Off Auto Match',
+  Deriveconformanceresults: 'Export Results',
  Regulatorycompliancekanban: 'Regulatory Compliance Kanban',
  exportComparisonReport: 'Export Comparison Report',
  comparisonDifferenceComment: 'Comparison Difference Comment',
-  fullTextComments: 'Full text comments',
+  fullTextComments: 'Full Text Comment',
+  pleaseEnterfullTextComments:'Please enter Full Text Comment',
  fileDeclaration: 'File Declaration',
  FileForDetails: 'File For Details',
  Converting: 'Converting',
@@ -1178,7 +1186,7 @@ module.exports = {
  convertFailed: 'Convert Failed',
  standardData: 'Standard Data',
  Theorganization: 'The Organization',
-  Addingfolder: 'Adding a folder',
+  Addingfolder: 'Create New Folder',
  Addingsubfolders: 'Adding Subfolders',
  Editfolder: 'Edit Folder',
  Deletefolders: 'Delete Folders',
@@ -1189,8 +1197,8 @@ module.exports = {
  Openpersonnel: 'Open Personnel',
  originalText: 'Original Text',
  translatedText: 'Translated Text',
-  Administrativeprivileges: 'Administrativ Pprivileges',
-  Checkthepermissions: 'Check The Permissions',
+  Administrativeprivileges: 'Administrative Permissions',
+  Checkthepermissions: 'Read Permissions',
  onlyFilesUploaded: 'Only.Docx,.Doc files can be uploaded',
  selectDirectorylocation: 'Please select the directory location to add the folder',
  Fileuploaded: 'File uploaded, please wait',
@@ -1200,10 +1208,10 @@ module.exports = {
  Parametercollection: 'Parameter Collection',
  Collectlist: 'Colle Ctlist',
  Statisticalmodels: 'Statisti Calmodels',
-  Inthecollection: 'In the collection',
-  Notatthe: 'Not at the',
+  Inthecollection: 'During collection',
+  Notatthe: 'Not started',
  Thepercentage: 'The Percentage',
-  problemKnowledgeBase: 'Problem Knowledge Base',
+  problemKnowledgeBase: 'Q&A Knowledge',
  recentHotSpots: 'Recent Hot Spots',
  disseminationMaterials: 'Dissemination Materials',
  informationSafety: 'Information Safety',
@@ -1212,36 +1220,37 @@ module.exports = {
  productHighlights: 'Product Highlights',
  financialReimbursement: 'Financial Reimbursement',
  classificationMaintenance: 'Classification Maintenance',
-  managePublishing: 'Manage Publishing',
-  displayPermission: 'Display permission',
+  managePublishing: 'Release Management',
+  displayPermission: 'Display Permission',
  authorizedUser: 'Authorized user',
-  problemClassification: 'Problem classification',
+  problemClassification: 'Problem Classification',
  market: 'Market',
  documentNumber: 'Document Number',
  documentTitle: 'Document Title',
  bringInDocumentInformation: 'Bring in document information',
+  addStandardInformation:'Add standard information',
  thereWhichCannotDeleted: 'There are sub headings under this title, which cannot be deleted',
  sdt: 'Sdt',
  dre: 'Dre',
  applicableInstructionsMarketList: 'Applicable instructions of market list',
  pleaseSelectTheDataCompared: 'Please select the data to be compared',
-  problemLabel: 'Problem label',
+  problemLabel: 'Topic Tag',
  personCharge: 'Person in charge',
-  addLabel: 'Add Label',
+  addLabel: 'Add Tag',
  editLabel: 'Edit Label',
-  applicableMarket: 'Applicable market',
-  templateMaintenance: 'Template maintenance',
+  applicableMarket: 'Applicable Market',
+  templateMaintenance: 'Template Maintenance',
  associatedWebsite: 'Associated website',
  dropDownOptions: 'Drop down options',
  dropDownOptionMaintenance: 'Drop down option maintenance',
-  displayInformation: 'Display information',
-  addComparison: 'Add comparison',
+  displayInformation: 'Display Information',
+  addComparison: 'Add Comparison',
  showOrNot: 'Show or not',
  comparisonMarket: 'Comparison Market',
  share: 'Share',
  simplifiedChinese:'Simplified Chinese',
  uploadOnly:'Upload only',
-  turnOnAutoMatch:'Turn on auto match',
+  turnOnAutoMatch:'Turn On Auto Match',
  Adjustareasofresponsibility:'Adjust areas of responsibility',
  regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
  punctuationmark:'You can only enter English punctuation marks except the # sign and commas',
@@ -1267,8 +1276,8 @@ module.exports = {
  onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'Only the data whose list confirmation status is accepted and the task list status is not initiated or the task list status is accepted can be changed',
  thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted',
  industryInformationDynamicTemplate:'Industry information dynamic template',
-  relatedFields:'Related fields',
-  relatedFieldsEn:'Related fields (English)',
+  relatedFields:'Relaevant Area',
+  relatedFieldsEn:'Relaevant Area (English)',
  source:'Source',
  sourceEn:'Source (English)',
  onlyone:'Only one merge delimiter can be entered',
@@ -1308,9 +1317,9 @@ module.exports = {
  inRecentYear2:'In recent 2 year',
  selectAll:'Select All',
  importLocalDisassemblyOrder:'Import local disassembly order',
-  notExport:'Not export',
-  hasBeenExport:'Has been export',
-  firstLevelDirectory:'First level directory',
+  notExport:'Not exported',
+  hasBeenExport:'Exported',
+  firstLevelDirectory:'Primary Directory',
  deselectAll:'Deselect All',
  classification:'Classification',
  consistentAssessment:'Consistent',
@@ -1319,7 +1328,7 @@ module.exports = {
  viewAll:'View All',
  endProcess:'End Process',
  thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data',
-  secondaryDirectory:'Secondary directory',
+  secondaryDirectory:'Secondary Directory',
  OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
  projectVersion:'Project Version',
  softwareVersion:'Authentication Software version',
@@ -195,8 +195,15 @@ module.exports = {
  OperationLog: '操作日志',
  SearchLog: '搜索日志',
  enterSearchKeyword: '请输入搜索关键词',
+  enterSearchContent:'请输入搜索内容',
+  enterStandard:'请输入编号',
+  entertitle:'请输入标题',
  OperationType: '操作类型',
  selectOperationType: '请选择操作类型',
+  selectProblemClassification:'请选择问题分类',
+  selectClassification:'请选择分类',
+  selectTranslationResults:'请选择翻译结果',
+  selectMarket:'请选择市场',
  RequestMethod: '请求方法',
  RequestParameters: '请求参数',
  logManagementPage: '这是日志管理页面',
@@ -1174,6 +1181,7 @@ module.exports = {
  exportComparisonReport: '导出对比报告',
  comparisonDifferenceComment: '对比差异评论',
  fullTextComments: '全文评论',
+  pleaseEnterfullTextComments:'请输入全文评论',
  fileDeclaration: '文件说明',
  FileForDetails: '文件详情',
  Converting: '转换中',
@@ -1322,6 +1330,7 @@ module.exports = {
  documentNumber: '文档编号',
  documentTitle: '文档标题',
  bringInDocumentInformation: '带入文档信息',
+  addStandardInformation:'添加标准信息',
  thereWhichCannotDeleted: '该标题下存在子标题无法进行删除',
  sdt: '工程接口人',
  dre: '填写人',
@@ -652,7 +652,7 @@
      </div>
    </div>
    <uploadFileChangeDown ref="uploadFile" @uploadSuccess="uploadSuccess"
-                          :detailDate='detailDate'></uploadFileChangeDown>
+                          :detailDate='detailDate' watermark='download'></uploadFileChangeDown>
  </div>
 </template>

@@ -667,6 +667,10 @@
        type: Object,
        default: {},
        require: true
+      },
+      watermark: {
+        type: String,
+        default: ''
      }
    },
    data() {
@@ -1,16 +1,33 @@
 <template>
  <div>
-    <div class="box-title-text" v-if="!isInput">
-      <a-input class="box-input" :value="value" @input="indexclick($event)"
-               :disabled="true"
-               :title="value"
-               :placeholder="$t('PleaseSelect')+query.db_field_txt"/>
+    <div class="itemModelStand-select" v-if="!isInput">
+      <a-select
+        class="itemModelStand-input"
+        :value="valueSelect"
+        @change="onChange"
+        mode="multiple"
+        :disabled="disabled"
+        :placeholder="$t('PleaseSelect')+query.db_field_txt"
+        :getPopupContainer="triggerNode=> triggerNode.parentNode">
+        <a-select-option
+          v-for="(item,index) in dictOptions"
+          :key="index"
+          :value="item.value">
+                        <span class="itemOption" :title="item.title">
+                          {{ item.title }}
+                        </span>
+        </a-select-option>
+      </a-select>
+      <!--      <a-input class="box-input" :value="value" @input="indexclick($event)"-->
+      <!--               :disabled="true"-->
+      <!--               :title="value"-->
+      <!--               :placeholder="$t('PleaseSelect')+query.db_field_txt"/>-->
      <a-button type="primary" class="button-box" :disabled="disabled" @click="standardClick">
        {{this.$t('PersonnelSelection')}}
      </a-button>
-      <a-button type="primary" v-if='isDelete' class="button-box" @click="standardDelete">
-        {{this.$t('delete')}}
-      </a-button>
+      <!--      <a-button type="primary" v-if='isDelete' class="button-box" @click="standardDelete">-->
+      <!--        {{this.$t('delete')}}-->
+      <!--      </a-button>-->
    </div>
    <div class="box-title-text" v-if="isInput">
      <a-input :class="{'box-input':!isClass}" :value="value"
@@ -71,7 +88,6 @@
        <a-button @click="handleSubmit" type="primary">{{$t('submit')}}</a-button>
      </div>
    </a-drawer>
-
  </div>
 </template>

@@ -91,6 +107,8 @@
      return {
        loading: false,
        gData: [],
+        valueSelect: [],
+        dictOptions: [],
        autoExpandParent: false,
        checkboxList: [],
        expandedKeys: [],
@@ -111,7 +129,35 @@
      }
    },
    mounted() {
-
+      this.valueSelect = []
+      this.dictOptions = []
+      setTimeout(() => {
+        if (this.value) {
+          let contentName = []
+          let contentId = []
+          if (this.personneQuery[this.query.db_field_name + 'Name']) {
+            contentName = this.personneQuery[this.query.db_field_name + 'Name'].split(',')
+          } else if (this.personneQuery[this.query.db_field_name]) {
+            contentName = this.personneQuery[this.query.db_field_name].split(',')
+          } else {
+            contentName = []
+          }
+          if (this.personneQuery[this.query.db_field_name + '_id']) {
+            contentId = this.personneQuery[this.query.db_field_name + '_id'].split(',')
+          } else if (this.personneQuery[this.query.db_field_name]) {
+            contentId = this.personneQuery[this.query.db_field_name].split(',')
+          } else {
+            contentId = []
+          }
+          contentId.forEach((res, index) => {
+            this.dictOptions.push({
+              value: res,
+              title: contentName[index]
+            })
+            this.valueSelect.push(res)
+          })
+        }
+      }, 600)
    },
    methods: {
      // checkChange(val, checked, indeterminate) {
@@ -314,6 +360,28 @@
        this.visible = false
        this.treeVisible = false
      },
+      onChange(value) {
+        this.valueSelect = value
+        console.log(this.valueSelect)
+        console.log(this.dictOptions)
+        this.userIds = []
+        this.userName = []
+        if (this.valueSelect && this.valueSelect.length > 0) {
+          value.forEach(res => {
+            this.dictOptions.forEach(val => {
+              if (res == val.value) {
+                this.userIds.push(val.value)
+                this.userName.push(val.title)
+              }
+            })
+          })
+        }
+        let userIds = JSON.parse(JSON.stringify(this.userIds))
+        let userName = JSON.parse(JSON.stringify(this.userName))
+        console.log(userIds)
+        this.$emit('input', userName.join(','))
+        this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript)
+      },
      handleSubmit() {
        // if (this.userIds && this.userIds.length > 0) {
        if (this.isSingleChoice) {
@@ -330,6 +398,19 @@
        // userIds = userIds.filter(function(item, index) {
        //   return userIds.indexOf(item) === index  // 因为indexOf 只能查找到第一个
        // })
+        if (!this.isInput) {
+          this.dictOptions = []
+          this.valueSelect = []
+          if (userIds && userIds.length > 0) {
+            userIds.forEach((res, index) => {
+              this.dictOptions.push({
+                title: userName[index],
+                value: res
+              })
+              this.valueSelect.push(res)
+            })
+          }
+        }
        this.$emit('input', userName.join(','))
        this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript)
        this.visible = false
@@ -514,11 +595,18 @@
    width: 100%;
  }

+  .itemModelStand-input {
+    width: calc(100% - 100px);
+    display: inline-block;
+    height: 38px;
+  }
+
  .button-box {
+    width: 90px;
    margin-left: 10px;
    height: 38px;
    line-height: 38px;
-
+    float: right;
  }

  .drawer-bootom-button {
@@ -590,4 +678,18 @@
    color: #21c9cc;
    display: inline-block;
  }
+
+  .itemOption {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
+</style>
+<style>
+  .itemModelStand-select .ant-select-dropdown--multiple {
+    display: none !important;
+  }
 </style>
@@ -150,6 +150,7 @@
                  </div>
                  <a-form-model-item class="itemModel" :prop="item.db_field_name">
                    <PersonnelSelection :query="item"
+                                        v-if="isFormInline"
                                        :personneQuery="formInline"
                                        @change="PersonnelSelectionChange"
                                        :disabled="disabled"
@@ -11,7 +11,6 @@
        :data-source="dataSource"
        :loading="loading"
        sticky
-        :components="components"
        :columns="columns"
        :rowClassName="rowClassName"
        @change="tableOnChange"
@@ -22,7 +21,7 @@
        </span>
        <div :slot="'titleName'+(index+1)" v-for="(item,index) in content">
          <span v-if='item.isLock == 1' style='padding-right: 20px'><a-icon type="lock" theme="twoTone" two-tone-color="#00B3BE" /></span>
-          <span style='padding-right: 10px;margin-left: -16px'>{{ item.db_field_txt }} </span>
+          <span style='padding-right: 10px'>{{ item.db_field_txt }} </span>
          <a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
        </div>
 <!--        {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
@@ -605,9 +604,11 @@
                res.result.userType = result[0] ? result[0].value : ''
              }
              this.getTableList(res.result.userType)
+              this.getHeader(res.result.userType)

            } else {
              this.getTableList(result[0].value)
+              this.getHeader(result[0].value)
            }
            this.$emit('LoginUserType', result, this.currentPersonRole, res.result.userType)
          } else {
@@ -615,7 +616,7 @@
          }
        })
      },
-      getHeader() {
+      getHeader(userType) {
        let paramsManifestid
        let url
        if (this.$route.query.it === undefined) {
@@ -629,7 +630,8 @@
        }
        let params = {
          paramsManifestId: paramsManifestid,
-          flag: '7'
+          flag: '7',
+          userType:userType,
        }
        getAction(url, params).then((res) => {
          if (res.success) {
@@ -43,7 +43,7 @@ import { mapGetters } from 'vuex'

  export default {
    name: 'file',
-    props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate'],
+    props: ['disableds', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'detailDate','watermark'],
    data() {
      return {
        visible: false,
@@ -91,7 +91,11 @@ import { mapGetters } from 'vuex'
  methods: {
    ...mapGetters(['userInfo']),
    download() {
-      downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId })
+      if(this.watermark == 'download'){
+        downloadFile('/sys/common/downLoadFileNOMark', this.template.templateName, { id: this.template.templateId })
+      } else {
+        downloadFile('/sys/common/downLoadFile', this.template.templateName, { id: this.template.templateId })
+      }
    },
    perentHandleFunc(data) {
      this.myfileList = data
@@ -220,7 +224,11 @@ import { mapGetters } from 'vuex'
      //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
      //   window.open(url, '_blank')
      // } else {
+      if(this.watermark == 'download'){
+        downloadFile('/sys/common/downLoadFileNOMark', fileQuery.fileName, { id: fileQuery.id })
+      }else {
        downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+      }
      // }
    }
  }
@@ -11,6 +11,7 @@ import {
  CACHE_INCLUDED_ROUTES
 } from '@/store/mutation-types'
 import { welcome } from '@/utils/util'
+import { LZString } from '@/utils/compressedData'
 import { queryPermissionsByUser } from '@/api/api'
 import { getAction } from '@/api/manage'

@@ -146,7 +147,8 @@ const user = {
          // if (!gData) {
          //   getAction('sys/user/queryUserTreeList', {}).then((res) => {
          //     if (res.success) {
-          //       localStorage.setItem('gData', JSON.stringify(res.result))
+          //       let index = LZString.compressToUint8Array(JSON.stringify(res.result)).join(',')
+          //       localStorage.setItem('gData', LZString.compressToEncodedURIComponent(index))
          //     }
          //   })
          // }
@@ -0,0 +1,313 @@
+export const LZString = function() {
+  function f(h, e) {
+    if (!b[h]) {
+      b[h] = {};
+      for (var i = 0; i < h.length; i++) {
+        b[h][h.charAt(i)] = i
+      }
+    }
+    return b[h][e]
+  }
+
+  var c = String.fromCharCode,
+    g = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+    d = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-$",
+    b = {},
+    a = {
+      compressToBase64: function(h) {
+        if (null == h) {
+          return ""
+        }
+        var e = a._compress(h, 6,
+          function(i) {
+            return g.charAt(i)
+          });
+        switch (e.length % 4) {
+          default:
+          case 0:
+            return e;
+          case 1:
+            return e + "===";
+          case 2:
+            return e + "==";
+          case 3:
+            return e + "="
+        }
+      },
+      decompressFromBase64: function(e) {
+        return null == e ? "": "" == e ? null: a._decompress(e.length, 32,
+          function(h) {
+            return f(g, e.charAt(h))
+          })
+      },
+      compressToUTF16: function(e) {
+        return null == e ? "": a._compress(e, 15,
+          function(h) {
+            return c(h + 32)
+          }) + " "
+      },
+      decompressFromUTF16: function(e) {
+        return null == e ? "": "" == e ? null: a._decompress(e.length, 16384,
+          function(h) {
+            return e.charCodeAt(h) - 32
+          })
+      },
+      compressToUint8Array: function(l) {
+        for (var j = a.compress(l), m = new Uint8Array(2 * j.length), k = 0, h = j.length; h > k; k++) {
+          var i = j.charCodeAt(k);
+          m[2 * k] = i >>> 8,
+            m[2 * k + 1] = i % 256
+        }
+        return m
+      },
+      decompressFromUint8Array: function(k) {
+        if (null === k || void 0 === k) {
+          return a.decompress(k)
+        }
+        for (var l = new Array(k.length / 2), j = 0, h = l.length; h > j; j++) {
+          l[j] = 256 * k[2 * j] + k[2 * j + 1]
+        }
+        var i = [];
+        return l.forEach(function(e) {
+          i.push(c(e))
+        }),
+          a.decompress(i.join(""))
+      },
+      compressToEncodedURIComponent: function(e) {
+        return null == e ? "": a._compress(e, 6,
+          function(h) {
+            return d.charAt(h)
+          })
+      },
+      decompressFromEncodedURIComponent: function(e) {
+        return null == e ? "": "" == e ? null: (e = e.replace(/ /g, "+"), a._decompress(e.length, 32,
+          function(h) {
+            return f(d, e.charAt(h))
+          }))
+      },
+      compress: function(e) {
+        return a._compress(e, 16,
+          function(h) {
+            return c(h)
+          })
+      },
+      _compress: function(q, j, w) {
+        if (null == q) {
+          return ""
+        }
+        var C, I, z, J = {},
+          k = {},
+          H = "",
+          E = "",
+          F = "",
+          y = 2,
+          B = 3,
+          A = 2,
+          D = [],
+          x = 0,
+          G = 0;
+        for (z = 0; z < q.length; z += 1) {
+          if (H = q.charAt(z), Object.prototype.hasOwnProperty.call(J, H) || (J[H] = B++, k[H] = !0), E = F + H, Object.prototype.hasOwnProperty.call(J, E)) {
+            F = E
+          } else {
+            if (Object.prototype.hasOwnProperty.call(k, F)) {
+              if (F.charCodeAt(0) < 256) {
+                for (C = 0; A > C; C++) {
+                  x <<= 1,
+                    G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++
+                }
+                for (I = F.charCodeAt(0), C = 0; 8 > C; C++) {
+                  x = x << 1 | 1 & I,
+                    G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+                    I >>= 1
+                }
+              } else {
+                for (I = 1, C = 0; A > C; C++) {
+                  x = x << 1 | I,
+                    G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+                    I = 0
+                }
+                for (I = F.charCodeAt(0), C = 0; 16 > C; C++) {
+                  x = x << 1 | 1 & I,
+                    G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+                    I >>= 1
+                }
+              }
+              y--,
+              0 == y && (y = Math.pow(2, A), A++),
+                delete k[F]
+            } else {
+              for (I = J[F], C = 0; A > C; C++) {
+                x = x << 1 | 1 & I,
+                  G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+                  I >>= 1
+              }
+            }
+            y--,
+            0 == y && (y = Math.pow(2, A), A++),
+              J[E] = B++,
+              F = String(H)
+          }
+        }
+        if ("" !== F) {
+          if (Object.prototype.hasOwnProperty.call(k, F)) {
+            if (F.charCodeAt(0) < 256) {
+              for (C = 0; A > C; C++) {
+                x <<= 1,
+                  G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++
+              }
+              for (I = F.charCodeAt(0), C = 0; 8 > C; C++) {
+                x = x << 1 | 1 & I,
+                  G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+                  I >>= 1
+              }
+            } else {
+              for (I = 1, C = 0; A > C; C++) {
+                x = x << 1 | I,
+                  G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+                  I = 0
+              }
+              for (I = F.charCodeAt(0), C = 0; 16 > C; C++) {
+                x = x << 1 | 1 & I,
+                  G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+                  I >>= 1
+              }
+            }
+            y--,
+            0 == y && (y = Math.pow(2, A), A++),
+              delete k[F]
+          } else {
+            for (I = J[F], C = 0; A > C; C++) {
+              x = x << 1 | 1 & I,
+                G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+                I >>= 1
+            }
+          }
+          y--,
+          0 == y && (y = Math.pow(2, A), A++)
+        }
+        for (I = 2, C = 0; A > C; C++) {
+          x = x << 1 | 1 & I,
+            G == j - 1 ? (G = 0, D.push(w(x)), x = 0) : G++,
+            I >>= 1
+        }
+        for (;;) {
+          if (x <<= 1, G == j - 1) {
+            D.push(w(x));
+            break
+          }
+          G++
+        }
+        return D.join("")
+      },
+      decompress: function(e) {
+        return null == e ? "": "" == e ? null: a._decompress(e.length, 32768,
+          function(h) {
+            return e.charCodeAt(h)
+          })
+      },
+      _decompress: function(B, C, I) {
+        var r, F, x, z, q, K, L, E, H = [],
+          G = 4,
+          J = 4,
+          D = 3,
+          k = "",
+          j = [],
+          y = {
+            val: I(0),
+            position: C,
+            index: 1
+          };
+        for (F = 0; 3 > F; F += 1) {
+          H[F] = F
+        }
+        for (z = 0, K = Math.pow(2, 2), L = 1; L != K;) {
+          q = y.val & y.position,
+            y.position >>= 1,
+          0 == y.position && (y.position = C, y.val = I(y.index++)),
+            z |= (q > 0 ? 1 : 0) * L,
+            L <<= 1
+        }
+        switch (r = z) {
+          case 0:
+            for (z = 0, K = Math.pow(2, 8), L = 1; L != K;) {
+              q = y.val & y.position,
+                y.position >>= 1,
+              0 == y.position && (y.position = C, y.val = I(y.index++)),
+                z |= (q > 0 ? 1 : 0) * L,
+                L <<= 1
+            }
+            E = c(z);
+            break;
+          case 1:
+            for (z = 0, K = Math.pow(2, 16), L = 1; L != K;) {
+              q = y.val & y.position,
+                y.position >>= 1,
+              0 == y.position && (y.position = C, y.val = I(y.index++)),
+                z |= (q > 0 ? 1 : 0) * L,
+                L <<= 1
+            }
+            E = c(z);
+            break;
+          case 2:
+            return ""
+        }
+        for (H[3] = E, x = E, j.push(E);;) {
+          if (y.index > B) {
+            return ""
+          }
+          for (z = 0, K = Math.pow(2, D), L = 1; L != K;) {
+            q = y.val & y.position,
+              y.position >>= 1,
+            0 == y.position && (y.position = C, y.val = I(y.index++)),
+              z |= (q > 0 ? 1 : 0) * L,
+              L <<= 1
+          }
+          switch (E = z) {
+            case 0:
+              for (z = 0, K = Math.pow(2, 8), L = 1; L != K;) {
+                q = y.val & y.position,
+                  y.position >>= 1,
+                0 == y.position && (y.position = C, y.val = I(y.index++)),
+                  z |= (q > 0 ? 1 : 0) * L,
+                  L <<= 1
+              }
+              H[J++] = c(z),
+                E = J - 1,
+                G--;
+              break;
+            case 1:
+              for (z = 0, K = Math.pow(2, 16), L = 1; L != K;) {
+                q = y.val & y.position,
+                  y.position >>= 1,
+                0 == y.position && (y.position = C, y.val = I(y.index++)),
+                  z |= (q > 0 ? 1 : 0) * L,
+                  L <<= 1
+              }
+              H[J++] = c(z),
+                E = J - 1,
+                G--;
+              break;
+            case 2:
+              return j.join("")
+          }
+          if (0 == G && (G = Math.pow(2, D), D++), H[E]) {
+            k = H[E]
+          } else {
+            if (E !== J) {
+              return null
+            }
+            k = x + x.charAt(0)
+          }
+          j.push(k),
+            H[J++] = x + k.charAt(0),
+            G--,
+            x = k,
+          0 == G && (G = Math.pow(2, D), D++)
+        }
+      }
+    };
+  return a
+} ();
+
+// module.exports = LZString
@@ -34,6 +34,7 @@
            </div>
            <a-form-model-item class="itemModel" prop="chargePersonIdName">
              <PersonnelSelection
+                v-if="visible"
                :isSingleChoice="true"
                :query="{db_field_name:'chargePersonId',db_field_txt:$t('personCharge')}"
                :personneQuery="formInline"
@@ -36,7 +36,9 @@
      </a-form>
    </div>
    <div class="box-content-right">
-      <div @click="managePublishingClick" class="operator-text">
+      <div @click="managePublishingClick"
+           v-has="'countryCard:managePublishing'"
+           class="operator-text">
        <a-icon type="carry-out"/>
        {{$t('managePublishing')}}
      </div>
@@ -34,9 +34,10 @@
                    <span class="title-text-text"
                          :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
                  </div>
-                  <a-form-model-item class="itemModel" prop="problemType">
+                  <a-form-model-item class="itemModel itemModel-multi" prop="problemType">
                    <a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
                              @change="problemTypeChange"
+                              mode="multiple"
                              v-model="formInline.problemType">
                      <a-select-option v-for="(item, key) in problemTypeList"
                                       :key="key"
@@ -94,7 +95,7 @@
                    <span class="Required">*</span>
                    <span class="title-text-text" :title="$t('authorizedUser')">{{$t('authorizedUser')}}</span>
                  </div>
-                  <a-form-model-item class="itemModel" prop="studioEngineerName">
+                  <a-form-model-item class="itemModel-multi" prop="studioEngineerName">
                    <PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('authorizedUser')}"
                                        :personneQuery="formInline"
                                        @change="PersonnelSelectionChange"
@@ -125,9 +126,9 @@
                      </a-select-option>
                    </a-select>
                    <a-button class="box-button-index"
-                              :title="$t('bringInDocumentInformation')"
+                              :title="$t('addStandardInformation')"
                              type="primary" @click="bringInDocumentInformationClick">
-                      {{$t('bringInDocumentInformation')}}
+                      {{$t('addStandardInformation')}}
                    </a-button>
                  </a-form-model-item>
                </div>
@@ -178,7 +179,10 @@
            </a-row>
          </a-form-model>
          <div class="submit-button">
-            <a-button class="box-button" type="primary" @click="submit">{{$t('submit')}}</a-button>
+            <a-button class="box-button" type="primary" @click="submit('Draft')">
+              {{$t('tempSave')}}
+            </a-button>
+            <a-button class="box-button" type="primary" @click="submit('Have released')">{{$t('release')}}</a-button>
          </div>
        </div>
      </div>
@@ -356,7 +360,7 @@
        document.title = this.$t('problemKnowledgeBase') + this.$t('edit')
      } else {
        this.isDisplayIndex = true
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
          this.myQuillEditor()
        })
        document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded')
@@ -476,6 +480,11 @@
            } else {
              this.formInline.standNumber = []
            }
+            if (this.formInline.problemType) {
+              this.formInline.problemType = this.formInline.problemType.split(',')
+            } else {
+              this.formInline.problemType = []
+            }
            this.formInline = { ...this.formInline }
          } else {
            this.formInline = {}
@@ -491,7 +500,7 @@
        this.$router.go(-1)
      },
      onEditorReady(quill) {
-        if (this.formInlineOne.content){
+        if (this.formInlineOne.content) {
          document.getElementsByClassName('ql-editor')[0].innerHTML = this.formInlineOne.content
        }
      },
@@ -595,14 +604,20 @@
        this.formInline[this.uploadName] = attIdList.join(',')
        this.formInline = { ...this.formInline }
      },
-      submit() {
+      tempSaveClick(){
+
+      },
+      submit(releaseStatus) {
        this.$refs.ruleForm.validate(valid => {
          if (valid) {
            let formInline = JSON.parse(JSON.stringify(this.formInline))
            // if (formInline.standNumber && formInline.standNumber.length > 0) {
-            if (formInline.standNumber instanceof Array){
+            if (formInline.standNumber instanceof Array) {
              formInline.standNumber = formInline.standNumber.join(',')
            }
+            if (formInline.problemType instanceof Array) {
+              formInline.problemType = formInline.problemType.join(',')
+            }
            // }
            this.loading = true
            this.confirmLoading = true
@@ -624,6 +639,7 @@
                })
              })
            }
+            formInline.releaseStatus = releaseStatus
            Action(url, formInline).then((res) => {
              if (res.success) {
                this.$message.success(this.$t('OperationSuccessful'))
@@ -775,6 +791,7 @@
  .box-button {
    height: 38px;
    margin-top: 4px;
+    margin-left: 10px;
  }

  .box-button-index {
@@ -15,7 +15,9 @@
        </template>
      </div>
      <div class="box-content-content">
-        <div class="box-content-content-index" :title="$t('classificationMaintenance')"
+        <div class="box-content-content-index"
+             v-has="'problemKnowledgeBase:classificationMaintenance'"
+             :title="$t('classificationMaintenance')"
             @click="classificationClick">
          <a-icon type="setting"/>
          {{$t('classificationMaintenance')}}
@@ -42,11 +44,15 @@
          <!--          <a-icon type="setting"/>-->
          <!--          {{$t('classificationMaintenance')}}-->
          <!--        </div>-->
-          <div @click="managePublishingClick" class="operator-text-text-index">
+          <div @click="managePublishingClick"
+               v-has="'problemKnowledgeBase:release'"
+               class="operator-text-text-index">
            <a-icon type="carry-out"/>
            {{$t('managePublishing')}}
          </div>
-          <div @click="newlyAddedClick" class="operator-text-text-index">
+          <div @click="newlyAddedClick"
+               v-has="'problemKnowledgeBase:add'"
+               class="operator-text-text-index">
            <a-icon type="plus"/>
            {{$t('newlyAdded')}}
          </div>
@@ -65,16 +71,16 @@
                {{val}}
            </span>
          </div>
-          <div class="content-box-content" @click="detailClcik(item)">
-            <div class="content-box-content-top" v-html="item.contentOne">
-
+          <div class="content-box-content">
+            <div class="content-box-content-top" @click="detailClcik(item)"
+                 v-html="item.contentOne">
            </div>
            <div class="content-box-content-botton">
              <div class="content-box-content-botton-text"
                   v-if="item.accessoryFileNameList && item.accessoryFileNameList.length > 0"
                   :title="val.fileName"
                   v-for="val in item.accessoryFileNameList">
-                {{val.fileName}}
+                <span @click="fileClick(val)">{{val.fileName}}</span>
              </div>
            </div>
          </div>
@@ -85,9 +91,13 @@
                <a-icon type="user"/>
                {{item.createBy}}
              </div>
-              <div class="content-box-button-text">
+              <div class="content-box-button-text" v-if="item.standNumber">
                <a-icon type="audit"/>
-                {{item.problemTypeName}}
+                {{item.standNumber}}
+              </div>
+              <div class="content-box-button-text" v-if="item.targetMarket_dicText">
+                <a-icon type="idcard"/>
+                {{item.targetMarket_dicText}}
              </div>
              <div class="content-box-button-text">
                <a-icon type="history"/>
@@ -170,6 +180,7 @@
  import SelectedBy from '@/components/SelectedBy/index'
  import problemKnowledgeBaseListView from './problemKnowledgeBaseListView'
  import { mapGetters } from 'vuex'
+  import { Base64 } from 'js-base64'

  export default {
    name: 'problemKnowledgeBaseList',
@@ -193,6 +204,7 @@
        queryForm: {},
        tagList: [],
        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
        pageNo: 1,
        url: {
          getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page'
@@ -207,6 +219,17 @@
        localStorage.removeItem('serial_number')
      }
      this.isTrue = true
+      let BaseQuery = localStorage.getItem('problemknowledgeBase')
+      if (BaseQuery) {
+        let content = JSON.parse(BaseQuery)
+        if (content.id) {
+          this.isTrue = false
+          this.$nextTick(() => {
+            this.$refs.problemKnowledgeBaseListViewRef.getData(JSON.parse(JSON.stringify(content)))
+          })
+        }
+        localStorage.removeItem('problemknowledgeBase')
+      }
      this.getList()
      this.replacePage()
    },
@@ -255,6 +278,26 @@
          this.getList()
        })
      },
+      fileClick(fileQuery) {
+        let fileName = fileQuery.fileName
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix == '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+        }
+      },
      problemKnowledgeBase() {
        this.pageNo = 1
        this.isTrue = true
@@ -309,7 +352,8 @@
      },
      getText(str) {
        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
-        return words.replace(/\s/g, '') //这里是去除空格
+        //.replace(/\s/g, '') //这里是去除空格
+        return words
      },
      getList() {
        let selectedTags = JSON.parse(JSON.stringify(this.selectedTags))
@@ -317,7 +361,8 @@
          pageNo: this.pageNo,
          pageSize: this.pageSize,
          searchStr: this.searchStr,
-          problemTypes: selectedTags.join(',')
+          problemTypes: selectedTags.join(','),
+          releaseStatus: 'Have released'
        }
        this.loading = true
        getAction(this.url.getInfoList, query).then((res) => {
@@ -629,7 +674,7 @@
        background: #DBF2F3;
        border-radius: 3px;
        margin-left: 6px;
-        max-width: 120px;
+        max-width: 140px;
        text-overflow: ellipsis;
        white-space: nowrap;
        overflow: hidden;
@@ -662,22 +707,22 @@
        margin-top: 10px;

        .content-box-content-botton-text {
-          max-width: 198px;
+          /*max-width: 198px;*/
          height: 32px;
          display: inline-block;
          text-align: center;
          line-height: 32px;
-          padding: 0 10px;
-          background: #EFF1F3;
+          /*background: #EFF1F3;*/
          border-radius: 4px;
          text-overflow: ellipsis;
          white-space: nowrap;
          overflow: hidden;
-          font-size: 12px;
+          font-size: 14px;
          font-weight: 400;
          color: #040B29;
-          margin-right: 10px;
+          margin-right: 20px;
          cursor: pointer;
+          text-decoration: underline;
        }
      }
    }
@@ -789,7 +834,7 @@
    background: #fff;
    background: rgba(4, 11, 41, 0.06);
    color: #363C54;
-    max-width: 150px;
+    max-width: 280px;
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;
@@ -33,9 +33,13 @@
            <a-icon type="user"/>
            {{queryForm.createBy}}
          </div>
-          <div class="content-box-button-text">
-            <a-icon type="audit"/>
-            {{queryForm.problemTypeName}}
+          <div class="content-box-button-text" v-if="queryForm.standNumber">
+            <a-icon type="file-markdown"/>
+            {{queryForm.standNumber}}
+          </div>
+          <div class="content-box-button-text" v-if="queryForm.targetMarket_dicText">
+            <a-icon type="idcard"/>
+            {{queryForm.targetMarket_dicText}}
          </div>
          <div class="content-box-button-text">
            <a-icon type="history"/>
@@ -96,8 +100,16 @@
          <div class="commentContent-content">
            {{item.commentContent}}
          </div>
-          <div class="answer-text" style="margin-bottom: 14px" @click="messageClick(item)">
-            {{$t('answer')}}
+          <div class="answer-text-index"
+               style="margin-bottom: 14px">
+            <span class="answer-text" @click="messageClick(item)">
+              {{$t('answer')}}
+            </span>
+            <span class="answer-text"
+                  v-if="administrators || item.createBy == userInfoQuery.username"
+                  @click="deleteClick(item)">
+              {{$t('delete')}}
+            </span>
          </div>
          <div class="commentContent-text-one" v-for="(val,index1) in item.problemKnowledgeBaseCommentVOList"
               v-if="item.problemKnowledgeBaseCommentVOList && item.problemKnowledgeBaseCommentVOList.length > 0">
@@ -109,8 +121,15 @@
            <div class="commentContent-content">
              {{val.commentContent}}
            </div>
-            <div class="answer-text" @click="messageClick(item)">
+            <div class="answer-text-index">
+               <span class="answer-text" @click="messageClick(item)">
              {{$t('answer')}}
+              </span>
+              <span class="answer-text"
+                    v-if="administrators || val.createBy == userInfoQuery.username"
+                    @click="deleteClick(val)">
+              {{$t('delete')}}
+              </span>
            </div>
          </div>
        </div>
@@ -158,6 +177,7 @@
  import SelectedBy from '@/components/SelectedBy/index'
  import { mapGetters } from 'vuex'
  import { Base64 } from 'js-base64'
+  import { deleteAction } from '../../../../api/manage'

  export default {
    name: 'problemKnowledgeBaseListView',
@@ -167,6 +187,8 @@
    data() {
      return {
        visibleComment: false,
+        administrators: false,
+        userInfoQuery: {},
        releaseList: [],
        loading: false,
        formInline: {},
@@ -205,7 +227,15 @@
      }
    },
    mounted() {
-
+      this.administrators = false
+      this.userInfoQuery = this.userInfo()
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
    },
    methods: {
      ...mapGetters(['userInfo']),
@@ -229,6 +259,28 @@
          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
        }
      },
+      deleteClick(item) {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('ConfirmDelete'),
+          onOk() {
+            let url = ''
+            if (item.problemKnowledgeBaseId) {
+              url = '/problemKnowledgeBase/problemKnowledgeBaseCommentEO/deleteBatch'
+            } else {
+              url = '/project/problemKnowledgeBaseReplyEO/deleteBatch'
+            }
+            deleteAction(url, { ids: item.id }).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.releaseData()
+              } else {
+                _this.$message.warning(res.message)
+              }
+            })
+          }
+        })
+      },
      download(item) {
        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
      },
@@ -494,22 +546,22 @@
        margin-top: 10px;

        .content-box-content-botton-text {
-          max-width: 200px;
+          /*max-width: 200px;*/
          /*min-width: 120px;*/
          height: 32px;
          display: inline-block;
          text-align: center;
          line-height: 32px;
-          padding: 0 10px;
-          background: #EFF1F3;
+          /*padding: 0 10px;*/
+          /*background: #EFF1F3;*/
          border-radius: 4px;
          text-overflow: ellipsis;
          white-space: nowrap;
          overflow: hidden;
-          font-size: 12px;
+          font-size: 14px;
          font-weight: 400;
          color: #040B29;
-          margin-right: 10px;
+          margin-right: 20px;
          cursor: pointer;

          .file-text {
@@ -517,6 +569,7 @@
            overflow: hidden;
            text-overflow: ellipsis;
            white-space: nowrap;
+            text-decoration: underline;
            display: inline-block;
            margin-right: 6px;
            cursor: pointer;
@@ -632,6 +685,10 @@
          margin-top: 6px;
        }

+        .answer-text-index {
+          width: 100%;
+        }
+
        .answer-text {
          display: inline-block;
          padding: 3px 14px;
@@ -3,25 +3,49 @@
    <div class="doc-detail-wrap">
      <div class="doc-detail-header" style="position: fixed;top: 0">
        <div class="doc-detail-title">
-<!--           <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">-->
-<!--             <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
-<!--           </span>-->
+          <!--           <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">-->
+          <!--             <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
+          <!--           </span>-->
          {{$t('managePublishing')}}
        </div>
      </div>
      <div style="padding-top: 68px;background: #fff">
        <div class="detail-content" style="padding: 30px">
          <div class="search-detail-wrap">
-            <a-form layout="inline" @keyup.enter.native="onSearch">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('searchContent')">
-                  <span>{{$t('searchContent')}}</span>
+            <a-form layout="inline" style="width: 1200px;margin: 0 auto" @keyup.enter.native="onSearch">
+              <a-row :gutter="24">
+                <a-col :span="10">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('searchContent')">
+                      <span>{{$t('searchContent')}}</span>
+                    </div>
+                    <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
+                             v-model="queryParam.searchStr"></a-input>
+                  </div>
+                </a-col>
+                <a-col :span="10">
+                  <div class="box-title-text">
+                    <div class="title-text" :title="$t('releaseStatus')">
+                      <span>{{$t('releaseStatus')}}</span>
+                    </div>
+                    <a-select :placeholder="$t('PleaseSelect')+$t('releaseStatus')"
+                              v-model="queryParam.releaseStatus">
+                      <a-select-option v-for="(item, key) in releaseStatusList"
+                                       :key="key"
+                                       :value="item.value">
+                     <span class="selectText" :title=" item.name ">
+                           {{ item.name}}
+                     </span>
+                      </a-select-option>
+                    </a-select>
+                  </div>
+                </a-col>
+                <div style="text-align: right">
+                  <a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}
+                  </a-button>
                </div>
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
-                         v-model="searchStr"></a-input>
-                <a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
-                <a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}</a-button>
-              </div>
+              </a-row>
            </a-form>
          </div>
          <div v-if="conList.length > 0" style="height: calc(100vh - 240px);overflow:auto;">
@@ -41,9 +65,14 @@
                  <div class="text-content">
                    {{item.contentOne}}
                  </div>
+                  <div class="text-text-right-text-One">
+                    {{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
+                  </div>
                  <div class="text-text-right-text">
-                    <a style="margin-right: 10px" @click="edit(item)">{{$t('edit')}}</a>
-                    <a @click="deleteData(item)">{{$t('delete')}}</a>
+                    <a style="margin-right: 10px" @click="edit(item)"
+                       v-if="userInfoQuery.username == item.createBy || administrators">{{$t('edit')}}</a>
+                    <a @click="deleteData(item)"
+                       v-if="userInfoQuery.username == item.createBy || administrators">{{$t('delete')}}</a>
                  </div>
                </div>
              </div>
@@ -83,10 +112,22 @@
        conList: [],
        total: 0,
        pageSize: 10,
-        searchStr: '',
+        queryParam: {},
+        releaseStatusList: [
+          {
+            name: this.$t('draft'),
+            value: 'Draft'
+          },
+          {
+            name: this.$t('HaveReleased'),
+            value: 'Have released'
+          }
+        ],
        loading: false,
+        administrators: false,
        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
        pageNo: 1,
+        userInfoQuery: {},
        url: {
          getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page',
          deleteBatch: '/problemKnowledgeBase/problemKnowledgeBaseEO/deleteBatch'
@@ -96,6 +137,15 @@
    mounted() {
      this.getList()
      document.title = this.$t('managePublishing')
+      this.administrators = false
+      this.userInfoQuery = this.userInfo()
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
    },
    methods: {
      ...mapGetters(['userInfo']),
@@ -113,20 +163,21 @@
        this.getList()
      },
      ResetSearch() {
-        this.searchStr = ''
+        this.queryParam = {}
        this.pageNo = 1
        this.getList()
      },
      getText(str) {
        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
-        return words.replace(/\s/g, '') //这里是去除空格
+        //.replace(/\s/g, '') //这里是去除空格
+        return words
      },
      getList() {
        let query = {
          pageNo: this.pageNo,
          pageSize: this.pageSize,
          createBy: this.userInfo().username,
-          searchStr: this.searchStr
+          ...this.queryParam
        }
        this.loading = true
        getAction(this.url.getInfoList, query).then((res) => {
@@ -271,11 +322,21 @@

  .text-text-right {
    padding: 19px 19px;
-    width: calc(100% - 180px);
+    width: calc(100% - 300px);
    box-sizing: border-box;
    /*margin-left: 38px;*/
  }

+  .text-text-right-text-One {
+    width: 120px;
+    height: 100%;
+    text-align: center;
+    position: absolute;
+    right: 180px;
+    top: 50%;
+    transform: translate-Y(-50%);
+  }
+
  .text-text-right-text {
    width: 180px;
    height: 100%;
@@ -351,16 +412,13 @@

  .search-detail-wrap {
    width: 100%;
-    margin: 0 auto;
+    margin-bottom: 16px;
  }

  .box-title-text {
    line-height: 1.4;
    display: flex;
    align-items: center;
-    margin-bottom: 10px;
-    text-align: center;
-    justify-content: center;
  }

  .title-text {
@@ -380,7 +438,7 @@
  .box-input {
    /*min-width: 200px;*/
    display: inline-block;
-    width: 50%;
+    width: 100%;
    height: 38px;
    margin-top: 2px;
    margin-right: 16px;
@@ -44,19 +44,27 @@
      </a-form>
    </div>
    <div class="table-operator">
-      <div @click="monthlyTitleTemplateClick" class="operator-text">
+      <div @click="monthlyTitleTemplateClick"
+           v-has="'monthlyReportFilling:titleTemplate'"
+           class="operator-text">
        <a-icon type="apartment"/>
        {{$t('monthlyTitleTemplate')}}
      </div>
-      <div @click="monthlyIntegrationAndExportClick" class="operator-text">
+      <div @click="monthlyIntegrationAndExportClick"
+           v-has="'monthlyReportFilling:integratedExport'"
+           class="operator-text">
        <a-icon type="import"/>
        {{$t('monthlyIntegrationAndExport')}}
      </div>
-      <div @click="addContentClick" class="operator-text">
+      <div @click="addContentClick"
+           v-has="'monthlyReportFilling:adding'"
+           class="operator-text">
        <a-icon type="plus"/>
        {{$t('addContent')}}
      </div>
-      <div @click="BatchDeleteClick" class="operator-text">
+      <div @click="BatchDeleteClick"
+           v-has="'monthlyReportFilling:batchDelete'"
+           class="operator-text">
        <a-icon type="delete"/>
        {{$t('BatchDelete')}}
      </div>
@@ -74,10 +82,28 @@
        :columns="columns"
      >
         <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="copyClick(record)">{{$t('copy')}}</a>
-           <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
-           <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
-           <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+           <a class="text-operation"
+              v-has="'monthlyReportFilling:copy'"
+              @click="copyClick(record)">
+             {{$t('copy')}}
+           </a>
+           <a class="text-operation"
+              v-has="'monthlyReportFilling:view'"
+              @click="viewClick(record)">
+             {{$t('view')}}
+           </a>
+           <a class="text-operation"
+              v-if="record.createBy == userData.username || administrators"
+              v-has="'monthlyReportFilling:edit'"
+              @click="edit(record)">
+             {{$t('edit')}}
+           </a>
+           <a class="text-operation"
+              v-if="record.createBy == userData.username || administrators"
+              v-has="'monthlyReportFilling:delete'"
+              @click="deleteLib(record)">
+             {{$t('deleteLib')}}
+           </a>
        </span>
      </a-table>
      <div class="page" v-if="dataSource && dataSource.length > 0">
@@ -103,6 +129,7 @@
  import fillTable from './modules/fillTable'
  import fillAdd from './modules/fillAdd'
  import moment from 'moment'
+  import { mapGetters } from 'vuex'

  export default {
    name: 'RegulationMonthlyFill',
@@ -118,14 +145,14 @@
          list: '/report/lawsMonthlyReportWriteEO/page',
          exportData: '/report/lawsMonthlyReportWriteEO/exportMonthlyReport'
        },
-        exportStatusList:[
+        exportStatusList: [
          {
-            value:'2',
-            name:this.$t('hasBeenExport')
+            value: '2',
+            name: this.$t('hasBeenExport')
          },
          {
-            value:'1',
-            name:this.$t('notExport')
+            value: '1',
+            name: this.$t('notExport')
          }
        ],
        loading: false,
@@ -192,15 +219,27 @@
            width: 190,
            scopedSlots: { customRender: 'operation' }
          }
-        ]
+        ],
+        userData:{},
+        administrators:false
      }
    },
    mounted() {
      this.queryParam.month = moment(new Date()).format('YYYY-MM')
      this.getList()
+      this.userData = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
    },
    methods: {
-      copyClick(row){
+      ...mapGetters(['userInfo']),
+      copyClick(row) {
        let _this = this
        this.$confirm({
          content: _this.$t('ConfirmReplication'),
@@ -22,7 +22,7 @@
      </a-form>
    </div>
    <div class="table-operator">
-      <div @click="uploadMonthlyClick" class="operator-text">
+      <div @click="uploadMonthlyClick" v-has="'monthlyReportManagement:upload'" class="operator-text">
        <a-icon type="cloud-upload"/>
        {{$t('uploadMonthly')}}
      </div>
@@ -51,14 +51,16 @@
          </span>
        <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
-              v-if="record.createBy == userData.username"
+              v-has="'monthlyReportManagement:release'"
+              v-if="record.createBy == userData.username || administrators"
              @click="withdraw(record)">
             {{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
           </a>
           <a class="text-operation"
-              v-if="record.createBy == userData.username && record.issueStatus == 2"
+              v-if="(record.createBy == userData.username || administrators) && record.issueStatus == 2"
              @click="deleteLib(record)">{{$t('deleteLib')}}</a>
           <a class="text-operation"
+              v-has="'monthlyReportManagement:download'"
              v-if="record.createBy == userData.username || record.issueStatus == 1"
              @click="download(record)">{{$t('download')}}</a>
        </span>
@@ -110,6 +112,7 @@
        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
        downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
        userData: {},
+        administrators:false,
        columns: [
          {
            title: this.$t('RegulationMonthlyName'),
@@ -161,6 +164,14 @@
    mounted() {
      this.getList()
      this.userData = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
    },
    methods: {
      ...mapGetters(['userInfo']),
@@ -98,7 +98,7 @@
                                :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
                                :type="'checkbox'"
                                :disabled="disabled"
-                                :triggerChange="false" :dictCode="'apply_scope'"/>
+                                :triggerChange="false" :dictCode="'fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2'"/>
          </a-form-model-item>
        </div>
      </a-col>
@@ -255,7 +255,7 @@
            <span class="Required" v-if="!disabled">*</span>
            <span class="title-text-text" :title="$t('regulatoryContact')">{{$t('regulatoryContact')}}</span>
          </div>
-          <a-form-model-item class="itemModel" prop="lawsContactName">
+          <a-form-model-item class="itemModel-multi" prop="lawsContactName">
            <PersonnelSelection
              :query="{db_field_name:'lawsContact',db_field_txt:$t('regulatoryContact')}"
              :personneQuery="formInline"
@@ -366,15 +366,15 @@
          ],
          workProgressEn: [
            {
-              max: 300,
-              message: this.$t('workProgressEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 5000,
+              message: this.$t('workProgressEn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
              trigger: 'blur'
            }
          ],
          workProgressCn: [
            {
-              max: 300,
-              message: this.$t('workProgressEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 5000,
+              message: this.$t('workProgressEn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
              trigger: 'blur'
            }
          ],
@@ -385,8 +385,8 @@
              trigger: 'blur'
            },
            {
-              max: 300,
-              message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 5000,
+              message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
              trigger: 'blur'
            }
          ],
@@ -397,8 +397,8 @@
              trigger: 'blur'
            },
            {
-              max: 300,
-              message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 5000,
+              message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
              trigger: 'blur'
            }
          ],
@@ -241,8 +241,8 @@
              trigger: 'blur'
            },
            {
-              max: 300,
-              message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 5000,
+              message: this.$t('primaryCoverageEn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
              trigger: 'blur'
            }
          ],
@@ -253,8 +253,8 @@
              trigger: 'blur'
            },
            {
-              max: 300,
-              message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              max: 5000,
+              message: this.$t('primaryCoverageCn') + this.$t('cannotExceed') + 5000 + this.$t('Characters'),
              trigger: 'blur'
            }
          ]
@@ -205,7 +205,8 @@
      },
      getText(str) {
        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
-        return words.replace(/\s/g, '') //这里是去除空格
+        //.replace(/\s/g, '') //这里是去除空格
+        return words
      },
      getList() {
        let query = {
@@ -155,6 +155,7 @@
                              </div>
                              <a-form-model-item class="itemModel" :prop="item.db_field_name">
                                <PersonnelSelection :query="item"
+                                                    v-if="visible"
                                                    :personneQuery="formInline"
                                                    @change="PersonnelSelectionChange"
                                                    :disabled="disabled"
@@ -60,7 +60,7 @@
                <span style="cursor: pointer"
                      @click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
              </div>
-              <div class="detail-content-header-content-rightOne">
+              <div class="detail-content-header-content-rightOne" :title="$t('comparisonDifferenceComment')">
                {{$t('comparisonDifferenceComment')}}
              </div>
              <div class="detail-content-header-content-right" v-if="!isDisplay">
@@ -162,7 +162,7 @@
            <span>{{$t('fullTextComments')}}</span>
          </div>
          <a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
+            <a-textarea :placeholder="$t('pleaseEnterfullTextComments')"
                        v-model.trim="formInlineText.comment"
                        :rows="4"/>
          </a-form-model-item>
@@ -494,6 +494,7 @@
      .operator-text-text {
        cursor: pointer;
        margin-right: 53px;
+        max-width: 138px;
        font-size: 14px;
        font-weight: 400;
        color: #040B29;
@@ -91,7 +91,9 @@
            </div>
          </div>
          <div class="Remarks">
-            <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+            <a-form-model :model="formInline"
+                          class="formAdd" :rules="rules"
+                          ref="ruleForm">
              <div class="box-title-text-Remarks">
                <div class="title-text-Remarks" :title="$t('comparativeComments')">
                  <span>{{$t('comparativeComments')}}</span>
@@ -99,7 +101,7 @@
                <a-form-model-item class="itemModel" prop="comment">
                  <a-textarea :placeholder="$t('pleaseEnter')+$t('comparativeComments')"
                              v-model="formInline.comment"
-                              :rows="4"/>
+                              :rows="3"/>
                </a-form-model-item>
              </div>
            </a-form-model>
@@ -135,7 +137,7 @@
            <span>{{$t('fullTextComments')}}</span>
          </div>
          <a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
+            <a-textarea :placeholder="$t('PleaseEnter')+' '+$t('fullTextComments')"
                        v-model.trim="formInlineText.comment"
                        :rows="4"/>
          </a-form-model-item>
@@ -536,7 +538,7 @@
  .detail-content-left {
    width: 50%;
    float: left;
-    height: 620px;
+    height: calc(100vh - 210px);
    border-right: 2px #EFF1F3 solid;
    padding: 24px 32px;
    box-sizing: border-box;
@@ -545,7 +547,7 @@

  .detail-content-right {
    width: 50%;
-    height: 620px;
+    height: calc(100vh - 210px);
    float: left;
    padding: 24px 32px;
    box-sizing: border-box;
@@ -593,6 +595,7 @@
  .Remarks {
    margin-top: 20px;
    width: 50%;
+    display: inline-block;
    padding: 0 32px;
    box-sizing: border-box;
  }
@@ -602,7 +605,8 @@
  }

  .submit-button {
-    width: 100%;
+    display: inline-block;
+    width: 50%;
    margin-top: 20px;
    text-align: right;
    padding: 0 32px;
@@ -8,7 +8,7 @@
              <div class="title-text" :title="$t('standard')">
                <span>{{$t('standard')}}</span>
              </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+              <a-input class="box-input" :placeholder="$t('enterStandard')"
                       v-model="queryParam.serialNumber"></a-input>
            </div>
          </a-col>
@@ -17,7 +17,7 @@
              <div class="title-text" :title="$t('title')">
                <span>{{$t('title')}}</span>
              </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+              <a-input class="box-input" :placeholder="$t('entertitle')"
                       v-model="queryParam.title"></a-input>
            </div>
          </a-col>
@@ -42,11 +42,11 @@
      </a-form>
    </div>
    <div class="table-operator">
-      <div @click="initiatingProcessClick" class="operator-text">
+      <div @click="initiatingProcessClick" v-has="'documentComparison:Initiate'" class="operator-text">
        <a-icon type="apartment"/>
        {{$t('initiateComparison')}}
      </div>
-      <div @click="BatchDelete" class="operator-text">
+      <div @click="BatchDelete" v-has="'documentComparison:batchDelete'" class="operator-text">
        <a-icon type="delete"/>
        {{$t('BatchDelete')}}
      </div>
@@ -67,15 +67,15 @@
        <span slot="operation" slot-scope="text,record">
           <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
           <a class="text-operation"
-              v-if="record.createBy == userInfoQuery.username"
+              v-if="record.createBy == userInfoQuery.username || administrators"
              @click="subscribe(record)">
            {{!record.releaseState || record.releaseState == 'draft' ? $t('release') :$t('withdraw')}}
           </a>
          <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
             @click="edit(record)">{{$t('edit')}}</a>
          <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
             @click="deleteData(record)">{{$t('delete')}}</a>
        </span>
        <span slot="serialNumberRight" :title="text" slot-scope="text,record">
@@ -132,10 +132,11 @@
        pageNo: 1,
        queryParam: {},
        userInfoQuery: {},
+        administrators:false,
        selectedRowKeysRecord: [],
        columns: [
          {
-            title: this.$t('standard') + 1,
+            title: this.$t('standard') + ' 1',
            align: 'center',
            dataIndex: 'serialNumberLeft',
            width: 170,
@@ -143,7 +144,7 @@
            scopedSlots: { customRender: 'serialNumberLeft' }
          },
          {
-            title: this.$t('title') + 1,
+            title: this.$t('title') + ' 1',
            align: 'center',
            dataIndex: 'titleLeft',
            width: 170,
@@ -151,7 +152,7 @@
            scopedSlots: { customRender: 'serialNumberLeft' }
          },
          {
-            title: this.$t('TextStatus') + 1,
+            title: this.$t('TextStatus') + ' 1',
            align: 'center',
            width: 200,
            ellipsis: true,
@@ -166,7 +167,7 @@
          //   scopedSlots: { customRender: 'fileNameLeft' }
          // },
          {
-            title: this.$t('standard') + 2,
+            title: this.$t('standard') + ' 2',
            align: 'center',
            dataIndex: 'serialNumberRight',
            ellipsis: true,
@@ -174,7 +175,7 @@
            width: 170
          },
          {
-            title: this.$t('title') + 2,
+            title: this.$t('title') + ' 2',
            align: 'center',
            dataIndex: 'titleRight',
            scopedSlots: { customRender: 'serialNumberRight' },
@@ -182,7 +183,7 @@
            width: 170
          },
          {
-            title: this.$t('TextStatus') + 2,
+            title: this.$t('TextStatus') + ' 2',
            align: 'center',
            width: 200,
            ellipsis: true,
@@ -233,6 +234,14 @@
        this.queryParam = { ...this.queryParam }
      }
      this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
      this.getList()
    },
    methods: {
@@ -8,7 +8,7 @@
              <div class="title-text" :title="$t('standard')">
                <span>{{$t('standard')}}</span>
              </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+              <j-input class="box-input" :placeholder="$t('enterStandard')"
                       v-model="queryParam.serialNumber"></j-input>
            </div>
          </a-col>
@@ -17,7 +17,7 @@
              <div class="title-text" :title="$t('title')">
                <span>{{$t('title')}}</span>
              </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+              <j-input class="box-input" :placeholder="$t('entertitle')"
                       v-model="queryParam.title"></j-input>
            </div>
          </a-col>
@@ -27,7 +27,7 @@
                <span>{{$t('translationResults')}}</span>
              </div>
              <j-dict-select-tag class="box-input" v-model="queryParam.translationResult"
-                                 :placeholder="$t('PleaseSelect')+$t('translationResults')"
+                                 :placeholder="$t('selectTranslationResults')"
                                 :type="'select'"
                                 :triggerChange="false" dictCode="translation_result"/>
            </div>
@@ -59,15 +59,15 @@
      </a-form>
    </div>
    <div class="table-operator">
-      <div @click="uploadClick" class="operator-text">
+      <div @click="uploadClick" v-has="'documentTranslation:upload'" class="operator-text">
        <a-icon type="cloud-upload"/>
        {{$t('upload1')}}
      </div>
-      <div @click="RetrieveFilesClick" class="operator-text">
+      <div @click="RetrieveFilesClick" v-has="'documentTranslation:retrieval'" class="operator-text">
        <a-icon type="database"/>
        {{$t('RetrieveFiles')}}
      </div>
-      <div @click="BatchDelete" class="operator-text">
+      <div @click="BatchDelete" v-has="'documentTranslation:batchDeletion'" class="operator-text">
        <a-icon type="delete"/>
        {{$t('BatchDelete')}}
      </div>
@@ -86,18 +86,22 @@
      >
        <!--         -->
        <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
+          <a class="text-operation"
+             v-has="'documentTranslation:view'"
+             @click="viewClick(record)">{{$t('view')}}</a>
          <!--          <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>-->
           <a class="text-operation"
-              v-if="record.createBy == userInfoQuery.username"
+              v-if="record.createBy == userInfoQuery.username || administrators"
              @click="subscribe(record)">
            {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}}
           </a>
          <a class="text-operation"
+             v-has="'documentTranslation:download'"
             v-if="record.translationResult == 'Translation done'"
             @click="downloadData(record)">{{$t('download')}}</a>
          <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
+             v-has="'documentTranslation:delete'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseCondition == 'draft'"
             @click="deleteData(record)">{{$t('delete')}}</a>
        </span>
        <span slot="standardTitle" slot-scope="text,record" :title="text">
@@ -158,6 +162,7 @@
        queryParam: {},
        userInfoQuery: {},
        selectedRowKeysRecord: [],
+        administrators:false,
        columns: [
          {
            title: this.$t('standard'),
@@ -233,6 +238,14 @@
      }
      this.getList()
      this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
    },
    methods: {
      ...mapGetters(['userInfo']),
@@ -4,8 +4,8 @@
      <div class="text-left">
        <div class="text-left-wrap">
          <div class="text-left-select">
-            <span class="text-sel" :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
-            <a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
+            <span class="text-sel" :title="$t('classification')">{{$t('classification')}}</span>
+            <a-select :placeholder="$t('selectClassification')"
                      class="text-select"
                      mode="multiple"
                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -23,7 +23,7 @@
          <div class="text-left-select">
            <span class="text-sel" :title="$t('market')">{{$t('market')}}</span>
            <j-multi-select-tag class="text-select" v-model="queryParamOne.target_market"
-                                :placeholder="$t('PleaseSelect')+$t('market')"
+                                :placeholder="$t('selectMarket')"
                                :type="'select'"
                                :triggerChange="false" :dictCode="'region'"/>
          </div>
@@ -176,13 +176,20 @@
        })
      },
      checkedClick(item) {
-        let newUrl = this.$router.resolve({
-          path: '/problemKnowledgeBaseView',
+        localStorage.setItem('problemknowledgeBase',JSON.stringify(item))
+        this.$router.push({
+          path: '/problemknowledgeBase',
          query: {
            id: item.id
          }
        })
-        window.open(newUrl.href, '_blank')
+        // let newUrl = this.$router.resolve({
+        //   path: '/problemknowledgeBase',
+        //   query: {
+        //     id: item.id
+        //   }
+        // })
+        // window.open(newUrl.href, '_blank')
      },
      pageOnChange(page, pageSize) {
        this.pageNo = page
@@ -222,7 +229,8 @@
      },
      getText(str) {
        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
-        return words.replace(/\s/g, '') //这里是去除空格
+        //.replace(/\s/g, '') //这里是去除空格
+        return words
      },
      getParagraphInfoList() {
        let queryParamIndex = JSON.parse(JSON.stringify(this.queryParam))
@@ -201,7 +201,8 @@
      },
      getText(str) {
        let words = str.replace(/<[^<>]+>/g, '').replace(/&nbsp;/gi, '') //这里是去除标签
-        return words.replace(/\s/g, '') //这里是去除空格
+        //.replace(/\s/g, '') //这里是去除空格
+        return words
      },
      getList() {
        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -26,7 +26,7 @@
              v-else-if="active === $t('whole') || active === $t('problemKnowledgeBase')
              || active === $t('monthlyReportRegulations')"
              class="inputSearch"
-              :placeholder="$t('pleaseEnter')+$t('searchContent')"
+              :placeholder="$t('enterSearchContent')"
            ></a-input>
            <a-button class="textSearch"
                      v-if="active === $t('DocumentLibrary')"
@@ -18,7 +18,7 @@
                    <div class="title-text">
                      <span class="Required">*</span>
                      <span class="title-text-text"
-                            :title="$t('file')">{{$t('file')}}</span>
+                            :title="$t('fileName')">{{$t('fileName')}}</span>
                    </div>
                    <a-form-model-item class="itemModel" prop="fileKey">
                      <a-button type="primary" class="button-text"
@@ -99,6 +99,7 @@
                  <PersonnelSelection
                    :query="{db_field_name:'userId',db_field_txt:$t('engineer')}"
                    :personneQuery="formInline"
+                    v-if="visible"
                    :distributionEngineerList="distributionEngineerList"
                    @change="PersonnelSelectionChange"
                    v-model="formInline.userIdName"/>
@@ -717,6 +717,7 @@
              if (res.success) {
                this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode
                this.$message.success(this.$t('OperationSuccessful'))
+                this.$refs.CollectionTabel.getHeader(this.currentPersonRole)
                this.visibleRoleSwitching = false
                this.confirmLoadingRoleSwitching = false
                localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode))
@@ -107,10 +107,11 @@
                <span class="Required">*</span>
                <span class="title-text-text" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
              </div>
-              <a-form-model-item class="itemModel" :prop="'studioEngineerName'">
+              <a-form-model-item class="itemModel-multi" :prop="'studioEngineerName'">
                <PersonnelSelection :query="{db_field_name:'studioEngineer',db_field_txt:$t('StudioEngineer')}"
                                    :isSingleChoice="true"
                                    :personneQuery="formInline"
+                                    v-if="visible"
                                    @change="PersonnelSelectionChange"
                                    :disabled="disabled"
                                    v-model="formInline.studioEngineerName"/>
@@ -124,11 +125,11 @@
              <div class="title-text">
                <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
              </div>
-              <a-form-model-item class="itemModel" :prop="'certificationEngineerName'">
+              <a-form-model-item class="itemModel-multi" :prop="'certificationEngineerName'">
                <PersonnelSelection
                  :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
                  :personneQuery="formInline"
-                  :selectDepartment="true"
+                  v-if="visible"
                  @change="PersonnelSelectionChange"
                  :disabled="disabled"
                  v-model="formInline.certificationEngineerName"/>
@@ -1456,15 +1456,18 @@
        this.selectedRowKeys = value
      },
      searchQuery() {
+        this.selectedRowKeys = []
        this.getList()
      },
      searchReset() {
        this.queryParam = {}
+        this.selectedRowKeys = []
        this.$refs.globalAdvancedQueryRef.resetLine()
        this.$refs.globalAdvancedQueryRef.emitCallback()
        // this.getList()
      },
      addModelList() {
+        this.selectedRowKeys = []
        this.getList()
      },
      handleSuperQuery(params, matchType) {
@@ -2130,7 +2133,7 @@
        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
          window.open(url, '_blank')
-        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + fileQuery.id + fileSuffix)
          window.open(url, '_blank')
        } else {
@@ -2151,7 +2154,7 @@
        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
          window.open(url, '_blank')
-        }else if(fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg'){
+        } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') {
          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix)
          window.open(url, '_blank')
        } else {
@@ -2484,17 +2487,17 @@
  }

  ::v-deep .ant-table-body-one {
-    padding-bottom: 0!important;
+    padding-bottom: 0 !important;
  }

  ::v-deep .antfixedLeft {
-    padding-bottom: 0!important;
-    overflow: scroll!important;
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
  }

  ::v-deep .antfixedRight {
-    padding-bottom: 0!important;
-    overflow: scroll!important;
+    padding-bottom: 0 !important;
+    overflow: scroll !important;
  }
 </style>
 <style>
@@ -176,8 +176,9 @@
                  <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
                </div>
                <!--                :prop="'lawEngineerName'"-->
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel-multi">
                  <PersonnelSelection
+                    v-if="editVisible"
                    :query="{db_field_name:'lawEngineer',db_field_txt:$t('regulatoryEngineer')}"
                    :personneQuery="formInline"
                    :isDelete='true'
@@ -196,8 +197,9 @@
                  <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
                </div>
                <!--                :prop="'engineeringInterfacePersonName'"-->
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel-multi">
                  <PersonnelSelection
+                    v-if="editVisible"
                    :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
                    :personneQuery="formInline"
                    :isDelete='true'
@@ -20,6 +20,7 @@
                <PersonnelSelection
                  :query="{db_field_name:'lawEngineer',db_field_txt:$t('regulatoryEngineer')}"
                  :personneQuery="formInline"
+                  v-if="visible"
                  @change="PersonnelSelectionChange"
                  v-model="formInline.lawEngineerName"/>
              </a-form-model-item>
@@ -36,6 +37,7 @@
                <PersonnelSelection
                  :query="{db_field_name:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
                  :personneQuery="formInline"
+                  v-if="visible"
                  @change="PersonnelSelectionChange"
                  v-model="formInline.engineeringInterfacePersonName"/>
              </a-form-model-item>
@@ -65,7 +65,9 @@
    </div>
    <div class="table-operator" style="overflow:hidden;margin-bottom: 20px">
      <div style="float: right;margin-bottom: 0px;margin-left: 20px">
-        <div class="operator-text" @click="deriveconformanceresults()">
+        <div class="operator-text"
+             v-has="'complianceKanban:export'"
+             @click="deriveconformanceresults()">
          <a-icon type="solution"/>
          {{ $t('Deriveconformanceresults') }}
        </div>
@@ -96,7 +98,7 @@
 <!--            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}-->
 <!--        </span>-->
        <span slot="operation" slot-scope="text,record">
-            <a class="text-operation" @click="handlecody(record)">{{$t('view')}}</a>
+            <a class="text-operation" v-has="'complianceKanban:view'" @click="handlecody(record)">{{$t('view')}}</a>
        </span>
      </a-table>
    </div>
@@ -8,11 +8,14 @@
              :url="url"/>
    </div>
    <div class="table-operator">
-      <div @click="handleCompare" class="operator-text">
+      <div @click="handleCompare" v-has="'regulatoryEarlyWarning:push'"
+           class="operator-text">
        <a-icon type="rocket" :rotate="45"/>
        {{$t('Push')}}
      </div>
-      <div @click="handleExport" class="operator-text">
+      <div @click="handleExport"
+           v-has="'regulatoryEarlyWarning:export'"
+           class="operator-text">
        <a-icon type="export" :rotate="-90"/>
        {{$t('export')}}
      </div>