合并

dist/static/css/chunk-070f0ff8.e180073e.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-23ac0c21.b965bb7f.css
+.alert[data-v-2fc363a8]{margin:10px 0}[data-v-2fc363a8] .el-icon-check,[data-v-2fc363a8] .el-icon-close{font-size:18px;font-weight:700}[data-v-2fc363a8] .el-icon-close{color:red}[data-v-2fc363a8] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-0facfdc6] .el-dialog__body{padding:10px 20px}[data-v-0facfdc6] .description-title{margin:0!important}
+=======
+.alert[data-v-2fc363a8]{margin:10px 0}[data-v-2fc363a8] .el-icon-check,[data-v-2fc363a8] .el-icon-close{font-size:18px;font-weight:700}[data-v-2fc363a8] .el-icon-close{color:red}[data-v-2fc363a8] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-05b7bde4] .el-dialog__body{padding:10px 20px}[data-v-05b7bde4] .description-title{margin:0!important}
+>>>>>>> temp_0223:dist/static/css/chunk-070f0ff8.e180073e.css

dist/static/css/chunk-16ec54a1.ef620564.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-34ce962e.2b297b2b.css
+.newBand[data-v-7e5842a7]{display:inline-block}[data-v-7e5842a7] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-7e5842a7]{display:inline-block}.lookTitle[data-v-7e5842a7]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-7e5842a7]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-7e5842a7]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+=======
+.newBand[data-v-1c78dd64]{display:inline-block}[data-v-1c78dd64] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-1c78dd64]{display:inline-block}.lookTitle[data-v-1c78dd64]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-1c78dd64]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-1c78dd64]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+>>>>>>> temp_0223:dist/static/css/chunk-16ec54a1.ef620564.css

dist/static/css/chunk-23ac0c21.b965bb7f.css

@@ -1 +1,5 @@
-.alert[data-v-2fc363a8]{margin:10px 0}[data-v-2fc363a8] .el-icon-check,[data-v-2fc363a8] .el-icon-close{font-size:18px;font-weight:700}[data-v-2fc363a8] .el-icon-close{color:red}[data-v-2fc363a8] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-0facfdc6] .el-dialog__body{padding:10px 20px}[data-v-0facfdc6] .description-title{margin:0!important}
+<<<<<<< HEAD:dist/static/css/chunk-23ac0c21.b965bb7f.css
+.alert[data-v-2fc363a8]{margin:10px 0}[data-v-2fc363a8] .el-icon-check,[data-v-2fc363a8] .el-icon-close{font-size:18px;font-weight:700}[data-v-2fc363a8] .el-icon-close{color:red}[data-v-2fc363a8] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-0facfdc6] .el-dialog__body{padding:10px 20px}[data-v-0facfdc6] .description-title{margin:0!important}
+=======
+.alert[data-v-2fc363a8]{margin:10px 0}[data-v-2fc363a8] .el-icon-check,[data-v-2fc363a8] .el-icon-close{font-size:18px;font-weight:700}[data-v-2fc363a8] .el-icon-close{color:red}[data-v-2fc363a8] .el-icon-check{color:#14928a}.title[data-v-03796907]{margin-bottom:20px}.amap-demo[data-v-03796907]{height:500px}[data-v-05b7bde4] .el-dialog__body{padding:10px 20px}[data-v-05b7bde4] .description-title{margin:0!important}
+>>>>>>> temp_0223:dist/static/css/chunk-070f0ff8.e180073e.css

dist/static/css/chunk-34ce962e.2b297b2b.css

@@ -1 +1,5 @@
-.newBand[data-v-7e5842a7]{display:inline-block}[data-v-7e5842a7] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-7e5842a7]{display:inline-block}.lookTitle[data-v-7e5842a7]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-7e5842a7]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-7e5842a7]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+<<<<<<< HEAD:dist/static/css/chunk-34ce962e.2b297b2b.css
+.newBand[data-v-7e5842a7]{display:inline-block}[data-v-7e5842a7] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-7e5842a7]{display:inline-block}.lookTitle[data-v-7e5842a7]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-7e5842a7]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-7e5842a7]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+=======
+.newBand[data-v-1c78dd64]{display:inline-block}[data-v-1c78dd64] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-1c78dd64]{display:inline-block}.lookTitle[data-v-1c78dd64]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-1c78dd64]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-1c78dd64]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+>>>>>>> temp_0223:dist/static/css/chunk-16ec54a1.ef620564.css

