Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/CarTouristGuideGrounContent.vue

@@ -55,14 +55,19 @@
                         </el-table-column>
                         <el-table-column label="金额/币种" width="400">
                             <template slot-scope="scope">
-                                <el-input placeholder="请输入金额" v-model="scope.row.price" clearable style="width:180px;"
-                                    @change="PriceChange" />
-                                <el-select v-model="currency" placeholder="币种选择" clearable filterable style="width:120px"
-                                    :disabled="true">
-                                    <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
-                                        :value="item.id">
-                                    </el-option>
-                                </el-select>
+                                <div class="el-input-number-style">
+                                    <el-input-number placeholder="请输入金额" v-model="scope.row.price" :controls="false"
+                                        @change="PriceChange"></el-input-number>
+
+                                    <!-- <el-input placeholder="请输入金额" v-model="scope.row.price" clearable style="width:180px;"
+                                    @change="PriceChange" /> -->
+                                    <el-select v-model="currency" placeholder="币种选择" clearable filterable
+                                        style="width:120px" :disabled="true">
+                                        <el-option v-for="item in currencyList" :key="item.id" :label="item.name"
+                                            :value="item.id">
+                                        </el-option>
+                                    </el-select>
+                                </div>
                             </template>
                         </el-table-column>
                         <el-table-column label="费用明细">
@@ -324,6 +329,7 @@ export default {
                                         message: res.data.msg,
                                         type: 'success'
                                     });
+                                    that.$router.back();
                                 } else {
                                     that.$message.error(res.data.msg);
                                 }
@@ -347,10 +353,9 @@ export default {
         PriceChange() {
             var countCost = 0;
             this.ContentList.forEach(function (item) {
-                if (item.price != '') {
+                if (item.price) {
                     countCost += parseFloat(item.price)
                 }
-
             })
 
             this.countCost = countCost
@@ -413,6 +418,10 @@ export default {
     border-radius: 10px;
 }
 
+.el-input-number-style .el-input input {
+    text-align: left;
+}
+
 @media screen and (max-width: 1700px) {
     .appraise-box>div {
         width: 48%;

src/components/OP/CarTouristGuideGroundId.vue

@@ -91,9 +91,8 @@
                     </el-table-column>
                     <el-table-column prop="id" label="详细费用">
                         <template slot-scope="scope">
-                            <a @click="AddDetails(scope.row.id)">点击填写</a>
+                            <el-button @click="AddDetails(scope.row.id)" size="small">点击填写</el-button>
                         </template>
-
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">