巡检修改

src/views/Inspection.vue

@@ -11,7 +11,7 @@
               v-model="title"
               placeholder="搜索"
               @input="searchData()"
-            >
+            />
           </div>
           <button class="selectBtn fr" @click="showPicker">筛选</button>
         </div>
@@ -30,31 +30,49 @@
               @change="stateChange()"
             ></cube-select>-->
             <div class="conentBox">
-              <div class="conent" v-for="(item,index) in items" @click="toDetail(item)" :key="index">
+              <div
+                class="conent"
+                v-for="(item, index) in items"
+                @click="toDetail(item)"
+                :key="index"
+              >
                 <div class="head">
                   <p>
                     <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
-                    巡检单号：{{item.sign}}
+                    巡检单号：{{ item.sign }}
                     <span
-                      :class="{'btn':true, 'zhixingzhong':item.state==0,'yiwancheng':item.state==1}"
-                    >{{item.stateName}}</span>
+                      :class="{
+                        btn: true,
+                        zhixingzhong: item.state == 0,
+                        yiwancheng: item.state == 1
+                      }"
+                      >{{ item.stateName }}</span
+                    >
                   </p>
                 </div>
                 <div class="center">
                   <p>
                     <span class="fl">巡检主题：</span>
-                    <span class="grayFont overflowEllipsis2">{{item.inspection.title}}</span>
+                    <span class="grayFont overflowEllipsis2">{{
+                      item.inspection.title
+                    }}</span>
                   </p>
                 </div>
                 <div class="bottom">
                   <i
-                    :class="{'iconfont':true ,'icon-yiyuqi':item.overdueType==0 ,'icon-zhengchang':item.overdueType==1,'icon-jijiang':item.overdueType==2,'newPapir':true}"
+                    :class="{
+                      iconfont: true,
+                      'icon-yiyuqi': item.overdueType == 0,
+                      'icon-zhengchang': item.overdueType == 1,
+                      'icon-jijiang': item.overdueType == 2,
+                      newPapir: true
+                    }"
                   ></i>
-                  <span>逾期时间：{{item.overdueTime}}</span>
+                  <span>逾期时间：{{ item.overdueTime }}</span>
                 </div>
               </div>
               <div class="wushuju" v-show="wushuju">
-                <img src="./../../static/images/wushuju.svg" alt>
+                <img src="./../../static/images/wushuju.svg" alt />
                 <p>暂无巡检</p>
               </div>
             </div>
@@ -67,9 +85,14 @@
                 <div
                   v-show="props.beforePullDown"
                   class="before-trigger"
-                  :style="{paddingTop: props.bubbleY + 'px'}"
+                  :style="{ paddingTop: props.bubbleY + 'px' }"
                 >
-                  <span :class="{rotate: props.bubbleY > pullDownRefreshThreshold - 40}">↓</span>
+                  <span
+                    :class="{
+                      rotate: props.bubbleY > pullDownRefreshThreshold - 40
+                    }"
+                    >↓</span
+                  >
                 </div>
                 <div class="after-trigger" v-show="!props.beforePullDown">
                   <div v-show="props.isPullingDown" class="loading">
@@ -85,7 +108,7 @@
         </div>
       </div>
     </div>
-    <load-ing v-if="!items.length&&!wushuju"></load-ing>
+    <load-ing v-if="!items.length && !wushuju"></load-ing>
   </div>
 </template>
 <script>
