Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-repair-app

components/tabBar/tabBar.vue

@@ -140,6 +140,12 @@
             if (currentCount < playCount) {
               // 继续播放
               innerAudioContext.play();
+              // 震动
+              uni.vibrateLong({
+                success: function () {
+                  console.log('success');
+                }
+              });
             } else {
               // 播放完成，可以在这里添加额外的逻辑
               console.log('播放完成');

pages-home/home/home.vue

@@ -106,6 +106,16 @@
     </view>
     <project-picker ref="proj" @confirm="projConfirm"></project-picker>
     <tabBarVue msg="1" @socketSuccess="socketSuccess"></tabBarVue>
+    <!-- 提示窗示例 -->
+    <uni-popup ref="alertDialog" type="dialog">
+      <uni-popup-dialog type="success" cancelText="线下告知" confirmText="去签字" title="系统提示" content="客户是否在场进行签字确认？" @confirm="dialogConfirm"
+                        @close="dialogClose"></uni-popup-dialog>
+    </uni-popup>
+    <!-- 输入框示例 -->
+    <uni-popup ref="inputDialog" type="dialog">
+      <uni-popup-dialog ref="inputClose"  mode="input" title="线下告知" value=""
+                        placeholder="请填入告知方式!" @confirm="dialogInputConfirm"></uni-popup-dialog>
+    </uni-popup>
   </view>
 </template>
 
@@ -122,7 +132,8 @@ import {
   getUserInfo,
   getStrData,
   getTenantId,
-  setJSONData
+  setJSONData,
+  getJSONData
 } from '@/utils/auth'
 
 export default {
@@ -188,6 +199,8 @@ export default {
       ticketId: null,
       //新加的维修项目
       selectedProj: [],
+      //告知客户的内容
+      tellCusText:"",
     }
   },
   onLoad(){
@@ -225,6 +238,48 @@ export default {
     }
   },
   methods: {
+    /**
+     * 保存当前项目
+     */
+    dialogInputConfirm(val) {
+      // 关闭窗口后，恢复默认内容
+      this.$refs.inputDialog.close()
+      const newData = {itemList:getJSONData("newProject"),remark:val}
+      request({
+        url: '/admin-api/repair/titem/addNewProj',
+        method: 'post',
+        data:newData
+      }).then((res) => {
+        if (res.code == 200) {
+          uni.showToast({
+            title: '添加维修项目成功！',
+            icon: 'success'
+          })
+          uni.navigateTo({
+            url: `/pages-order/orderDetail/orderDetail?id=${res.data}&isDetail=0`
+          });
+        }else{
+          uni.showToast({
+            title: '操作失败，请联系管理员',
+            icon: 'none'
+          })
+        }
+      })
+    },
+    /**
+     * 去签字
+     */
+    dialogConfirm() {
+      uni.navigateTo({
+        url: '/pages-home/service/sign-agin'
+      })
+    },
+    /**
+     * 客户不在场，手动输入
+     */
+    dialogClose() {
+      this.$refs.inputDialog.open()
+    },
     /**
      * 添加项目
      */
@@ -238,10 +293,8 @@ export default {
     projConfirm(proj) {
       this.selectedProj = proj
       if(this.selectedProj.length>0){
-        setJSONData("newProject",this.selectedProj)
+        setJSONData("newProject",this.formatItem(this.selectedProj))
-        uni.navigateTo({
+        this.$refs.alertDialog.open()
-          url: '/pages-home/service/sign-agin'
-        })
       }
       console.log(this.selectedProj,"selectedProj")
       console.log(this.ticketId,"this.ticketId")

pages-home/service/sign-agin.vue

@@ -433,7 +433,7 @@
                     icon: 'success'
                   })
                   uni.navigateTo({
-                    url: `/pages-order/orderDetail/orderDetail?id=${res.data.id}&isDetail=0`
+                    url: `/pages-order/orderDetail/orderDetail?id=${res.data}&isDetail=0`
                   });
                 }else{
                   uni.showToast({

pages-order/choosePeople/choosePeople.vue

@@ -268,6 +268,7 @@ export default {
           id: this.ticketId,
           nowRepairId: this.checkedUserId,
           nowRepairName: this.checkedUserName,
+          operateCode:"sgwczj"
         }
         console.log(param)
         request({
@@ -281,8 +282,6 @@ export default {
           })
           setTimeout(() => {
             if (this.ifDetail) {
-              //记录一下操作记录
-              saveTicketsRecords(this.ticketId, '03',this.itemId,"03","sgwczj","维修完成移交下一班组维修","","01",this.checkedUserName);
               uni.navigateBack({
                 delta: 2 // 返回倒数第2页
               })

pages-order/orderDetail/orderDetail.vue

@@ -546,6 +546,7 @@ export default {
         if("working"==this.nowChooseOperate){
           //维修中拍照
           const result = await saveTicketsRecords(this.ticketInfo.id,null,this.nowRepair.repairItemId,null,"sgz","施工中拍照记录",fileStr,"","");
+          console.log(result)
         }else if("done_half"==this.nowChooseOperate){
           //阶段完成
           const result = await saveTicketsRecords(this.ticketInfo.id, '03',this.nowRepair.repairItemId,"03","sgwczj","阶段完成",fileStr,"","");