Merge branch 'develop' of http://124.70.211.186:3000/zxh/E_WeChat into develop

Eservice/installConfirmBill/index.js

@@ -165,6 +165,17 @@ Page({
     })
     this.updateBill()
   },
+  createImage () {
+    let token = wx.getStorageSync('userMsg').token
+    let parentid = wx.getStorageSync('siteP').appfolderid
+    let url = `${getApp().globalData.host}/comfirmBill/#/htmlToImage?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
+    this.setData({
+      url:url
+    })
+    wx.navigateTo({
+      url: '/Eservice/webView/index',
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */

Eservice/installConfirmBill/index.wxml

@@ -76,7 +76,7 @@
   <view class="title colorInfo">
     其他
   </view>
-  <t-cell title="生成单据预览图" note="点击查看" hover arrow/>
+  <t-cell title="生成单据预览图" note="点击查看" bind:click="createImage" hover arrow/>
 </view>
 
 

Eservice/nodeDetail/index.js

@@ -6,6 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    stopClick:'',
     SignName:true,
     timerid:null,
     act_confirm_value:'是',
@@ -215,6 +216,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    console.log(options)
     this.data.bindContractData.ownerid = options.id
     this.data.bindNormalData.ownerid = options.id
     this.data.bindSignNameData.ownerid = options.id

Eservice/nodeDetail/index.wxml

@@ -137,7 +137,9 @@
       </view>
     </card>
   </view>
-  <t-button style="margin-bottom:10px" wx:if="{{stopClick}}" theme="primary" size="large" bind:tap="confirmBill" block>确认完成</t-button>
-  <t-button wx:if="{{stopClick}}" theme="primary" size="large" bind:tap="updateNode" data-info="needBack" block>保存</t-button>
-
+  <view wx:if="{{stopClick === 'undefined'}}">
+    <t-button style="margin-bottom:10px" theme="primary" size="large" bind:tap="confirmBill" block>确认完成</t-button>
+    <t-button  theme="primary" size="large" bind:tap="updateNode" data-info="needBack" block>保存</t-button>
+  </view>
+  
 </view>

Eservice/saler/serviceBillDetail/index.wxml

@@ -46,6 +46,8 @@
       <t-call phone="{{orderMainData.scenecontactphonenumber}}"></t-call>
     </view>
     <view class="small"><text class="label">岗位:</text>{{orderMainData.scenecontactrole}}</view>
+    <view class="small"><text class="label">省市县:</text>{{orderMainData.province + orderMainData.city+orderMainData.county}}</view>
+    <view class="small"><text class="label">地址:</text>{{orderMainData.address}}</view>
   </view>
 </view>
 <!-- <view style="padding:5px" class="small"><text class="label">关联订单</text></view> -->

Eservice/serviceConfirmBill/index.js

@@ -163,6 +163,17 @@ Page({
     })
     this.updateBill()
     this.setInputData()
+	},
+	createImage () {
+    let token = wx.getStorageSync('userMsg').token
+    let parentid = wx.getStorageSync('siteP').appfolderid
+    let url = `${getApp().globalData.host}/comfirmBill/#/htmlToImageServe?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
+    this.setData({
+      url:url
+    })
+    wx.navigateTo({
+      url: '/Eservice/webView/index',
+    })
   },
   /**
    * 生命周期函数--监听页面加载

Eservice/serviceConfirmBill/index.wxml

@@ -61,7 +61,7 @@
   <view class="title colorInfo">
     其他
   </view>
-  <t-cell title="生成单据预览图" note="点击查看" hover arrow/>
+  <t-cell title="生成单据预览图" note="点击查看" bind:click="createImage" hover arrow/>
 </view>
 
 

Eservice/trainConfirmBill/index.js

@@ -190,6 +190,17 @@ Page({
       })
     })
     this.updateBill()
+	},
+	createImage () {
+    let token = wx.getStorageSync('userMsg').token
+    let parentid = wx.getStorageSync('siteP').appfolderid
+    let url = `${getApp().globalData.host}/comfirmBill/#/htmlToImageTrain?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
+    this.setData({
+      url:url
+    })
+    wx.navigateTo({
+      url: '/Eservice/webView/index',
+    })
   },
   /**
    * 生命周期函数--监听页面加载

Eservice/trainConfirmBill/index.wxml

@@ -75,11 +75,10 @@
   <view class="title colorInfo">
     其他
   </view>
-  <t-cell title="生成单据预览图" note="点击查看" hover arrow/>
+  <t-cell title="生成单据预览图" note="点击查看" hover arrow bind:click="createImage"/>
 </view>
 
-
-<view class="{{stopClick}}" style="padding:10px">
+<view wx:if="{{stopClick === 'undefined'}}" class="{{stopClick === 'undefined'}}" style="padding:10px">
   <t-button style="margin-bottom: 10px;" disabled="{{mainData.status !== '新建'?true:false}}"  variant="primary" bind:tap="submit" block>提 交</t-button>
   <t-button disabled="{{mainData.status !== '新建'?true:false}}"  variant="danger" bind:tap="delete" block>删 除</t-button>
 </view>

Eservice/webView/index.js

@@ -0,0 +1,69 @@
+// Eservice/webView/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url:''
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    let page = getCurrentPages()[getCurrentPages().length - 2]
+    this.setData({
+      url:page.data.url
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

Eservice/webView/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

Eservice/webView/index.scss

@@ -0,0 +1 @@
+/* Eservice/webView/index.wxss */

