修改

src/components/director/addGuide.vue

@@ -4,15 +4,15 @@
       <span @click="CommonJump('directorGuideList')" class="blue point">导游管理</span> / 编辑导游管理
     </div>
     <div class="content">
-      <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px" style="width:60%">
+      <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px" style="width:50%">
 
         <el-form-item label="导游名称" prop="Name" class="is-required">
-          <el-input v-model="addMsg.Name" placeholder="请输入站点名称" />
+          <el-input v-model="addMsg.Name" size="small" placeholder="请输入站点名称" />
         </el-form-item>
 
-        <el-form-item label="用户头像">
+        <el-form-item label="用户头像" size="small">
             <el-tooltip class="item" effect="dark" content="建议尺寸100*100" placement="top">
-              <el-button @click="openChangeDig(1)" size="small">选择文件</el-button>
+              <el-button @click="openChangeDig(1)">选择文件</el-button>
             </el-tooltip>
             <div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;">
               <img v-if="!addMsg.GuidePhoto || addMsg.GuidePhoto==''"
@@ -22,7 +22,7 @@
             </div>
         </el-form-item>
 
-        <el-form-item label="工作年限" prop="WorkYears" class="is-required">
+        <el-form-item label="工作年限" prop="WorkYears" class="is-required" size="small">
           <el-input v-model="addMsg.WorkYears" placeholder="请输入工作年限" />
         </el-form-item>
         <el-form-item label="站点" prop="SiteId" class="is-required">
@@ -32,13 +32,13 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="联系电话" prop="Telephone" class="is-required">
+        <el-form-item label="联系电话" prop="Telephone" class="is-required" size="small">
           <el-input v-model="addMsg.Telephone" placeholder="请输入联系电话" type="number"/>
         </el-form-item>
-        <el-form-item label="紧急联系电话" prop="EmergencyPhone" class="is-required">
+        <el-form-item label="紧急联系电话" prop="EmergencyPhone" class="is-required" size="small">
           <el-input v-model="addMsg.EmergencyPhone" placeholder="请输入紧急联系电话" type="number"/>
         </el-form-item>
-        <el-form-item label="简介" >
+        <el-form-item label="简介">
           <UE style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true" ref="ue"></UE>
         </el-form-item>
 
@@ -309,4 +309,4 @@
     height: 32px;
     margin: 0 5px;
   }
-</style>
+  </style>

src/components/director/directorGoodsEdit.vue

@@ -198,7 +198,7 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="线路名称" v-if="EnumType==5">
+                  <el-form-item label="线路名称" v-if="EnumType==5" prop="LineName">
                     <el-input v-model="addMsg.LineName" size="small" placeholder="请输入内容" class="input-with-select">
                     </el-input>
                   </el-form-item>
@@ -225,9 +225,9 @@
                       <el-button slot="append">人</el-button>
                     </el-input>
                   </el-form-item>
-                  <el-form-item label="是否拼车">
-                    <el-radio v-model="addMsg.IsSpell" label="1">是</el-radio>
-                    <el-radio v-model="addMsg.IsSpell" label="2">否</el-radio>
+                  <el-form-item label="是否拼车" v-if="addMsg.CarType==5">
+                    <el-radio v-model="addMsg.IsSpell" :label="1">是</el-radio>
+                    <el-radio v-model="addMsg.IsSpell" :label="2">否</el-radio>
                   </el-form-item>
                   <el-form-item label="提前预定天数" prop="AdvanceDay">
                     <el-input v-model="addMsg.AdvanceDay" size="small" placeholder="请输入内容" class="input-with-select">
@@ -337,7 +337,7 @@
                         </el-select>
                       </div>
                     </template>
-                    <el-button size="small" type="primary" @click="SaveDate()">追加</el-button>
+                    <el-button size="small" type="primary" @click="SaveDate()">添加</el-button>
                   </el-form-item>
                   <el-form-item>
                     <el-tag type="info" style="margin-right:20px;" closable @close="handleClose(index)"
