2020-8-10 3.0

src/apps/mobile/components/MTCompanyUserPower/MTUserPowerTable.vue

@@ -253,7 +253,7 @@
        </div>
     </el-dialog>
     <!--  -->
-    <el-dialog title="更换维保负责人" :visible.sync="DiaModels.changePeopel" width="960px" >
+    <el-dialog title="更换维保负责人" :visible.sync="DiaModels.changePeopel" :before-close="changePeopelClose" width="960px" >
       <div class="changePeople">
         <el-button type="primary" plain @click="changePerson">更换维保负责人</el-button>
       </div>
@@ -479,17 +479,19 @@ export default {
        setTimeout(() => {this.DiaModels.changePeopel=true}, 10);
     },
     geteleList(_this) {
+      console.log(this)
       var url = "business/project/relevance/list";
       var param = {
-        workerId: _this.assOldData.userId,
-        projectId:_this.changeProject.projectId,
-        pageSize: _this.elelist.pageSize,
-        pageNum: _this.elelist.pageNum
+        workerId: this.assOldData.userId,
+        projectId:this.changeProject.projectId,
+        pageSize: this.elelist.pageSize,
+        pageNum: this.elelist.pageNum
       };
-      _this.axios.post(url, param).then(res => {
+      console.log(param);
+      this.axios.post(url, param).then(res => {
         if (res.statusCode === "1") {
-          _this.eleListData=res.data.rows;
-          _this.elelist.total=res.data.total;
+          this.eleListData=res.data.rows;
+          this.elelist.total=res.data.total;
         } else {
           // this.
           this.$message.error(res.message)
@@ -499,7 +501,6 @@ export default {
     // 保存选中项
     handleSelectionChange(val) {
       this.DataSelection = val;
-      console.log(val);
     },
     // 是否急修工
     IsRepir(row, index) {
@@ -764,6 +765,12 @@ export default {
       this.personvalue = null;
       this.DiaModels.pesrson = false;
     },
+    // 关闭关联查询
+    changePeopelClose(){
+      this.DiaModels.changePeopel=false;
+      this.eleListData=[]
+      this.elelist.total=0;
+    },
     // 关闭取消关联
     closeCurrSeek(){
        this.DiaModels.CurrSeekDia = false;

src/apps/mobile/components/home/calendar.vue

@@ -146,7 +146,7 @@ export default {
     let bMonth = newDate.getMonth() + 1;
     let aMonth = bMonth < 10 ? "0" + bMonth : bMonth;
     let a = newDate.getFullYear() + "-" + aMonth;
-    this.initData(null, a);
+    this.changeMonth(null);
   },
   methods: {
     initData(_istrue, yearMonth) {
@@ -176,13 +176,14 @@ export default {
         // 判断是加载，还是调用
         if (istrue) {
           date = new Date(istrue);
+          // _this.currentMonth = date.getMonth();
         } else {
           date = new Date();
+          // _this.currentMonth = date.getMonth() + 1;
         }
         // 获取年 月  日
-        _this.currentDay = date.getDate();
-        _this.currentMonth = date.getMonth() + 1;
-        _this.currentYear = date.getFullYear();
+        // _this.currentDay = date.getDate();
+        // _this.currentYear = date.getFullYear();
         // 获取当月的所有天数
         var newdays = new Date(_this.currentYear, _this.currentMonth, 0);
         var newPrevDays = new Date(
@@ -270,7 +271,7 @@ export default {
       if (isAB === "a") {
         // 记录减的月份；
         let year = this.OriginalS.getFullYear();
-        let month = this.OriginalS.getMonth();
+        let month = parseInt(this.currentMonth)-1
         let day = this.OriginalS.getDate();
         if (month == 0) {
           year = year - 1;
@@ -278,7 +279,7 @@ export default {
         }
         let amonth = month < 10 ? "0" + month : month;
         this.currentYear = year;
-        this.currentMonth = month;
+        this.currentMonth = amonth;
         this.OriginalS = new Date(year + "-" + month + "-" + day);
         // 判断月份是否是一月份
         this.initData(year + "-" + month + "-" + day, year + "-" + amonth);
@@ -286,7 +287,7 @@ export default {
         this.dayNum = {};
         // 记录减的月份；
         let year = this.OriginalS.getFullYear();
-        let month = this.OriginalS.getMonth() + 2;
+        let month = parseInt(this.currentMonth)+1;
         let day = this.OriginalS.getDate();
         if (month > 12) {
           year = year + 1;
@@ -294,14 +295,18 @@ export default {
         }
         let amonth = month < 10 ? "0" + month : month;
         this.currentYear = year;
-        this.currentMonth = month;
+        this.currentMonth = amonth;
         this.OriginalS = new Date(year + "-" + month + "-" + day);
         // 判断月份是否是一月份
         this.initData(year + "-" + month + "-" + day, year + "-" + amonth);
       } else {
         this.OriginalS = new Date();
+        let year = this.OriginalS.getFullYear();
         let bMonth = this.OriginalS.getMonth() + 1;
         let aMonth = bMonth < 10 ? "0" + bMonth : bMonth;
+        this.currentDay=this.OriginalS.getDate();
+        this.currentYear = this.OriginalS.getFullYear();
+        this.currentMonth = aMonth;
         let a = this.OriginalS.getFullYear() + "-" + aMonth;
         this.initData(null, a);
       }
@@ -345,7 +350,6 @@ export default {
       ymd[1] = parseInt(ymd[1]) < 10 ? `0${parseInt(ymd[1])}` : ymd[1];
       ymd[2] = parseInt(ymd[2]) < 10 ? `0${parseInt(ymd[2])}` : ymd[2];
       val.YMD = ymd.join("-");
-      console.log(val.YMD);
       var url = "system/home/enterprise/calendar/taskLiftNum";
       var param = {
         mtCompanyId: JSON.parse(sessionStorage.getItem("companyID")).id,
@@ -353,7 +357,6 @@ export default {
         calendarLiftStatus: item.key
       };
       this.axios.post(url, param).then(res => {
-        console.log(res);
         if (res.statusCode === "1") {
           this.eleTableList = res.data;
         } else {

src/apps/mobile/http.js

@@ -12,11 +12,18 @@ let source = CancelToken.source();
 let loadingRequestCount = 0;
 var loadingInstance;
 var listUrl=['business/common/area/list','system/login/checkImagCode','system/login/checkMobile']
-const showLoading = () => {
-    if (loadingRequestCount === 0) {
-        loadingInstance = Loading.service({ target: '.el-table'});
+
+var elModalUrl=['business/maintenance/modify/plan','business/maintenance/generate/plan','business/project/relevance/modify','business/emergency/emergency-repair/close','business/emergency/emergency-repair/transfer','business/contract/detail','business/contract/modify','business/contract/renew','business/contract/add','system/user/delete','system/companyuser/assignRole','business/project/modify','business/lift/add','business/lift/modify']
+
+const showLoading = (a) => {
+  if (loadingRequestCount === 0) {
+    if(elModalUrl.indexOf(a.url)==-1){
+      loadingInstance = Loading.service({ target: '.el-table'});
+    }else{
+      loadingInstance = Loading.service({ target: '.plansNext'});
     }
-    loadingRequestCount++
+  }
+  loadingRequestCount++
 }
 const hideLoading = () => {
     if (loadingRequestCount <= 0) return

src/apps/mobile/views/project/project.vue

@@ -1206,6 +1206,7 @@
                 :before-close="handleClose"
                 class="AddLift"
               >
+               <div class="plansNext">
                 <el-form
                   :model="AddLift"
                   :inline="true"
@@ -1681,10 +1682,11 @@
                   
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogAddLift = false">取 消</el-button>
-                  <el-button v-if="addLi==1" type="primary" @click="submitAddLift('LiftForm')">确 定</el-button>
-                  <el-button v-if="addLi==2" type="primary" @click="submitEditLift('LiftForm')">确 定</el-button>
+                  <el-button size="small" @click="dialogAddLift = false">取 消</el-button>
+                  <el-button v-if="addLi==1" size="small" type="primary" @click="submitAddLift('LiftForm')">确 定</el-button>
+                  <el-button v-if="addLi==2" type="primary" size="small" @click="submitEditLift('LiftForm')">确 定</el-button>
                 </div>
+               </div>
               </el-dialog>
             </div>
 
@@ -5012,6 +5014,9 @@ $ft14 = 14px;
         width: 100%;
       }
     }
+    .dialog-footer{
+      text-align:right;
+    }
   }
 }
 

src/assets/css/page.styl

@@ -1403,8 +1403,6 @@ body {
         height: 28px;
         line-height:28px;
     }
-
-
     background: #fff;
 
     .addProvice {
@@ -1585,6 +1583,20 @@ body {
         }
 
     }
+    .projectRegionChange{
+        .el-dialog__body{
+            padding:15px 20px;
+        }
+        .el-tabs__active-bar{
+            background-color: #fff;
+        }
+        .el-tabs__nav-wrap::after{
+            height:0;
+        }
+        .el-tabs__header{
+            margin:0 0 0 5px;
+        }
+    }
 }
 .indexUser{
      .userMain{