Eservice/webView/index.wxml

@@ -0,0 +1,2 @@
+<!--Eservice/webView/index.wxml-->
+<web-view src="{{url}}"></web-view>

Eservice/workOrderDetail/index.js

@@ -20,14 +20,6 @@ Page({
     this.setData({
       billData:res.data
     })
-    setTimeout(() => {
-      if (this.data.billData.status === '待开始') {
-        getApp().globalData.handelSelect = this
-        wx.navigateTo({
-          url: '/Eservice/workBillConfirmInfo/index',
-        })
-      }
-    }, 1000);
     
   },
   changeBillStatus(data) {
@@ -42,13 +34,21 @@ Page({
 
     Dialog.confirm(dialogConfig)
       .then(async () => {
-        const res = await api._post({
-          "id": id,
-          "content": {
-            "sa_workorderid":this.data.id
-          }
-        })
-        this.mainData()
+        if (id == '20230209144503') {
+          getApp().globalData.handelSelect = this
+          wx.navigateTo({
+            url: '/Eservice/workBillConfirmInfo/index',
+          })
+        } else {
+          const res = await api._post({
+            "id": id,
+            "content": {
+              "sa_workorderid":this.data.id
+            }
+          })
+          this.mainData()
+        }
+        
       })
       .catch(() => console.log('点击了取消'))
       .finally(() => Dialog.close());

Eservice/workerLeader/serviceBillDetail/index.wxml

@@ -13,11 +13,11 @@
       </view>
     </view>
     <view class="flex-align-center">
-      <view  wx:if="{{orderMainData.status === '提交'}}" class="mr-10" bindtap="showWorkerDialog">
+      <view  wx:if="{{orderMainData.status === '待指派'}}" class="mr-10" bindtap="showWorkerDialog">
         <t-icon name="root-list" size="36rpx" bind:click="onIconTap" />
         <text style="font-size: 20rpx;">转工单</text>
       </view>
-      <view  wx:if="{{orderMainData.status === '提交'}}" class="mr-10" bindtap="showBackReason">
+      <view  wx:if="{{orderMainData.status === '待指派'}}" class="mr-10" bindtap="showBackReason">
         <t-icon name="enter" size="36rpx" bind:click="onIconTap" />
         <text style="font-size: 20rpx;">退回</text>
       </view>
@@ -54,6 +54,8 @@
       <t-call phone="{{orderMainData.scenecontactphonenumber}}"></t-call>
     </view>
     <view class="small"><text class="label">岗位:</text>{{orderMainData.scenecontactrole}}</view>
+    <view class="small"><text class="label">省市县:</text>{{orderMainData.province + orderMainData.city+orderMainData.county}}</view>
+    <view class="small"><text class="label">地址:</text>{{orderMainData.address}}</view>
   </view>
 </view>
 <!-- <view style="padding:5px" class="small"><text class="label">关联订单</text></view> -->

app.js

@@ -59,5 +59,6 @@ App({
             that: null, //保存this
             callback: function () {}
         },
+        host:"http://122.226.136.204:8082"
     }
 })

app.json

@@ -96,7 +96,8 @@
         "trainConfirmBill/index",
         "workBillConfirmInfo/index",
         "installConfirmBill/index",
-        "serviceConfirmBill/index"
+        "serviceConfirmBill/index",
+        "webView/index"
       ]
     }
   ],

project.private.config.json

@@ -5,7 +5,7 @@
     "compileHotReLoad": true,
     "urlCheck": false
   },
-  "libVersion": "2.29.1",
+  "libVersion": "2.18.1",
   "condition": {
     "miniprogram": {
       "list": [