Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/RecPayQuery.vue

@@ -213,8 +213,10 @@
   :inactive-text="$t('fnc.bweibi')"
   inactive-value="0">
 </el-switch>
-                <el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-
-                <el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>
+                <!--  @keyup.native="checkPrice(msg,'sMoney')" -->
+                <!--  @keyup.native="checkPrice(msg,'eMoney')" -->
+                <el-input v-model="msg.sMoney" type="Number" class="w64d5"></el-input>-
+                <el-input v-model="msg.eMoney" type="Number" class="w64d5"></el-input>
               </el-form-item>
             </el-col>
 

src/components/systemManagement/douyinTips.vue

@@ -10,7 +10,7 @@
     /*border-left: 1px solid #d1d1d1;*/
     /* border-right: 1px solid #d1d1d1;  */
     font-size: 14px;
-    width:100%;
+    width: 100%;
     min-width: 1200px;
     padding-bottom: 5px;
   }
@@ -27,10 +27,12 @@
     position: relative;
     background-color: #E6E6E6;
   }
-  .LP_table tr th:last-child{
+
+  .LP_table tr th:last-child {
 
     border-right: 1px solid #d1d1d1;
-}
+  }
+
   .LP_table td {
     border-left: 1px solid #d1d1d1;
     border-bottom: 1px solid #d1d1d1;
@@ -38,10 +40,12 @@
     text-align: center;
     padding: 5px 0;
   }
- .LP_table  td:last-child{
+
+  .LP_table td:last-child {
 
     border-right: 1px solid #d1d1d1;
-}
+  }
+
   .LP_table .el-button--primary {
     padding: 5px;
   }
@@ -57,66 +61,67 @@
     right: 30px;
     top: 5px;
   }
-  .comLessDiv{
-    width:100%;
-    height:40px;
-    margin-top:5px;
-    padding-bottom:5px;
-    border-bottom:1px solid #d1d1d1;
+
+  .comLessDiv {
+    width: 100%;
+    height: 40px;
+    margin-top: 5px;
+    padding-bottom: 5px;
+    border-bottom: 1px solid #d1d1d1;
     display: flex;
     justify-content: center;
     align-items: center;
   }
-  .comLessDiv:last-child{
-    border:0;
-    padding-bottom:0;
+
+  .comLessDiv:last-child {
+    border: 0;
+    padding-bottom: 0;
   }
-  .comLessDiv input{
+
+  .comLessDiv input {
     padding: 0 5px;
   }
-  .comLessDiv .el-input-group__append,.comLessDiv .el-input-group__append button{
+
+  .comLessDiv .el-input-group__append,
+  .comLessDiv .el-input-group__append button {
     padding: 0 8px;
     cursor: pointer;
   }
-  .addLessPrice{
-    margin-left:10px;
-    color:seagreen;
+
+  .addLessPrice {
+    margin-left: 10px;
+    color: seagreen;
     cursor: pointer;
   }
-  .lessBtn{
-    margin-top:5px;
+
+  .lessBtn {
+    margin-top: 5px;
   }
+
 </style>
 
 <template>
   <div>
-    <!-- <el-row>
-      <el-col :offset="23">
-        <input type='button' class="normalBtn lessBtn" @click="SaveLessPrice(null)" :value="$t('pub.saveBtn')"></input>
-      </el-col>
-    </el-row> -->
+
     <div class="LM_mainDiv">
       <!--保存-->
       <table border="0" cellspacing="0" cellpadding="0" class="LP_table" v-loading="this.loading">
         <tr>
-          <th width="150">标记</th> 
-          <th width="40%">标记名称</th>
-         
-          <th width="150">{{$t('hotel.table_operat')}}</th>
+          <th width="40%">项目名称</th>
+          <th width="150">{{$t('hotel.table_operat')}}&nbsp;&nbsp; <i
+              class="iconfont icon-bumenguanli-tianjia addLessPrice" @click="addLessPrice(item)"></i></th>
         </tr>
-        <tr >
-          <td>
-            <i class="iconfont icon-bumenguanli-tianjia addLessPrice" @click="addLessPrice(item)"></i>
-          </td>
+        <tr>
           <td>
             <div v-for="subItem in dataList" class="comLessDiv">
-              <el-input   placeholder="名称" v-model="subItem.Name" @keyup.native=""> </el-input>
+              <el-input placeholder="名称" v-model="subItem.Name"> </el-input>
             </div>
           </td>
           <td>
             <div v-for="(subItem,subIndex) in dataList" class="comLessDiv">
-              <input type='button' class="normalBtn lessBtn" @click="SaveLessPrice(subItem)" :value="$t('pub.saveBtn')"></input>
-              <input type='button' class="normalBtn lessBtn" @click="RemoveItem( subItem, subIndex)" value="删除"></input>
+              <input type='button' class="normalBtn lessBtn" @click="SaveLessPrice(subItem)"
+                :value="$t('pub.saveBtn')" />
+              <input type='button' class="normalBtn lessBtn" @click="RemoveItem( subItem, subIndex)" value="删除" />
             </div>
           </td>
         </tr>
@@ -132,26 +137,26 @@
         dataList: [],
         //角色列表
         RoleList: [],
-        loading:false,
+        loading: false,
         LineList: [],
-        commonSelect:0,
+        commonSelect: 0,
       };
     },
     methods: {
       //保存少价管理
       SaveLessPrice(subItem) {
         if (subItem) {
-          if (subItem.Name.length==0) {
+          if (subItem.Name.length == 0) {
             return this.Error('请填写标记信息');
           }
         }
         this.apipost(
-          "dict_post_Set",subItem ,
+          "dict_post_Set", subItem,
           res => {
             if (res.data.resultCode == 1) {
               this.Success(res.data.message);
               this.getList();
-            }else{
+            } else {
               this.Error(res.data.message);
             }
           },
@@ -161,15 +166,17 @@
       //获取列表
       getList() {
         this.loading = true;
-        var that=this;
+        var that = this;
         that.apipost(
-          "dict_post_GetList", {Key:'DouYin_MainOrder'},
+          "dict_post_GetList", {
+            Key: 'DouYin_MainOrder'
+          },
           res => {
             that.loading = false;
             if (res.data.resultCode == 1) {
               var data = res.data.data;
-              that.dataList=data;
-            }else{
+              that.dataList = data;
+            } else {
               that.Error(res.data.message);
             }
           },
@@ -178,15 +185,17 @@
       },
       //获取列表
       RemoveItem(subItem, index) {
-        if(subItem.ID==0){
-          this.dataList.splice(index,1);
+        if (subItem.ID == 0) {
+          this.dataList.splice(index, 1);
           return;
         }
         var that = this;
         this.Confirm("是否删除此标记信息?", function () {
           if (subItem.ID > 0) {
             that.apipost(
-              "dict_post_Remove", {dictID:subItem.ID},
+              "dict_post_Remove", {
+                dictID: subItem.ID
+              },
               res => {
                 if (res.data.resultCode == 1) {
                   that.Success("操作成功!");
@@ -201,7 +210,7 @@
         });
       },
       //点击添加
-      addLessPrice(){
+      addLessPrice() {
         var obj = {
           Name: '',
           DictKey: 'DouYin_MainOrder',