Merge branch 'develop' into FOTON

src/api/process.js

@@ -472,7 +472,7 @@ export function afterConferenceProcess (data) {
   })
 }
 
-// 海外标准清单流程入库
+// 国外标准清单流程入库
 export function foreignAccessProcess (data) {
   return axios({
     url: '/api/lawss/actSarItems/foreignAccessProcess',

src/assets/languages/cn.js

@@ -28,7 +28,7 @@ export const m = {
   more: '更多',
   dataCenter: '资料中心',
   domesticStandardDatabase: '国内标准法规',
-  foreignStandardDatabase: '海外标准法规',
+  foreignStandardDatabase: '国外标准法规',
   domesticRegulationsDatabase: '国内政策',
   foreignRegulationsDatabase: '国外政策',
   enterpriseStandardDatabase: '企业标准法规',

src/components/CustomFormComponents/InputForStandardsForEnterprise.vue

@@ -220,7 +220,7 @@ export default {
       // 数据搜索 数据来源list
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
-        {value: 'FOREIGN_STAND', label: '海外标准法规'},
+        {value: 'FOREIGN_STAND', label: '国外标准法规'},
         {value: 'BUSINESS', label: '企业标准 '}
       ],
       dataSource: 'BUSINESS'

src/components/CustomFormComponents/InputForStandardsForLaws.vue

@@ -207,7 +207,7 @@ export default {
       // 数据搜索 数据来源list
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
-        {value: 'FOREIGN_STAND', label: '海外标准法规'},
+        {value: 'FOREIGN_STAND', label: '国外标准法规'},
         {value: 'BUSINESS', label: '企业标准 '},
         {value: 'LAWS_STAND', label: '国内外政策'}
       ],

src/components/roleTree/index.vue

@@ -89,9 +89,9 @@
                 </div>
             </div>
             <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="subLoading" @click="saveUserInfo">确定</el-button>
 
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleTreeDrawerCancel">取消</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" :loading="subLoading" @click="handleTreeDrawerCancel">取消</el-button>
             </div>
             <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
         </el-drawer>
@@ -150,6 +150,7 @@
                 treeData: [],
                 open1: true,
                 treeLoading: false,
+                subLoading: false,
                 roleRow: {}
             }
         },
@@ -307,6 +308,7 @@
                                 ids = item
                             }
                         })
