添加集团时 配置集团站或者单站

src/views/station/Station_Group.vue

@@ -7,10 +7,10 @@
           <el-radio label="1">共享</el-radio>
         </el-radio-group>
         <div style="color: red; font-size: 12px">
-          不共享：每个站点单独设置积分规则，每个集团下站点的积分不统一
+          不共享：每个站点单独设置积分规则，集团下每个站点的积分不通用
         </div>
         <div style="color: red; font-size: 12px">
-          共享：集团站点统一设置积分规则，每个集团下的站点积分统一，每个站点下的商品需要站点单独配置
+          共享：集团站点统一设置积分规则，集团下的每个站点积分通用，每个站点下的商品需要站点单独配置
         </div>
       </el-form-item>
       <el-form-item label="集团内共享电子卡" prop="cardRuleFlag">
@@ -19,10 +19,10 @@
           <el-radio label="1">共享</el-radio>
         </el-radio-group>
         <div style="color: red; font-size: 12px">
-          不共享：每个站点单独设置电子卡规则，每个集团下电子卡不统一
+          不共享：每个站点单独设置电子卡规则，每个集团下电子卡不通用
         </div>
         <div style="color: red; font-size: 12px">
-          共享：集团站点统一设置电子卡规则，每个集团下的站点电子卡统一
+          共享：集团站点统一设置电子卡规则，每个集团下的站点电子卡通用
         </div>
       </el-form-item>
       <el-form-item label="集团内共享优惠劵" prop="couponFlag">

src/views/system/dept/index.vue

@@ -96,21 +96,42 @@
               <el-input v-model="form.deptName" placeholder="请输入部门名称" />
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
               <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="油站类型" prop="singleStationFlag" :required="isShow" v-show="isShow">
+              <el-radio-group v-model="form.singleStationFlag">
+                <el-radio
+                  label="0"
+                > 
+                  单站
+                </el-radio>
+                <el-radio
+                  label="1"
+                >
+                  集团站
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item label="负责人" prop="leader">
               <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
             </el-form-item>
           </el-col>
+          
           <el-col :span="12">
             <el-form-item label="联系电话" prop="phone">
               <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
               <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
@@ -122,43 +143,43 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12" v-show=isShow>
+          <el-col :span="12" v-show="isShow">
             <el-form-item label="油站地址" prop="deptAddress">
               <el-input v-model="form.deptAddress"  maxlength="50" />
             </el-form-item>
           </el-col>
 
-          <el-col :span="12" v-show=isShow>
+          <el-col :span="12" v-show="isShow">
             <el-form-item label="油枪数量" prop="oilGunNum">
               <el-input v-model="form.oilGunNum"  maxlength="50" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show=isShow>
+          <el-col :span="12" v-show="isShow">
             <el-form-item label="油站照片" prop="stationPic">
               <el-input v-model="form.stationPic"  maxlength="50" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show=isShow>
+          <el-col :span="12" v-show="isShow">
             <el-form-item label="油站经度" prop="stationLatitude">
               <el-input v-model="form.stationLatitude"  maxlength="50" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show=isShow>
+          <el-col :span="12" v-show="isShow">
             <el-form-item label="油站纬度" prop="stationLongitude">
               <el-input v-model="form.stationLongitude"  maxlength="50" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show=isShow>
+          <el-col :span="12" v-show="isShow">
             <el-form-item label="商户号" prop="mno">
               <el-input v-model="form.mno"  maxlength="50" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show=isShow>
+          <el-col :span="12" v-show="isShow">
             <el-form-item label="小程序appID" prop="appId">
               <el-input v-model="form.appId"  maxlength="50" />
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show=isShow>
+          <el-col :span="12" v-show="isShow">
             <el-form-item label="小程序appSecret" prop="appSecret">
               <el-input v-model="form.appSecret"  maxlength="50" />
             </el-form-item>
@@ -227,6 +248,9 @@ export default {
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
+        // singleStationFlag: [
+        //   { required: true, message: "站点类型不能为空", trigger: "change" }
+        // ],
         email: [
           {
             type: "email",
@@ -268,7 +292,6 @@ export default {
     selectDepart(val) {
       this.form.jiBie=parseInt(val.jiBie)+1;
       if(val.jiBie==1){
-        console.log("123123123");
         this.isShow=true;
       }else{
         this.isShow=false;