Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!294

src/components/navMenu/index.vue

@@ -721,7 +721,7 @@
       }
     }
     .el-menu-item {
-      padding-left: 29px !important;
+      padding-left: 0 !important;
       font-size: 16px;
       font-weight: normal;
       height: 40px;

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

@@ -2,7 +2,7 @@
 <template>
   <div class="link" id="link">
     <!--  此部分暂时这样写，到后面做修改    -->
-    <div style="display: inline-block;width: 15%;">
+    <div style="display: inline-block;width: 10%;">
       <span class="title borderRight">友情链接</span>
     </div>
     <div style="display: inline-block;width: 80%;text-align: center">
@@ -225,7 +225,7 @@ export default {
     word-break: break-all;
     line-height: normal;
     margin-top: 10px;
-    font-size: 5px;
+    //font-size: 5px;
   }
 }
 </style>

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

@@ -81,7 +81,7 @@
               border-radius: 10px;
             }
             .menu-wrap {
-                height: 200px;
+                height: 175px;
                 display: flex;
                 flex-wrap: wrap;
                 justify-content: space-between;

src/pages/localTool/standContrast/pages/seeDatalis.vue

@@ -182,8 +182,8 @@ export default {
     },
     page () {
       this.spinShow = true
-      // this.$http.get('lawss/sarItemsCompareHis/page', {
-      this.$http.get('lawss/sarStandItemsCompareHis/page', {
+      this.$http.get('lawss/sarItemsCompareHis/page', {
+      // this.$http.get('lawss/sarStandItemsCompareHis/page', {
         page: this.splitInfoPage,
         pageSize: this.splitInfoPageSize,
         standHisId: JSON.parse(this.$route.query.row).id

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

@@ -160,6 +160,19 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <!--<el-form-item label="归档位置">
+                  <el-input
+                    style="display: none"
+                    v-model="form.treeListId"
+                    placeholder="请"
+                    readonly
+                  ></el-input>
+                  <el-input
+                    v-model="form.treeListName"
+                    placeholder="请输入标准英文名称"
+                    readonly
+                  ></el-input>
+                </el-form-item>-->
               </el-col>
             </el-row>
           </div>
@@ -2575,7 +2588,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+      this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'

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

@@ -1998,7 +1998,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+      this.replaceLawsNumForm.standType = 'FOREIGN' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -107,15 +107,6 @@
               <span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-                  prop="overTime"
-                  label="完成日期"
-                  align="center"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-            </template>
-          </el-table-column>
           <el-table-column :label="$t('m.operation')" align="center" width="80">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="dealWith(scope.row)">办理</el-button>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -285,10 +285,13 @@
                 <span v-else>{{ scope.row.ZCCSSRQ }}</span>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="dtbzh"
+              width="200"
+              label="代替标准号">
+            </el-table-column>
             <el-table-column
                 prop="textStatus"
-                sortable="custom"
-                width="110"
                 label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
               <!--                <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
@@ -304,11 +307,6 @@
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="replaceStandNum"
-              width="150"
-              label="代替标准号">
-            </el-table-column>
             <el-table-column fixed="right"
                              v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
                              label="收藏" align="center" width="50px"