Browse Source

确认单查看单据

xiaohaizhao 1 year ago
parent
commit
ca815e2ea8

+ 14 - 48
Eservice/installConfirmBill/index.js

@@ -125,9 +125,8 @@ Page({
         });
         this.updateBill()
     },
-
     async submit() {
-        this.createImage();
+        this.createImage(true);
         const res = await api._post({
             "id": "20230211110003",
             "content": {
@@ -165,10 +164,10 @@ Page({
         })
         this.updateBill()
     },
-    createImage() {
+    createImage(active = false) {
         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}`
+        let url = `${getApp().globalData.http.baseUrl}/yosweb/#/printTable?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}${active==true?'&action=1':''}`
         this.setData({
             url: url
         })
@@ -176,6 +175,16 @@ Page({
             url: '/Eservice/webView/index',
         })
     },
+    /* 查看单据 */
+    checkImage() {
+        let attinfos = this.data.mainData.attinfos.map(v => v.usetype);
+        let index = attinfos.lastIndexOf("comfirmbill");
+        //没有查询到有效单据 跳转生成
+        if (index == -1) return this.createImage(true);
+        wx.previewImage({
+            urls: [this.data.mainData.attinfos[index].url],
+        })
+    },
     /**
      * 生命周期函数--监听页面加载
      */
@@ -185,59 +194,16 @@ Page({
             id: options.id,
             bindSignNameData: this.data.bindSignNameData
         })
-        this.billData()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
     },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
     onShow() {
         this.setData({
             SignName: true
         })
+        this.billData()
     },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
     onHide() {
         this.setData({
             SignName: false
         })
     },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
 })

+ 4 - 3
Eservice/installConfirmBill/index.wxml

@@ -79,8 +79,9 @@
     <view class="count">
     </view>
     <view class="but-box">
-        <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>
+        <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="createImage">单据预览</van-button>
+        <van-button custom-class='but' wx:else bind:click="checkImage">查看单据</van-button>
+        <van-button custom-class='but delete' wx:if="{{mainData.status == '新建'}}" bind:click="delete">删 除</van-button>
+        <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="submit">提 交</van-button>
     </view>
 </view>

+ 14 - 51
Eservice/materielConfirmBill/index.js