@@ -436,28 +436,11 @@
                       </el-button>
                     </el-input>
                   </el-form-item>
-                  <el-form-item label-width="110px">
+                  <el-form-item label-width="200px">
                     <el-checkbox v-model="addMsg.IsMultipleDeduction" :true-label="1" :false-label="2">允许多件抵扣
                     </el-checkbox>
                   </el-form-item>
-                  <el-form-item label="商品赠送VIP" v-if="FxState==1">
-                    <el-select class="w150" style="margin-left:15px" v-model="addMsg.PresentFXGrade" size="small"
-                      clearable placeholder="请选择" @change='changeVIP'>
-                      <el-option v-for="item in FXlevelList" :key="item.Id" :label="item.GradeName" :value="item.Id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="赠送日期" v-if="FxState==1 && giveDate==true">
-                    <el-input v-model="addMsg.PresentFXMonth" style="width:100%;margin-left:15px" type="number" min="1"
-                      size="small" placeholder="请输入内容" class="input-with-select">
-
-                      <el-button slot="append">
-                        月
-                      </el-button>
-                    </el-input>
-                  </el-form-item>
                   <el-form-item label="广告词">
-
                     <el-input v-model="addMsg.Advertising" style="width:100%;margin-left:15px" type="textarea" :rows="3"
                       size="small" placeholder="请输入内容" class="input-with-select"></el-input>
                   </el-form-item>
@@ -632,59 +615,15 @@
             <el-form-item v-if="addMsg.SeparateSetMember == 1 && huiyList.length == 0" label="会员价设置">
               <el-button @click="CommonJump('setMember')" size="small" type="danger">如需设置请先添加会员</el-button>
             </el-form-item>
-            <el-form-item v-if="
-                addMsg.SeparateSetMember == 1 &&
-                  SpecificationPriceList.length == 0
+            <el-form-item v-if="addMsg.SeparateSetMember == 1
               " label="默认规格会员价设置">
-              <div v-for="(item, index) in memberList1[0].GradePriceList" :key="index+'15'">
+              <div v-for="(item, index) in addMsg.MemberPriceTreeList[0].GradePriceList" :key="index+'15'">
                 <el-input style="width:700px" placeholder="请输入内容" v-model="item.MemberPrice" size="small"
                   class="input-with-select">
-                  <el-button slot="prepend">{{ item.Name }}</el-button>
+                  <el-button slot="prepend">{{ item.MemberGrade }}级会员</el-button>
                   <el-button slot="append">元</el-button>
                 </el-input>
               </div>
-              <el-tag type="danger">如需设置多规格会员价,请先添加商品规格</el-tag>
-            </el-form-item>
-             <el-form-item v-if="
-                addMsg.SeparateSetMember == 1 &&
-                  SpecificationPriceList.length > 0
-              " label="会员价设置">
-              <div class="app-attr">
-                <div class="box">
-                  <el-form-item style="display:inline-block">
-                    <el-input style="width:500px;position:relative;top:5px" size="small" v-model="memberinput"
-                      placeholder="请输入内容">
-                      <el-select slot="prepend" style="width:130px" v-model="memberVal" size="small">
-                        <el-option v-for="(item, index) in huiyList" :label="item.Name" :value="item.Grade"
-                          :key="index">
-                        </el-option>
-                      </el-select>
-                      <el-button @click="HySet" slot="append">确定</el-button>
-                    </el-input>
-                  </el-form-item>
-                </div>
-                <el-table ref="table" :data="memberList2" border style="width: 100%"
-                  @selection-change="TbaleSelectionChange4">
-                  <el-table-column type="selection" width="55">
-                  </el-table-column>
-                  <template v-for="(item, index) in SpecificationList">
-                    <el-table-column :key="index+'16'" :label="item.Name" width="100">
-                      <template slot-scope="scope">
-                        <span v-if="index == index2" v-for="(item2, index2) in scope.row.AttrList" :key="index2+'17'">
-                          {{ scope.row.AttrList[index2].SVName }}
-                        </span>
-                      </template>
-                    </el-table-column>
-                  </template>
-                  <template v-for="(item, index) in huiyList">
-                    <el-table-column :key="index+'18'" :label="item.Name">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.GradePriceList[index].MemberPrice" size="small"></el-input>
-                      </template>
-                    </el-table-column>
-                  </template>
-                </el-table>
-              </div>
             </el-form-item>
           </el-tab-pane>
         </el-tabs>
