修改

src/components/director/directorGoodsEdit.vue

@@ -234,6 +234,28 @@
                       <el-button slot="append">天</el-button>
                     </el-input>
                   </el-form-item>
+                  <el-form-item label="区域购买">
+                    <el-switch v-model="addMsg.IsAreaBuy" active-color="#409EFF" :active-value="1" :inactive-value="0">
+                    </el-switch>
+                  </el-form-item>
+                  <el-form-item v-if="addMsg.IsAreaBuy == 1" label="允许购买区域">
+                    <span v-if="addMsg.AreaList.length == 0" @click="addOf" class="blue point">+添加地区</span>
+                    <div v-if="addMsg.AreaList.length > 0" style="border: 1px solid #EBEEF5;padding:20px"
+                      flex="dir:left box:last">
+                      <div>
+                        <div flex="dir:left" style="flex-wrap: wrap; width: 90%;">
+                          <span>区域：</span>
+                          <el-tag v-for="item in addMsg.AreaList" :key="item.Id" type="info" style="margin:5px">
+                            {{ item.AreaName }}</el-tag>
+                        </div>
+                      </div>
+                      <div>
+                        <img @click="editQy" src="../../assets/img/userman/edit.png" alt="" />
+                        <img @click="(addMsg.AreaList = []), (AreaList = [])" style="margin-left:15px"
+                          src="../../assets/img/userman/del.png" alt="" />
+                      </div>
+                    </div>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </el-card>
@@ -292,7 +314,8 @@
                       <div style="margin-left:30px;display:inline-block;">
                         日期：
                         <el-date-picker class="w130" size="small" v-model="dateMsg.StartDate" type="date"
-                          value-format="yyyy-MM-dd" :picker-options="pickerBeginDateBefore" placeholder="选择日期"></el-date-picker>
+                          value-format="yyyy-MM-dd" :picker-options="pickerBeginDateBefore" placeholder="选择日期">
+                        </el-date-picker>
                         -
                         <el-date-picker class="w130" size="small" v-model="dateMsg.EndDate" value-format="yyyy-MM-dd"
                           type="date" :picker-options="pickerBeginDateAfter" placeholder="选择日期"></el-date-picker>
@@ -301,14 +324,16 @@
                     <template v-if="dateMsg.DayType==2">
                       <div style="margin-left:20px;display:inline-block;">
                         月：
-                        <el-date-picker v-model="dateMsg.Month" size="small" value-format="yyyy-MM" type="month" placeholder="选择月">
+                        <el-date-picker v-model="dateMsg.Month" size="small" value-format="yyyy-MM" type="month"
+                          placeholder="选择月">
                         </el-date-picker>
                       </div>
                     </template>
                     <template v-if="dateMsg.DayType==3">
                       <div style="display:inline-block;">
                         年：
-                        <el-date-picker class="w90" size="small" v-model="dateMsg.Year" value-format="yyyy" type="year" placeholder="选择年">
+                        <el-date-picker class="w90" size="small" v-model="dateMsg.Year" value-format="yyyy" type="year"
+                          placeholder="选择年">
                         </el-date-picker>
                         月：
                         <el-select size="small" class="w90" v-model="dateMsg.Month">
@@ -347,51 +372,6 @@
                 </el-col>
               </el-row>
             </el-card>
-            <el-card style="margin-top:20px" shadow="never">
-              <div slot="header" class="clearfix">
-                <span>商品服务</span>
-              </div>
-              <el-row>
-                <el-col :span="12">
-                  <!-- <el-form-item label="自定义表单">
-                    <el-tooltip class="item" effect="dark" content="选择第一项（默认表单）将会根据表单列表的（默认表单）变化而变化"
-                      placement="top-start" style="position: absolute;left: -22px;top:12px">
-                      <i class="elzk el-tooltip el-icon-info"></i>
-                    </el-tooltip>
-                    <template v-if="addMsg.FormsName && addMsg.FormsName != ''">
-                      <el-tag style="margin-right:10px;" @close="(addMsg.FormsName = ''), (addMsg.FormsId = -1)"
-                        closable>
-                        {{ addMsg.FormsName }}</el-tag>
-                    </template>
-                    <el-button @click="
-                        (choosebdDig = true), (keepFormsId = addMsg.FormsId)
-                      " size="mini">选择表单</el-button>
-                  </el-form-item> -->
-                  <el-form-item label="区域购买">
-                    <el-switch v-model="addMsg.IsAreaBuy" active-color="#409EFF" :active-value="1" :inactive-value="0">
-                    </el-switch>
-                  </el-form-item>
-                  <el-form-item v-if="addMsg.IsAreaBuy == 1" label="允许购买区域">
-                    <span v-if="addMsg.AreaList.length == 0" @click="addOf" class="blue point">+添加地区</span>
-                    <div v-if="addMsg.AreaList.length > 0" style="border: 1px solid #EBEEF5;padding:20px"
-                      flex="dir:left box:last">
-                      <div>
-                        <div flex="dir:left" style="flex-wrap: wrap; width: 90%;">
-                          <span>区域：</span>
-                          <el-tag v-for="item in addMsg.AreaList" :key="item.Id" type="info" style="margin:5px">
-                            {{ item.AreaName }}</el-tag>
-                        </div>
-                      </div>
-                      <div>
-                        <img @click="editQy" src="../../assets/img/userman/edit.png" alt="" />
-                        <img @click="(addMsg.AreaList = []), (AreaList = [])" style="margin-left:15px"
-                          src="../../assets/img/userman/del.png" alt="" />
-                      </div>
-                    </div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-card>
             <el-card style="margin-top:20px" shadow="never">
               <div slot="header" class="clearfix">
                 <span>营销设置</span>
