页面修改

src/pages/sale/peerManagement.vue

@@ -41,17 +41,10 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props" style="width:200px;">
-<<<<<<< HEAD
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
-              @click="EditCustom(props.rows)" />
+              @click="EditCustom(props.row)" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="客户审批"
-              @click="AuditCustomer(props.rows)" />
-
-=======
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" @click="EditCustom(props.row)" />
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="客户审批" @click="AuditCustomer(props.row)" />
- 
->>>>>>> 29ded45511ea95ccb28a26bb4c112eea321df0ff
+              @click="AuditCustomer(props.row)" />
           </q-td>
         </template>
       </q-table>