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

pages/assign/assign.vue

@@ -57,6 +57,77 @@
         </view>
       </template>
       
+      <!-- 补单 -->
+      <template v-if="dataInfo.tabActiveValue === 'supplement' && dataInfo.supplementFlag">
+        <view class="form_item">
+          <view class="title select"><text class="required newicon newicon-bitian"></text>登记时间：</view>
+          <uni-datetime-picker class="value" type="datetime" v-model="dataInfo.acceptDate" :class="{formRed: isSubmit && !dataInfo.acceptDate}" />
+      	</view>
+        <view class="form_item">
+          <view class="title select"><text class="required newicon newicon-bitian"></text>接单时间：</view>
+          <uni-datetime-picker class="value" type="datetime" v-model="dataInfo.responseHandleTime" :class="{formRed: isSubmit && !dataInfo.responseHandleTime}" />
+        </view>
+        <view class="form_item">
+          <view class="title select"><text class="required newicon newicon-bitian"></text>解决时间：</view>
+          <uni-datetime-picker class="value" type="datetime" v-model="dataInfo.handleTime" :class="{formRed: isSubmit && !dataInfo.handleTime}" />
+        </view>
+        <view class="form_item">
+          <view class="title select"><text class="required newicon newicon-bitian"></text>处理人：</view>
+        	<uni-data-picker class="value" placeholder="请选择处理人"
+        		:localdata="dataInfo.userList" v-model="dataInfo.handlingPersonnelUserId" 
+        		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handlingPersonnelUserId}">
+        	</uni-data-picker>
+        </view>
+      </template>
+      
+      <!-- 补单-下一步 -->
+      <template v-if="dataInfo.tabActiveValue === 'supplement' && !dataInfo.supplementFlag">
+        <view class="form_item column" v-if="dataInfo.category.hasSimple != 1">
+          <view class="title"><text class="required newicon newicon-bitian"></text>解决方案：</view>
+          <uni-easyinput class="value" type="textarea" v-model="dataInfo.handleDescription" placeholder="请输入解决方案" :class="{formRed: isSubmit && !dataInfo.handleDescription.trim()}" />
+        </view>
+        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+          <view class="title"><text class="required newicon newicon-bitian"></text>故障现象：</view>
+          <view class="value category" @click="selectCategory('assign_supplement')">
+            <text class="categoryName ellipsis-multiline">{{dataInfo.category.mutiCategory}}</text>
+            <text class="newicon newicon-weibiaoti2010104"></text>
+          </view>
+        </view>
+        <view class="form_item">
+          <view class="title select"><text class="required newicon newicon-bitian"></text>处理方式：</view>
+        	<uni-data-picker class="value" placeholder="请选择处理方式"
+        		:localdata="dataInfo.handleCategoryList" v-model="dataInfo.handleCategory" 
+        		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.handleCategory}">
+        	</uni-data-picker>
+        </view>
+        <view class="form_item" v-if="dataInfo.category.hasSimple != 1">
+          <view class="title select"><text class="required newicon newicon-bitian"></text>处理结果：</view>
+        	<uni-data-picker class="value" placeholder="请选择处理结果"
+        		:localdata="dataInfo.closecodeList" v-model="dataInfo.closecode" 
+        		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.closecode}">
+        	</uni-data-picker>
+        </view>
+        <view class="form_item">
+          <view class="title"><text class="required newicon newicon-bitian transparent"></text>协同人员：</view>
+          <text class="synergeticNames ellipsis">{{dataInfo.synergetic.map(v => v.name).join('，')}}</text>
+          <button type="primary" plain size="mini" class="primaryPlainButton synergeticAdd" @click="synergeticAdd('assign_supplement')">+立即添加</button>
+        </view>
+        <view class="form_item_column">
+          <view class="form_item">
+            <view class="title"><text class="required newicon newicon-bitian transparent"></text>处理图片：</view>
+            <view class="value">
+              <uni-file-picker ref="handlerImgRef" v-model="dataInfo.handlerImgList" limit="3" @success="handlerImgSuccess" @fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete"></uni-file-picker>
+            </view>
+          </view>
+          <view class="form_item">
+            <view class="title transparent"><text class="required newicon newicon-bitian transparent"></text>处理图片：</view>
+            <view class="value">
+              <text class="imgTips ellipsis">(支持JPG/PNG格式图片，单张大小10M以内)</text>
+            </view>
+          </view>
+        </view>
+      </template>
+      
       <!-- 派单 -->
       <template v-if="dataInfo.tabActiveValue === 'assign'">
         <view class="form_item">