@@ -866,7 +805,7 @@
           SeparateDistributionType: 1,
           SeparateDistributionMoneyType: 2, //默认显示固定金额
           EnjoyMember: 1, //会员价
-          SeparateSetMember: 2,
+          SeparateSetMember: 0,
           SupplierId: '', //供应商id
           Commission: 0, // 返佣总金额 （粉象模式开启 才显示）
           AreaList: [], //区域列表	
@@ -897,13 +836,8 @@
           AdvanceDay: 0, //	提前预定天数
           TargetDateStrList:[],
 
-          SpecificationList: [],
-          SpecificationPriceList: [],
-
           // FormsId: -1,
           // FormsName: "",
-          // PresentFXGrade: '',
-          // PresentFXMonth: 0,
         },
 
         predefineColors: [
@@ -966,6 +900,11 @@
             required: true,
             message: "请输入提前预定天数",
             trigger: "blur"
+          }],
+          LineName: [{
+            required: true,
+            message: "请输入线路名称",
+            trigger: "blur"
           }]
         },
         SiteList: [], //站点列表
@@ -1069,7 +1008,6 @@
         shareSettings: [],
         companyCommission: 0,
         options: [],
-        FXlevelList: [],
         giveDate: false,
 
         //请求日期参数 
@@ -1114,7 +1052,6 @@
       this.getDistributor();
       this.gethuiyList();
       this.getSupplierList()
-      this.getFXDGradeList()
       this.getAllGuideCarSiteList()
       this.getGuideCarList() //获取车辆下拉
       this.getOrderListExportEnumList()
@@ -1254,13 +1191,6 @@
               this.Error('请选择商品分类');
               return false
             }
-            // if (this.SpecificationList.length > 0) {
-            //   this.addMsg.IsCustomSpecification = 1;
-            // }
-            // if (this.SpecificationList.length == 0) {
-            //   this.addMsg.IsCustomSpecification = 2;
-            // }
-
             //预定日期设置
             this.addMsg.TargetDateStrList=this.subDateList;
             
@@ -1271,11 +1201,11 @@
                 }],
                 this.addMsg.DistributionCommissionList = this.disList1;
             }
-            if (this.addMsg.SeparateSetMember == 1 && this.SpecificationList.length == 0) {
+            if (this.addMsg.SeparateSetMember == 1) {
               this.addMsg.MemberPriceList = this.memberList1;
               this.addMsg.MemberPriceTreeList = this.memberList1;
             }
-            if (this.addMsg.SeparateSetMember == 1 && this.SpecificationList.length > 0) {
+            if (this.addMsg.SeparateSetMember == 1) {
               this.addMsg.MemberPriceList = this.memberList2;
               this.addMsg.MemberPriceTreeList = this.memberList2;
             }
@@ -1286,8 +1216,6 @@
             } else {
               this.addMsg.SupplierId = this.SupplierId != '' ? this.SupplierId : 0;
             }
-            this.addMsg.SpecificationPriceList = this.SpecificationPriceList;
-            this.addMsg.SpecificationList = this.SpecificationList;
 
             if (this.addMsg.PresentFXGrade == '') { //没选择的时候默认为0
               this.addMsg.PresentFXGrade = 0
@@ -1531,10 +1459,6 @@
               this.getGuideCarGuideList(this.addMsg.SiteId) //导游下拉
 
               this.initShareSettings();
-              if(this.addMsg.SpecificationPriceList){
-                this.SpecificationPriceList = this.addMsg.SpecificationPriceList;
-              }
-              this.SpecificationList = this.addMsg.SpecificationList;
 
               this.ComTreeList = this.addMsg.DistributionCommissionTreeList;
             
@@ -1759,28 +1683,6 @@
           }
         });
       },
