更新部分功能

src/App.vue

@@ -67,7 +67,7 @@ export default {
       useTime:0,
       showCareer:false,
       careerId:0,
-      isRed:true
+      isRed:false
       // sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
     }
   },
@@ -131,6 +131,7 @@ export default {
       this.timekeeper()
       this.listeneruser()
     }
+    
     this.haveOpenMode=!localStorage.openMode
     this.MsgBus.$on('imgpreviewoverflow',content=>{
       this.show(content)
@@ -170,6 +171,10 @@ export default {
       this.careerId=0
       this.showCareer=false
     })
+    this.MsgBus.$on("changeTheme",t=>{
+      console.log('theme type:'+t)
+      this.isRed=t==1;
+    })
   }
 }
 </script>

src/components/Details.vue

@@ -181,7 +181,7 @@
       } else {
         this.goUrl('/' + hrefs[hrefs.length - 1])
       }
-
+      this.isRed=(this.getLocalStorage().ThemeType?this.getLocalStorage().ThemeType:0)==1
     },
     methods: {
       nullMethod() {

src/components/WebSet/WebSiteCustomer.vue

@@ -45,6 +45,16 @@
         </el-table-column>
         <el-table-column prop="CreateTimeStr" label="新增時間" header-align="center" align="center">
         </el-table-column>
+        <el-table-column prop="IsIndex" label="设为首页" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.IsIndex"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              @change="changeIndexStatus(scope.row)">
+            </el-switch>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" header-align="center" align="center">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
@@ -102,6 +112,9 @@
           res => {
             this.loading = false;
             if (res.data.resultCode == 1) {
+              res.data.data.pageData.forEach(x=>{
+                x.IsIndex=x.IsIndex==1
+              })
               this.dataList = res.data.data.pageData;
               this.total = res.data.data.count
             } else {
@@ -152,7 +165,22 @@
           }
         });
       },
-
+      changeIndexStatus(e){
+        this.loading = true;
+        let msg={
+          id:e.Id,
+          isindex:e.IsIndex?1:0
+        }
+        this.apipost(
+          "ws_get_setPageIndex",
+          msg,
+          res => {
+            this.loading = false;
+            this.getData();
+          },
+          err => {}
+        );
+      },
       //跳转预览
       GoCustom(Id) {
         var B2BDomain = this.CurrentUserInfo.B2BDomain;

src/components/index.vue

@@ -1216,7 +1216,7 @@
     data() {
       return {
         b2bDomain:"",
-        useRed:true,
+        useRed:false,
         //提成账单弹窗
         commissionDialog: false,
         //判断显示哪个组件
@@ -1737,6 +1737,8 @@
         this.isShowMore = false
       }
       this.b2bDomain=this.userInfo.B2BDomain
+      this.useRed=(this.userInfo.ThemeType?this.userInfo.ThemeType:0)==1
+      this.MsgBus.$emit("changeTheme",this.useRed)
       document.title = this.userInfo.GroupName
       if (this.userInfo.Icon != null) {
         this.userInfo.UserPhoto = this.userInfo.Icon;

src/components/platformModule/groupManagement.vue

@@ -242,6 +242,12 @@
         <el-form-item class='w400' label='航班' prop="Status">
           <el-radio v-model="addMsg.UseFlightType" :label="0">系统</el-radio>
           <el-radio v-model="addMsg.UseFlightType" :label="1">自定义</el-radio>
+        </el-form-item>
+         <el-form-item class='w400' label='主题'>
+          <el-select v-model="addMsg.ThemeType" placeholder="请选项">
+            <el-option label='黑色' value='0'></el-option>
+            <el-option label='红色' value='1'></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item class='w400' label='备注' prop="Remarks">
           <el-input type="textarea" v-model="addMsg.Remarks"></el-input>
@@ -406,6 +412,7 @@
           IsOpenTripFeature: 0, //是否有行程特色(0-没有，1-有)
           TripFeatureImg: "", //行程特色背景图片
           UseFlightType: 0, //使用航班类型(0-系统默认航班,1-自定义航班信息)
+          ThemeType:'0' //主题颜色
         },
         verSionMsg: {
           Status: 0

src/components/work/mywork.vue

@@ -119,7 +119,10 @@
       </tr>
       <tr v-for="(item, index) in tempList" :key="index">
         <td>
-          <span class="circle" v-if="(item.ExamineStatus==0||item.ExamineStatus==-1)&&(item.ZongExamineStatus==0||item.ZongExamineStatus==-1)"></span>
+          <span
+            class="circle"
+            v-if="(item.ExamineStatus==0||item.ExamineStatus==-1)&&(item.ZongExamineStatus==0||item.ZongExamineStatus==-1)"
+          ></span>
           <span class="circle green" v-else-if="item.Status==0"></span>
           <span class="circle red" v-else-if="item.Status==1||item.Status==2"></span>
           <span class="circle black" v-else-if="item.Status==3"></span>
@@ -211,12 +214,7 @@
               circle
             ></el-button>
           </el-tooltip>
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="详情"
-            placement="top-start"
-          >
+          <el-tooltip class="item" effect="dark" content="详情" placement="top-start">
             <el-button
               style="padding:4px"
               type="info"
@@ -463,6 +461,9 @@ export default {
     addData() {
       this.addMsg.BeginTime = this.addMsg.TimeRanges[0];
       this.addMsg.EndTime = this.addMsg.TimeRanges[1];
+      if (this.addMsg.BeginTime != this.addMsg.EndTime) {
+        this.$message.error("只能添加当日工作计划，不能跨天计划");
+      } else {
         this.addMsg.Tags =
           this.addMsg.TempTags && this.addMsg.TempTags.length == 1
             ? this.addMsg.TempTags[0]
@@ -484,6 +485,7 @@ export default {
           },
           err => {}
         );
+      }
       //this.getList();
     },
     getList() {
@@ -505,7 +507,7 @@ export default {
     deleteItem(id) {
       this.apipost(
         "user_post_DeleteWork",
-        {id},
+        { id },
         res => {
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);
@@ -519,24 +521,24 @@ export default {
         err => {}
       );
     },
-    query(id){
+    query(id) {
       this.$router.push({
         name: "workDetails",
         query: {
-          "id": id,
-          blank: 'y'
+          id: id,
+          blank: "y"
         }
-      })
+      });
     },
-    query2(id){
+    query2(id) {
       this.$router.push({
         name: "workDetails",
         query: {
-          "id": id,
-          update:"u",
-          blank: 'y'
+          id: id,
+          update: "u",
+          blank: "y"
         }
-      })
+      });
     }
   }
 };

src/components/work/workDetails.vue

@@ -590,6 +590,10 @@ export default {
       );
     },
     setprogress() {
+      if(this.d.w.BeginTime.split(' ')[0]!=this.formatDate("yyyy-MM-dd")){
+        this.$message.error("今日事，今日毕，你已经超时，无法提交咯");
+        return;
+      }
       if (this.textarea2 == "") {
         this.$message.error("请填写进度说明");
         return;

src/plug/index.js

@@ -114,8 +114,8 @@ export default {
             //域名管理对象
             Vue.prototype.domainManager = function() {
                 let domainUrl = '';
-                domainUrl = "http://reborn.oytour.com";
-                //domainUrl = "http://192.168.2.65:8025";
+                //domainUrl = "http://reborn.oytour.com";
+                domainUrl = "http://127.0.0.1:8082";
 
                 let locationName = window.location.hostname;