Changpeng Duan пре 5 година
родитељ
комит
cc586ddce4
5 измењених фајлова са 53 додато и 132 уклоњено
  1. 2 2
      pc/src/components/Navside.vue
  2. 5 4
      pc/src/views/Main.vue
  3. 4 4
      pc/src/views/Member.vue
  4. 3 1
      pc/src/views/cost.vue
  5. 39 121
      pc/src/views/tempUser.vue

+ 2 - 2
pc/src/components/Navside.vue

@@ -157,8 +157,8 @@
     /*注释*/
     /*注释*/
     .Navside {
     .Navside {
         width: 100%;
         width: 100%;
-        height: 910px;
-        /*height: 100%;*/
+        /* height: 910px; */
+        height: 100%;
         overflow: hidden;
         overflow: hidden;
         display: block;
         display: block;
         margin: 0 auto;
         margin: 0 auto;

+ 5 - 4
pc/src/views/Main.vue

@@ -1099,7 +1099,7 @@ i {
 
 
     .lt .top {
     .lt .top {
         width: 96%;
         width: 96%;
-        float: left;
+        /* float: left; */
         margin-bottom: 1px;
         margin-bottom: 1px;
     }
     }
 
 
@@ -1118,11 +1118,11 @@ i {
 
 
     .btLine em {
     .btLine em {
         font-size: 12px;
         font-size: 12px;
-        float: left;
+        /* float: left; */
         line-height: 22px;
         line-height: 22px;
     }
     }
     .finish {
     .finish {
-        float: left;
+        /* float: left; */
     }
     }
 
 
     .finish ul li {
     .finish ul li {
@@ -1199,7 +1199,8 @@ i {
         font-size: 12px;
         font-size: 12px;
     }
     }
     .appoint {
     .appoint {
-        float: left;
+        /* float: left; */
+        margin-top: 9px;
     }
     }
 
 
     .asTitle {
     .asTitle {

+ 4 - 4
pc/src/views/Member.vue

@@ -51,7 +51,7 @@
                 element-loading-background="rgba(0, 0, 0, 0.8)" @selection-change="handleSelectionChange"
                 element-loading-background="rgba(0, 0, 0, 0.8)" @selection-change="handleSelectionChange"
                 @current-change="clickChange">
                 @current-change="clickChange">
                 >
                 >
-                <el-table-column label="选择" width="55">
+                <el-table-column label="选择" width="55" fixed>
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
                         <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
                     </template>
                     </template>
@@ -63,14 +63,14 @@
                         width="50"
                         width="50"
                 >
                 >
                 </el-table-column> -->
                 </el-table-column> -->
-                <el-table-column label="序号" type="index" width="50" align="center">
+                <el-table-column label="序号" type="index" width="50" align="center" fixed>
                     <template scope="scope">
                     <template scope="scope">
                         <span>{{(start) + scope.$index + 1}}</span>
                         <span>{{(start) + scope.$index + 1}}</span>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column prop="UserInfo.Name" label="会员名" width="90">
+                <el-table-column prop="UserInfo.Name" label="会员名" width="90" fixed>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column prop="UserInfo.Phone" label="手机号" width="110" sortable>
+                <el-table-column prop="UserInfo.Phone" label="手机号" width="110" sortable fixed>
                 </el-table-column>
                 </el-table-column>
                 <el-table-column prop="UserInfo.head" label="头像" width="50">
                 <el-table-column prop="UserInfo.head" label="头像" width="50">
                     <template slot-scope="scope">
                     <template slot-scope="scope">

+ 3 - 1
pc/src/views/cost.vue

@@ -65,7 +65,7 @@
                     :summary-method="getSummaries"
                     :summary-method="getSummaries"
                     @selection-change="handleSelectionChange"
                     @selection-change="handleSelectionChange"
             >
             >
-            <el-table-column label="序号" type="index" width="50" align="center">
+            <el-table-column label="序号" type="index" width="50" align="center"  fixed>
                 <template scope="scope">
                 <template scope="scope">
                     <span>{{(start) + scope.$index + 1}}</span>
                     <span>{{(start) + scope.$index + 1}}</span>
                 </template>
                 </template>
@@ -75,6 +75,7 @@
                         label="会员名"
                         label="会员名"
                         min-width="80dp"
                         min-width="80dp"
                         align="center"
                         align="center"
+                        fixed
                 >
                 >
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column
@@ -83,6 +84,7 @@
                         min-width="110dp"
                         min-width="110dp"
                         align="center"
                         align="center"
                         sortable
                         sortable
+                        fixed
                 >
                 >
                 </el-table-column>
                 </el-table-column>
                 <el-table-column
                 <el-table-column

+ 39 - 121
pc/src/views/tempUser.vue

@@ -22,102 +22,54 @@
             </div>
             </div>
         </div>
         </div>
         <div class="change">
         <div class="change">
-            <el-button @click="addMember"  type="primary" size="mini">新增临时会员</el-button>
+            <el-button @click="addMember" type="primary" size="mini">新增临时会员</el-button>
             <el-button @click="delList" size="mini">删除临时会员</el-button>
             <el-button @click="delList" size="mini">删除临时会员</el-button>
         </div>
         </div>
         <div class="table">
         <div class="table">
-            <el-table
-                    :data="tableData"
-                    border
-                    is-horizontal-resize
-                    :default-sort="{prop: 'date', order: 'descending'}"
-                    element-loading-background="rgba(0, 0, 0, 0.8)"
-                    @selection-change="handleSelectionChange" @current-change="clickChange"
-            >
+            <el-table :data="tableData" border is-horizontal-resize :default-sort="{prop: 'date', order: 'descending'}"
+                element-loading-background="rgba(0, 0, 0, 0.8)" @selection-change="handleSelectionChange"
+                @current-change="clickChange">
                 >
                 >
-                <el-table-column label="选择" width="55">
+                <el-table-column label="选择" width="55" fixed>
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
                         <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column label="序号" type="index" width="50" align="center">
+                <el-table-column label="序号" type="index" width="50" align="center" fixed>
                     <template scope="scope">
                     <template scope="scope">
                         <span>{{(start) + scope.$index + 1}}</span>
                         <span>{{(start) + scope.$index + 1}}</span>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column
-                        prop="UserInfo.head"
-                        label="头像"
-                        width="50"
-                >
+                <el-table-column prop="UserName" label="会员名" width="90" fixed>
+                </el-table-column>
+                <el-table-column prop="Phone" label="手机号" width="110" fixed>
+                </el-table-column>
+                <el-table-column prop="UserInfo.head" label="头像" width="50">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <div class="demo-image__preview" v-if="scope.row.Head">
                         <div class="demo-image__preview" v-if="scope.row.Head">
-                            <el-image
-                                    style="width: 25px; height: 25px"
-                                    :src="scope.row.Head"
-                                    :preview-src-list="[scope.row.Head]"
-
-                            >
+                            <el-image style="width: 25px; height: 25px" :src="scope.row.Head"
+                                :preview-src-list="[scope.row.Head]">
                             </el-image>
                             </el-image>
                         </div>
                         </div>
                         <img src="../assets/img/nav/head.png" alt="" v-else width="25px" height="25px">
                         <img src="../assets/img/nav/head.png" alt="" v-else width="25px" height="25px">
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column
-                        prop="UserName"
-                        label="会员名"
-                        width="90"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="Phone"
-                        label="手机号"
-                        width="110"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="StaticHr"
-                        label="静态心率"
-                        width="110"
-                        sortable
-                >
+                <el-table-column prop="StaticHr" label="静态心率" width="110" sortable>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column
-                        prop="Height"
-                        label="身高(CM)"
-                        width="110"
-                        sortable
-                >
+                <el-table-column prop="Height" label="身高(CM)" width="110" sortable>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column
-                        prop="Weight"
-                        label="体重(KG)"
-                        width="110"
-                        sortable
-                >
+                <el-table-column prop="Weight" label="体重(KG)" width="110" sortable>
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <span>{{scope.row.Weight / 10}}</span>
                         <span>{{scope.row.Weight / 10}}</span>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column
-                        prop="Sex"
-                        label="类型"
-                        align="center"
-                        width="80px"
-                        sortable
-                >
+                <el-table-column prop="Sex" label="类型" align="center" width="80px" sortable>
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <span v-if="scope.row.Sex == 1">男</span>
                         <span v-if="scope.row.Sex == 1">男</span>
                         <span v-if="scope.row.Sex == 2">女</span>
                         <span v-if="scope.row.Sex == 2">女</span>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column
-                        prop="Birthday"
-                        label="生日"
-                        width="110"
-                        :formatter="filterFmtDate"
-                        sortable
-                >
+                <el-table-column prop="Birthday" label="生日" width="110" :formatter="filterFmtDate" sortable>
                 </el-table-column>
                 </el-table-column>
                 <!--<el-table-column-->
                 <!--<el-table-column-->
                 <!--prop="ClassInfo"-->
                 <!--prop="ClassInfo"-->
@@ -129,45 +81,29 @@
                 <!--v-for="lesson in scope.row.ClassInfo">{{ lesson.ClassName }}</span>-->
                 <!--v-for="lesson in scope.row.ClassInfo">{{ lesson.ClassName }}</span>-->
                 <!--</template>-->
                 <!--</template>-->
                 <!--</el-table-column>-->
                 <!--</el-table-column>-->
-                <el-table-column
-                        prop="UserInfo.Memo"
-                        label="备注">
+                <el-table-column prop="UserInfo.Memo" label="备注">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
-                        <el-popover
-                                placement="top"
-                                title=""
-                                width="200"
-                                trigger="hover"
-                                :content="scope.row.Memo">
-                            <span slot="reference"
-                                  v-if="scope.row.Memo.length > 6">{{ scope.row.Memo.substr(0, 6) }} ....</span>
+                        <el-popover placement="top" title="" width="200" trigger="hover" :content="scope.row.Memo">
+                            <span slot="reference" v-if="scope.row.Memo.length > 6">{{ scope.row.Memo.substr(0, 6) }}
+                                ....</span>
                         </el-popover>
                         </el-popover>
                         <span v-if="scope.row.Memo.length <= 6">{{ scope.row.Memo }}</span>
                         <span v-if="scope.row.Memo.length <= 6">{{ scope.row.Memo }}</span>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column
-                        prop="UserInfo.Status"
-                        label="操作"
-                        width="160px"
-                >
+                <el-table-column prop="UserInfo.Status" label="操作" width="160px">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-button class="btn" type="default" size="mini" @click="editMember(scope.row)"
                         <el-button class="btn" type="default" size="mini" @click="editMember(scope.row)"
-                                   v-if="userLevel != 4">编辑
+                            v-if="userLevel != 4">编辑
                         </el-button>
                         </el-button>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
             </el-table>
             </el-table>
             <br>
             <br>
-            <el-pagination
-                    background
-                    :total="pageination.total"
-                    :page-size="pageination.pageItem"
-                    @current-change="pageChange"
-            ></el-pagination>
+            <el-pagination background :total="pageination.total" :page-size="pageination.pageItem"
+                @current-change="pageChange"></el-pagination>
         </div>
         </div>
 
 
-        <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible"
-                   :width="form.btnType == 1 ?'650px':'650px'">
+        <el-dialog :title="dialogTitle" :visible.sync="dialogMemberVisible" :width="form.btnType == 1 ?'650px':'650px'">
             <div class="dialogContent">
             <div class="dialogContent">
                 <div :class="['pull-left',{'tabwild':form.btnType == 1}]">
                 <div :class="['pull-left',{'tabwild':form.btnType == 1}]">
                     <el-form ref="form" :model="form" label-width="80px">
                     <el-form ref="form" :model="form" label-width="80px">
@@ -191,40 +127,23 @@
                         </el-form-item>
                         </el-form-item>
                         <el-form-item label="性别" :required="true">
                         <el-form-item label="性别" :required="true">
                             <el-select v-model="form.sex " placeholder="">
                             <el-select v-model="form.sex " placeholder="">
-                                <el-option
-                                        v-for="item in sexOptions"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value"
-                                ></el-option>
+                                <el-option v-for="item in sexOptions" :key="item.value" :label="item.label"
+                                    :value="item.value"></el-option>
                             </el-select>
                             </el-select>
                         </el-form-item>
                         </el-form-item>
                         <el-form-item label="出生年份" :required="true">
                         <el-form-item label="出生年份" :required="true">
-                            <el-date-picker
-                                    v-model="form.birthday"
-                                    align="right"
-                                    type="date"
-                                    placeholder="选择日期"
-                            >
+                            <el-date-picker v-model="form.birthday" align="right" type="date" placeholder="选择日期">
                             </el-date-picker>
                             </el-date-picker>
                         </el-form-item>
                         </el-form-item>
                         <el-form-item label="头像">
                         <el-form-item label="头像">
                             <div class="upload">
                             <div class="upload">
-                                <el-upload
-                                        class="avatar-uploader"
-                                        :action=domain
-                                        :http-request=upqiniu
-                                        :show-file-list="false"
-                                        :before-upload="beforeUpload">
+                                <el-upload class="avatar-uploader" :action=domain :http-request=upqiniu
+                                    :show-file-list="false" :before-upload="beforeUpload">
                                     <!--<i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
                                     <!--<i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
                                 </el-upload>
                                 </el-upload>
                                 <img v-if="imageUrl" :src="imageUrl" class="avatar">
                                 <img v-if="imageUrl" :src="imageUrl" class="avatar">
-                                <cropper
-                                        :width="300"
-                                        :height="300"
-                                        :fixed-number="[1,1]"
-                                        @subUploadSucceed="getShopImages"
-                                ></cropper>
+                                <cropper :width="300" :height="300" :fixed-number="[1,1]"
+                                    @subUploadSucceed="getShopImages"></cropper>
                                 <!--<ImgCutter v-on:cutDown="cutDown"></ImgCutter>-->
                                 <!--<ImgCutter v-on:cutDown="cutDown"></ImgCutter>-->
                             </div>
                             </div>
                         </el-form-item>
                         </el-form-item>
@@ -233,8 +152,7 @@
             </div>
             </div>
             <div class="dialogFooter">
             <div class="dialogFooter">
                 <el-button :disabled="addDisabled" :loading="addDisabled" type="primary" size="small"
                 <el-button :disabled="addDisabled" :loading="addDisabled" type="primary" size="small"
-                           v-if="form.btnType == 0"
-                           @click="confirmMember">确定
+                    v-if="form.btnType == 0" @click="confirmMember">确定
                 </el-button>
                 </el-button>
                 <el-button type="primary" size="small" v-if="form.btnType == 1" @click="confirmEditMember">确定
                 <el-button type="primary" size="small" v-if="form.btnType == 1" @click="confirmEditMember">确定
                 </el-button>
                 </el-button>
@@ -276,8 +194,8 @@
                 dialogTitle: '新增临时会员',
                 dialogTitle: '新增临时会员',
                 dialogMemberVisible: false,//新增会员dialog
                 dialogMemberVisible: false,//新增会员dialog
                 sexOptions: [
                 sexOptions: [
-                    {value: 1, label: '男'},//性别 1:男, 2:女
-                    {value: 2, label: '女'},
+                    { value: 1, label: '男' },//性别 1:男, 2:女
+                    { value: 2, label: '女' },
                 ],
                 ],
                 panel: {
                 panel: {
                     usercode: '',
                     usercode: '',
@@ -593,7 +511,7 @@
             upqiniu(req) {
             upqiniu(req) {
                 let that = this;
                 let that = this;
                 const config = {
                 const config = {
-                    headers: {'Content-Type': 'multipart/form-data'}
+                    headers: { 'Content-Type': 'multipart/form-data' }
                 };
                 };
                 let filetype = '';
                 let filetype = '';
                 if (req.file.type === 'image/png') {
                 if (req.file.type === 'image/png') {
@@ -795,4 +713,4 @@
         width: 50%;
         width: 50%;
         float: left;
         float: left;
     }
     }
-</style>
+</style>