src/views/businessManager/orderManager/financeManager.vue

@@ -73,6 +73,7 @@
         <el-form-item>
           <el-input
             placeholder="交易流水号"
+            clearable
             type="text"
             v-model.trim="searchForm.transNo"
           ></el-input>
@@ -80,6 +81,7 @@
         <el-form-item>
           <el-input
             placeholder="订单号"
+            clearable
             type="text"
             v-model.trim="searchForm.orderNo"
           ></el-input>
@@ -87,6 +89,7 @@
         <el-form-item>
           <el-input
             placeholder="收款账户"
+            clearable
             type="text"
             v-model.trim="searchForm.merNos"
           ></el-input>
@@ -94,6 +97,7 @@
         <el-form-item>
           <el-input
             placeholder="余额支付大于等于"
+            clearable
             type="number"
             @mousewheel.native.prevent
             v-model.trim="searchForm.balancePaymentAmount"
@@ -102,6 +106,7 @@
         <el-form-item>
           <el-input
             placeholder="现金支付大于等于"
+            clearable
             type="number"
             @mousewheel.native.prevent
             v-model.trim="searchForm.actualAmount"
@@ -110,6 +115,7 @@
         <el-form-item>
           <el-input
             placeholder="余额支付小于等于"
+            clearable
             type="number"
             @mousewheel.native.prevent
             v-model.trim="searchForm.lessBalancePaymentAmount"
@@ -118,6 +124,7 @@
         <el-form-item>
           <el-input
             placeholder="现金支付小于等于"
+            clearable
             type="number"
             @mousewheel.native.prevent
             v-model.trim="searchForm.lessActualAmount"

src/views/businessManager/orderManager/orderAudit-taoqi/index.vue

@@ -10,6 +10,7 @@
         <el-form-item>
           <el-input v-model.trim="searchForm.transNo"
                     @keyup.enter.native="transNo"
+                    clearable
                     placeholder='交易流水号'></el-input>
         </el-form-item>
 

src/views/categroyManager/specialSetup/chargesList.vue

@@ -38,7 +38,7 @@
           <el-button type="primary" native-type="reset">重置</el-button>
         </el-form-item>
       </save-form>
-      <div @click="onChargeOperation('create')" v-permission="'chargeTypeOrganizationFee/add'"
+      <div @click="onChargeOperation('create')" v-permission="'musicGroupOrganizationCourseSettings/add'"
            class='newBand'>添加</div>
       <div class="tableWrap">
         <el-table :data="dataList"
@@ -90,10 +90,10 @@
                            label="操作">
             <template slot-scope="scope">
               <el-button @click="onChargeOperation('update', scope.row)"
-                         v-permission="'chargeTypeOrganizationFee/update'"
+                         v-permission="'musicGroupOrganizationCourseSettings/update'"
                          type="text">修改</el-button>
               <el-button @click="onChargeDelete(scope.row)"
-                         v-permission="'chargeTypeOrganizationFee/delete'"
+                         v-permission="'musicGroupOrganizationCourseSettings/delSetting'"
                          type="text">删除</el-button>
             </template>
           </el-table-column>

src/views/musicInspection/index.vue

@@ -7,7 +7,7 @@
         <div class="m-core">
             <save-form :inline="true" ref="searchForm" @submit="search" @reset="onReSet" :model="searchForm">
                 <el-form-item prop='search'>
-                    <el-input type="text" placeholder="请输入乐团名称" v-model="searchForm.search" />
+                    <el-input type="text" placeholder="请输入乐团名称" clearable v-model="searchForm.search" />
                 </el-form-item>
                 <el-form-item prop='organId'>
                     <el-select class='multiple'

src/views/teamBuild/signupList.vue

@@ -135,7 +135,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="用户名或手机号">
-          <el-input v-model.trim="searchFrom.name"></el-input>
+          <el-input v-model.trim="searchFrom.name" clearable></el-input>
         </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>