@@ -16,7 +16,6 @@ Page({
     SignName: true,
     paidServiceAmount: 0
   },
-
   async billData() {
     const res = await api._post({
       "id": "20230211105803",
@@ -119,9 +118,16 @@ Page({
       "content": this.data.mainData
     })
   },
-
-
-
+  /* 查看单据 */
+  checkImage() {
+    let attinfos = this.data.mainData.attinfos.map(v => v.usetype);
+    let index = attinfos.lastIndexOf("comfirmbill");
+    //没有查询到有效单据 跳转生成
+    if (index == -1) return this.createImage(true);
+    wx.previewImage({
+      urls: [this.data.mainData.attinfos[index].url],
+    })
+  },
   // 改变评分
   onChange(e) {
     this.data.mainData[e.currentTarget.dataset.name] = e.detail.value
@@ -132,7 +138,7 @@ Page({
   },
 
   async submit() {
-    this.createImage();
+    this.createImage(true);
     const res = await api._post({
       "id": "20230211110003",
       "content": {
@@ -194,10 +200,10 @@ Page({
     this.updateBill()
     this.setInputData()
   },
-  createImage() {
+  createImage(active = false) {
     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}`
+    let url = `${getApp().globalData.http.baseUrl}/yosweb/#/printTable??token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}${active==true?'&action=1':''}`
     this.setData({
       url: url
     })
@@ -205,9 +211,6 @@ Page({
       url: '/Eservice/webView/index',
     })
   },
-  /**
-   * 生命周期函数--监听页面加载
-   */
   onLoad(options) {
     this.data.bindSignNameData.ownerid = options.id
     this.setData({
@@ -215,59 +218,19 @@ Page({
       id: options.id,
       bindSignNameData: this.data.bindSignNameData
     })
-    this.billData()
   },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
   onReady() {
 
   },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
   onShow() {
     this.setData({
       SignName: true
     })
+    this.billData()
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
   onHide() {
     this.setData({
       SignName: false
     })
   },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

+ 4 - 3
Eservice/materielConfirmBill/index.wxml

@@ -63,8 +63,9 @@
   <view class="count">
   </view>
   <view class="but-box">
-    <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>
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="createImage">单据预览</van-button>
+    <van-button custom-class='but' wx:else bind:click="checkImage">查看单据</van-button>
+    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建'}}" bind:click="delete">删 除</van-button>
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="submit">提 交</van-button>
   </view>
 </view>

+ 14 - 47
Eservice/serviceConfirmBill/index.js

@@ -131,7 +131,7 @@ Page({
   },
 
   async submit() {
-    this.createImage();
+    this.createImage(true);
     const res = await api._post({
       "id": "20230211110003",
       "content": {
@@ -193,10 +193,20 @@ Page({
     this.updateBill()
     this.setInputData()
   },
-  createImage() {
+  /* 查看单据 */
+  checkImage() {
+    let attinfos = this.data.mainData.attinfos.map(v => v.usetype);
+    let index = attinfos.lastIndexOf("comfirmbill");
+    //没有查询到有效单据 跳转生成
+    if (index == -1) return this.createImage(true);
+    wx.previewImage({
+      urls: [this.data.mainData.attinfos[index].url],
+    })
+  },
+  createImage(active = false) {
     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}`
+    let url = `${getApp().globalData.http.baseUrl}/yosweb/#/printTable?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}${active==true?'&action=1':''}`
     this.setData({
       url: url
     })
@@ -214,59 +224,16 @@ Page({
       id: options.id,
       bindSignNameData: this.data.bindSignNameData
     })
-    this.billData()
   },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
   onShow() {
     this.setData({
       SignName: true
     })
+    this.billData()
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
   onHide() {
     this.setData({
       SignName: false
     })
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
   }
 })

+ 4 - 3
Eservice/serviceConfirmBill/index.wxml

@@ -65,9 +65,10 @@
   <view class="count">
   </view>
   <view class="but-box">
-    <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>
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="createImage">单据预览</van-button>
+    <van-button custom-class='but' wx:else bind:click="checkImage">查看单据</van-button>
+    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建'}}" bind:click="delete">删 除</van-button>
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="submit">提 交</van-button>
   </view>
 </view>
 

+ 14 - 50
Eservice/trainConfirmBill/index.js

@@ -160,7 +160,7 @@ Page({
     },
 
     async submit() {
-        this.createImage();
+        this.createImage(true);
         const res = await api._post({
             "id": "20230211110003",
             "content": {
@@ -199,10 +199,20 @@ Page({
         })
         this.updateBill()
     },
-    createImage() {
+    /* 查看单据 */
+    checkImage() {
+        let attinfos = this.data.mainData.attinfos.map(v => v.usetype);
+        let index = attinfos.lastIndexOf("comfirmbill");
+        //没有查询到有效单据 跳转生成
+        if (index == -1) return this.createImage(true);
+        wx.previewImage({
+            urls: [this.data.mainData.attinfos[index].url],
+        })
+    },
+    createImage(active = false) {
         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}`
+        let url = `${getApp().globalData.http.baseUrl}/yosweb/#/printTable?token=${token}&parentid=${parentid}&ownerid=${this.data.mainData.sa_workorder_confirmationid}${active==true?'&action=1':''}`
         this.setData({
             url: url
         })
@@ -210,9 +220,6 @@ Page({
             url: '/Eservice/webView/index',
         })
     },
-    /**
-     * 生命周期函数--监听页面加载
-     */
     onLoad(options) {
         this.data.bindSignNameData.ownerid = options.id
         this.setData({
@@ -220,59 +227,16 @@ Page({
             id: options.id,
             bindSignNameData: this.data.bindSignNameData
         })
-        this.billData()
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
     },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
     onShow() {
         this.setData({
             SignName: true
         })
+        this.billData()
     },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
     onHide() {
         this.setData({
             SignName: false
         })
     },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
 })

+ 5 - 4
Eservice/trainConfirmBill/index.wxml

@@ -80,8 +80,9 @@
   <view class="count">
   </view>
   <view class="but-box">
-    <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>
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="createImage">单据预览</van-button>
+    <van-button custom-class='but' wx:else bind:click="checkImage">查看单据</van-button>
+    <van-button custom-class='but delete' wx:if="{{mainData.status == '新建'}}" bind:click="delete">删 除</van-button>
+    <van-button custom-class='but' wx:if="{{mainData.status == '新建'}}" bind:click="submit">提 交</van-button>
   </view>
-</view>
+</view>