Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/baccitemstype/index.vue

@@ -23,6 +23,11 @@
             <small slot="more">...</small>
           </avue-text-ellipsis>
         </template>
+        <template slot="remarks" slot-scope="scope">
+          <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
+            <small slot="more">...</small>
+          </avue-text-ellipsis>
+        </template>
         <template slot="menuLeft">
           <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新增核算项目
           </el-button>

src/views/iosBasicData/bcorps/index.vue

@@ -112,6 +112,11 @@
                 <small slot="more">...</small>
               </avue-text-ellipsis>
             </template>
+            <template slot="remarks" slot-scope="scope">
+              <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
+                <small slot="more">...</small>
+              </avue-text-ellipsis>
+            </template>
 
             <template slot="menuLeft">
               <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入

src/views/iosBasicData/bcountrys/index.vue

@@ -30,6 +30,11 @@
                     <small slot="more">...</small>
                 </avue-text-ellipsis>
             </template>
+            <template slot="remarks" slot-scope="scope">
+                <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
+                    <small slot="more">...</small>
+                </avue-text-ellipsis>
+            </template>
             <template slot="menuLeft">
                 <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新建国家
                 </el-button>

src/views/iosBasicData/blines/index.vue

@@ -24,6 +24,11 @@
           <small slot="more">...</small>
         </avue-text-ellipsis>
       </template>
+      <template slot="remarks" slot-scope="scope">
+        <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
+          <small slot="more">...</small>
+        </avue-text-ellipsis>
+      </template>
       <template slot="menuLeft">
         <el-button type="primary" size="small" icon="el-icon-plus" @click="addbtnfun()">新建航线
         </el-button>

src/views/iosBasicData/bpackages/index.vue

@@ -297,6 +297,7 @@ export default {
           {
             label: "修改时间",
             prop: "updateTime",
+            width: 160,
             display: false,
           },
           {

src/views/iosBasicData/rateManagement/index.vue

@@ -37,7 +37,7 @@
           <!-- <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
             编辑
           </el-button> -->
-          <el-button type="text" size="small" @click.stop="rowDel(row, index)" :disabled="row.status > 0">
+          <el-button type="text" size="small" @click.stop="rowDel(row, index)">
             删除
           </el-button>
         </template>