Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/pages/details/otherStandardDetails/index.vue

@@ -376,12 +376,12 @@
                                 <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                             </template>
                         </p>
-                        <!--                <el-button-->
+                                        <el-button
-                        <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+                                          v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
-                        <!--                  @click="showItemsModel(child.attrField)"-->
+                                          @click="showItemsModel(child.attrField)"
-                        <!--                  class="decomposition-btn"-->
+                                          class="decomposition-btn"
-                        <!--                  icon="icon-separate"-->
+                                          icon="icon-separate"
-                        <!--                >标准分解单</el-button>-->
+                                        >标准分解单</el-button>
                     </div>
                 </div>
 

src/pages/localTool/standAutoSplit/index.vue

@@ -186,12 +186,20 @@
               prop="standNumber"
               label="标准号/政策号"
               align="center">
+            <template slot-scope="scope">
+              <a class="table-jump"
+                 @click="handlePreview1(scope.row)">{{ scope.row.standNumber }}</a>
+            </template>
           </el-table-column>
           <el-table-column
               prop="standName"
               label="标准名称/政策名称"
               align="center"
           >
+            <template slot-scope="scope">
+              <a class="table-jump"
+                 @click="handlePreview1(scope.row)">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
               prop="standFileClassifyShow"
@@ -819,6 +827,17 @@ export default {
       })
       window.open(routeUrl.href, '_blank')
     },
+    //拆分页点击查看详情
+    handlePreview1(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          pageType: item.sarType + '_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     // 查询政策和标准
     getSearch () {
       if (this.conditionForm.standType === 'FOREIGN2') {

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

@@ -39,7 +39,7 @@
           <div class="action-bar">
             <el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'"  size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
             <el-button v-btn-permission="''"   size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
-            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
+<!--            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>-->
             <el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'"   size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
             <el-button v-btn-permission="''"   size="mini" @click="batchCopy">批量复制</el-button>
             <el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'"   size="mini" @click="combineItems">合并条款</el-button>