调整冲突

src/views/Core/KtCommonTable.vue

@@ -53,22 +53,10 @@
             @click="handleButton1(scope.$index, scope.row)" />
             <kt-button :style="{ background: button2Background, border: '1px solid'+button2Background, color:'#fff'}"  v-if="button2Name" :label="button2Name" :perms="permsButton2" :size="size"
             @click="handleButton2(scope.$index, scope.row)" />
-            <kt-button :style="{ background: button3Background, border: '1px solid'+button3Background, color:'#fff'}" v-if="button3Name" :label="button3Name" :perms="permsButton3"  :size="size"
-          <kt-button :style="{
-              background:button3Background,
-              border: '1px solid '+button3Background,
-              color:'#ffffff',
-            }
-            " v-if="button3Name" :label="button3Name" :perms="permsButton3" :icon="button3Icon" :size="size"
-            @click="handleButton3(scope.$index, scope.row)" />
+            <kt-button :style="{ background: button3Background, border: '1px solid'+button3Background, color:'#fff'}" v-if="button3Name" :label="button3Name" :perms="permsButton3"  :size="size" :icon="button3Icon"
+             @click="handleButton3(scope.$index, scope.row)" />
 
-            <kt-button  :style="{ background: button4Background, border: '1px solid'+button4Background, color:'#fff'}" v-if="button4Name" :label="button4Name" :perms="permsButton4" :size="size"
-          <kt-button :style="{
-              background:button2Background,
-              border: '1px solid '+button2Background,
-              color:'#ffffff',
-            }
-            " :icon="button2Icon" v-if="button2Name" :label="button2Name" :perms="permsButton2" :size="size"
+            <kt-button  :style="{ background: button4Background, border: '1px solid'+button4Background, color:'#fff'}" v-if="button4Name" :label="button4Name" :perms="permsButton4" :size="size" :icon="button2Icon"
             @click="handleButton2(scope.$index, scope.row)" />
           <kt-button :style="{
               background:button1Background,

src/views/FinancialManagement/ExpenseManagement/TransferRecord.vue

@@ -50,6 +50,7 @@ export default {
   mounted() {},
   data() {
     return {
+      operationWidth: 200, //操作列宽度
       queryFrom: {
         //查询条件
         revenueOutlay:""