Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/components/Toolbars.vue

@@ -26,7 +26,7 @@
           <li id="tool-innerAccountBal">内部户可用余额查询</li>
         </ul>
       </div>
-      <div class="toolbar-core" slot="reference">工具条</div>
+      <div class="toolbar-core" slot="reference">工具箱</div>
     </el-popover>
   </div>
 </template>

src/views/Public/Docpan.vue

@@ -140,7 +140,7 @@
                     </el-form-item>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="115px" fixed="right">
+            <el-table-column label="操作" width="135px" fixed="right">
                 <template slot-scope="scope">
                     <c-button
                         type="primary"
@@ -151,17 +151,15 @@
                             model.didgrp.rec.elcflg == 'Y')||suppress
                         "
                         @click="handleDisplay(scope.row.index, scope.row, model.trnmod.trndoc.doceot[scope.row.idx])"
-                        icon="el-icon-search"
                         style="margin-left:0"
-                        ></c-button
+                        >预览</c-button
                     >
                     <c-button
                         size="small"
                         type="primary"
-                        icon="el-icon-edit"
                         style="margin-left:0"
                         @click="handleDetail(scope.row.index, scope.row)"
-                        ></c-button
+                        >详情</c-button
                     >
                 </template>
             </el-table-column>