+                        this.subLoading = true
                         this.$http.get('SarInstitution/institution/getNextById', {
                             ids: ids,
                             topNum: 3,
@@ -316,6 +318,7 @@
                             this.$emit('checkedRole', res)
                             this.nodeList2 = []
                             this.$emit('update:isVisible', false)
+                            this.subLoading = false
                         })
                     } else {
                         this.$emit('checkedRole', this.roleList)

src/components/treeSelect/treeSelectNew.vue

@@ -321,7 +321,7 @@
 //  }
 //}
 .common-tree{
-    height: 100%;
+    height: 87%;
     overflow-y: auto;
 }
 </style>

src/components/treeSelect/treeSelectStand.vue

@@ -310,5 +310,8 @@ export default {
 ::v-deep .el-drawer{
   outline: none!important;
 }
-
+.common-tree{
+  height: 100%;
+  overflow-y: auto;
+}
 </style>

src/pages/config/pages/attributeCustom/components/buss.vue

@@ -377,12 +377,12 @@ export default {
       ],
       sarTypeOptions: [
         { label: '国内标准法规', value: 'INLAND_STAND' },
-        { label: '海外标准法规', value: 'FOREIGN_STAND' },
+        { label: '国外标准法规', value: 'FOREIGN_STAND' },
-        { label: '国内及海外标准法规', value: 'STAND' }
+        { label: '国内及国外标准法规', value: 'STAND' }
       ],
       sarTypeLocationOptions: [
         { label: '国内标准法规', value: 'INLAND_STAND' },
-        { label: '海外标准法规', value: 'FOREIGN_STAND' }
+        { label: '国外标准法规', value: 'FOREIGN_STAND' }
       ],
       isMustOptions: [
         { label: '是', value: '0' },
@@ -727,9 +727,9 @@ export default {
       if (type === 'INLAND_STAND') {
         texts = '国内标准法规'
       } else if (type === 'FOREIGN_STAND') {
-        texts = '海外标准法规'
+        texts = '国外标准法规'
       } else if (type === 'STAND') {
-        texts = '国内及海外标准法规'
+        texts = '国内及国外标准法规'
       } else if (type === 'BUSS') {
         texts = '企业标准库'
       }

src/pages/config/pages/attributeCustom/components/stand.vue

@@ -366,12 +366,12 @@ export default {
       ],
       sarTypeOptions: [
         { label: '国内标准法规', value: 'INLAND_STAND' },
-        { label: '海外标准法规', value: 'FOREIGN_STAND' },
+        { label: '国外标准法规', value: 'FOREIGN_STAND' },
-        { label: '国内及海外标准法规', value: 'STAND' }
+        { label: '国内及国外标准法规', value: 'STAND' }
       ],
       sarTypeLocationOptions: [
         { label: '国内标准法规', value: 'INLAND_STAND' },
-        { label: '海外标准法规', value: 'FOREIGN_STAND' }
+        { label: '国外标准法规', value: 'FOREIGN_STAND' }
       ],
       isMustOptions: [
         { label: '是', value: '0' },
@@ -710,9 +710,9 @@ export default {
       if (type === 'INLAND_STAND') {
         texts = '国内标准法规'
       } else if (type === 'FOREIGN_STAND') {
-        texts = '海外标准法规'
+        texts = '国外标准法规'
       } else if (type === 'STAND') {
-        texts = '国内及海外标准法规'
+        texts = '国内及国外标准法规'
       }
       return texts
     },

src/pages/details/otherStandardDetails/pages/standInvolveProjectDetailTwo.vue

@@ -82,7 +82,7 @@
         >
           <template slot-scope="scope">
             <div v-if="scope.row.standType === 'INLAND_STAND'">国内标准法规</div>
-            <div v-if="scope.row.standType === 'FOREIGN_STAND'">海外标准法规</div>
+            <div v-if="scope.row.standType === 'FOREIGN_STAND'">国外标准法规</div>
             <div v-if="scope.row.standType === 'INLAND_LAWS'">国内政策</div>
             <div v-if="scope.row.standType === 'FOREIGN_LAWS'">国内外政策</div>
             <div v-if="scope.row.standType === 'BUSINESS_STAND'">企业标准</div>

src/pages/details/otherStandardDetails/pages/technologyInvolveProjectTwo.vue

@@ -82,7 +82,7 @@
         >
           <template slot-scope="scope">
             <div v-if="scope.row.standType === 'INLAND_STAND'">国内标准法规</div>
-            <div v-if="scope.row.standType === 'FOREIGN_STAND'">海外标准法规</div>
+            <div v-if="scope.row.standType === 'FOREIGN_STAND'">国外标准法规</div>
             <div v-if="scope.row.standType === 'INLAND_LAWS'">国内政策</div>
             <div v-if="scope.row.standType === 'FOREIGN_LAWS'">国内外政策</div>
             <div v-if="scope.row.standType === 'BUSINESS_STAND'">企业标准</div>

src/pages/details/otherStandardExternalDetails/pages/standInvolveProjectDetailTwo.vue

@@ -82,7 +82,7 @@
         >
           <template slot-scope="scope">
             <div v-if="scope.row.standType === 'INLAND_STAND'">国内标准法规</div>
-            <div v-if="scope.row.standType === 'FOREIGN_STAND'">海外标准法规</div>
+            <div v-if="scope.row.standType === 'FOREIGN_STAND'">国外标准法规</div>
             <div v-if="scope.row.standType === 'INLAND_LAWS'">国内政策</div>
             <div v-if="scope.row.standType === 'FOREIGN_LAWS'">国内外政策</div>
             <div v-if="scope.row.standType === 'BUSINESS_STAND'">企业标准</div>

src/pages/details/otherStandardExternalDetails/pages/technologyInvolveProjectTwo.vue

@@ -82,7 +82,7 @@
         >
           <template slot-scope="scope">
             <div v-if="scope.row.standType === 'INLAND_STAND'">国内标准法规</div>
-            <div v-if="scope.row.standType === 'FOREIGN_STAND'">海外标准法规</div>
+            <div v-if="scope.row.standType === 'FOREIGN_STAND'">国外标准法规</div>
             <div v-if="scope.row.standType === 'INLAND_LAWS'">国内政策</div>
             <div v-if="scope.row.standType === 'FOREIGN_LAWS'">国内外政策</div>
             <div v-if="scope.row.standType === 'BUSINESS_STAND'">企业标准</div>

src/pages/home/index.vue

@@ -85,7 +85,7 @@ export default {
           value: 'stand'
         },
         {
-          label: '海外标准法规', // value没改
+          label: '国外标准法规', // value没改
           value: 'bussstand'
         },
         {

src/pages/home/information.vue

@@ -192,7 +192,7 @@ export default {
           value: 'stand'
         },
         {
-          label: '海外标准法规', // value没改
+          label: '国外标准法规', // value没改
           value: 'bussstand'
         },
         {
@@ -1043,7 +1043,7 @@ export default {
             })
           }
           break
-        // 海外标准法规清单发布/更新流程
+        // 国外标准法规清单发布/更新流程
         case '18':
           if (row.taskInfo === '会签人审批') {
             this.$router.push({

src/pages/home1/components/searchGroup/index.vue

@@ -48,7 +48,7 @@ export default {
           value: 'stand'
         },
         {
-          label: '海外标准法规', // value没改
+          label: '国外标准法规', // value没改
           value: 'bussstand'
         },
         // {

src/pages/home1/index.vue

@@ -115,9 +115,9 @@ export default {
           this.$router.push({name: 'standardForComments'})
           break
         case 'release':
-          this.$confirm('请选择国内/海外标准', {
+          this.$confirm('请选择国内/国外标准', {
             confirmButtonText: '国内标准',
-            cancelButtonText: '海外标准',
+            cancelButtonText: '国外标准',
             type: 'warning',
             center: true
           }).then(() => {

src/pages/home2/components/searchGroup/index.vue

@@ -51,7 +51,7 @@ export default {
           value: 'stand'
         },
         {
-          label: '海外标准法规', // value没改
+          label: '国外标准法规', // value没改
           value: 'bussstand'
         },
         // {

src/pages/home2/index.vue

@@ -101,9 +101,9 @@ export default {
           this.$router.push({name: 'standardForComments'})
           break
         case 'release':
-          this.$confirm('请选择国内/海外标准', {
+          this.$confirm('请选择国内/国外标准', {
             confirmButtonText: '国内标准',
-            cancelButtonText: '海外标准',
+            cancelButtonText: '国外标准',
             type: 'warning',
             center: true
           }).then(() => {

src/pages/localTool/standAutoSplit/index.vue

@@ -204,7 +204,7 @@
               align="center">
             <template slot-scope="scope">
               <div v-if="scope.row.sarType === 'INLAND'">国内标准法规</div>
-              <div v-else-if="scope.row.sarType === 'FOREIGN'">海外标准法规</div>
+              <div v-else-if="scope.row.sarType === 'FOREIGN'">国外标准法规</div>
             </template>
           </el-table-column>
           <el-table-column
@@ -539,7 +539,7 @@
                 placeholder="请选择"
               >
                 <el-option value="INLAND" label="国内标准法规"></el-option>
-                <el-option value="FOREIGN" label="海外标准法规"></el-option>
+                <el-option value="FOREIGN" label="国外标准法规"></el-option>
                 <el-option value="FOREIGN2" label="国内外政策"></el-option>
               </el-select>
             </el-form-item>
@@ -729,7 +729,7 @@ export default {
       addFileConvertFormRules: {},
       fileTypeOptions: [
         {label: '国内标准法规', value: 'INLAND'},
-        {label: '海外标准法规', value: 'FOREIGN'}
+        {label: '国外标准法规', value: 'FOREIGN'}
       ],
       standFileClassifyOptions: [],
       drawerModal: false,
@@ -1518,15 +1518,22 @@ export default {
       })
     },
     getFileSel () {
-      this.$http.get('lawss/sarStandAttrDetails/getFileFieldForSel1', {}, {
+      this.$http.get('sys/dictype/getDicTypeListCode', {}, {
         _this: this
       }, res => {
         if (res.ok) {
           const standFileClassifyOptions = []
-          res.data.map(item => {
+          res.data.lawsTextState.map(item => {
-            if (item.label !== '相关资料') {
+            item.label += '（政策）'
-              standFileClassifyOptions.push(item)
+            standFileClassifyOptions.push(item)
-            }
+          })
+          res.data.TEXTSTATUSBUSS.map(item => {
+            item.label += '（企标）'
+            standFileClassifyOptions.push(item)
+          })
+          res.data.WBZTCLASS.map(item => {
+            item.label += '（国内外）'
+            standFileClassifyOptions.push(item)
           })
           this.standFileClassifyOptions = standFileClassifyOptions
         }

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -701,7 +701,7 @@
           <!--<el-input v-model="sarMenu.menuName" placeholder="请输入名称"></el-input>-->
           <el-select v-model="openSubmitAndExamineForm" placeholder="请选择">
             <el-option label="国内标准法规FO" value="INLAND"></el-option>
-            <el-option label="海外标准法规FO" value="FOREIGN"></el-option>
+            <el-option label="国外标准法规FO" value="FOREIGN"></el-option>
             <el-option label="政策法规FO" value="POLICY"></el-option>
           </el-select>
         </el-formItem>

src/pages/localTool/standContrast/pages/comparisonClauses.vue

@@ -57,7 +57,9 @@
                   </el-row>
                 </div>
 <!--                <div v-html="leftString" v-if="comparisonFlag === '2'"></div>-->
-                <div v-for="(item,index) in leftString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>
+                <div v-if="comparisonFlag === '2'">
+                  <span  v-for="(item,index) in leftString" v-html="item" :key="index"></span>
+                </div>
               </div>
             </div>
           </div>
@@ -110,7 +112,9 @@
                     </el-col>
                   </el-row>
                 </div>
-                <div v-for="(item,index) in rightString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>
+                <div v-if="comparisonFlag === '2'">
+                  <span  v-for="(item,index) in rightString" v-html="item" :key="index"></span>
+                </div>
 <!--                <div v-html="rightString" v-if="comparisonFlag === '2'"></div>-->
               </div>
             </div>
@@ -206,6 +210,7 @@ export default {
         })
       }
       this.spinShow = true
+
       let itemsEoPage = {
         oldItemId: this.saveItemId,
         newItemId: this.saveItemIdRight,
@@ -215,8 +220,18 @@ export default {
         _this: this
       }, res => {
         this.comparisonFlag = '2'
-        this.leftString = res.data.leftString
+       this.leftString = []
-        this.rightString = res.data.rightString
+        if((typeof res.data.leftString) === "string"){
+          this.leftString.push(res.data.leftString)
+        }else {
+          this.leftString = res.data.leftString
+        }
+        this.rightString = []
+        if((typeof res.data.rightString) === "string"){
+          this.rightString.push(res.data.rightString)
+        }else {
+          this.rightString = res.data.rightString
+        }
         this.text = res.data.similarityDegree
         if (parseFloat(res.data.similarityDegree) < parseFloat('75%')) {
           this.textcontent = '不相似'

src/pages/localTool/standardRecognition/index.vue

@@ -46,7 +46,7 @@
                 scope.row.fileType === "1"
                   ? "国内标准法规"
                   : scope.row.fileType === "2"
-                  ? "海外标准法规"
+                  ? "国外标准法规"
                   : scope.row.fileType === "3"
                   ? "政策"
                   : scope.row.fileType === "4"
@@ -244,7 +244,7 @@
                 :popper-append-to-body="false"
                 placeholder="请选择标准/政策来源">
               <el-option value="INLAND" label="国内标准库"></el-option>
-              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <el-option value="FOREIGN" label="国外标准库"></el-option>
               <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>
               <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
             </el-select>
@@ -940,7 +940,7 @@ export default {
         this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{
           _this: this
         },res=>{
-          console.log('海外标准库数据',res)
+          console.log('国外标准库数据',res)
           if (res.ok){
             this.lawInfoTable = res.data.list
             this.handleSelectForm.total = res.data.count
@@ -958,7 +958,7 @@ export default {
           this.lawInfoTable = []
           this.handleSelectForm.total = 0
         })
-        console.log('海外标准库')
+        console.log('国外标准库')
       }else if(this.handleSelectForm.dataSource === 'FOREIGN_LAWS'){
         this.$http.get('lawss/sarLawsInfo/page',this.handleSelectForm,{
           _this: this

src/pages/localTool/standardWarning.vue

@@ -176,7 +176,7 @@
                 <el-table-column prop="standType" label="类型" width="100" align="center">
                   <template slot-scope="scope">
                     <div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
-                    <div v-if="scope.row.standType === 'FOREIGN'">海外标准法规</div>
+                    <div v-if="scope.row.standType === 'FOREIGN'">国外标准法规</div>
                     <div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
                     <div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
                     <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>

src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue

@@ -1008,7 +1008,7 @@ export default {
     if (this.$route.params.pageType === 'INLAND_STAND') {
       this.showModalTitle = '国内标准法规条目'
     } else {
-      this.showModalTitle = '海外标准法规条目'
+      this.showModalTitle = '国外标准法规条目'
     }
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {

src/pages/personal/pages/my-collection/components/CollectionStandard.vue

@@ -50,7 +50,7 @@
               <div>
                 <el-col :span="5" :offset="1" >
                   <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
-                  所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }}
+                  所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '国外标准法规' : '企业标准') }}
                 </el-col>
                 <el-col :span="6">
                   <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">

src/pages/personal/pages/my-forward/index.vue

@@ -51,7 +51,7 @@
                 <span v-if="item.resType == 'RESOURCE_MSG'">所属板块：资料中心</span>
                 <span v-if="item.resType == 'FOREIGN_LAWS'">所属板块：国内外政策</span>
                 <span v-if="item.resType == 'INLAND_STAND'">所属板块：国内标准法规</span>
-                <span v-if="item.resType == 'FOREIGN_STAND'">所属板块：海外标准法规</span>
+                <span v-if="item.resType == 'FOREIGN_STAND'">所属板块：国外标准法规</span>
                 <span v-if="item.resType == 'BUSINESS_STAND'">所属板块：企业标准</span>
                 <span v-if="item.resType == 'STAND_SPLIT'">所属板块：标准拆分</span>
                 <span v-if="item.resType == 'NOTICE_MSG'">所属板块：动态信息</span>
@@ -243,7 +243,7 @@ export default {
     /**
      * 跳转到各个详情页
      * INLAND_STAND 国内标准详情
-     * FOREIGN_STAND 海外标准详情
+     * FOREIGN_STAND 国外标准详情
      * FOREIGN_LAWS  国内外政策
      * BUSINESS_STAND 企业标准库
      * RESOURCE_MSG  资料中心

src/pages/personal/pages/my-push/index.vue

@@ -49,7 +49,7 @@
                 <span v-if="item.resType == 'RESOURCE_MSG'">所属板块：资料中心</span>
                 <span v-if="item.resType == 'FOREIGN_LAWS'">所属板块：国内外政策</span>
                 <span v-if="item.resType == 'INLAND_STAND'">所属板块：国内标准法规</span>
-                <span v-if="item.resType == 'FOREIGN_STAND'">所属板块：海外标准法规</span>
+                <span v-if="item.resType == 'FOREIGN_STAND'">所属板块：国外标准法规</span>
                 <span v-if="item.resType == 'BUSINESS_STAND'">所属板块：企业标准</span>
                 <span v-if="item.resType == 'NOTICE_MSG'">所属板块：动态信息</span>
                 <span v-if="item.resType == 'STAND_SPLIT'">所属板块：标准拆分</span>

src/pages/phone/databaseSearch.vue

@@ -30,7 +30,7 @@
       <div class="standContent">
         <div class="standState">标准类别:
           <span v-if="item.indexType === 'stand'">国内标准</span>
-          <span v-if="item.indexType === 'FOREIGN'">海外标准</span>
+          <span v-if="item.indexType === 'FOREIGN'">国外标准</span>
           <span v-if="item.indexType === 'bussstand'">企业标准</span>
         </div>
         <div class="standSubTime">发布日期: {{item.issue_time}} </div>

src/pages/phone/domesticDetails.vue

@@ -8,7 +8,7 @@
         }} 《{{ sarStandardsInfoEO.standName }}》</span>
       <span v-else>{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
-        }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》</span>
+        }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》</span>
     </div>
     <!--主体内容-->
     <div class="details-content" style="position: relative">

src/pages/phone/domesticStand.vue

@@ -502,7 +502,7 @@ export default {
   },
   mounted() {
     this.titleType = this.$route.query.standType
-    this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '海外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' )
+    this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '国外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' )
     this.standSearch()
     this.$refs.cardBox.addEventListener('scroll', this.scrool);
     //从数据库中查询下拉框数据

src/pages/phone/phoneHome.vue

@@ -25,7 +25,7 @@
       </div>
       <div class="content-top" style="margin-top: 10px" @click="standChange('FOREIGN')">
         <div class="content-box content-box2"></div>
-        <span class="content-span">海外标准法规</span>
+        <span class="content-span">国外标准法规</span>
       </div>
       <div class="content-top" @click="standChange('POLICY')">
         <div class="content-box content-box3"></div>

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

@@ -42,10 +42,10 @@
                   </el-date-picker>
                 </el-form-item>
                 <el-form-item label="汇总调研结果" prop="hzfileId" class="add-form-item form-item-disabled">
-                  <div v-if="form.hzfileName" @click="updateFile(form.hzfileId)" class="fileClass">
+                  <div v-if="form.hzfileName" @click="updateFile(form.hzfileId)" class="fileClass" style="margin-right: 5px;padding-left: 10px">
                     {{ form.hzfileName }}
                   </div>
-                  <div v-else>
+                  <div v-else style="margin-right: 5px;padding-left: 10px">
                     - -
                   </div>
                 </el-form-item>
@@ -61,7 +61,7 @@
                       ></el-button>
                     </div>
                   </div>
-                  <div v-else>
+                  <div v-else style="margin-right: 5px;padding-left: 10px">
                     - -
                   </div>
                 </el-form-item>
@@ -77,7 +77,7 @@
                       ></el-button>
                     </div>
                   </div>
-                  <div v-else>
+                  <div v-else style="margin-right: 5px;padding-left: 10px">
                     - -
                   </div>
                 </el-form-item>

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

@@ -59,7 +59,7 @@
                                                 style="height: 32px; margin-left: 5px;"
                                         ></el-button>
                                     </div>
-                                    <div v-else>
+                                    <div v-else style="margin-right: 5px;padding-left: 10px">
                                         - -
                                     </div>
                                 </el-form-item>
@@ -75,7 +75,7 @@
                                             ></el-button>
                                         </div>
                                     </div>
-                                    <div v-else>
+                                    <div v-else style="margin-right: 5px;padding-left: 10px">
                                         - -
                                     </div>
                                 </el-form-item>
@@ -91,7 +91,7 @@
                                             ></el-button>
                                         </div>
                                     </div>
-                                    <div v-else>
+                                    <div v-else style="margin-right: 5px;padding-left: 10px">
                                         - -
                                     </div>
                                 </el-form-item>

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

@@ -563,7 +563,7 @@ export default {
         },
         {
           value: "FOREIGN",
-          label: "海外标准法规",
+          label: "国外标准法规",
           item: "FOREIGN"
         }
       ],

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

@@ -860,7 +860,7 @@ export default {
         },
         {
           value: "FOREIGN",
-          label: "海外标准法规",
+          label: "国外标准法规",
           item: "FOREIGN"
         }
       ],

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -380,7 +380,7 @@ export default {
         },
         {
           value: "FOREIGN",
-          label: "海外标准法规",
+          label: "国外标准法规",
           item: "FOREIGN"
         }
       ],

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

@@ -829,7 +829,7 @@ export default {
         },
         {
           value: "FOREIGN",
-          label: "海外标准法规",
+          label: "国外标准法规",
           item: "FOREIGN"
         }
       ],

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

@@ -451,7 +451,7 @@ export default {
         },
         {
           value: "FOREIGN",
-          label: "海外标准法规",
+          label: "国外标准法规",
           item: "FOREIGN"
         }
       ],

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

@@ -27,7 +27,7 @@
                 <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.standInData" @change="standInChange">
                     <el-radio :disabled="disabledXX" label="0">国内标准入库</el-radio>
-                    <el-radio :disabled="disabledXX" label="1">海外标准入库</el-radio>
+                    <el-radio :disabled="disabledXX" label="1">国外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
@@ -507,6 +507,31 @@
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <el-input :disabled="disabledXX"
+                            disabled
+                            style="display: none;"
+                            v-model="form.fbgywbdName"
+                            clearable
+                  ></el-input>
+                  <div style="display: flex;justify-content: space-between">
+                    <div style="width: 80%;line-height: 40px">
+                      <div v-for="(item,index) in FBGYWBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
+                        {{ item.name }}
+                      </div>
+                    </div>
+                    <div style="width: 20%;">
+                      <el-button :disabled="disabledXX"
+                                 type="primary"
+                                 class="common-button-primary"
+                                 size="mini"
+                                 style="margin-left: 10px; margin-top: 11px; float: right;"
+                                 @click="fileUpload('fbgywbd')">
+                        <i class="el-icon-upload el-icon--right"></i>
+                      </el-button>
+                    </div>
+                  </div>
+                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"
                     disabled
@@ -1264,7 +1289,7 @@
                     v-model="standardSearchForm.standType"
                     placeholder="请选择标准来源">
                     <el-option value="INLAND" label="国内标准库"></el-option>
-                    <el-option value="FOREIGN" label="海外标准库"></el-option>
+                    <el-option value="FOREIGN" label="国外标准库"></el-option>
                   </el-select>
                 </el-formItem>
                 <el-form-item label="标准类别" prop="standSort" class="search-item">
@@ -1475,6 +1500,7 @@ export default {
       fileList: [],
       caFileList: [],
       FBGBJBDFileList: [],
+      FBGYWBDFileList: [],
       xgdFileList: [],
       bpgFileList: [],
       ssgFileList: [],
@@ -1629,7 +1655,8 @@ export default {
         zccssrqgj: '', // 在产车实施日期(国际)
         // 文本信息
         ca: '', // 草案
-        FBGBJBD: '', // 发布稿
+        FBGBJBD: '', // 发布稿 原文
+        FBGYWBD: '', // 发布稿 译文
         xgd: '', // 修改单
         bpg: '', // 报批稿
         ssg: '', // 送审稿
@@ -1638,7 +1665,8 @@ export default {
         zbjbd: '', // 增补件
         kwj: '', // 勘 误件
         caName: '', // 草案
-        fbgbjbdName: '', // 发布稿
+        fbgbjbdName: '', // 发布稿 原文
+        fbgywbdName: '', // 发布稿 译文
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿
@@ -1715,7 +1743,7 @@ export default {
           {min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}
         ],
         standYear: [
-          {required: true, message: '请输入标准年份'},
+          {required: true, message: '请输入标准年份'}
           // { type: 'number', message: '年标准年份必须为数字值'}
         ],
         standName: [
@@ -1808,6 +1836,21 @@ export default {
         }
       }
     },
+    'form.standSort' : {
+      handler: function() {
+        this.checkIsOnly()
+      }
+    },
+    'form.standNumber' : {
+      handler: function() {
+        this.checkIsOnly()
+      }
+    },
+    'form.standYear' : {
+      handler: function() {
+        this.checkIsOnly()
+      }
+    }
    /* 'form.signFlag' : {
       handler: function () {
         if (this.form.signFlag === '1') {
@@ -1952,6 +1995,47 @@ export default {
     // },
   },
   methods: {
+    checkIsOnly() {
+      let standType = ''
+      if(this.submitType !== 1){
+        return
+      }
+      if (this.form.standInData === '0') {
+        standType = 'INLAND'
+        if(this.form.standSort && this.form.standNumber && this.form.standYear){
+          this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
+            standType: standType,
+            standSort: this.form.standSort,
+            standNumber: this.form.standNumber,
+            standYear: this.form.standYear,
+          }, {
+            _this: this
+          }, res => {
+            if (!res.ok) {
+              this.$message.warning('标准号重复')
+              return
+            }
+          })
+        }
+      } else {
+        standType = 'FOREIGN'
+        if(this.form.standSort && this.form.standNumber){
+          this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
+            standType: standType,
+            standSort: this.form.standSort,
+            standNumber: this.form.standNumber,
+            standYear: this.form.standYear,
+          }, {
+            _this: this
+          }, res => {
+            if (!res.ok) {
+              this.$message.warning('标准号重复')
+              return
+            }
+          })
+        }
+      }
+    },
     //限制上传文件个数
     handleExceed (files, fileList) {
       this.$message.warning(`当前限制选择 8 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
@@ -1998,7 +2082,8 @@ export default {
         zccssrqgj: '', // 在产车实施日期(国际)
         // 文本信息
         ca: '', // 草案
-        FBGBJBD: '', // 发布稿
+        FBGBJBD: '', // 发布稿 原文
+        FBGYWBD: '', // 发布稿 译文
         xgd: '', // 修改单
         bpg: '', // 报批稿
         ssg: '', // 送审稿
@@ -2007,7 +2092,8 @@ export default {
         zbjbd: '', // 增补件
         kwj: '', // 勘 误件
         caName: '', // 草案
-        fbgbjbdName: '', // 发布稿
+        fbgbjbdName: '', // 发布稿 原文
+        fbgywbdName: '', // 发布稿 译文
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿
@@ -2204,7 +2290,8 @@ export default {
         zccssrqgj: '', // 在产车实施日期(国际)
         // 文本信息
         ca: '', // 草案
-        fbgbjbd: '', // 发布稿
+        fbgbjbd: '', // 发布稿 原文
+        fbgywbd: '', // 发布稿 译文
         xgd: '', // 修改单
         bpg: '', // 报批稿
         ssg: '', // 送审稿
@@ -2213,7 +2300,8 @@ export default {
         zbjbd: '', // 增补件
         kwj: '', // 勘误件
         caName: '', // 草案
-        fbgbjbdName: '', // 发布稿
+        fbgbjbdName: '', // 发布稿 原文
+        fbgywbdName: '', // 发布稿 译文
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿
@@ -2353,6 +2441,9 @@ export default {
         case 'fbgbjbd':
           this.getFileList(value, this.FBGBJBDFileList);
           break;
+        case 'fbgywbd':
+          this.getFileList(value, this.FBGYWBDFileList);
+          break;
         case 'ssg':
           this.getFileList(value, this.ssgFileList);
           break;
@@ -2974,6 +3065,9 @@ export default {
             this.FBGBJBDFileList = fileList;
             console.log("FBGJBDFileList", this.FBGBJBDFileList);
             break;
+          case 'fbgywbd':
+            this.FBGYWBDFileList = fileList;
+            break;
           case 'xgd' :
             this.xgdFileList = fileList;
             break;
@@ -3046,6 +3140,9 @@ export default {
         case 'fbgbjbd':
           this.fileList = this.FBGBJBDFileList
           break;
+        case 'fbgywbd':
+          this.fileList = this.FBGYWBDFileList
+          break;
         case 'xgd' :
           this.fileList = this.xgdFileList
           break;
@@ -3088,6 +3185,9 @@ export default {
         case 'fbgbjbd':
           this.FBGBJBDFileList = fileList;
           break;
+        case 'fbgywbd':
+          this.FBGYWBDFileList = fileList;
+          break;
         case 'xgd' :
           this.xgdFileList = fileList;
           break;
@@ -3278,6 +3378,8 @@ export default {
       //拼接文件名和id 提交到流程Activity
       this.form.fbgbjbd = this.FBGBJBDFileList.map(item => item.response.data.id).join(",")
       this.form.fbgbjbdName = this.FBGBJBDFileList.map(item => item.name).join(",")
+      this.form.fbgywbd = this.FBGYWBDFileList.map(item => item.response.data.id).join(",")
+      this.form.fbgywbdName = this.FBGYWBDFileList.map(item => item.name).join(",")
 
       this.form.xgd = this.xgdFileList.map(item => item.response.data.id).join(",")
       this.form.xgdName = this.xgdFileList.map(item => item.name).join(",")

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

@@ -27,7 +27,7 @@
                  <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                    <el-radio-group v-model="form.standInData" disabled>
                      <el-radio label="0">国内标准入库</el-radio>
-                     <el-radio label="1">海外标准入库</el-radio>
+                     <el-radio label="1">国外标准入库</el-radio>
                    </el-radio-group>
                  </el-form-item>
                  <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -366,6 +366,14 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <div v-if="fbgywbdFileMap.length>0" v-for="(value,index)  in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
+                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
                   <div v-if="bpgFileMap.length>0" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
@@ -831,6 +839,7 @@ export default {
     return {
       xgdFileMap: [],
       fbgbjbdFileMap: [],
+      fbgywbdFileMap: [],
       bpgFileMap: [],
       ssgFileMap: [],
       zqyjgFileMap: [],
@@ -912,6 +921,7 @@ export default {
         // 文本信息
         ca: '', // 草案
         fbgbjbd: '', // 发布稿
+        fbgywbd: '', // 发布稿 译文
         xgd: '', // 修改单
         bpg: '', // 报批稿
         ssg: '', // 送审稿
@@ -923,6 +933,7 @@ export default {
         kwj: '', // 勘误件
         caName: '', // 草案
         fbgbjbdName: '', // 发布稿
+        fbgywbdName: '', // 发布稿 译文
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿
@@ -1171,6 +1182,7 @@ export default {
             this.xgdFileMap = this.assemble(processForm.xgd, processForm.xgdName);
 
             this.fbgbjbdFileMap = this.assemble(processForm.fbgbjbd, processForm.fbgbjbdName);
+            this.fbgywbdFileMap = this.assemble(processForm.fbgywbd, processForm.fbgywbdName);
             // fbgbjbdFileMap: {},
             this.bpgFileMap = this.assemble(processForm.bpg, processForm.bpgName);
             // bpgFileMap: {},

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

@@ -27,7 +27,7 @@
                 <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.standInData" disabled>
                     <el-radio label="0">国内标准入库</el-radio>
-                    <el-radio label="1">海外标准入库</el-radio>
+                    <el-radio label="1">国外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -268,7 +268,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                  <div  v-if="xgdFileMap.length>0" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
+                  <div v-if="xgdFileMap.length>0 && xgdFileMap[0].id" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
                   </div>
                   <div v-else>
@@ -327,6 +327,14 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
+                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
                   <div v-if="form.bpgName" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
@@ -817,6 +825,7 @@ export default {
       submitType: '',
       xgdFileMap: [],
       fbgbjbdFileMap: [],
+      fbgywbdFileMap: [],
       bpgFileMap: [],
       ssgFileMap: [],
       zqyjgFileMap: [],
@@ -880,7 +889,8 @@ export default {
         zccssrqgj: '', // 在产车实施日期(国际)
         // 文本信息
         ca: '', // 草案
-        fbgbjbd: '', // 发布稿
+        fbgbjbd: '', // 发布稿 原文
+        fbgywbd: '', // 发布稿 译文
         xgd: '', // 修改单
         bpg: '', // 报批稿
         ssg: '', // 送审稿
@@ -889,7 +899,8 @@ export default {
         zbjbd: '', // 增补件
         kwj: '', // 勘误件
         caName: '', // 草案
-        fbgbjbdName: '', // 发布稿
+        fbgbjbdName: '', // 发布稿 原文
+        fbgywbdName: '', // 发布稿 译文
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿
@@ -1131,8 +1142,8 @@ export default {
 
 
       this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
-
       this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName);
+      this.fbgywbdFileMap=this.assemble(processForm.fbgywbd,processForm.fbgywbdName);
       // fbgbjbdFileMap: {},
       this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName);
       // bpgFileMap: {},

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

@@ -28,7 +28,7 @@
                 <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.standInData" @change="standInChange">
                     <el-radio label="0">国内标准入库</el-radio>
-                    <el-radio label="1">海外标准入库</el-radio>
+                    <el-radio label="1">国外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -726,6 +726,14 @@
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
+                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
@@ -1758,7 +1766,8 @@ export default {
         zccssrqgj: '', // 在产车实施日期(国际)
         // 文本信息
         ca: '', // 草案
-        fbgbjbd: '', // 发布稿
+        fbgbjbd: '', // 发布稿 原文
+        fbgywbd: '', // 发布稿 译文
         xgd: '', // 修改单
         bpg: '', // 报批稿
         ssg: '', // 送审稿
@@ -1767,7 +1776,8 @@ export default {
         zbjbd: '', // 增补件
         kwj: '', // 勘误件
         caName: '', // 草案
-        fbgbjbdName: '', // 发布稿
+        fbgbjbdName: '', // 发布稿 原文
+        fbgywbdName: '', // 发布稿 译文
         bfbdtbzh: '', // 发布稿
         bfdtbzh: '',
         xgdName: '', // 修改单

src/pages/processCenter/pages/creatProcess/bzrk/step5.vue

@@ -27,7 +27,7 @@
                 <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.standInData" disabled>
                     <el-radio label="0">国内标准入库</el-radio>
-                    <el-radio label="1">海外标准入库</el-radio>
+                    <el-radio label="1">国外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -366,6 +366,14 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.fbgywbdName" v-for="(value,index)  in this.fbgywbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee">
+                    <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
                   <div v-if="bpgFileMap.length>0" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                     <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
@@ -883,7 +891,8 @@ export default {
         zccssrqgj: '', // 在产车实施日期(国际)
         // 文本信息
         ca: '', // 草案
-        fbgbjbd: '', // 发布稿
+        fbgbjbd: '', // 发布稿 原文
+        fbgywbd: '', // 发布稿 译文
         xgd: '', // 修改单
         bpg: '', // 报批稿
         ssg: '', // 送审稿
@@ -894,7 +903,8 @@ export default {
         bfdtbz: '',
         kwj: '', // 勘误件
         caName: '', // 草案
-        fbgbjbdName: '', // 发布稿
+        fbgbjbdName: '', // 发布稿 原文
+        fbgywbdName: '', // 发布稿 译文
         xgdName: '', // 修改单
         bpgName: '', // 报批稿
         ssgName: '', // 送审稿

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

@@ -242,7 +242,7 @@
                   <el-formItem label="标准来源" prop="standType" class="search-item">
                     <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
                       <el-option value="INLAND" key="1" label="国内标准"></el-option>
-                      <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                      <el-option value="FOREIGN" key="2" label="国外标准"></el-option>
                     </el-select>
                   </el-formItem>
                   <el-formItem class="search-item btn-box">

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

@@ -241,7 +241,7 @@
                   <el-formItem label="标准来源" prop="standType" class="search-item">
                     <el-select :disabled="disabledXX"  v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
                       <el-option value="INLAND" key="1" label="国内标准"></el-option>
-                      <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                      <el-option value="FOREIGN" key="2" label="国外标准"></el-option>
                     </el-select>
                   </el-formItem>
                   <el-formItem class="search-item btn-box">

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

@@ -444,7 +444,7 @@ export default {
         },
         {
           value: "FOREIGN",
-          label: "海外标准法规",
+          label: "国外标准法规",
           item: "FOREIGN"
         }
       ],

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

@@ -382,7 +382,7 @@ export default {
         },
         {
           value: "FOREIGN",
-          label: "海外标准法规",
+          label: "国外标准法规",
           item: "FOREIGN"
         }
       ],

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue

@@ -226,7 +226,7 @@
               :popper-append-to-body="false"
               placeholder="请选择标准来源">
               <el-option value="INLAND" label="国内标准库"></el-option>
-              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <el-option value="FOREIGN" label="国外标准库"></el-option>
               <!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
               <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
             </el-select>

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

@@ -380,7 +380,7 @@
               :popper-append-to-body="false"
               placeholder="请选择标准来源">
               <el-option value="INLAND" label="国内标准库"></el-option>
-              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <el-option value="FOREIGN" label="国外标准库"></el-option>
               <!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
               <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
             </el-select>

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

@@ -248,7 +248,7 @@
               :popper-append-to-body="false"
               placeholder="请选择标准来源">
               <el-option value="INLAND" label="国内标准库"></el-option>
-              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <el-option value="FOREIGN" label="国外标准库"></el-option>
 <!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
               <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
             </el-select>

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

@@ -248,7 +248,7 @@
               :popper-append-to-body="false"
               placeholder="请选择标准来源">
               <el-option value="INLAND" label="国内标准库"></el-option>
-              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <el-option value="FOREIGN" label="国外标准库"></el-option>
               <!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
               <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
             </el-select>

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

@@ -241,7 +241,7 @@
               :popper-append-to-body="false"
               placeholder="请选择标准来源">
               <el-option value="INLAND" label="国内标准库"></el-option>
-              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <el-option value="FOREIGN" label="国外标准库"></el-option>
               <!--              <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>-->
               <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
             </el-select>

src/pages/processCenter/pages/phone/bzrk/step2.vue

@@ -24,7 +24,7 @@
             <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
               <el-radio-group v-model="form.standInData" disabled>
                 <el-radio label="0">国内标准入库</el-radio>
-                <el-radio label="1">海外标准入库</el-radio>
+                <el-radio label="1">国外标准入库</el-radio>
               </el-radio-group>
             </el-form-item>
             <van-field label="标准编号" v-model="form.standNumber" readonly />
@@ -40,7 +40,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="标准类别"  prop="standSort" class="add-form-item form-item-disabled">
-              <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
+              <el-select v-model="form.standSort" placeholder="" disabled>
                 <el-option
                   v-for="item in standSortOptions"
                   placeholder="请选择"
@@ -59,7 +59,7 @@
                 v-else
                 disabled
                 v-model="form.standName"
-                placeholder="请输入标准中文名称"
+                placeholder=""
                 clearable
               ></el-input>
             </el-form-item>
@@ -73,7 +73,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
-              <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
+              <el-select v-model="form.standNature" placeholder="" disabled>
                 <el-option
                   v-for="item in standNatureOptions"
                   placeholder="请选择"
@@ -89,7 +89,7 @@
                 disabled
                 v-model="form.issueTime"
                 type="date"
-                placeholder="请选择标准发布日期"
+                placeholder=""
                 value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
@@ -106,7 +106,7 @@
               <el-input
                 disabled
                 v-model="form.gxhbq"
-                placeholder="请输入标签"
+                placeholder=""
                 clearable
               ></el-input>
             </el-form-item>
@@ -119,7 +119,7 @@
                 <el-input
                   v-model="form.treeListName"
                   clearable
-                  placeholder="选择归档位置"
+                  placeholder=""
                   readonly>
                 </el-input>
               </el-tooltip>
@@ -242,7 +242,7 @@
                </el-select>
              </el-form-item>-->
             <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
-              <el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
+              <el-select v-model="form.cllx" placeholder="" multiple disabled>
                 <el-option
                   v-for="item in applyArcticOptions"
                   placeholder="请选择"
@@ -253,7 +253,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-              <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
+              <el-select v-model="form.nylx" placeholder="" multiple disabled>
                 <el-option
                   v-for="item in categoryOptions"
                   placeholder="请选择"
@@ -264,7 +264,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-              <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
+              <el-select v-model="form.sycpx" placeholder="" multiple disabled>
                 <el-option
                   v-for="item in sycpxOptions"
                   placeholder="请选择"
@@ -274,14 +274,14 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <van-field label="关联模块--乘用车VPPS编码" v-model="form.cycvppsbm" readonly   placeholder="请输入乘用车VPPS编码"/>
+            <van-field label="关联模块--乘用车VPPS编码" v-model="form.cycvppsbm" readonly   placeholder=""/>
-            <van-field label="关联模块--卡车VPPS编码" v-model="form.kccvppsbm" readonly placeholder="请输入卡车VPPS编码"/>
+            <van-field label="关联模块--卡车VPPS编码" v-model="form.kccvppsbm" readonly placeholder=""/>
-            <van-field label="关联模块--乘用车vpps中文名称" v-model="form.cycvppscn" readonly placeholder="请输入乘用车vpps中文名称" />
+            <van-field label="关联模块--乘用车vpps中文名称" v-model="form.cycvppscn" readonly placeholder="" />
-            <van-field label="关联模块--卡车vpps中文名称" v-model="form.kccvppscn" placeholder="请输入卡车vpps中文名称" readonly />
+            <van-field label="关联模块--卡车vpps中文名称" v-model="form.kccvppscn" placeholder="" readonly />
-            <van-field label="模块结构单元变型号(卡车)" v-model="form.dybxh" readonly  placeholder="请输入模块结构单元变型号"/>
+            <van-field label="模块结构单元变型号(卡车)" v-model="form.dybxh" readonly  placeholder=""/>
-            <van-field label="模块结构单元名称(卡车)" v-model="form.dymc" readonly placeholder="请输入模块结构单元名称" />
+            <van-field label="模块结构单元名称(卡车)" v-model="form.dymc" readonly placeholder="" />
-            <van-field label="模块结构单元变型号(乘用车)" v-model="form.dybxhcar" readonly  placeholder="请输入模块结构单元变型号"/>
+            <van-field label="模块结构单元变型号(乘用车)" v-model="form.dybxhcar" readonly  placeholder=""/>
-            <van-field label="模块结构单元名称(乘用车)" v-model="form.dymccar" readonly placeholder="请输入模块结构单元名称" />
+            <van-field label="模块结构单元名称(乘用车)" v-model="form.dymccar" readonly placeholder="" />
             <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="" disabled>
                 <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -331,7 +331,7 @@
                  ></el-option>
                </el-select>
              </el-form-item>-->
-            <van-field v-if="form.standInData === '0'" label="我司署名人" v-model="form.wssmr" readonly  placeholder="请选择我司署名人"/>
+            <van-field v-if="form.standInData === '0'" label="我司署名人" v-model="form.wssmr" readonly  placeholder=""/>
             <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
               <el-select v-model="form.cysd" placeholder="" disabled>
                 <el-option
@@ -396,7 +396,7 @@
                 type="textarea"
                 :rows="3"
                 resize="none"
-                placeholder="请输入意见"
+                placeholder=""
                 v-model="commentText">
               </el-input>
             </div>

src/pages/processCenter/pages/processAcceptDetail/index.vue

@@ -801,7 +801,7 @@ export default {
               })
             }
             break
-            // 海外标准法规清单发布/更新流程
+            // 国外标准法规清单发布/更新流程
           case '18':
             if (row.taskInfo === '会签审批') {
               this.$router.push({

src/pages/processCenter/pages/processDetail/index.vue

@@ -863,7 +863,7 @@ export default {
               })
             }
             break
-            // 海外标准法规清单发布/更新流程
+            // 国外标准法规清单发布/更新流程
           case '18':
             if (row.taskInfo === '会签审批') {
               this.$router.push({

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -226,7 +226,7 @@ export default {
       },
       dataSourceOptions: [
         { value: "INLAND_STAND", label: "国内标准法规" },
-        { value: "FOREIGN_STAND", label: "海外标准法规" },
+        { value: "FOREIGN_STAND", label: "国外标准法规" },
         { value: "FOREIGN_LAWS", label: "国内外政策" },
         { value: "BUSINESS", label: "企业标准 " }
       ],

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -235,7 +235,7 @@ export default {
       },
       dataSourceOptions: [
         { value: "INLAND_STAND", label: "国内标准法规" },
-        { value: "FOREIGN_STAND", label: "海外标准法规" },
+        { value: "FOREIGN_STAND", label: "国外标准法规" },
         { value: "FOREIGN_LAWS", label: "国内外政策" },
         { value: "BUSINESS", label: "企业标准 " }
       ],

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -239,7 +239,7 @@ export default {
       },
       dataSourceOptions: [
         { value: "INLAND_STAND", label: "国内标准法规" },
-        { value: "FOREIGN_STAND", label: "海外标准法规" },
+        { value: "FOREIGN_STAND", label: "国外标准法规" },
         { value: "FOREIGN_LAWS", label: "国内外政策" },
         { value: "BUSINESS", label: "企业标准 " }
       ],

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -281,7 +281,7 @@
                 :popper-append-to-body="false"
                 placeholder="请选择标准/政策来源">
               <el-option value="INLAND" label="国内标准库"></el-option>
-              <el-option value="FOREIGN" label="海外标准库"></el-option>
+              <el-option value="FOREIGN" label="国外标准库"></el-option>
               <el-option value="FOREIGN_LAWS" label="国内外政策库"></el-option>
               <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
             </el-select>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -889,7 +889,7 @@ export default {
       // 数据搜索 数据来源list
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
-        {value: 'FOREIGN_STAND', label: '海外标准法规'},
+        {value: 'FOREIGN_STAND', label: '国外标准法规'},
         {value: 'FOREIGN_LAWS', label: '国内外政策'},
         {value: 'BUSINESS', label: '企业标准 '},
         // {value: 'TEMP', label: '标准法规清单 '}
@@ -1235,7 +1235,7 @@ export default {
       if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') {
         formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
         formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
-        formData.issueTime = null
+        // formData.issueTime = null
       } /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') {
         // formData.issueTime = formData.issueTime ? formData.issueTime[0] : null
         // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
@@ -1388,7 +1388,7 @@ export default {
         this.standLabelNum = '标准号'
         this.standLabelName = '标准名称'
         this.selectLawsStands()
-        // 海外标准法规可查字段
+        // 国外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
         this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
         this.standLabelNum = '标准号'
@@ -1761,7 +1761,6 @@ export default {
           delete this.sarAccessInfo.lawsNumber
           delete this.sarAccessInfo.standCode
         }
-        console.log('this.sarAccessInfo===' , this.sarAccessInfo)
         StandardsInfoPage(type === 1 ? ({...this.sarAccessInfo, standNumber: this.sarAccessInfo.seniorStandNumber, lawsNumber: this.sarAccessInfo.seniorLawsNumber, standCode: this.sarAccessInfo.seniorStandCode}) : (this.sarAccessInfo)).then(res => {
           // if (type === 1) {
           //   this.sarAccessInfo.standNumber = ''

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -729,7 +729,7 @@ export default {
       // 数据搜索 数据来源list
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
-        {value: 'FOREIGN_STAND', label: '海外标准法规'},
+        {value: 'FOREIGN_STAND', label: '国外标准法规'},
         {value: 'FOREIGN_LAWS', label: '国内外政策'},
         {value: 'BUSINESS', label: '企业标准 '},
         // {value: 'TEMP', label: '标准法规清单 '}
@@ -1177,7 +1177,7 @@ export default {
         this.standLabelNum = '标准号'
         this.standLabelName = '标准名称'
         this.selectLawsStands()
-        // 海外标准法规可查字段
+        // 国外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
         this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
         this.standLabelNum = '标准号'

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -743,7 +743,7 @@ export default {
       // 数据搜索 数据来源list
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
-        {value: 'FOREIGN_STAND', label: '海外标准法规'},
+        {value: 'FOREIGN_STAND', label: '国外标准法规'},
         {value: 'FOREIGN_LAWS', label: '国内外政策'},
         {value: 'BUSINESS', label: '企业标准 '},
         // {value: 'TEMP', label: '标准法规清单 '}
@@ -1108,7 +1108,7 @@ export default {
         this.standLabelNum = '标准号'
         this.standLabelName = '标准名称'
         this.selectLawsStands()
-        // 海外标准法规可查字段
+        // 国外标准法规可查字段
       } else if (val === 'FOREIGN_STAND') {
         this.sarAccessInfo.dataSource = 'FOREIGN_STAND'
         this.standLabelNum = '标准号'

src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue

@@ -252,7 +252,8 @@ export default {
     padding: 0 10% 0 10%;
     background: #ffffff;
     font-size: 16px;
-
+    height: 84%;
+    overflow-y: auto;
     .transition-box-p {
       line-height: 50px;
       border-bottom: 1px solid #E5E5E5;
@@ -266,6 +267,8 @@ export default {
         display: inline-block;
         color: #7e8083;
         width: calc(~'100% - 100px');
+        overflow-y: auto;
+        overflow-y: auto;
         word-break: break-all;
         white-space: pre-wrap;
       }

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -238,7 +238,7 @@
         :styles="styles"
         :close="cancelModel"
     >
-      <div style="margin-left: 3%">
+      <div style="height: 92%;margin-left: 3%">
         <el-form
             ref="attributeEO"
             :model="attributeEO"
@@ -295,7 +295,8 @@
           >
             <el-input
                 type="textarea"
-                :autosize="{ minRows: 1, maxRows: 15}"
+                :autosize="{ minRows: 1, maxRows: 10}"
+                resize="none"
                 style="width: 95%"
                 maxlength="4000"
                 show-word-limit
@@ -325,26 +326,26 @@
             </el-upload>
           </el-form-item>
         </el-form>
-        <div style="float: right">
+      </div>
-          <el-button
+      <div style="height: 4%;text-align: right;">
-              type="primary"
+        <el-button
-              class="common-button-primary"
+          type="primary"
-              size="mini"
+          class="common-button-primary"
-              icon="el-icon-check"
+          size="mini"
-              @click="saveInfo"
+          icon="el-icon-check"
-              :loading="submitLoading"
+          @click="saveInfo"
-          >提交
+          :loading="submitLoading"
-          </el-button
+        >提交
-          >
+        </el-button
-          <el-button
+        >
-              size="mini"
+        <el-button
-              icon="el-icon-close"
+          size="mini"
-              class="common-button-default"
+          icon="el-icon-close"
-              @click="cancelModel"
+          class="common-button-default"
-          >取消
+          @click="cancelModel"
-          </el-button
+        >取消
-          >
+        </el-button
-        </div>
+        >
       </div>
     </el-drawer>
   </div>
@@ -1041,7 +1042,7 @@ export default {
 }
 .upload-demo{
   /deep/.el-upload-list{
-    height: 60vh;
+    height: 42vh;
     overflow-y: auto;
   }
 }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -546,7 +546,7 @@
                   class="add-form-item"
                 >
                   <template slot="label">标准体系</template>
-                  <el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系"
+                  <el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系" readonly
                             @click.native="choiceZRR1('standSystem', '标准体系', sarStandardsInfoEO.standSystem)"></el-input>
                 </el-form-item>
               </template>
@@ -3777,43 +3777,6 @@ export default {
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
-      // // 自定义属性字段高级搜索处理
-      //advanceSearchVOStr
-      const advanceSearchVOList = [];
-      for (let key in this.advanceSearchMapping) {
-        const value = this.advanceSearchMapping[key];
-        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
-          advanceSearchVOList.push({
-            connect: "and",
-            field: key || '',
-            type: 'regexp',
-            value: value.join(',')
-          });
-        } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
-          advanceSearchVOList.push({
-            connect: "and",
-            field: key || '',
-            type: 'between',
-            value: value.join(',')
-          });
-        } else if (value !== null && value !== '' && (key === 'BARQ')) {
-          advanceSearchVOList.push({
-            connect: "and",
-            field: key || '',
-            type: 'between',
-            value: value.join(',')
-          });
-        } else if (value !== null && value !== '' && (key === 'TXLBName')) {
-        } else if (value !== null && value !== '') {
-          advanceSearchVOList.push({
-            connect: "and",
-            field: key || '',
-            type: 'like',
-            value: value
-          });
-        }
-      }
-      item.advanceSearchVOStr = advanceSearchVOList
       sessionStorage.setItem('tableFlag', JSON.stringify(item))
       this.tableFlag = item
       item.page = 1
@@ -3834,6 +3797,7 @@ export default {
         this.sarStandardsSearch.standSort = ''
         this.sarStandardsSearch.standNumber = ''
         this.sarStandardsSearch.standName = ''
+        this.sarStandardsSearch.standEnName = ''
         this.sarStandardsSearch.standState = ''
         this.sarStandardsSearch.standNature = ''
         this.sarStandardsSearch.issueTime = ''
@@ -3850,11 +3814,18 @@ export default {
         // } else if (flag === 'standCommonlySearch') {
         this.sarStandardsSearch.standName = ''
         this.sarStandardsSearch.standNumber = ''
-        this.pageChange(1)
+        this.advanceSearchMapping = {}
-        this.getDomesticStandardTable(this.sarStandardsSearch)
+        this.standCommonlySearch = {}
+        this.sarStandardsSearch = {
+            page: 1,
+            pageSize: this.$store.getters.userInfo.configContent,
+            standType: 'INLAND',
+            validFlag: '0',
+        }
         for (let key in this.advanceSearchMapping) {
           this.advanceSearchMapping[key] = ''
         }
+        this.pageChange(1)
       } else if (flag === 2) {
         // 标准条目搜索
         this.standItemSearch.responsibleUnit = ''
@@ -4598,6 +4569,7 @@ export default {
     },
     // 分页查询国内标准
     getDomesticStandardTable(item, type) {
+        console.log(item)
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4642,12 +4614,12 @@ export default {
 
       for (let key in this.advanceSearchMapping) {
         const value = this.advanceSearchMapping[key];
-        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
+        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (key === 'CLLX' && item.CLLX && item.CLLX.length > 0))) {
           advanceSearchVOList.push({
             connect: "and",
             field: key || '',
             type: 'regexp',
-            value: value.join(',')
+            value: list.join(',')
           });
         } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
           advanceSearchVOList.push({

src/pages/regulatoryRepository/dynamicInformation/pages/components/ImplementWarning.vue

@@ -28,7 +28,7 @@
           >
             <template slot-scope="scope">
               <div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
-              <div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>
+              <div v-if="scope.row.sortName === 'FOREIGN_STAND'">国外标准法规</div>
               <div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>
               <div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
               <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>
@@ -81,7 +81,7 @@
           >
             <template slot-scope="scope">
               <div v-if="scope.row.sortName === 'BUSINESS_STAND'">企业标准</div>
-              <div v-if="scope.row.sortName === 'FOREIGN_STAND'">海外标准法规</div>
+              <div v-if="scope.row.sortName === 'FOREIGN_STAND'">国外标准法规</div>
               <div v-if="scope.row.sortName === 'INLAND_STAND'">国内标准法规</div>
               <div v-if="scope.row.sortName === 'INLAND_LAWS'">国内政策</div>
               <div v-if="scope.row.sortName === 'FOREIGN_LAWS'">国外政策</div>

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -1386,10 +1386,10 @@
                           placeholder="请输入模块结构单元名称(卡车)"
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称(乘用车)" title="关联模块--乘用车vpps中文名称" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" class="add-form-item form-item-disabled">
                   <el-input
                           v-model="sarBussionessSearch.CYCDYMCBUSS"
-                          placeholder="请输入关联模块--乘用车vpps中文名称"
+                          placeholder="请输入模块结构单元名称(乘用车)"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -3529,7 +3529,7 @@ export default {
         }
       }
     },
-    
+
     SearchTreeConfigDblClick(treeId, treeNode) {
       this.sarConfigStandSearch.responsibleUnit = treeNode.id
       this.sarConfigStandSearch.orgName = treeNode.name

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -3363,7 +3363,7 @@
         return new Promise((resolve, reject) => {
           let menu = this.selectSarMenu
           if (menu.id === 'gxhbq' || menu.pId === 'gxhbq' || menu.id === 'wdsc' || menu.pId === 'wdsc') {
-            this.$message.warning('请选择海外标准法规及以下节点')
+            this.$message.warning('请选择国外标准法规及以下节点')
           } else {
             resolve(true)
           }

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1,4 +1,4 @@
-<!--标准法规--海外标准法规-->
+<!--标准法规--国外标准法规-->
 <template>
   <div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
     <div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }">
@@ -860,8 +860,8 @@
           </el-button>
         </div>
       </el-drawer>
-      <!-- 新增海外标准 -->
+      <!-- 新增国外标准 -->
-      <!--      编辑海外标准-->
+      <!--      编辑国外标准-->
       <el-drawer
         :title="modalshowtitle"
         :visible.sync="modalshowflag"
@@ -998,7 +998,7 @@
                              clearable>
                     <el-option
                       v-for="opt in standStateOptions"
-                      :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑海外标准'"
+                      :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑国外标准'"
                       :key="opt.value"
                       :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                     >
@@ -1030,7 +1030,7 @@
                   class="add-form-item"
                 >
                   <template slot="label">标准体系</template>
-                  <el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系"
+                  <el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系" readonly
                             @click.native="choiceZRR1('standSystem', '标准体系', sarStandardsInfoEO.standSystem)"></el-input>
                 </el-form-item>
               </template>
@@ -1272,7 +1272,7 @@
         </div>
         <!--        提交/取消-->
         <div class="demo-drawer-footer">
-          <el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">
+          <el-button v-show="modalshowtitle === '新增国外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">
             保存
           </el-button>
           <el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">
@@ -2366,7 +2366,7 @@ export default {
       }, // 二级菜单对象，主要用于新增和修改
       testItemsModel: false,
       formdisableflag: false, // 查看标准不可编辑
-      modalshowtitle: '新增海外标准',
+      modalshowtitle: '新增国外标准',
       addOrUPdateFlag: 1, // 新增：1， 修改：2
       itemAddOrUPdateFlag: 1, // 新增：1， 修改：2
       menuAddOrUpdateFlag: 1, // 新增：1， 修改：2
@@ -3035,7 +3035,7 @@ export default {
       }, res => {
         const item = res.data || {}
         this.addOrUPdateFlag = 2
-        this.modalshowtitle = '编辑海外标准'
+        this.modalshowtitle = '编辑国外标准'
         this.modalshowflag = true
         this.resolveFormFieldList(item.isRelateAccess)
         this.$nextTick(() => {
@@ -3045,7 +3045,16 @@ export default {
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
             this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
             if (item.country !== undefined && item.country !== null && item.country !== '') {
-              this.sarStandardsInfoEO.country = item.country.split(",");
+              if((typeof item.country) === 'string' && item.country.indexOf("[") !== -1 && item.country.indexOf("]") !== -1){
+                const str = JSON.parse(item.country);
+                if((typeof str) === 'string'){
+                  this.sarStandardsInfoEO.country = str.split(",");
+                }else {
+                  this.sarStandardsInfoEO.country = str
+                }
+              }else{
+                this.sarStandardsInfoEO.country = item.country.split(",");
+              }
             }
             this.sarStandardsInfoEO.standSort = item.standSort
             if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
@@ -3572,7 +3581,7 @@ export default {
           this.sarStandardsInfoEO.isRelateAccess = '1'
           this.modalshowflag = true
           this.formdisableflag = false
-          this.modalshowtitle = '新增海外标准'
+          this.modalshowtitle = '新增国外标准'
           this.addOrUPdateFlag = 1
           this.standNumFlag = 1
           this.$nextTick(() => {
@@ -4636,7 +4645,7 @@ export default {
       return new Promise((resolve, reject) => {
         let menu = this.selectSarMenu
         if (menu.id === 'gxhbq' || menu.pId === 'gxhbq' || menu.id === 'wdsc' || menu.pId === 'wdsc') {
-          this.$message.warning('请选择海外标准法规及以下节点')
+          this.$message.warning('请选择国外标准法规及以下节点')
         } else {
           resolve(true)
         }

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -330,7 +330,7 @@
                     <el-formItem label="标准来源" prop="standType" class="search-item">
                       <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
                         <el-option value="INLAND" key="1" label="国内标准"></el-option>
-                        <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                        <el-option value="FOREIGN" key="2" label="国外标准"></el-option>
                       </el-select>
                     </el-formItem>
                     <el-formItem class="search-item btn-box">

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -675,10 +675,10 @@
     mounted () {
       this.queryStandAndLaws()
       this.tableHeight = $('.regulatory-repository').height() - 159
-      this.sarProStateTableHeight = $('body').height() - 152
+      this.sarProStateTableHeight = $('body').height() - 162
       window.onresize = () => {
         this.tableHeight = $('.regulatory-repository').height() - 159
-        this.sarProStateTableHeight = $('body').height() - 152
+        this.sarProStateTableHeight = $('body').height() - 162
       }
     }
   }

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -716,7 +716,7 @@ export default {
         },
         {
           value: "FOREIGN",
-          label: "海外标准法规",
+          label: "国外标准法规",
           item: "FOREIGN"
         }
       ],
@@ -1233,7 +1233,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.standId,
+          id: item.standId ? item.standId : item.id,
           pageType: "INLAND_STAND"
         }
       });

src/pages/regulatoryRepository/standQA/index.vue

@@ -85,7 +85,7 @@
         <el-form-item  label-width="30px" >
           <el-radio-group v-model="standType" @change="standTypeChange">
             <el-radio  label="INLAND">国内标准</el-radio>
-            <el-radio  label="FOREIGN">海外标准</el-radio>
+            <el-radio  label="FOREIGN">国外标准</el-radio>
             <el-radio  label="BUSINESS_STAND">企业标准</el-radio>
             <el-radio  label="OTHER">公共</el-radio>
           </el-radio-group>
@@ -124,7 +124,7 @@
       </el-form>
     </div>
     <span>相似历史问题：</span>
-    <div  style="height: 200px; width: 80%; margin-left: 80px;">
+    <div  style="height: 200px; width: 80%; margin-left: 80px;overflow-y: auto;">
       <div v-for="item in historyList" :key="item.id" @click="historyJump(item)">
         <span class="history-item">{{item.problemDescription}}</span>
         <span class="history-item">{{item.questionTime}}</span>
@@ -159,7 +159,7 @@
             :popper-append-to-body="false"
             placeholder="请选择标准来源">
             <el-option value="INLAND" label="国内标准库"></el-option>
-            <el-option value="FOREIGN" label="海外标准库"></el-option>
+            <el-option value="FOREIGN" label="国外标准库"></el-option>
             <el-option value="BUSINESS_STAND" label="企业标准库"></el-option>
           </el-select>
         </el-form-item>

src/pages/searchCenter/pages/advancedSearch.vue

@@ -2733,8 +2733,7 @@
   #advancedSearch {
     background: #fff;
     @borderColor: #BFBFBF;
-    height: auto !important;
+    height: 100%;
-    min-height: 100%;
     font-size: 14px;
     overflow-y: auto;
 

src/pages/searchCenter/pages/standardSearch.vue

@@ -265,7 +265,7 @@
                             <template v-if="Allitems.length">
                                 <div v-for="(item,key) in Allitems" :key="key" class="AllBox">
                                     <div class="AllBoxTitle">
-                                        <span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
+                                        <span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '国外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
                                         <span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
                                     </div>
                                     <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 0;top: 13px;">详情</span>
@@ -419,7 +419,7 @@
                                 value: 'stand'
                             },
                             {
-                                label: '海外标准法规', // value没改
+                                label: '国外标准法规', // value没改
                                 value: 'bussstand'
                             },
                             {
@@ -451,7 +451,7 @@
                                 value: 'stand'
                             },
                             {
-                                label: '海外标准法规', // value没改
+                                label: '国外标准法规', // value没改
                                 value: 'bussstand'
                             },
                             {
@@ -824,7 +824,7 @@
                                     value: 'stand'
                                 },
                                 {
-                                    label: '海外标准法规',
+                                    label: '国外标准法规',
                                     value: 'bussstand'
                                 },
                                 // {
@@ -1270,7 +1270,7 @@
                             filterOptions.CYSDLAWS.title = '我司是否参与'
                             filterOptions.CYSDLAWS.index = 3
                             break
-                        //  海外标准法规
+                        //  国外标准法规
                         case 'bussstand':
                             //  标准类别
                             filterOptions.standSort = originOptions.standSort

src/router/index.js

@@ -3391,7 +3391,7 @@ const routes = [
           menuId: 'WW7YDHQ9Z679TGMDZMUS'
         }
       },
-      // 海外标准法规
+      // 国外标准法规
       {
         path: '/foreignStandardsAndRegulations',
         name: 'foreignStandardsAndRegulations',
@@ -3399,7 +3399,7 @@ const routes = [
           import('@/pages/regulatoryRepository/foreignStandardsAndRegulations/index'),
         meta: {
           requireAuth: true,
-          title: '海外标准法规',
+          title: '国外标准法规',
           menuId: '6K8A2RZYRE'
         }
       },