Merge branch 'develop' of http://git.dashitech.com/seimin/itsm-wx-handle into new-itsm-wx-handle

pages/buildIncident/buildIncident.vue

@@ -267,7 +267,7 @@
   }
 
   // 获取故障来源列表
-  function getSources(){
+  function getSources(sourceValue){
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -284,9 +284,13 @@
         value: v.id,
         key: v.value,
       }));
-      let discover = dataInfo.sourceList.find(v => v.key === 'leader');
-      if(discover){
-        incidentData.source = discover.value;
+      if(sourceValue){
+        incidentData.source = sourceValue;
+      }else{
+        let discover = dataInfo.sourceList.find(v => v.key === 'leader');
+        if(discover){
+          incidentData.source = discover.value;
+        }
       }
     })
   }
@@ -440,7 +444,20 @@
 
   onLoad((option) => {
     handlerStore.clearHandlerData();
-    if(incidentBuildStore.incidentBuild.data){
+    if(option.type == 'inspection'){
+      Object.assign(
+        incidentData,
+        incidentBuildStore.incidentBuild.data,
+        {
+          priority: incidentBuildStore.incidentBuild.data.priority ? incidentBuildStore.incidentBuild.data.priority.id : (incidentBuildStore.incidentBuild.data.category ? (incidentBuildStore.incidentBuild.data.category.priority ? incidentBuildStore.incidentBuild.data.category.priority.id : undefined) : undefined),
+          description: incidentBuildStore.incidentBuild.data.description || (incidentBuildStore.incidentBuild.data.category ? incidentBuildStore.incidentBuild.data.category.mutiCategory : undefined),
+        },
+      );
+    	if(incidentData.category && incidentData.category.id && !incidentBuildStore.incidentBuild.data.priority){
+    		getPriorityData()
+    	}
+      getSources(incidentBuildStore.incidentBuild.data.source);
+    }else if(incidentBuildStore.incidentBuild.data){
       Object.assign(
         incidentData,
         incidentBuildStore.incidentBuild.data,
@@ -460,9 +477,9 @@
 			if(incidentData.category && incidentData.category.id){
 				getPriorityData()
 			}
+      getSources();
     }
     getBranchs();
-    getSources();
     getPrioritys();
   })
 </script>

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -11,7 +11,7 @@
     <view class="body" v-if="dataInfo.list.length">
       <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
         <view class="body_item_head ellipsis-multiline">
-          {{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
+          <text class="sign" v-if="data.status.value == 2" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
         </view>
 
         <view class="body_item_content">
@@ -33,6 +33,7 @@
         <view class="body_item_foot">
           <view class="btns pt0">
             <button v-if="data.status.value === '1'" @click.stop="toInspectionValue(data)" type="default" class="primaryButton btn">执行</button>
+            <button v-if="data.status.value === '2' && data.exception == 1 && !data.incidentId && data.inspectionDTO.inspectionFormDTO.showOrder == 1" @click.stop="toBuildIncident(data)" type="default" class="primaryButton btn">生成维修单</button>
           </view>
         </view>
       </view>
@@ -54,7 +55,7 @@
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
   import { SM } from "@/http/http.js"
-  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_scanNodeCode } from "@/http/api.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_scanNodeCode, api_listAttachment } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -67,6 +68,7 @@
   import { useInspectionListSearchStore } from '@/stores/inspectionListSearch'
   import { useInspectionValueStore } from '@/stores/inspectionValue'
   import { useSetTabbar } from '@/share/useSetTabbar.js'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
@@ -79,6 +81,7 @@
   const { currentLogOverTime }  = computedCurrentLogOverTime();
   const { makePhoneCall }  = useMakePhoneCall();
   const { setTabbar }  = useSetTabbar();
+  const incidentBuildStore = useIncidentBuildStore();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
@@ -90,6 +93,9 @@
   const computedSynergetic = computed(() => (synergetic) => {
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join('，') : ''
   })
+  
+  // 故障来源列表
+  const defaultSourceValue = ref();
 
   // 数据
   const dataInfo = reactive({
@@ -162,6 +168,64 @@
       uni.hideLoading();
     });
   }
+  
+  // 获取故障来源列表
+  function getSources(){
+    let postData = {
+      "key": 'incident_source',
+      "type": "list",
+    };
+    api_getDictionary(postData).then(res => {
+      res = res || [];
+      let discover = res.find(v => v.value === 'inspection');
+      if(discover){
+        defaultSourceValue.value = discover.id;
+      }
+    })
+  }
+  
+  // 新建事件
+  async function toBuildIncident(res){
+  	incidentBuildStore.clearIncidentBuildData();
+   let imgObj = res.inspectionFormValuesList.find(v => v.inspectionFormItemDTO.type.value == 7);
+   let repairImgList = [];
+   if(imgObj){
+     let result = await api_listAttachment('inspection', res.id);
+     result.data = result.data || [];
+     result.data = result.data.filter(v => v.recordId == imgObj.itemId);
+     result.data = result.data.map(v => ({
+       url: location.origin + "/file" + v.relativeFilePath,
+       path: location.origin + "/file" + v.relativeFilePath,
+       size: v.size,
+       name: v.name,
+       extname: v.suffix,
+     }))
+     repairImgList = result.data;
+   }
+   
+   console.log(repairImgList, 'repairImgList')
+   
+   let incidentData = {
+     place: res.inspectionNodeDTO.floorDTO,
+     houseNumber: res.inspectionNodeDTO.address,
+     source: defaultSourceValue.value,
+     description: res.inspectionFormValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+     requester: loginUserStore.loginUser.user,
+     branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
+     contacts: loginUserStore.loginUser.user.name,
+     contactsInformation: loginUserStore.loginUser.user.phone,
+     category: res.inspectionDTO.inspectionFormDTO.categoryDTO,
+     department: res.inspectionDTO.inspectionFormDTO.repairDeptDTO,
+     priority: res.inspectionDTO.inspectionFormDTO.priorityDTO,
+     repairImgList,
+     inspectionTaskId: res.id,
+   }
+   console.log(incidentData, 'incidentData')
+   incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+   uni.navigateTo({
+     url: `/pages/buildIncident/buildIncident?type=inspection`
+   })
+  }
 
   // 巡检项
   function toInspectionValue(data){
@@ -334,6 +398,7 @@
   }
 
   onLoad((option) => {
+    getSources();
     for(let i = 0; i<7; i++){
     	setTabbar(i)
     }
@@ -431,6 +496,14 @@ page{
         text-align: left;
         margin: 24rpx;
         font-size: 30rpx;
+        .sign{
+          margin-right: 16rpx;
+          font-weight: bold;
+          color: #49B856;
+          &.signRed{
+            color: #FF0000;
+          }
+        }
       }
       .body_item_content{
         border-top: 1rpx solid #D8D8D8;

pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -9,7 +9,7 @@
     <view class="body" v-if="dataInfo.list.length">
       <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
         <view class="body_item_head ellipsis-multiline">
-          <text class="sign" v-if="dataInfo.tabActiveId == 1" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
+          <text class="sign" v-if="data.status.value == 2" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
         </view>
 
         <view class="body_item_content">
@@ -31,6 +31,7 @@
         <view class="body_item_foot">
           <view class="btns pt0">
             <button v-if="data.status.value === '1' && dataInfo.tabActiveId === 0" @click.stop="toInspectionValue(data)" type="default" class="primaryButton btn">执行</button>
+            <button v-if="data.status.value === '2' && data.exception == 1 && !data.incidentId && data.inspectionDTO.inspectionFormDTO.showOrder == 1" @click.stop="toBuildIncident(data)" type="default" class="primaryButton btn">生成维修单</button>
           </view>
         </view>
       </view>
@@ -46,7 +47,7 @@
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
   import { SM } from "@/http/http.js"
-  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_inspectionNode } from "@/http/api.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_inspectionNode, api_listAttachment } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -59,6 +60,7 @@
   import { useInspectionListSearchStore } from '@/stores/inspectionListSearch'
   import { useInspectionValueStore } from '@/stores/inspectionValue'
   import { useSetTabbar } from '@/share/useSetTabbar.js'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
@@ -71,10 +73,14 @@
   const { currentLogOverTime }  = computedCurrentLogOverTime();
   const { makePhoneCall }  = useMakePhoneCall();
   const { setTabbar }  = useSetTabbar();
+  const incidentBuildStore = useIncidentBuildStore();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+  // 故障来源列表
+  const defaultSourceValue = ref();
+  
   // 数据
   const dataInfo = reactive({
     tabs: [{id: 0, name: '巡检工单', value: 'todo', num: ''}, {id: 1, name: '历史工单', value: '', num: ''}],
@@ -88,6 +94,64 @@
     inspectionNodeName: '',
   })
   
+  // 获取故障来源列表
+  function getSources(){
+    let postData = {
+      "key": 'incident_source',
+      "type": "list",
+    };
+    api_getDictionary(postData).then(res => {
+      res = res || [];
+      let discover = res.find(v => v.value === 'inspection');
+      if(discover){
+        defaultSourceValue.value = discover.id;
+      }
+    })
+  }
+  
+  // 新建事件
+  async function toBuildIncident(res){
+  	incidentBuildStore.clearIncidentBuildData();
+   let imgObj = res.inspectionFormValuesList.find(v => v.inspectionFormItemDTO.type.value == 7);
+   let repairImgList = [];
+   if(imgObj){
+     let result = await api_listAttachment('inspection', res.id);
+     result.data = result.data || [];
+     result.data = result.data.filter(v => v.recordId == imgObj.itemId);
+     result.data = result.data.map(v => ({
+       url: location.origin + "/file" + v.relativeFilePath,
+       path: location.origin + "/file" + v.relativeFilePath,
+       size: v.size,
+       name: v.name,
+       extname: v.suffix,
+     }))
+     repairImgList = result.data;
+   }
+   
+   console.log(repairImgList, 'repairImgList')
+   
+   let incidentData = {
+     place: res.inspectionNodeDTO.floorDTO,
+     houseNumber: res.inspectionNodeDTO.address,
+     source: defaultSourceValue.value,
+     description: res.inspectionFormValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+     requester: loginUserStore.loginUser.user,
+     branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
+     contacts: loginUserStore.loginUser.user.name,
+     contactsInformation: loginUserStore.loginUser.user.phone,
+     category: res.inspectionDTO.inspectionFormDTO.categoryDTO,
+     department: res.inspectionDTO.inspectionFormDTO.repairDeptDTO,
+     priority: res.inspectionDTO.inspectionFormDTO.priorityDTO,
+     repairImgList,
+     inspectionTaskId: res.id,
+   }
+   console.log(incidentData, 'incidentData')
+   incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+   uni.navigateTo({
+     url: `/pages/buildIncident/buildIncident?type=inspection`
+   })
+  }
+  
   // 巡检项
   function toInspectionValue(data){
     uni.showLoading({
@@ -206,6 +270,7 @@
   }
   
   onLoad((option) => {
+    getSources();
     dataInfo.inspectionNodeCode = option.inspectionNodeCode;
     dataInfo.inspectionNodeNewCode = option.inspectionNodeNewCode;
     dataInfo.inspectionNodeName = option.inspectionNodeName;

pages/inspection/inspectionValue/inspectionValue.vue

@@ -72,7 +72,7 @@
   import DsFilePicker from '@/components/DsFilePicker.vue';
   import { ref, reactive, nextTick } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
-  import { api_addModel } from "@/http/api.js"
+  import { api_addModel, api_getDictionary } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -80,17 +80,22 @@
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useInspectionValueStore } from '@/stores/inspectionValue'
   import { forIn } from 'lodash-es';
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const { goBack }  = useGoBack();
   const inspectionValueStore = useInspectionValueStore();
+  const incidentBuildStore = useIncidentBuildStore();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
 
   // 所有页码数据
   const formPageList = reactive([]);
+  
+  // 故障来源列表
+  const defaultSourceValue = ref();
 
   // 表单
   const baseForm = ref()
@@ -132,6 +137,61 @@
   function changeForm(){
     handleData(true);
   }
+  
+  // 跳转巡检列表
+  function toInspectionExecute(){
+    inspectionValueStore.clearInspectionValueData();
+    uni.reLaunch({
+      url: `/pages/inspection/inspectionExecute/inspectionExecute`
+    })
+  }
+  
+  // 获取故障来源列表
+  function getSources(){
+    let postData = {
+      "key": 'incident_source',
+      "type": "list",
+    };
+    api_getDictionary(postData).then(res => {
+      res = res || [];
+      let discover = res.find(v => v.value === 'inspection');
+      if(discover){
+        defaultSourceValue.value = discover.id;
+      }
+    })
+  }
+  
+  // 跳转新建事件
+  function toBuildIncident(res){
+    let imgList = Object.values(itemRefs.value);
+    let repairImgList = [];
+    if(imgList.length){
+      repairImgList = imgList[0].baseFormData.handlerImgList;
+    }
+
+    let incidentData = {
+      place: res.inspectionNode.floorDTO,
+      houseNumber: res.inspectionNode.address,
+      source: defaultSourceValue.value,
+      description: res.inspectionValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+      requester: loginUserStore.loginUser.user,
+      branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
+      contacts: loginUserStore.loginUser.user.name,
+      contactsInformation: loginUserStore.loginUser.user.phone,
+      category: res.inspectionForm.categoryDTO,
+      department: res.inspectionForm.repairDeptDTO,
+      priority: res.inspectionForm.priorityDTO,
+      repairImgList,
+      inspectionTaskId: res.id,
+    }
+    console.log(repairImgList, 'repairImgList')
+    console.log(incidentData, 'incidentData')
+    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+    inspectionValueStore.clearInspectionValueData();
+    uni.navigateTo({
+      url: `/pages/buildIncident/buildIncident?type=inspection`
+    })
+  }
 
   // 保存
   function submit(){
@@ -194,10 +254,75 @@
             Object.values(itemRefs.value).forEach(v => {
               v && v.uploadFn();
             })
-            inspectionValueStore.clearInspectionValueData();
-            uni.reLaunch({
-              url: `/pages/inspection/inspectionExecute/inspectionExecute`
-            })
+
+            if(res.exception){
+              // 异常
+              if(res.inspectionForm.createOrder == 1){
+                // 是否自动生成维修单
+                uni.showModal({
+                	title: '提示',
+                	content: `巡检提交成功，您巡检有产生异常；系统自动生成工单：${res.incidentSign}`,
+                  showCancel: false,
+                  confirmText: '返回巡检列表',
+                	success: (res) => {
+                		if (res.confirm) {
+                      toInspectionExecute();
+                		}
+                	}
+                });
+              } else if(res.inspectionForm.showOrder == 1){
+                // 是否显示生成维修单
+                uni.showModal({
+                	title: '提示',
+                	content: '巡检提交成功，您巡检有产生异常，是否生成维修单',
+                  confirmText: '生成维修单',
+                  cancelText: '返回巡检列表',
+                	success: (result) => {
+                		if (result.confirm) {
+                			toBuildIncident(res);
+                		} else if (result.cancel) {
+                			toInspectionExecute();
+                		}
+                	}
+                });
+              } else {
+                uni.showToast({
+                  icon: 'none',
+                  title: "巡检提交成功，有异常",
+                  duration: 2000,
+                  mask: true,
+                })
+                setTimeout(() => {
+                  toInspectionExecute();
+                }, 2000)
+              }
+            }else{
+              // 无异常
+              uni.showToast({
+                icon: 'none',
+                title: "巡检提交成功，无异常",
+                duration: 2000,
+                mask: true,
+              })
+              setTimeout(() => {
+                toInspectionExecute();
+              }, 2000)
+            }
+          } else if(res.status == 555){
+            // 自动生成维修单失败
+            uni.showModal({
+            	title: '提示',
+            	content: '巡检提交成功，您巡检有产生异常；系统自动生成工单失败，请手动建单',
+              confirmText: '生成维修单',
+              cancelText: '返回巡检列表',
+            	success: (result) => {
+            		if (result.confirm) {
+            			toBuildIncident(res);
+            		} else if (result.cancel) {
+            			toInspectionExecute();
+            		}
+            	}
+            });
           } else {
             uni.showToast({
               icon: 'none',
@@ -334,6 +459,7 @@
   }
 
   onLoad((option) => {
+    getSources();
     inspectionExecuteId.value = +option.inspectionExecuteId;
     // 巡检项
     if(inspectionValueStore.inspectionValue.data){
@@ -352,6 +478,9 @@
     margin-top: 8rpx;
   }
 }
+::v-deep .uni-modal__btn_primary{
+  color: $uni-primary!important;
+}
 .inspectionValue{
   height: 100%;
   display: flex;