Merge remote-tracking branch 'origin/master'

src/views/sjzx/czbhwh.vue

@@ -65,6 +65,9 @@
               show-header-overflow
 
             >
+              <template #operation="{ row }">
+                <el-button type="success" >推送</el-button>
+              </template>
               <template #wgbsEdit="{ row}">
                 <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"  @change="checkBoxClick(row,'tzDsqx01')"></vxe-checkbox>
               </template>
@@ -114,6 +117,7 @@ export default {
       tableColumn: [
         { type: 'checkbox', width: 50 ,
         },
+        { title: '操作', width: 70, slots: { default: 'operation' },  },
         { type: 'seq', width: 60, title: '序号' },
 
         { field: 'cbbm', title: '船号编码', width: 120,editRender: { name: 'input' },