@@ -97,8 +168,15 @@
 		</view>
     <!-- </scroll-view> -->
     <view class="foot_common_btns">
-      <button @click="goBack" type="default" class="cancelButton btn">返回</button>
-      <button @click="submit" type="default" class="primaryButton btn">提交</button>
+      <template v-if="dataInfo.tabActiveValue === 'supplement' && dataInfo.supplementFlag">
+        <button @click="goBack" type="default" class="primaryButton btn">上一步</button>
+        <button @click="next" type="default" class="primaryButton btn">下一步</button>
+      </template>
+      <template v-else>
+        <button @click="previous" type="default" class="primaryButton btn" v-if="dataInfo.tabActiveValue === 'supplement'">上一步</button>
+        <button @click="goBack" type="default" class="cancelButton btn" v-else>返回</button>
+        <button @click="submit" type="default" class="primaryButton btn">提交</button>
+      </template>
     </view>
   </view>
 </template>
@@ -132,6 +210,7 @@
   const dataInfo = reactive({
     tabs: [
       {id: 5, name: '直接处理', value: 'direct', num: ''},
+      // {id: 7, name: '补单', value: 'supplement', num: ''},
       {id: 6, name: '派单', value: 'assign', num: ''},
     ],
     tabActiveValue: 0,//当前选择的tab
@@ -164,6 +243,11 @@
       { text: '是', value: 1 },
       { text: '否', value: 0 },
     ], //工作组是否转派到人选项
+    supplementFlag: true,//补单是否有下一步
+    acceptDate: undefined,//补单-登记时间
+    responseHandleTime: undefined,//补单-接单时间
+    handleTime: undefined,//补单-解决时间
+    handlingPersonnelUserId: undefined,//补单-处理人
   })
   
   // 是否提交
@@ -257,16 +341,16 @@
   }
   
   // 添加协同人员
-  function synergeticAdd(){
-    handlerStore.setHandlerData(dataInfo, 'assign');
+  function synergeticAdd(sign = 'assign'){
+    handlerStore.setHandlerData(dataInfo, 'assign', sign);
     uni.navigateTo({
       url: `/pages/synergeticAdd/synergeticAdd?incidentId=${dataInfo.incidentId}`
     })
   }
   
   // 选择故障现象
-  function selectCategory(){
-    handlerStore.setHandlerData(dataInfo, 'assign');
+  function selectCategory(sign = 'assign'){
+    handlerStore.setHandlerData(dataInfo, 'assign', sign);
     uni.navigateTo({
       url: `/pages/categoryOne/categoryOne?incidentId=${dataInfo.incidentId}`
     })
@@ -392,6 +476,7 @@
   
   // 重置
   function reset(){
+    dataInfo.userList = [];//处理人列表
     dataInfo.repairTypeList = []; //延期原因列表
     dataInfo.groupId = undefined; //延期原因ID
     dataInfo.userIdList = []; //延期天数列表
@@ -421,6 +506,10 @@
     if(dataInfo.tabActiveValue === 'direct'){
       getHandleCategorys();
       getClosecodes();
+    }else if(dataInfo.tabActiveValue === 'supplement'){
+      getHandleCategorys();
+      getClosecodes();
+      getUsers();
     }else if(dataInfo.tabActiveValue === 'assign'){
       getGroups();
     }
@@ -483,8 +572,11 @@
     })
   }
   
-  // 获取用户列表
-  function getUsers(){
+  /**
+   * 获取用户列表
+   * @param {boolean} noGroup 是否查询组里的用户
+   */
+  function getUsers(noGroup = false){
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -494,9 +586,7 @@
       "sum": 9999,
       "user": {
         "duty": dataInfo.incidentData.duty || undefined,
-        "groupdata":{
-          "id": dataInfo.groupId,
-        },
+        "groupdata": (dataInfo.groupId && !noGroup) ? { "id": dataInfo.groupId } : undefined,
         "roledata": {
             "rolecode": "first-line support"
         },
@@ -587,11 +677,57 @@
     })
   }
   
+  // 补单-上一步
+  function previous(){
+    dataInfo.supplementFlag = true;
+  }
+  
+  // 补单-下一步
+  function next(){
+    console.log(dataInfo)
+    isSubmit.value = true;
+    if(!dataInfo.acceptDate){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择登记时间'
+      });
+      return;
+    }
+    
+    if(!dataInfo.responseHandleTime){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择接单时间'
+      });
+      return;
+    }
+    
+    if(!dataInfo.handleTime){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择解决时间'
+      });
+      return;
+    }
+    
+    if(!dataInfo.handlingPersonnelUserId){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择处理人'
+      });
+      return;
+    }
+    dataInfo.supplementFlag = false;
+    isSubmit.value = false;
+  }
+  
   // 提交
   function submit(){
     isSubmit.value = true;
     if(dataInfo.tabActiveValue === 'direct'){
       submitHandler();
+    }else if(dataInfo.tabActiveValue === 'supplement'){
+      submitSupplement();
     }else if(dataInfo.tabActiveValue === 'assign'){
       submitAssign();
     }
@@ -625,6 +761,40 @@
     return api_incidentTask('accept', postData);
   }
   
