lhch2015 1 month ago
parent
commit
8edab06344

+ 4 - 4
admin-ui/.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
-VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
-VUE_APP_BASE_API = 'http://127.0.0.1:9801'
-#VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-#VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+# VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
+# VUE_APP_BASE_API = 'http://127.0.0.1:9801'
+VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
 # VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
 

+ 8 - 8
admin-ui/src/views/cloth/laundryPrice/index.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <div style="display: flex;">
       <!--部门数据-->
-      <el-col :span="2" :xs="24" style="margin-top: 80px">
+      <div style="margin-top: 80px; flex-shrink: 0;">
         <div class="head-container">
           <el-tabs v-model="checkWashMode" @tab-click="handleQuery" tab-position="left">
-            <el-tab-pane v-for="item in clothWashModes" :label="item.name" :name="item.id + ''"></el-tab-pane>
+            <el-tab-pane v-for="(item, i) in clothWashModes" :label="item.name" :name="item.id + ''" :key="i"></el-tab-pane>
           </el-tabs>
         </div>
-      </el-col>
-      <el-col :span="22" :xs="24">
+      </div>
+      <div style="flex: 1; max-width: calc(100vw - 400px);margin-left: 20px;">
         <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" label-width="68px">
           <el-form-item prop="checkStoreAreaId">
             <el-tabs v-model="checkStoreAreaId" @tab-click="handleQuery">
-              <el-tab-pane v-for="item in areaList" :label="item.name" :name="item.id + ''"></el-tab-pane>
+              <el-tab-pane v-for="(item, i) in areaList" :label="item.name" :name="item.id + ''" :key="i"></el-tab-pane>
             </el-tabs>
             <!--                <el-select v-model="queryParams.storeAreaId" placeholder="请选择区域" clearable @change="handleQuery" filterable>-->
             <!--                    <el-option v-for="(item, index) in areaList" :key="index" :label="item.name" :value="item.id" />-->
@@ -57,8 +57,8 @@
             </template>
           </el-table-column>
         </Page>
-      </el-col>
-    </el-row>
+      </div>
+    </div>
     <!--  设置价格  -->
     <el-dialog title="设置价格" :visible.sync="unitPriceType" width="30%" :before-close="handleClose" append-to-body>
       <form ref="unitpriceForm">

+ 1 - 1
admin-ui/src/views/cloth/washMode/index.vue

@@ -14,7 +14,7 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['cloth:texture:add']">新增</el-button>
             </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+            <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
         </el-row>
 
         <Page uri="/mapi/core/washMode/list" :request-params="queryParams" ref="pagination">

+ 1 - 0
admin-ui/src/views/coupon/type/index.vue

@@ -435,6 +435,7 @@ export default {
             } else {
                 this.form.deductAmount = 0
             }
+            this.form = JSON.parse(JSON.stringify(this.form))
         },
         /** 搜索按钮操作 */
         handleQuery() {