修改

Eservice/components/productCard/index.wxml

@@ -18,7 +18,7 @@
           数量:{{data.qty?data.qty:0}}
         </view>
       </block>
-      <block wx:else-if="{{model==3}}">
+      <block wx:if="{{model==3}}">
         <view class="small">
           数量:{{data.qty?data.qty:0}}
         </view>

Eservice/trainConfirmBill/index.js

@@ -6,63 +6,69 @@ Page({
    * 页面的初始数据
    */
   data: {
-    timerid:null,
-    bindSignNameData:{
+    timerid: null,
+    bindSignNameData: {
       "ownertable": "sa_workorder_confirmation",
       "ownerid": 0,
       "usetype": "signature",
     }
   },
 
-  async billData () {
+  async billData() {
     const res = await api._post({
       "id": "20230211105803",
       "content": {
-        "sa_workorder_confirmationid":this.data.id
+        "sa_workorder_confirmationid": this.data.id
       }
     })
+    console.log('详情', res)
     this.setData({
-      mainData:res.data,
-      stopClick:res.data.status !== '新建'?'stopClick':this.data.stopClick
+      mainData: res.data,
+      sa_serviceorderid: res.data.workorder.sa_serviceorderid,
+      sa_orderid: res.data.workorder.sa_orderid||'0',
+      stopClick: res.data.status !== '新建' ? 'stopClick' : this.data.stopClick
     })
     this.setInputData()
   },
-  setInputData () {
-    this.data.mainData.confirmationcontent.forEach(e=>{
-      Object.keys(e).map((key,index)=>{
+  setInputData() {
+    this.data.mainData.confirmationcontent.forEach(e => {
+      Object.keys(e).map((key, index) => {
         if (key.includes('现场培训内容')) {
           this.setData({
-            trainerContent:e[key].confirm_value
+            trainerContent: e[key].confirm_value
           })
-        } else if(key.includes('现场互动及测试培训效果')) {
-          
+        } else if (key.includes('现场互动及测试培训效果')) {
+
           this.setData({
-            trainerResult:e[key].confirm_value
+            trainerResult: e[key].confirm_value
           })
         } else {
-          
+
         }
       })
     })
   },
-  async updateBill () {
+  async updateBill() {
     if (this.data.mainData.status !== '新建') return wx.showToast({
       title: '非新建状态,修改的数据将不会保存',
-      icon:'none'
+      icon: 'none'
     })
     const res = await api._post({
       "id": "20230211105703",
       "content": this.data.mainData
     })
   },
-   // 跳转到物料添加
-   addProduct () {
+  // 跳转到物料添加
+  addProduct() {
+    /*  wx.navigateTo({
+       url: '/Eservice/serviceMaterial/index',
+     }) */
     wx.navigateTo({
-      url: '/Eservice/serviceMaterial/index',
+      url: '/Eservice/agent/billCanUseProduct/index?id=' + this.data.mainData.sa_workorderid
     })
   },
   // 跳转到添加人员
-  addTrainers () {
+  addTrainers() {
     wx.navigateTo({
       url: '/Eservice/addTrainers/index',
     })
@@ -74,71 +80,72 @@ Page({
     const res = await api._post({
       "id": "20230215202103",
       "content": {
-        "sa_workorder_confirmationid":this.data.mainData.sa_workorder_confirmationid,
-        "sa_workorderid":this.data.mainData.workorder.sa_workorderid,
-        "trainers":this.data.mainData.trainers
+        "sa_workorder_confirmationid": this.data.mainData.sa_workorder_confirmationid,
+        "sa_workorderid": this.data.mainData.workorder.sa_workorderid,
+        "trainers": this.data.mainData.trainers
       }
     })
     this.billData()
   },
   // 删除人员
-  async deleteMenber (data) {
-    let id =  data.detail.sa_workorder_node_teamid
+  async deleteMenber(data) {
+    let id = data.detail.sa_workorder_node_teamid
     const res = await api._post({
       "id": "20230215202203",
-      "version":1,
+      "version": 1,
       "content": {
-        "sa_workorder_node_teamids":[id]
+        "sa_workorder_node_teamids": [id]
       }
     })
     this.billData()
   },
   // 添加物料
   async getAdd(selection) {
-    let arr = selection.map(e=>{
+    console.log(selection)
+    let arr = selection.map(e => {
       return {
-        "sa_workorder_node_itemsid":0,
-        "itemid":e.itemid,
-        "qty":1
+        "sa_workorder_node_itemsid": 0,
+        "itemid": e,
+        "qty": 1
       }
     })
     this.data.mainData.trainertitems = this.data.mainData.trainertitems.concat(arr)
     this.updateMaterial(this.data.mainData.trainertitems)
   },
-  async updateMaterial (trainertitems) {
+  async updateMaterial(trainertitems) {
     const res = await api._post({
       "id": "20230215201903",
       "content": {
-        "sa_workorder_confirmationid":this.data.mainData.sa_workorder_confirmationid,
-        "sa_workorderid":this.data.mainData.workorder.sa_workorderid,
-        "iteminfos":trainertitems
+        "sa_workorder_confirmationid": this.data.mainData.sa_workorder_confirmationid,
+        "sa_workorderid": this.data.mainData.workorder.sa_workorderid,
+        "iteminfos": trainertitems
       }
     })
     this.billData()
   },
   // 修改物料数量
-  qtyChange (data) {
+  qtyChange(data) {
     clearTimeout(this.data.timerid)
-    this.data.timerid = setTimeout(()=>{
-      this.data.mainData.trainertitems.forEach(e=>{
+    this.data.timerid = setTimeout(() => {
+      this.data.mainData.trainertitems.forEach(e => {
         if (e.itemid == data.detail.itemid) {
           e.qty = data.detail.qty
         }
       })
       this.updateMaterial(this.data.mainData.trainertitems)
-    },1000)
+    }, 1000)
     this.setData({
-      timerid:this.data.timerid
+      timerid: this.data.timerid
     })
-    
+
   },
   // 删除物料
-  async deleteMaterial (data) {
+  async deleteMaterial(data) {
     let itemid = data.detail.sa_workorder_node_itemsid
     const res = await api._post({
       "id": "20230215202003",
       "content": {
-        "sa_workorder_node_itemsids":[itemid]
+        "sa_workorder_node_itemsids": [itemid]
       }
     })
     this.billData()
@@ -147,43 +154,43 @@ Page({
   onChange(e) {
     this.data.mainData[e.currentTarget.dataset.name] = e.detail.value
     this.setData({
-      mainData:this.data.mainData
+      mainData: this.data.mainData
     });
     this.updateBill()
   },
 
-  async submit () {
+  async submit() {
     this.createImage();
     const res = await api._post({
       "id": "20230211110003",
       "content": {
-        "sa_workorder_confirmationid":this.data.mainData.sa_workorder_confirmationid
+        "sa_workorder_confirmationid": this.data.mainData.sa_workorder_confirmationid
       }
     })
     if (res.code == 1) {
       wx.showToast({
         title: '提交成功',
-        icon:"success"
+        icon: "success"
       })
       this.billData()
     }
-    
+
   },
-  async delete () {
+  async delete() {
     const res = await api._post({
       "id": "20230211110103",
       "content": {
-        "sa_workorder_confirmationids":[this.data.mainData.sa_workorder_confirmationid]
+        "sa_workorder_confirmationids": [this.data.mainData.sa_workorder_confirmationid]
       }
     })
     if (res.code == 1) {
       wx.navigateBack()
     }
   },
-  inputChange (data) {
+  inputChange(data) {
     let keyValue = data.currentTarget.dataset.name
-    this.data.mainData.confirmationcontent.forEach(e=>{
-      Object.keys(e).map((key,index)=>{
+    this.data.mainData.confirmationcontent.forEach(e => {
+      Object.keys(e).map((key, index) => {
         if (key.includes(keyValue)) {
           console.log(e)
           e[key].confirm_value = data.detail.value
@@ -191,13 +198,13 @@ Page({
       })
     })
     this.updateBill()
-	},
-	createImage () {
+  },
+  createImage() {
     let token = wx.getStorageSync('userMsg').token
     let parentid = wx.getStorageSync('siteP').appfolderid
     let url = `${getApp().globalData.http.baseUrl}/yosweb/#/printTable?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}`
     this.setData({
-      url:url
+      url: url
     })
     wx.navigateTo({
       url: '/Eservice/webView/index',
@@ -209,9 +216,9 @@ Page({
   onLoad(options) {
     this.data.bindSignNameData.ownerid = options.id
     this.setData({
-      stopClick:options.class,
-      id:options.id,
-      bindSignNameData:this.data.bindSignNameData
+      stopClick: options.class,
+      id: options.id,
+      bindSignNameData: this.data.bindSignNameData
     })
     this.billData()
   },
@@ -228,7 +235,7 @@ Page({
    */
   onShow() {
     this.setData({
-      SignName:true
+      SignName: true
     })
   },
 
@@ -237,7 +244,7 @@ Page({
    */
   onHide() {
     this.setData({
-      SignName:false
+      SignName: false
     })
   },
 

Eservice/trainConfirmBill/index.wxml

@@ -80,8 +80,8 @@
   <view class="count">
   </view>
   <view class="but-box">
-    <van-button custom-class='but delete' disabled="{{mainData.status !== '新建'?true:false}}" bind:click="delete">删 除</van-button>
     <van-button custom-class='but' bind:click="createImage">单据预览</van-button>
+    <van-button custom-class='but delete' disabled="{{mainData.status !== '新建'?true:false}}" bind:click="delete">删 除</van-button>
     <van-button custom-class='but'  disabled="{{mainData.status !== '新建'?true:false}}" bind:click="submit">提 交</van-button>
   </view>
 </view>

Eservice/workOrderDetail/index.js

@@ -104,7 +104,6 @@ Page({
     this.setData({
       billData: res.data
     })
-
   },
   changeBillStatus(data) {
     let id = data.currentTarget.dataset.id;

Eservice/workOrderDetail/index.wxml

@@ -61,7 +61,6 @@
           </view>
         </view>
       </view>
-
       <view wx:else style="padding:10px">
         <view class="small mt-5" wx:for="{{billData.nodes}}" wx:key="sa_workorder_nodeid">
           {{index + 1}}.{{item.workpresetjson.workname}}

utils/Http.js

@@ -1,7 +1,7 @@
 class HTTP {
     constructor() {
-        this.baseUrl = "http://61.164.207.46:8000";
-        // this.baseUrl = "https://oms.idcgroup.com.cn:8079";
+        // this.baseUrl = "http://61.164.207.46:8000";
+        this.baseUrl = "https://oms.idcgroup.com.cn:8079";
     }
     request({
         url,