+  // 补单提交事件
+  async function supplementOrder(){
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
+    
+    let result = await beforeBuild();
+    if(result[0].status == 200 && result[1].status == 200){
+      postData.incident.repairType = result[0].list.length ? result[0].list[0].valueconfig : undefined;
+      postData.incident.incidentsign = result[1].data || undefined;
+    }else{
+      uni.showToast({
+        icon: 'none',
+        title: '请求数据失败！'
+      });
+      return;
+    }
+    
+    postData.incident.handleDescription = dataInfo.handleDescription;
+    postData.incident.handleCategory = {id: dataInfo.handleCategory};
+    postData.incident.closecode = {id: dataInfo.closecode};
+    postData.incident.category = dataInfo.category;
+    postData.incident.synergetic = dataInfo.synergetic;
+    postData.incident.directProcess = 1;//直接解决
+    
+    postData.incident.acceptDate = dataInfo.acceptDate;
+    postData.incident.responseHandleTime = dataInfo.responseHandleTime;
+    postData.incident.handleTime = dataInfo.handleTime;
+    postData.incident.handlingPersonnelUser = { id: dataInfo.handlingPersonnelUserId };
+    console.log(postData.incident)
+    
+    return api_incidentTask('patchOrder', postData);
+  }
+  
   // 建单前的接口
   function beforeBuild(){
     let repairMain$ = api_systemConfiguration({
@@ -871,11 +1041,148 @@
    
   }
   
+  // 补单提交
+  function submitSupplement(){
+    console.log(dataInfo);
+    if(!dataInfo.handleDescription.trim() && dataInfo.category.hasSimple != 1){
+      uni.showToast({
+      	icon: 'none',
+        title: '请填写解决方案'
+      });
+      return;
+    }
+    
+    if(!dataInfo.category.id && dataInfo.category.hasSimple != 1){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择故障现象'
+      });
+      return;
+    }
+    
+    if(!dataInfo.handleCategory){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择处理方式'
+      });
+      return;
+    }
+    
+    if(!dataInfo.closecode && dataInfo.category.hasSimple != 1){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择处理结果'
+      });
+      return;
+    }
+    
+    if(!dataInfo.incidentData.duty){
+      uni.showToast({
+      	icon: 'none',
+        title: '您选择的故障现象没有设置责任科室'
+      });
+      return;
+    }
+    console.log(dataInfo)
+    console.log(dataInfo.handlerImgList)
+    console.log(dataInfo.incidentData.repairImgList)
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    if(dataInfo.handlerImgList.length){
+      // 有处理图片
+      let supplementOrder$ = supplementOrder();
+      let requestList = [supplementOrder$];
+      Promise.all(requestList).then(resList => {
+        console.log(resList);
+        if(resList[0].state == 200){
+          dataInfo.incidentId = resList[0].data.id;
+          handlerImgRef.value.upload();
+        }else{
+          uni.hideLoading();
+          uni.showToast({
+            icon: 'none',
+            title: resList[0].msg || '请求数据失败！'
+          });
+        }
+      })
+    }else if(dataInfo.incidentData.repairImgList.length){
+      // 有报修图片,无处理图片
+      let supplementOrder$ = supplementOrder();
+      let requestList = [supplementOrder$];
+      Promise.all(requestList).then(resList => {
+        console.log(resList);
+        if(resList[0].state == 200){
+          dataInfo.incidentId = resList[0].data.id;
+          handlerImgSuccessNew();
+        }else{
+          uni.hideLoading();
+          uni.showToast({
+            icon: 'none',
+            title: resList[0].msg || '请求数据失败！'
+          });
+        }
+      })
+    }else{
+      // 没有图片
+      let supplementOrder$ = supplementOrder();
+      let requestList = [supplementOrder$];
+      Promise.all(requestList).then(resList => {
+        uni.hideLoading();
+        console.log(resList);
+        if(resList[0].state == 200){
+          incidentBuildStore.clearIncidentBuildData();
+          uni.showToast({
+          	icon: 'none',
+            title: '建单成功',
+            mask: true,
+          });
+          setTimeout(() => {
+            uni.reLaunch({
+              url: '/pages/incidentList/incidentList',
+            })
+          }, 1500)
+        }else{
+          uni.showToast({
+            icon: 'none',
+            title: resList[0].msg || '请求数据失败！'
+          });
+        }
+      })
+    }
+  }
+  
+  // 菜单权限
+  function menuAuthHandle(){
+    let shijianliebiao_supplement = false;//故障处理权限
+    for (let i = 0; i < loginUserStore.loginUser.menu.length; i++) {
+        if (loginUserStore.loginUser.menu[i].link == "shijianliebiao_supplement") {
+          shijianliebiao_supplement = true
+        }
+    }
+    
+    // 补单
+    if(shijianliebiao_supplement){
+      let index = dataInfo.tabs.findIndex(v => v.value === 'assign');
+      dataInfo.tabs.splice(index, 0, {id: 7, name: '补单', value: 'supplement', num: ''});
+    }
+  }
+  
   onLoad((option) => {
+    menuAuthHandle()
     // 跳转页面选择了选项
     if(handlerStore.handler.data){
       Object.assign(dataInfo, handlerStore.handler.data);
       console.log(dataInfo)
+      if(handlerStore.handler.sign === 'assign'){
+        dataInfo.tabActiveValue = 'direct';
+      }else if(handlerStore.handler.sign === 'assign_supplement'){
+        dataInfo.tabActiveValue = 'supplement';
+        next();
+      }
       handlerStore.clearHandlerData();
       
       if(dataInfo.category){
@@ -934,7 +1241,9 @@
       }
     }
     
-    dataInfo.tabActiveValue = dataInfo.tabs[0].value;
+    if(!dataInfo.tabActiveValue){
+      dataInfo.tabActiveValue = dataInfo.tabs[0].value;
+    }
     initForm()
   })
 </script>