@@ -101,6 +124,7 @@ export default {
     return {
       //   items: _foods,
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
+      menu: JSON.parse(localStorage.getItem("menu")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
       items: [],
       pullDownRefresh: true,
@@ -128,12 +152,12 @@ export default {
           value: "done"
         }
       ],
-      stateValue: "all",
+      stateValue: "todo",
       sum: 10,
       idx: 0,
       stateClass: "",
       loadShow: true,
-      searching:false,
+      searching: false
     };
   },
   components: {
@@ -176,10 +200,11 @@ export default {
     toDetail(item) {
       console.log(item);
       // return;2020年4月27日23:44:23
-      var bxr = JSON.parse(localStorage.getItem("login_requester"));//bababa
-      item.processUser.name = bxr.name;
-      item.processUser.phone = bxr.mphone;
-
+      var bxr = JSON.parse(localStorage.getItem("login_requester")); //bababa
+      if(item.processUser){
+        item.processUser.name = bxr.name;
+        item.processUser.phone = bxr.mphone;
+      }
       if (item.state == 1) {
         this.$router.push({
           name: "InspectionDoneDetail",
@@ -188,16 +213,77 @@ export default {
           }
         });
       } else {
-        this.$router.push({
-          name: "InspectionDetail",
-          params: {
-            data: item
+        let chuli = false;
+        let chuliFlag = false;
+        // 判断权限
+        for (let i = 0; i < this.menu.length; i++) {
+          if (this.menu[i].link == "xunjianliebiao_chuli") {
+            chuli = true;
           }
-        });
+        }
+        //判断状态和对象
+        if (item.inspection.dictionary.value == 1) {
+          // 按巡检人员
+          if (
+            item.processUser.id == this.loginUser.id &&
+            item.stateName == "执行中"
+          ) {
+            chuliFlag = true;
+          } else {
+            chuliFlag = false;
+          }
+        } else if (item.inspection.dictionary.value == 3) {
+          // 按工作组
+          var hasGroup = this.loginUser.group.some(v => v.id == item.group.id);
+          if (hasGroup && item.stateName == "执行中") {
+            chuliFlag = true;
+          } else {
+            chuliFlag = false;
+          }
+        } else if (item.inspection.dictionary.value == 4) {
+          // 系统默认
+          if (item.online) {
+            // 线上人
+            if (
+              item.processUser.id == this.loginUser.id &&
+              item.stateName == "执行中"
+            ) {
+              chuliFlag = true;
+            } else {
+              chuliFlag = false;
+            }
+          } else {
+            // 线下组
+            var hasGroup = this.loginUser.group.some(
+              v => v.id == item.group.id
+            );
+            if (hasGroup && item.stateName == "执行中") {
+              chuliFlag = true;
+            } else {
+              chuliFlag = false;
+            }
+          }
+        }
+        if (chuli && chuliFlag) {
+          this.$router.push({
+            name: "InspectionDetail",
+            params: {
+              data: item
+            }
+          });
+        } else {
+          this.$router.push({
+            name: "InspectionDoneDetail",
+            params: {
+              data: item
+            }
+          });
+        }
       }
       window.localStorage.setItem("insDetailInfo", JSON.stringify(item));
     },
     getParamsState() {
+      console.log(this.$route.params.state)
       if (this.$route.params.state) {
         console.log(this.$route.params.state);
         this.stateValue = this.$route.params.state;
@@ -208,7 +294,7 @@ export default {
         this.picker = this.$createPicker({
           title: "",
           data: [this.stateData],
-          selectedIndex: this.$route.params.state ? [1] : [0],
+          selectedIndex: [1],
           onSelect: this.selectHandle,
           onCancel: this.cancelHandle
         });
@@ -226,29 +312,44 @@ export default {
     // 搜索
     searchData() {
       this.items = [];
-      this.searching=true;
+      this.searching = true;
       this.getData();
     },
     // 获取列表
     getData() {
+      console.log(this.stateValue);
       var that = this;
       // that.items.length=0;
+      let postData = {
+        assignee: that.loginUser.id,
+        idx: that.idx,
+        sum: that.sum,
+        inspectionProcessActual: {
+          // inspection: {
+          //   title: that.title,
+          //   executeUser: { id: that.loginUser.id }
+          // }
+          typeSearch: that.title
+          // processUser:{
+          //   id:that.loginUser.id
+          // }
+        },
+        searchType: that.stateValue
+      };
+      if (that.stateValue === "todo") {
+        // 待处理添加筛选条件
+        console.log(postData, "2022年5月30日");
+        postData.candidateGroups = that.loginUser.group
+          .map(v => v.id)
+          .toString();
+      } else {
+        delete postData.candidateGroups;
+      }
       this.$http
-        .post("service/bpm/InspectionProcessActual/fetchServiceTasks/ALL", {
-          assignee: that.loginUser.id,
-          idx: that.idx,
-          sum: that.sum,
-          inspectionProcessActual: {
-            // inspection: {
-            //   title: that.title,
-            //   executeUser: { id: that.loginUser.id }
-            // }
-            processUser:{
-              id:that.loginUser.id
-            }
-          },
-          searchType: that.stateValue
-        })
+        .post(
+          "service/bpm/InspectionProcessActual/fetchServiceTasks/ALL",
+          postData
+        )
         .then(function(res) {
           if (res.data.data.length > 0) {
             that.wushuju = false;
@@ -260,9 +361,9 @@ export default {
                 );
               }
             }
-            if(that.searching){
-              that.items =res.data.data;
-            }else{
+            if (that.searching) {
+              that.items = res.data.data;
+            } else {
               that.items = that.items.concat(res.data.data);
             }
           } else {
@@ -276,7 +377,7 @@ export default {
       var that = this;
       that.items = [];
       that.idx = 0;
-      that.searching=false;
+      that.searching = false;
       setTimeout(() => {
         that.getData();
       }, 1000);
@@ -284,7 +385,7 @@ export default {
     onPullingUp() {
       var that = this;
       that.idx = that.idx + 1;
-      that.searching=false;
+      that.searching = false;
       that.getData();
     },
     updatePullDownRefresh(val) {
@@ -432,7 +533,7 @@ export default {
   }
 }
 </style>
-<style lang='less' scoped>
+<style lang="less" scoped>
 .bgColor {
   background-color: white;
 }

src/views/InspectionDetail.vue

@@ -1,64 +1,66 @@
 <template>
   <div class="inspedtionDetail">
-    <div class="label">巡检信息</div>
-    <div class="head">
-      <p>
-        <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
-        巡检单号
-        <span class="num">{{ baseInfo.sign }}</span>
-        <span class="btn zhixingzhong">{{ baseInfo.stateName }}</span>
-      </p>
-    </div>
-    <div class="info">
-      <p>
-        <span class="fl">巡检类型</span>
-        <span class="fr">{{ baseInfo.inspectionType.type }}</span>
-      </p>
-      <p>
-        <span class="fl">计划主题</span>
-        <span class="fr">{{ baseInfo.inspection.title }}</span>
-      </p>
-      <p>
-        <span class="fl">计划内容</span>
-        <span class="fr showwrap">{{ baseInfo.inspection.content }}</span>
-      </p>
-      <p>
-        <span class="fl">巡检状态</span>
-        <span class="fr">{{ baseInfo.stateName }}</span>
-      </p>
-      <p>
-        <span class="fl">巡检策略</span>
-        <span class="fr">{{ baseInfo.inspection.planStrategy.name }}</span>
-      </p>
-      <p>
-        <span class="fl">执行时长</span>
-        <span class="fr">{{ baseInfo.inspection.executionTime }}分钟</span>
-      </p>
-      <p>
-        <span class="fl">开始时间</span>
-        <span class="fr">{{
-          baseInfo.inspection.planStartTime.slice(
-            0,
-            baseInfo.inspection.planStartTime.length - 2
-          )
-        }}</span>
-      </p>
-      <p>
-        <span class="fl">逾期时间</span>
-        <span class="fr">{{ baseInfo.overdueTime }}</span>
-      </p>
-    </div>
-    <div class="label">巡检结果</div>
-    <div class="form">
-      <p v-for="(item, index) in forms" :key="index">
-        <span>{{ item.name }}：</span>
-        <cube-switch
-          v-model="param[item.key]"
-          :class="{ abnormal: !param[item.key] }"
-          :data-label="item.key"
-        ></cube-switch>
-      </p>
-    </div>
+    <template v-if="baseInfo.online !== true">
+      <div class="label">巡检信息</div>
+      <div class="head">
+        <p>
+          <i class="iconfont icon-zuixinbaoxiu newPapir"></i>
+          巡检单号
+          <span class="num">{{ baseInfo.sign }}</span>
+          <span class="btn zhixingzhong">{{ baseInfo.stateName }}</span>
+        </p>
+      </div>
+      <div class="info">
+        <p>
+          <span class="fl">巡检范围</span>
+          <span class="fr">{{ baseInfo.inspectionType.type }}</span>
+        </p>
+        <p>
+          <span class="fl">计划主题</span>
+          <span class="fr">{{ baseInfo.inspection.title }}</span>
+        </p>
+        <p>
+          <span class="fl">计划内容</span>
+          <span class="fr showwrap">{{ baseInfo.inspection.content }}</span>
+        </p>
+        <p>
+          <span class="fl">巡检状态</span>
+          <span class="fr">{{ baseInfo.stateName }}</span>
+        </p>
+        <p>
+          <span class="fl">巡检策略</span>
+          <span class="fr">{{ baseInfo.inspection.planStrategy.name }}</span>
+        </p>
+        <p>
+          <span class="fl">执行时长</span>
+          <span class="fr">{{ baseInfo.inspection.executionTime }}分钟</span>
+        </p>
+        <p>
+          <span class="fl">开始时间</span>
+          <span class="fr">{{
+            baseInfo.inspection.planStartTime.slice(
+              0,
+              baseInfo.inspection.planStartTime.length - 2
+            )
+          }}</span>
+        </p>
+        <p>
+          <span class="fl">逾期时间</span>
+          <span class="fr">{{ baseInfo.overdueTime }}</span>
+        </p>
+      </div>
+      <div class="label">巡检结果</div>
+      <div class="form">
+        <p v-for="(item, index) in forms" :key="index">
+          <span>{{ item.name }}：</span>
+          <cube-switch
+            v-model="param[item.key]"
+            class="abnormal"
+            :data-label="item.name"
+          ></cube-switch>
+        </p>
+      </div>
+    </template>
     <div class="label formLabel">
       {{ xj_beizhu.name }}
     </div>
@@ -98,7 +100,7 @@ import { GL } from "./../http/http";
 export default {
   data() {
     return {
-      toast:null,
+      toast: null,
       action: {
         target:
           this.$host + "/service/common/common/uploadAttachment/inspection/",
@@ -134,32 +136,34 @@ export default {
   methods: {
     //获取位置，经纬度
     getLocation() {
+      // this.submit("香港");
+      // return;
       // 判断是否处于微信浏览器环境
       if (!/MicroMessenger/i.test(window.navigator.userAgent)) {
         this.$createToast({
           txt: "请前往微信中操作",
           type: "warn",
-          mask: true,
+          mask: true
         }).show();
         return;
       }
       this.toast = this.$createToast({
         time: 0,
         mask: true,
-        txt: "正在加载中",
+        txt: "正在加载中"
       });
       this.toast.show();
       // 中南财大
       if (this.isZncd) {
         //第二个参数 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
-        sdk.getLocation((res) => {
+        sdk.getLocation(res => {
           // alert(JSON.stringify(res));
           // latitude
           // longitude
           this.gl(res);
         });
       } else {
-        GL(this).then((res) => {
+        GL(this).then(res => {
           this.gl(res);
         });
       }
@@ -172,7 +176,7 @@ export default {
         data: {
           location: res.latitude + "," + res.longitude,
           key: "TADBZ-IRBWU-QAXVE-2IWED-UW2F5-YVF66",
-          output: "jsonp",
+          output: "jsonp"
         },
         dataType: "jsonp",
         success(result) {
@@ -180,7 +184,7 @@ export default {
             let address = result.result.formatted_addresses.recommend;
             _this.submit(address);
           }
-        },
+        }
       });
     },
     fileSubmitted(files) {
@@ -209,7 +213,7 @@ export default {
       that.toast = that.$createToast({
         time: 0,
         mask: true,
-        txt: "正在加载中",
+        txt: "正在加载中"
       });
       that.toast.show();
       that.$http
@@ -260,6 +264,27 @@ export default {
       this.param.inspectionProcessActual = this.baseInfo;
       this.param.address = address;
       console.log(this.param);
+      if (
+        this.param.inspectionProcessActual.group &&
+        this.param.inspectionProcessActual.group.id
+      ) {
+        //处理组
+        this.$http
+          .post("/service/bpm/InspectionProcessActual/batchAssign", {
+            ids: this.param.inspectionProcessActual.id.toString(),
+            userId: this.loginUser.id
+          })
+          .then(res => {
+            if (res.data.status == 200) {
+              this.completeIt();
+            }
+          });
+      } else {
+        this.completeIt();
+      }
+    },
+    // 完成-公共
+    completeIt() {
       var that = this;
       that.$http
         .post(

src/views/Login.vue

@@ -139,6 +139,10 @@ export default {
               JSON.stringify(res.data.data.user)
             );
             localStorage.setItem(
+              "menu",
+              JSON.stringify(res.data.data.menu)
+            );
+            localStorage.setItem(
               "login_requester",
               JSON.stringify(res.data.data.requester)
             );
@@ -214,6 +218,10 @@ export default {
         if (res.data && res.data.state == 200) {
           localStorage.setItem("loginUser", JSON.stringify(res.data.data.user));
           localStorage.setItem(
+            "menu",
+            JSON.stringify(res.data.data.menu)
+          );
+          localStorage.setItem(
             "login_requester",
             JSON.stringify(res.data.data.requester)
           );

src/views/inspectionDoneDetail.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="inspedtionDetail">
+    <template v-if="baseInfo.online !== true">
     <div class="label">巡检信息</div>
     <div class="head">
       <p>
@@ -11,7 +12,7 @@
     </div>
     <div class="info">
       <p>
-        <span class="fl">巡检类型</span>
+        <span class="fl">巡检范围</span>
         <span class="fr">{{ baseInfo.inspectionType.type }}</span>
       </p>
       <p>
@@ -60,6 +61,7 @@
         }}</span>
       </p>
     </div>
+    </template>
     <div class="label">{{ xj_beizhu.name }}</div>
     <div class="textarea_div">
       <cube-textarea