Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Business/Bdtset/Utlp.vue

@@ -544,7 +544,7 @@
         <el-divider></el-divider>
     </c-col>
     <c-col :span="23" :offset="0">
-        <c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" :showSelection="true">
+        <c-istream-table ref="bwxxIst" :list="stmData.data" :columns="stmData.columns" :paginationShow="false" :showSelection="true" >
         </c-istream-table>
       </c-col>
 

src/views/Business/Bdtset/index.vue

@@ -189,6 +189,9 @@ export default {
         console.log(rtnmsg)
         Utils.copyValueFromVO(this.model,rtnmsg.data)
         that.$refs.utlp.stmData.data=rtnmsg.data.liaall_tenstm.rows
+        this.$nextTick(() => {
+            that.$refs.utlp.$refs.bwxxIst.$refs.table.toggleAllSelection()
+        })
         console.log(this.model);
         if(this.isInDisplay){
             this.restoreDisplay()

src/views/Business/Bopsel/Selp.vue

@@ -210,7 +210,7 @@
               >查询</el-button
             >
             <el-button type="text" @click="searchToggle=false">
-                展开
+                收起
               <i class="el-icon-arrow-up"></i>
             </el-button>
           </c-col>

src/views/Public/Ptap.vue

@@ -29,8 +29,7 @@
           ></c-input>
           <template slot="footer">
             <c-button
-              style="margin:0 10px 0 10px;padding: 0 10px;"
-              class="searchButton"
+              style="margin:0 10px 0 10;padding: 0 12px;"
               size="small"
               type="primary"
               icon="el-icon-search"
@@ -39,7 +38,6 @@
             </c-button>
             <c-button
               style="margin:0 0"
-              class="detailsButton"
               size="small"
               type="primary"
               @click="onAplpDet"
@@ -178,14 +176,4 @@ export default {
 };
 </script>
 <style>
-.searchButton {
-  text-align: center;
-  /* margin: 0 10px; */
-  margin-right: 10px;
-  padding: 0 10px;
-}
-.detailsButton {
-  margin-left: 10px;
-  
-}
 </style>