Merge remote-tracking branch 'origin/develop' into develop

src/components/navMenu/index.vue

@@ -88,11 +88,11 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
-            {
+            // {
-              title: '零部件编号申请',
+            //   title: '零部件编号申请',
-              path: '/partCodeApply',
+            //   path: '/partCodeApply',
-              menuId: 'ad9db496772c075f78495382b7581fe9'
+            //   menuId: 'ad9db496772c075f78495382b7581fe9'
-            },
+            // },
             // {
             //   title: '标准法规工作组数据统计',
             //   path: '/dataStatisComments',

src/pages/config/pages/mechanismManage/index.vue

@@ -325,7 +325,7 @@ export default {
   watch: {
     filterText(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   mounted () {
     // 获取组织结构树

src/pages/details/otherStandardDetails/index.vue

@@ -3075,8 +3075,6 @@ export default {
     /*padding: 0 67px;*/
 
     .details-content-modular {
-      margin-bottom: 20px;
-
       .modular-header {
         display: flex;
         align-items: center;

src/pages/details/process/ruku/index.vue

@@ -5,7 +5,7 @@
       <span>{{ title }}</span>
     </div>
     <div class="details-content">
-      <div class="details-content-modular basic-information">
+      <div class="details-content-modular basic-information" style="margin-bottom: 0;">
         <div class="modular-header">
           <div class="modular-header-title"><i class="icon-modular-title" /><span>标准信息</span>
           </div>
@@ -2737,7 +2737,7 @@ export default {
   /deep/.details-content{
     /*padding: 0 67px;*/
     .details-content-modular{
-      margin-bottom: 20px;
+      /*margin-bottom: 20px;*/
       .modular-header{
         display: flex;
         align-items: center;

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -60,6 +60,28 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
+                                <el-form-item label="附件" prop="modelNameList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.fjNameList"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.fjList.length > 0" class="fileClass" style="display: flex;">
+                                        <div v-for="(item, index) in form.fjList" :key="index" @click="fileUpload2" style="margin-right: 5px;">
+                                            {{ item.name }}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                @click="fileUpload2"
+                                                size="mini">
+                                            点击上传
+                                        </el-button>
+                                    </div>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -188,6 +210,26 @@
                 </div>
             </el-upload>
         </el-dialog>
+        <el-dialog width='400px' :visible.sync="fileMadel2" title="上传附件">
+            <el-upload
+                    multiple
+                    class="upload-demo"
+                    drag
+                    :action="fileUrl"
+                    ref="importfile"
+                    name="file"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess2"
+                    :on-remove="importFileRemove2"
+                    :show-file-list="true"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
     </div>
 </template>
 
@@ -201,6 +243,7 @@
         name: "bzdyStep1-1",
         data() {
             return {
+                fileMadel2: false,
                 nodeList: [],
                 nodeList2: [],
                 commentText: '',
@@ -216,6 +259,8 @@
                 form: {
                     title: '', // 调研标题
                     date: '', // 完成时间
+                    fjList: [],
+                    fjNameList: '',
                     modelList: [],
                     modelNameList: ''
                 },
@@ -362,6 +407,20 @@
                 })
                 this.form.modelNameList = list
             },
+            importFileRemove2 (file, fileList) {
+                let list = ''
+                this.form.fjList = []
+                fileList.forEach(item => {
+                    this.form.fjList.push(item)
+                    if (list.length > 0) {
+                        list += ','
+                        list += item.name
+                    } else {
+                        list+= item.name
+                    }
+                })
+                this.form.fjNameList = list
+            },
             // 导入标准数据成功后执行
             importFileSuccess (response, file) {
                 if (response.ok) {
@@ -383,9 +442,32 @@
                     })
                 }
             },
+            importFileSuccess2 (response, file) {
+                if (response.ok) {
+                    this.form.fjList.push(response.data)
+                    let list = ''
+                    this.form.fjList.forEach(item => {
+                        if (list.length > 0) {
+                            list += ','
+                            list += item.name
+                        } else {
+                            list+= item.name
+                        }
+                    })
+                    this.form.fjNameList = list
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                }
+            },
             fileUpload () {
                 this.fileMadel = true
             },
+            fileUpload2 () {
+                this.fileMadel2 = true
+            },
             handleTabs(name) {
                 this.active = name
             },

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -60,6 +60,28 @@
                     </el-button>
                   </div>
                 </el-form-item>
+                <el-form-item label="附件" prop="modelNameList" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.fjNameList"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.fjList.length > 0" class="fileClass" style="display: flex;">
+                    <div v-for="(item, index) in form.fjList" :key="index" @click="fileUpload2" style="margin-right: 5px;">
+                      {{ item.name }}
+                    </div>
+                  </div>
+                  <div v-else>
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            @click="fileUpload2"
+                            size="mini">
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -169,7 +191,7 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
-    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传调研模板">
       <el-upload
               multiple
               class="upload-demo"
@@ -189,6 +211,26 @@
         </div>
       </el-upload>
     </el-dialog>
+    <el-dialog width='400px' :visible.sync="fileMadel2" title="上传附件">
+      <el-upload
+              multiple
+              class="upload-demo"
+              drag
+              :action="fileUrl"
+              ref="importfile"
+              name="file"
+              accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+              :before-upload="beginImportFile"
+              :on-success="importFileSuccess2"
+              :on-remove="importFileRemove2"
+              :show-file-list="true"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -202,6 +244,7 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      fileMadel2: false,
       commentText: '',
       nodeList: [],
       nodeList2: [],
@@ -217,6 +260,8 @@ export default {
       form: {
         title: '', // 调研标题
         date: '', // 完成时间
+        fjList: [],
+        fjNameList: '',
         modelList: [],
         modelNameList: ''
       },
@@ -325,7 +370,6 @@ export default {
       if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
         return true
       } else {
-        this.spinShow = false
         this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
         return false
       }
@@ -353,6 +397,20 @@ export default {
       })
       this.form.modelNameList = list
     },
+    importFileRemove2 (file, fileList) {
+      let list = ''
+      this.form.fjList = []
+      fileList.forEach(item => {
+        this.form.fjList.push(item)
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.form.fjNameList = list
+    },
     // 导入标准数据成功后执行
     importFileSuccess (response, file) {
       if (response.ok) {
@@ -374,9 +432,32 @@ export default {
         })
       }
     },
+    importFileSuccess2 (response, file) {
+      if (response.ok) {
+        this.form.fjList.push(response.data)
+        let list = ''
+        this.form.fjList.forEach(item => {
+          if (list.length > 0) {
+            list += ','
+            list += item.name
+          } else {
+            list+= item.name
+          }
+        })
+        this.form.fjNameList = list
+        this.$message({
+          showClose: true,
+          message: response.message,
+          type: 'success'
+        })
+      }
+    },
     fileUpload () {
       this.fileMadel = true
     },
+    fileUpload2 () {
+      this.fileMadel2 = true
+    },
     handleTabs(name) {
       this.active = name
     },

src/pages/processCenter/pages/creatProcess/bzdy/step2.vue

@@ -50,6 +50,16 @@
                                         - -
                                     </div>
                                 </el-form-item>
+                                <el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
+                                    <div v-if="form.fjList.length > 0" style="display: flex;">
+                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
+                                            {{ item.name }}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
                                 <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.responUserList"
@@ -181,6 +191,7 @@
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
+                    fjList: [],
                     responUserList: '',
                     responUserListName: '',
                 },
@@ -278,6 +289,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.fjList = data.fjList || data.form.fjList
                         this.form.modelList = data.modelList || data.form.modelList
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -50,6 +50,16 @@
                                         - -
                                     </div>
                                 </el-form-item>
+                                <el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
+                                    <div v-if="form.fjList.length > 0" style="display: flex;">
+                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
+                                            {{ item.name }}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
                                 <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
@@ -200,6 +210,7 @@
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
+                    fjList: [],
                     fileId: '',
                     fileName: '',
                     responUserList: '',
@@ -324,6 +335,7 @@
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
+                        this.form.fjList = data.fjList || data.form.fjList
                         this.form.modelList = data.modelList || data.form.modelList
                         this.form.responUserList = data.form.responUserList
                         this.form.responUserListName = data.form.responUserListName

src/pages/processCenter/pages/creatProcess/bzdy/step4.vue

@@ -50,6 +50,16 @@
                                         - -
                                     </div>
                                 </el-form-item>
+                                <el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
+                                    <div v-if="form.fjList.length > 0" style="display: flex;">
+                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
+                                            {{ item.name }}
+                                        </div>
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
                                 <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
                                     <div v-if="form.file" class="fileClass" @click="updateFile(form.file)">
                                         {{ form.fileName }}
@@ -172,6 +182,7 @@
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
+                    fjList: [],
                     fileId: '',
                     fileName: '',
                     responUserList: '',
@@ -259,6 +270,7 @@
                         this.form.file = data.fileId || data.form.fileId
                         this.form.fileName = data.fileName || data.form.fileName
                         this.form.modelList = data.modelList || data.form.modelList
+                        this.form.fjList = data.fjList || data.form.fjList
                     }).catch(e => {
                     })
                 })

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -16,7 +16,7 @@
         <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
           <span class="transition-box-span">
-             {{ sarAccessEO.countryArea }}
+             {{ sarAccessEO.countryAreaShow }}
             </span>
         </p>
         <p v-else></p>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -23,7 +23,9 @@
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
                       @mouseleave="mouseleave(data)">
                         <span
-                            :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label }} </span>
+                            :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
+                        <span v-if="node.label.length<15"> {{ node.label}} </span>
+                        <span v-else> {{ node.label.substring(0,15)+'...'}} </span>
                         <span>
                           <el-button
                               type="text"

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -21,7 +21,9 @@
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
+                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
+                        <span v-if="node.label.length<15"> {{ node.label}} </span>
+                        <span v-else> {{ node.label.substring(0,15)+'...'}} </span>
                         <span>
                           <el-button
                                   type="text"

src/pages/searchCenter/pages/advancedSearch.vue

@@ -39,9 +39,9 @@
                 <el-radio label="INLAND_STAND">
                   <span>{{ $t("m.standAll") }}</span>
                 </el-radio>
-                <el-radio label="INLAND_LAWS">
+<!--                <el-radio label="INLAND_LAWS">-->
-                  <span>{{ $t("m.lawsAll") }}</span>
+<!--                  <span>{{ $t("m.lawsAll") }}</span>-->
-                </el-radio>
+<!--                </el-radio>-->
                 <el-radio label="BUSINESS_STAND">
                   <span>{{ $t("m.enterpriseStandard") }}</span>
                 </el-radio>

src/pages/searchCenter/pages/standardSearch.vue

@@ -388,10 +388,10 @@
                                 label: '海外标准法规', // value没改
                                 value: 'bussstand'
                             },
-                            {
+                            // {
-                                label: '国内外政策',
+                            //     label: '国内外政策',
-                                value: 'laws'
+                            //     value: 'laws'
-                            },
+                            // },
                             {
                                 label: '企业标准',
                                 value: 'enterprise'