1.修改三期优化点

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

@@ -1305,4 +1305,5 @@ module.exports = {
   inRecentMonths6:'In recent 6 months',
   inRecentYear1:'In recent 1 year',
   inRecentYear2:'In recent 2 year',
+  selectAll:'Select All',
 }

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

@@ -1406,4 +1406,5 @@ module.exports = {
   inRecentMonths6:'近6个月内',
   inRecentYear1:'近1年内',
   inRecentYear2:'近2年内',
+  selectAll:'全选',
 }

jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue

@@ -30,6 +30,12 @@
           </a-row>
         </a-form>
       </div>
+      <div class="box-content-right">
+        <div @click="selectAllClick" class="operator-text">
+          <a-icon type="eye"/>
+          {{$t('selectAll')}}
+        </div>
+      </div>
       <div style="margin-bottom: 60px">
         <a-table
           v-if="this.visible"
@@ -90,6 +96,16 @@
     mounted() {
     },
     methods: {
+      selectAllClick() {
+        this.dataList.forEach(res => {
+          res.showOrNot = true
+          this.dataListOne.forEach(val => {
+            if (res.id == val.id) {
+              val.showOrNot = true
+            }
+          })
+        })
+      },
       searchQuery() {
         if (this.queryParam.labelName) {
           this.dataList = this.dataList.filter(res => {
@@ -186,12 +202,28 @@
   .text-operation {
     margin-right: 8px;
   }
+
   ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
     opacity: 0.9;
   }
 
   ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
+  }
+
+  .box-content-right {
+    width: 100%;
+    text-align: right;
+    margin-bottom: 20px;
+  }
+
+  .operator-text {
+    cursor: pointer;
+    margin-right: 13px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    display: inline-block;
   }
 </style>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue

@@ -52,11 +52,11 @@
               <a-col :span="8">
                 <div class="box-title-text">
                   <div class="title-text">
-<!--                    <span class="Required">*</span>-->
+                    <!--                    <span class="Required">*</span>-->
                     <span class="title-text-text" :title="$t('market')">{{$t('market')}}</span>
                   </div>
-<!--                  prop="targetMarket"-->
+                  <!--                  prop="targetMarket"-->
-                  <a-form-model-item class="itemModel" >
+                  <a-form-model-item class="itemModel">
                     <j-multi-select-tag class="box-input" v-model="formInline.targetMarket"
                                         :disabled="disabled"
                                         :placeholder="$t('PleaseSelect')+$t('market')"
@@ -107,12 +107,23 @@
                   <div class="title-text">
                     <span class="title-text-text" :title="$t('standardNo')">{{$t('standardNo')}}</span>
                   </div>
-                  <a-form-model-item class="itemModel" prop="standNumber">
+                  <a-form-model-item class="itemModel itemModel-multi itemModelStand" prop="standNumber">
-                    <a-input class="box-input-index"
+                    <a-select
-                             :title="formInline.standNumber"
+                      class="box-input-index"
-                             :disabled="true"
+                      v-model="formInline.standNumber"
-                             v-model="formInline.standNumber"
+                      @change="onChange"
-                             :placeholder="$t('PleaseEnter')+$t('standardNo')"/>
+                      mode="multiple"
+                      :placeholder="$t('standardNo')"
+                      :getPopupContainer="triggerNode=> triggerNode.parentNode">
+                      <a-select-option
+                        v-for="(item,index) in dictOptions"
+                        :key="index"
+                        :value="item.standNumber">
+                        <span class="itemOption" :title="item.standNumber">
+                          {{ item.standNumber }}
+                        </span>
+                      </a-select-option>
+                    </a-select>
                     <a-button class="box-button-index"
                               :title="$t('bringInDocumentInformation')"
                               type="primary" @click="bringInDocumentInformationClick">
@@ -230,6 +241,7 @@
         formInline: {},
         loading: false,
         headers: '',
+        dictOptions: [],
         uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
         editorOption: { // 富文本框配置
           placeholder: '',
@@ -437,6 +449,16 @@
             } else {
               this.isDisplay = false
             }
+            this.dictOptions = []
+            if (this.formInline.standNumber) {
+              this.formInline.standNumber = this.formInline.standNumber.split(',')
+              this.formInline.standNumber.forEach((res, index) => {
+                this.dictOptions.push({
+                  standNumber: res,
+                  id: this.formInline.bussDocumentLibraryId.split(',')[index]
+                })
+              })
+            }
             this.formInline = { ...this.formInline }
           } else {
             this.formInline = {}
@@ -467,9 +489,6 @@
         this.formInline = { ...this.formInline }
       },
       onEditorChange({ quill, html, text }) {
-        console.log(html)
-        console.log(quill)
-        console.log(text)
         this.formInline.content = html
       },
       handleInput(value) {
@@ -500,10 +519,34 @@
         }
       },
       listAddModelForm(id, number) {
-        this.formInline.standNumber = number
+        this.formInline.standNumber = number.split(',')
         this.formInline.bussDocumentLibraryId = id
+        this.dictOptions = []
+        if (number) {
+          number.split(',').forEach((res, index) => {
+            this.dictOptions.push({
+              standNumber: res,
+              id: id.split(',')[index]
+            })
+          })
+        }
         this.formInline = { ...this.formInline }
       },
+      onChange(value) {
+        console.log(value)
+        let content = []
+        let standNumber = []
+        value.forEach(res => {
+          this.dictOptions.forEach(val => {
+            if (res == val.standNumber) {
+              content.push(val.id)
+              standNumber.push(val.standNumber)
+            }
+          })
+        })
+        this.formInline.standNumber = standNumber
+        this.formInline.bussDocumentLibraryId = content.join(',')
+      },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
@@ -532,6 +575,9 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let formInline = JSON.parse(JSON.stringify(this.formInline))
+            if (formInline.standNumber && formInline.standNumber.length > 0){
+              formInline.standNumber = formInline.standNumber.join(',')
+            }
             this.loading = true
             this.confirmLoading = true
             let url = ''
@@ -576,7 +622,11 @@
     }
   }
 </script>
-
+<style>
+  .itemModelStand .ant-form-item-children .ant-select-dropdown--multiple {
+    display: none !important;
+  }
+</style>
 <style scoped lang="less">
   @import '~@assets/less/common.less';
 
@@ -703,7 +753,6 @@
 
   .box-button-index {
     height: 38px;
-    margin-top: 2px;
     width: 120px;
     overflow: hidden;
     padding: 0 0;
@@ -756,4 +805,12 @@
     height: 38px;
     margin-right: 10px;
   }
+  .itemOption {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
 </style>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -111,6 +111,11 @@
       }
     },
     mounted() {
+      let serial_number = localStorage.getItem('serial_number')
+      if (serial_number) {
+        this.searchStr = serial_number
+        localStorage.removeItem('serial_number')
+      }
       this.getList()
       this.replacePage()
     },
@@ -406,7 +411,8 @@
     text-overflow: ellipsis;
     word-break: break-all;
   }
-  .box-content-left .ant-tag-checkable-checked{
+
+  .box-content-left .ant-tag-checkable-checked {
     border: 1px #21c9cc solid;
     color: #21c9cc;
   }

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

@@ -396,6 +396,15 @@
         window.open(newUrl.href, '_blank')
       },
       KnowledgeDatabaseClick() {
+        let serial_number = ''
+        if (this.detailList.length > 0) {
+          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+            if (res.db_field_name == 'serial_number') {
+              serial_number = res.value
+            }
+          })
+        }
+        localStorage.setItem('serial_number',serial_number)
         let newUrl = this.$router.resolve({
           path: '/problemknowledgeBase',
         })