-      getFXDGradeList() {
-        this.apipost("/api/user/GetFXDistributorGradeList", {
-          GradeName: ''
-        }, res => {
-          this.loading = false;
-          if (res.data.resultCode == 1) {
-            if (res.data.data != null) {
-              let data = res.data.data;
-              let List = [];
-              data.forEach(x => {
-                let obj = {};
-                //  if(x.IsGuest !=1){
-                if (x.IsGuest == 3) { //只显示vip
-                  let obj = x
-                  List.push(obj)
-                }
-              })
-              this.FXlevelList = List;
-            }
-          }
-        });
-      },
       getAllGuideCarSiteList() { //获取站点下拉
         this.apipost("/api/GuideCar/GetAllGuideCarSiteList", {}, res => {
           if (res.data.resultCode == 1) {
@@ -1792,7 +1694,6 @@
         this.apipost("/api/GuideCar/GetGuideCarList", {}, res => {
           if (res.data.resultCode == 1) {
             this.CarList = res.data.data;
-            console.log(this.CarList,'carllist');
           }
         });
       },
@@ -1800,7 +1701,6 @@
         this.apipost("/api/GuideCar/GetOrderListExportEnumList", {}, res => {
           if (res.data.resultCode == 1) {
             this.EnumList = res.data.data
-            console.log(this.EnumList)
           }
         });
       },
@@ -1837,20 +1737,10 @@
         });
 
       },
-      changeVIP() {
-        if (this.addMsg.PresentFXGrade == '' || this.addMsg.PresentFXGrade == 0) {
-          this.giveDate = false;
-          this.addMsg.PresentFXMonth = 0
-        } else {
-          this.giveDate = true;
-        }
-      },
       //追加日期
       SaveDate() {
-        console.log(this.dateMsg, 'this.dateMsg');
         this.apipost("/api/GuideCar/GetGoodsTargetDateList", this.dateMsg, res => {
           if (res.data.resultCode == 1) {
-            console.log(res, 'ress');
             var myArr = res.data.data;
             //遍历当前数组
             for (var i = 0; i < myArr.length; i++) {
@@ -1860,6 +1750,8 @@
                 this.subDateList.push(myArr[i]);
               }
             }
+            //日期升序排列
+            this.subDateList.sort(function (a, b) {return Date.parse(a) - Date.parse(b);});
           }else{
             this.Error(res.data.message);
           }

src/components/director/directorGoodsList.vue

@@ -12,7 +12,6 @@
           <el-tab-pane :dataId="0" label="全部" name="first"></el-tab-pane>
           <el-tab-pane :dataId="1" label="上架中" name="second"></el-tab-pane>
           <el-tab-pane :dataId="2" label="下架中" name="third"></el-tab-pane>
-          <el-tab-pane :dataId="3" label="删除" name="fourth"></el-tab-pane>
         </el-tabs>
       </div>
       <div>
@@ -121,7 +120,7 @@
         </el-table-column>
         <el-table-column
           width="120"
-          label="已出售量"
+          label="订单数量"
           prop="GoodsBuyNum"
         >
         </el-table-column>
@@ -345,7 +344,7 @@
         msg = JSON.parse(JSON.stringify(msg));
         msg.pageSize=999;
         this.GetLocalFile(
-          "/api/product/GetProductGoodsListToExcel",
+          "/api/GuideCar/GetProductGoodsListToExcel",
           msg,
           "商品列表.xls"
         );
@@ -494,10 +493,6 @@
           this.msg.GoodsStatus=2;
           this.msg.IsSelectSellOut=0;
         }
-        if(dataId==3){
-          this.msg.GoodsStatus=0;
-          this.msg.IsSelectSellOut=1;
-        }
         this.msg.pageIndex=1
         this.getList();
       },