修改

src/components/offlineService/ServiceManageEdit.vue

@@ -23,6 +23,11 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="从业年限">
+          <el-input type="text" class="w200" size="small" @keyup.native="checkPrice(addMsg,'WorkYears')" v-model="addMsg.WorkYears">
+            <template slot="append">年</template>
+          </el-input>
+        </el-form-item>
         <el-form-item label="对应的类型" prop="ServiceType">
           <div style="display: flex;flex-direction: row;align-items: center">
             <div @click="getUseType(1)" style="margin-right: 15px">
@@ -54,17 +59,17 @@
         <el-form-item label="名称" prop="Name">
           <el-input v-model="addMsg.Name" class="w400" size="small" placeholder="请输入服务人员名称" maxlength="20" />
         </el-form-item>
-        <el-form-item label="性别" prop="Gender">
+        <el-form-item label="性别">
           <el-radio-group v-model="addMsg.Gender">
             <el-radio :label="item.Id" v-for="(item,index) in genderList" :key="index">{{item.Name}}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="标签">
-          <el-tag :key="tag" size="small" v-for="(tag,index) in addMsg.LableNameList" closable
+          <el-tag :key="tag" size="small" style="margin-right:5px;" v-for="(tag,index) in addMsg.LableNameList" closable
             :disable-transitions="false" @close="handleClose(index)">
             {{tag}}
           </el-tag>
-          <el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" ref="saveTagInput" size="small"
+          <el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" ref="saveTagInput" size="mini"
             @keyup.enter.native="handleInputConfirm" @blur="handleInputConfirm">
           </el-input>
           <el-button class="button-new-tag" size="mini" @click="showInput">+ 标签</el-button>
@@ -159,13 +164,6 @@
           callback();
         }
       }
-      let validataSex = (rule, value, callback) => {
-        if (this.addMsg.Gender == '') {
-          return callback(new Error('请选择性别'));
-        } else {
-          callback();
-        }
-      }
       return {
         //选择图片
         choicImg: false,
@@ -175,7 +173,7 @@
         addMsg: {
           LableNameList: [], //	标签
           StoreId: '', //	店铺id
-          Gender: '', //性别
+          Gender: 0, //性别
           ServiceType: '', //对应的类型
           ProductList: [], //商品信息
           ID: 0, //编号
@@ -184,7 +182,8 @@
           Major: '', //职务
           ServiceStatus: 1, //	启用/禁用 状态1启用 2禁用
           Telephone: '', //电话
-          FictitiousReserveNum: '' //虚拟预约数
+          FictitiousReserveNum: '', //虚拟预约数
+          WorkYears:'' //工作年限
         },
         msg2: {
           pageIndex: 1,
@@ -233,11 +232,6 @@
             validator: validataType,
             trigger: "blur",
             required: true
-          }],
-          Gender: [{
-            validator: validataSex,
-            trigger: "blur",
-            required: true
           }]
         }
       };
@@ -268,6 +262,7 @@
         this.apipost("/api/Reserve/GetGenderEnumList", {}, res => {
           if (res.data.resultCode == 1) {
             this.genderList = res.data.data;
+            console.log(res,'行呗');
           } else {
             this.Error(res.data.message);
           }

src/components/offlineService/osAddcardrelease.vue

@@ -69,6 +69,7 @@
         :data="tableData"
         tooltip-effect="dark"
         style="width: 100%"
+        height="400px"
         v-loading="loading"
         @selection-change="handleSelectionChange">
         <el-table-column
@@ -106,8 +107,8 @@
       </el-pagination>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="category = false">取 消</el-button>
-        <el-button type="primary" @click="getProductList">确 定</el-button>
+        <el-button @click="category = false" size="small">取 消</el-button>
+        <el-button type="primary" @click="getProductList" size="small">确 定</el-button>
       </div>
     </el-dialog>
   </div>

src/components/offlineService/osAddmealcard.vue

@@ -32,11 +32,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="从业年限">
-            <el-input type="text" @keyup.native="checkPrice(msg,'WorkYears')" v-model="msg.WorkYears">
-              <template slot="append">年</template>
-            </el-input>
-          </el-form-item>
           <el-form-item label="指定商品类别或商品">
             <div style="display: flex;flex-direction: row;align-items: center">
               <div @click="getUseType(1)" style="margin-right: 15px">
@@ -201,7 +196,6 @@
           IsZanYangUse: 0,
           HeXiao: 1,
           CouponIco: "",
-          WorkYears: '', //从业年限
           StoreIds: '' //	店铺id
         },
         checkedkeys: [], //默认选中的
@@ -340,10 +334,12 @@
               this.checked = false
             }
             this.storeCheck=[];
-            var cked = this.msg.StoreIds.split(',');
-            cked.forEach(x=>{
-              this.storeCheck.push(parseInt(x));
-            })
+            if(this.msg.StoreIds!=0){
+              var cked = this.msg.StoreIds.split(',');
+              cked.forEach(x=>{
+                this.storeCheck.push(parseInt(x));
+              })
+            }
             if (res.data.data.UseType == 1) {
               let ProductList = res.data.data.ProductList;
               this.AppointList = []
@@ -540,7 +536,11 @@
                   'ProductId': this.commoditylist[i].Id,
                 })
               }
-              this.msg.ProductList = ProductList
+              this.msg.ProductList = ProductList;
+              if(this.msg.ProductList.length==0){
+                this.Error('请选择指定商品');
+                return;
+              }
             } else if (this.msg.UseType == 1) {
               let ProductList = []
               for (let i = 0; i < this.AppointList.length; i++) {
@@ -549,6 +549,10 @@
                 })
               }
               this.msg.ProductList = ProductList
+              if(this.msg.ProductList.length==0){
+                this.Error('请选择指定商品类型');
+                return;
+              }
             }
             this.loading = true
             if (this.storeCheck.length == 0) {