pages/categoryThree/categoryThree.vue

@@ -67,7 +67,7 @@
     }
     dataInfo.paramData.category = dataInfo.categoryThreeObj;
     if(handlerStore.handler.type){
-      handlerStore.setHandlerData(dataInfo.paramData, handlerStore.handler.type);
+      handlerStore.setHandlerData(dataInfo.paramData, handlerStore.handler.type, handlerStore.handler.sign);
       uni.navigateTo({
         url: `/pages/${handlerStore.handler.type}/${handlerStore.handler.type}?incidentId=${dataInfo.incidentId}`,
       })

pages/synergeticAdd/synergeticAdd.vue

@@ -59,7 +59,7 @@
       return;
     }
     dataInfo.paramData.synergetic = dataInfo.userSelectedList;
-    handlerStore.setHandlerData(dataInfo.paramData, handlerStore.handler.type);
+    handlerStore.setHandlerData(dataInfo.paramData, handlerStore.handler.type, handlerStore.handler.sign);
     uni.navigateTo({
       url: `/pages/${handlerStore.handler.type}/${handlerStore.handler.type}?incidentId=${dataInfo.incidentId}`,
     })

static/scss/common.scss

@@ -130,10 +130,12 @@ uni-toast,
   opacity: 0;
 }
 
-// 下拉框边框红色
+// 边框红色
 .formRed{
   .uni-select,
-  .uni-easyinput__content{
+  .uni-easyinput__content,
+  .uni-date-x,
+  .uni-data-tree-input .input-value{
     border: 1px solid red!important;
   }
 }

stores/handler.js

@@ -7,12 +7,19 @@ export const useHandlerStore = defineStore(
     const handler = reactive({
       data: null,
       type: '',
+      sign: '',
     });
 
     // 保存事件信息
-    function setHandlerData(data, type) {
+    /**
+     * @param {Object} data 数据
+     * @param {Object} type 路由
+     * @param {Object} sign 标识
+     */
+    function setHandlerData(data, type, sign) {
       handler.data = data;
       handler.type = type;
+      handler.sign = sign;
     }
     
     // 清空事件信息
@@ -20,6 +27,7 @@ export const useHandlerStore = defineStore(
       console.log(handler.data)
       handler.data = null;
       handler.type = '';
+      handler.sign = '';
     }
 
     return {