@@ -787,7 +767,7 @@
           CarouselImageList: [], //轮播图
           VideoAddress: "", //视频地址	
           CustomShareTitles: "", // 分享标题	
-          CustomShareImage: "",  //分享图片	
+          CustomShareImage: "", //分享图片	
           GoodsStatus: 0, //商品状态 1销售中 2下架
           IsLiveGoods: 2, //是否直播商品 1是 2否
           Sort: 0, //排序
@@ -809,12 +789,12 @@
           SupplierId: '', //供应商id
           Commission: 0, // 返佣总金额 （粉象模式开启 才显示）
           AreaList: [], //区域列表	
-          DistributionCommissionList:[], //分销佣金
-          DistributionCommissionTreeList:[],
-          MemberPriceList:[], //会员价格
+          DistributionCommissionList: [], //分销佣金
+          DistributionCommissionTreeList: [],
+          MemberPriceList: [], //会员价格
           Advertising: '', //广告词
           SubName: '', //副标题
-          MarketingLogo: {  //图标
+          MarketingLogo: { //图标
             iswords: 0,
             words: "",
             wordsColor: "",
@@ -834,7 +814,7 @@
           RideNum: 0, //乘坐人数
           IsSpell: 2, //是否拼车 1是 2否
           AdvanceDay: 0, //	提前预定天数
-          TargetDateStrList:[],
+          TargetDateStrList: [],
 
           // FormsId: -1,
           // FormsName: "",
@@ -1192,8 +1172,8 @@
               return false
             }
             //预定日期设置
-            this.addMsg.TargetDateStrList=this.subDateList;
-            
+            this.addMsg.TargetDateStrList = this.subDateList;
+
             if (this.addMsg.SeparateDistributionType == 1) {
               this.disList1 = [{
                   SpecificationSort: "",
@@ -1444,6 +1424,7 @@
           res => {
             if (res.data.resultCode == 1) {
               this.addMsg = res.data.data;
+              this.EnumType = this.addMsg.CarType;
               if (this.addMsg.SupplierId != 0) {
                 this.SupplierId = this.addMsg.SupplierId;
 
@@ -1451,8 +1432,8 @@
               if (!this.$route.query.GoodsId) {
                 this.addMsg.Id = 0
               }
-              if(this.addMsg.TargetDateList.length>0){
-                this.addMsg.TargetDateList.forEach(x=>{
+              if (this.addMsg.TargetDateList.length > 0) {
+                this.addMsg.TargetDateList.forEach(x => {
                   this.subDateList.push(x.Date.split('T')[0])
                 })
               }
@@ -1461,7 +1442,7 @@
               this.initShareSettings();
 
               this.ComTreeList = this.addMsg.DistributionCommissionTreeList;
-            
+
               if (this.addMsg.SeparateDistributionType == 1) {
                 this.disList1 = this.addMsg.DistributionCommissionTreeList;
                 if (this.addMsg.DistributionCommissionTreeList.length > 0) {
@@ -1510,14 +1491,14 @@
               this.apipost("/api/GuideCar/GetGuideCarList", {}, res => {
                 if (res.data.resultCode == 1) {
                   var MyData = res.data.data;
-                  MyData.forEach(x=>{
+                  MyData.forEach(x => {
                     if (x.ID == this.addMsg.CarId) {
                       this.CarColorList = x.ColorList
                     }
                   })
                 }
               });
-            }else{
+            } else {
               this.Error(res.data.message);
             }
           }
@@ -1662,7 +1643,7 @@
         this.addMsg.GuideId = ''
       },
       changeCarId(val) {
-        this.addMsg.CarColorId='';
+        this.addMsg.CarColorId = '';
         this.CarList.forEach(x => {
           if (x.ID == val) {
             this.CarColorList = x.ColorList
@@ -1700,7 +1681,7 @@
       getOrderListExportEnumList() { //获取服务类型枚举列表
         this.apipost("/api/GuideCar/GetOrderListExportEnumList", {}, res => {
           if (res.data.resultCode == 1) {
-            this.EnumList = res.data.data
+            this.EnumList = res.data.data;
           }
         });
       },
@@ -1751,8 +1732,10 @@
               }
             }
             //日期升序排列
-            this.subDateList.sort(function (a, b) {return Date.parse(a) - Date.parse(b);});
-          }else{
+            this.subDateList.sort(function (a, b) {
+              return Date.parse(a) - Date.parse(b);
+            });
+          } else {
             this.Error(res.data.message);
           }
         });
@@ -2044,7 +2027,9 @@
   .directorGoodsEdit .w90 {
     width: 90px !important;
   }
-  .directorGoodsEdit .w130{
+
+  .directorGoodsEdit .w130 {
     width: 130px !important;
   }
+
 </style>