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

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2747,11 +2747,11 @@ export default {
         synopsis: [
           {type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'}
         ],
-        standYear: [
-          {required: true, message: '标准年份不能为空', trigger: 'change'},
-          // {validator: this.verify.testNumberCode, trigger: 'change'},
-          {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
-        ],
+        // standYear: [
+        //   {required: true, message: '标准年份不能为空', trigger: 'change'},
+        //   // {validator: this.verify.testNumberCode, trigger: 'change'},
+        //   {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
+        // ],
         standName: [
           {required: true, message: '中文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}

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

@@ -1396,17 +1396,11 @@
                   border
                   :height="300"
                   :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
-                  @selection-change="selectReplaceStandNumRowChange">
-              <el-table-column
-                      type="selection"
-                      width="55"
-                      align="center">
-              </el-table-column>
+          fontWeight: 'bold', height: '48px'}">
               <el-table-column
                       label="企标编号">
                   <template slot-scope="scope">
-                      <a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
+                      <a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row,'fs')">{{ scope.row.standCode }}</a>
                   </template>
               </el-table-column>
             <el-table-column
@@ -3366,7 +3360,7 @@ export default {
       })
     },
     // 点击查看
-    handlePreview(item) {
+    handlePreview(item,fs) {
       // const mj = item.attrInfoMap.QBMJ
       // if (mj === 'GXNX7D6H59') {
       //   // C1所有人都可查看
@@ -3444,10 +3438,11 @@ export default {
       let routeUrl = this.$router.resolve({
         name: 'OtherBussStandardDetails',
         params: {
-          id: item.id,
+          id: fs ? (fs === 'fs' ? item.standId:item.id) : item.id,
           pageType: 'BUSINESS_STAND'
         }
       })
+        console.log(routeUrl)
       window.open(routeUrl.href, '_blank')
     },
     // 编辑

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -1419,13 +1419,13 @@
         },
         productModelAdd: {
           id : "",
-          sorDivide : "INLAND_STAND",
+          sorDivide : "FOREIGN_LAWS",
           menuName : "",
           parentId : null,
           parentIds : null,
           parentIdsName : "",
           displaySeq : "",
-          validFlag : "",
+          validFlag : "0",
           creationTime : "",
           modifyTime : "",
           remarks : "",
@@ -2257,6 +2257,8 @@
       saveProduct (name) {
         this.$refs[name].validate((valid) => {
           if (valid) {
+            this.productModelAdd.sorDivide = 'FOREIGN_LAWS'
+            this.productModelAdd.validFlag = '0'
             if (this.modalType === 1) {
               this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, {
                 _this: this
@@ -2337,11 +2339,11 @@
                 if(row.parentIds.indexOf(res.data.id) != -1){
                   this.productModelAdd.parentIds = row.parentIds
                 }else {
-                  this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
+                  this.productModelAdd.parentIds = row.parentIds + res.data.id+','
                   idsName = row.parentIdsName + ',' + res.data.menuName
                 }
               }else {
-                this.productModelAdd.parentIds = res.data.id
+                this.productModelAdd.parentIds = +','+res.data.id+','
                 idsName = res.data.menuName;
               }
               this.productModelAdd.parentId = res.data.id