manage-client 4.1.140 → 4.1.142

package/build/dev-server.js

@@ -6,8 +6,8 @@ const proxyMiddleware = require('http-proxy-middleware')
 const app = express()
 const compiler = webpack(config)
 
-const server = 'http://192.168.50.67:31567/'
-const local = 'http://127.0.0.1:9026/'
+const server = 'http://121.36.106.17:31467/'
+const local = 'http://121.36.106.17:31467/'
 const proxyTable = {
   '/rs/logic/exportfile': {
     target: server
@@ -16,21 +16,21 @@ const proxyTable = {
     target: server
   },
   '/api/af-revenue/sql/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
     target: local
   },
   '/api/af-revenue/report/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
     target: local
   },
   '/api/af-revenue/logic': {
-    pathRewrite: {
-      '^/api/af-revenue': '/'
-    },
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
     target: local
   },
   '/api': {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.140",
+    "version": "4.1.142",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/SellReport/ManageBusSummary.vue

@@ -132,10 +132,28 @@
         <button class="button_clear" @click="cancel()">取消</button>
       </footer>
     </modal>
+    <modal :show.sync="signatureModalShow" large backdrop="false" width="50%">
+      <header slot="modal-header" class="modal-header" style="text-align: center">
+        <h4 class="modal-title">业务员签名</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div style="text-align:center">
+          <canvas v-ref:signCanvas data-sign-canvas="true"
+                  style="border:1px solid #ccc; background:#fff; width:600px; height:300px; touch-action:none;">
+          </canvas>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="button_clear" @click="clearSignatureCanvas()">清除</button>
+        <button type="button" class="button_search" @click="saveSignatureAndSubmit()" :disabled="signatureUploadInProgress">保存并提交</button>
+        <button type="button" class="button_clear" @click="signatureModalShow=false">取消</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
 <script>
+import Vue from 'vue'
 import {DataModel} from 'vue-client'
 import co from 'co'
 
@@ -174,6 +192,16 @@ export default {
       },
       pushAuditData: {},
       pushAuditShow: false,
+      signatureModalShow: false,
+      signatureData: '',
+      signatureDrawn: false,
+      signatureUploadInProgress: false,
+      signing: false,
+      signLastX: 0,
+      signLastY: 0,
+      signDPR: 1,
+      signCanvasContext: null,
+      signatureCanvas: null,
       config: {
         hasAudit: false
       }
@@ -189,10 +217,21 @@ export default {
   },
   methods: {
     auditConfirm () {
+      // If no signature yet, require the reviewer to sign first
+      if (!this.pushAuditData.f_audit_person) {
+        this.$showMessage('请选择审核人')
+        return
+      }
+      if (!this.pushAuditData.signature) {
+        this.signatureModalShow = true
+        return
+      }
+
       const param = {
         f_type: '收费结账报表',
         f_requestparam: this.model.data,
         f_audit_person: this.pushAuditData.f_audit_person,
+        f_signature: this.pushAuditData.signature,
         f_otherparam: this.pushAuditData,
         f_operator: this.$login.f.name,
         f_operatorid: this.$login.f.id,
@@ -210,8 +249,286 @@ export default {
       }).then((res) => {
         this.pushAuditShow = false
         this.pushAuditData.f_audit_person = ''
+        this.pushAuditData.signature = ''
+      })
+    },
+    initSignCanvas () {
+      this.$nextTick(() => {
+        let canvas = this.$refs.signCanvas
+        if (!canvas) {
+          canvas = this.$el.querySelector('canvas[data-sign-canvas]') || document.querySelector('canvas[data-sign-canvas]')
+
+        }
+        const desiredW = 600
+        const desiredH = 300
+        canvas.width = desiredW
+        canvas.height = desiredH
+        canvas.style.width = desiredW + 'px'
+        canvas.style.height = desiredH + 'px'
+        const ctx = canvas.getContext('2d')
+        ctx.setTransform(1, 0, 0, 1, 0, 0)
+        ctx.fillStyle = '#fff'
+        ctx.fillRect(0, 0, desiredW, desiredH)
+        ctx.strokeStyle = '#000'
+        ctx.lineWidth = 2
+        ctx.lineCap = 'round'
+        ctx.lineJoin = 'round'
+        this.signCanvasContext = ctx
+        this.signing = false
+        this.signatureDrawn = false
+        this.destroySignCanvasListeners()
+        const getPoint = (event) => {
+          const rect = canvas.getBoundingClientRect()
+          let clientX = event.clientX
+          let clientY = event.clientY
+          if (event.touches && event.touches.length) {
+            clientX = event.touches[0].clientX
+            clientY = event.touches[0].clientY
+          } else if (event.changedTouches && event.changedTouches.length) {
+            clientX = event.changedTouches[0].clientX
+            clientY = event.changedTouches[0].clientY
+          }
+          if (clientX == null || clientY == null) return null
+          const x = (clientX - rect.left) * (canvas.width / rect.width)
+          const y = (clientY - rect.top) * (canvas.height / rect.height)
+          return { x, y }
+        }
+
+        const onStart = (event) => {
+          event.preventDefault()
+          const point = getPoint(event)
+          if (!point) return
+          this.signing = true
+          this.signatureDrawn = true
+          this.signLastX = point.x
+          this.signLastY = point.y
+        }
+        const onMove = (event) => {
+          if (!this.signing) return
+          event.preventDefault()
+          const point = getPoint(event)
+          if (!point) return
+          const ctx2 = this.signCanvasContext
+          ctx2.beginPath()
+          ctx2.moveTo(this.signLastX, this.signLastY)
+          ctx2.lineTo(point.x, point.y)
+          ctx2.stroke()
+          this.signLastX = point.x
+          this.signLastY = point.y
+        }
+        const onEnd = (event) => {
+          if (this.signing) {
+            event.preventDefault()
+          }
+          this.signing = false
+        }
+        canvas.addEventListener('mousedown', onStart)
+        canvas.addEventListener('mousemove', onMove)
+        canvas.addEventListener('mouseup', onEnd)
+        canvas.addEventListener('mouseleave', onEnd)
+        canvas.addEventListener('touchstart', onStart, {passive:false})
+        canvas.addEventListener('touchmove', onMove, {passive:false})
+        canvas.addEventListener('touchend', onEnd)
+        canvas.addEventListener('touchcancel', onEnd)
+
+        this._signCanvasListeners = { canvas, onStart, onMove, onEnd }
+        this.signatureCanvas = canvas
+      })
+    },
+    destroySignCanvasListeners () {
+      if (!this._signCanvasListeners) return
+      const { canvas, onStart, onMove, onEnd } = this._signCanvasListeners
+      canvas.removeEventListener('mousedown', onStart)
+      canvas.removeEventListener('mousemove', onMove)
+      canvas.removeEventListener('mouseup', onEnd)
+      canvas.removeEventListener('mouseleave', onEnd)
+      canvas.removeEventListener('touchstart', onStart)
+      canvas.removeEventListener('touchmove', onMove)
+      canvas.removeEventListener('touchend', onEnd)
+      canvas.removeEventListener('touchcancel', onEnd)
+      this._signCanvasListeners = null
+      this.signatureCanvas = null
+    },
+    getSignCanvasElement () {
+      return this.$refs.signCanvas || this.signatureCanvas || this.$el.querySelector('canvas[data-sign-canvas]') || document.querySelector('canvas[data-sign-canvas]')
+    },
+    getSignPoint (event) {
+      const canvas = this.getSignCanvasElement()
+      if (!canvas) return null
+      const rect = canvas.getBoundingClientRect()
+      let clientX = event.clientX
+      let clientY = event.clientY
+
+      if (event.touches && event.touches.length) {
+        clientX = event.touches[0].clientX
+        clientY = event.touches[0].clientY
+      } else if (event.changedTouches && event.changedTouches.length) {
+        clientX = event.changedTouches[0].clientX
+        clientY = event.changedTouches[0].clientY
+      }
+
+      if (clientX == null || clientY == null) return null
+
+      // Use offset within canvas bounding box
+      const x = (clientX - rect.left) * (canvas.width / rect.width)
+      const y = (clientY - rect.top) * (canvas.height / rect.height)
+      return { x, y }
+    },
+    signStart (event) {
+      // legacy support: keep method but not used by native listeners
+      if (!this.signCanvasContext) return
+      const point = this.getSignPoint(event)
+      if (!point) return
+      this.signing = true
+      this.signatureDrawn = true
+      this.signLastX = point.x
+      this.signLastY = point.y
+    },
+    signMove (event) {
+      if (!this.signing || !this.signCanvasContext) return
+      const point = this.getSignPoint(event)
+      if (!point) return
+      const ctx = this.signCanvasContext
+      ctx.beginPath()
+      ctx.moveTo(this.signLastX, this.signLastY)
+      ctx.lineTo(point.x, point.y)
+      ctx.stroke()
+      this.signLastX = point.x
+      this.signLastY = point.y
+    },
+    signEnd () {
+      this.signing = false
+    },
+    clearSignatureCanvas () {
+      const canvas = this.getSignCanvasElement()
+      const ctx = this.signCanvasContext || (canvas ? canvas.getContext('2d') : null)
+      if (!canvas || !ctx) {
+        return
+      }
+
+      const desiredW = 600
+      const desiredH = 300
+      ctx.setTransform(1, 0, 0, 1, 0, 0)
+      ctx.clearRect(0, 0, desiredW, desiredH)
+      ctx.fillStyle = '#fff'
+      ctx.fillRect(0, 0, desiredW, desiredH)
+      this.signatureDrawn = false
+      this.pushAuditData.signature = ''
+    },
+    getUploadPathFromResponse (res) {
+      return res && (res.id)
+    },
+    canvasToBlob (canvas) {
+      return new Promise((resolve, reject) => {
+        if (canvas.toBlob) {
+          canvas.toBlob((blob) => {
+            if (blob) {
+              resolve(blob)
+            } else {
+              reject(new Error('canvas toBlob returned null'))
+            }
+          }, 'image/png')
+        } else {
+          try {
+            const dataURL = canvas.toDataURL('image/png')
+            const byteString = atob(dataURL.split(',')[1])
+            const mimeString = dataURL.split(',')[0].split(':')[1].split(';')[0]
+            const ab = new ArrayBuffer(byteString.length)
+            const ia = new Uint8Array(ab)
+            for (let i = 0; i < byteString.length; i++) {
+              ia[i] = byteString.charCodeAt(i)
+            }
+            resolve(new Blob([ab], { type: mimeString }))
+          } catch (err) {
+            reject(err)
+          }
+        }
+      })
+    },
+    uploadSignatureFile () {
+      return new Promise(async (resolve, reject) => {
+        const canvas = this.getSignCanvasElement()
+        if (!canvas) {
+          reject(new Error('签名画布未找到'))
+          return
+        }
+        let blob
+        try {
+          blob = await this.canvasToBlob(canvas)
+        } catch (err) {
+          reject(err)
+          return
+        }
+
+        const form = new FormData()
+        form.append('file', blob, 'signature.png')
+
+        const xhr = new XMLHttpRequest()
+        xhr.open('POST', 'api/af-revenue/file/uploadFile', true)
+        if (Vue.$login && Vue.$login.jwt) {
+          xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
+          xhr.setRequestHeader('Token', Vue.$login.jwt)
+        }
+
+        xhr.onreadystatechange = function () {
+          if (xhr.readyState < 4) return
+          if (xhr.status < 400) {
+            try {
+              const res = JSON.parse(xhr.responseText)
+              const uploadPath = this.getUploadPathFromResponse(res)
+              if (!uploadPath) {
+                reject(new Error('上传成功但未返回有效路径'))
+                return
+              }
+              resolve(uploadPath)
+            } catch (err) {
+              reject(err)
+            }
+          } else {
+            let err
+            try {
+              err = JSON.parse(xhr.responseText)
+            } catch (parseErr) {
+              err = new Error(xhr.statusText || '签名上传失败')
+            }
+            reject(err)
+          }
+        }.bind(this)
+
+        xhr.onerror = function () {
+          reject(new Error('签名文件上传网络错误'))
+        }
+
+        xhr.send(form)
       })
     },
+    async saveSignatureAndSubmit () {
+      if (!this.signatureDrawn) {
+        if (this.$showMessage) this.$showMessage('请先签名')
+        return
+      }
+
+      const canvas = this.getSignCanvasElement()
+      if (!canvas) {
+        if (this.$showMessage) this.$showMessage('签名画布未找到，请重新打开签名弹窗')
+        return
+      }
+
+      if (this.signatureUploadInProgress) {
+        return
+      }
+      this.signatureUploadInProgress = true
+      try {
+        const uploadPath = await this.uploadSignatureFile()
+        this.pushAuditData.signature = uploadPath
+        this.signatureModalShow = false
+        this.auditConfirm()
+      } catch (err) {
+        if (this.$showMessage) this.$showMessage('签名上传失败，请重试')
+      } finally {
+        this.signatureUploadInProgress = false
+      }
+    },
     async getAuditor () {
       await this.$MagGetSaleParam.initinputtor()
       console.log('查询到的人员：', await this.$MagGetSaleParam.initinputtor())
@@ -221,6 +538,7 @@ export default {
     },
     cancel () {
       this.pushAuditShow = false
+      this.pushAuditData.signature = ''
     },
     pushAudit () {
       if (this.model.data === null || this.model.data === ' ') {
@@ -278,6 +596,15 @@ export default {
       }
       this.spans = len
     }
+    ,
+    signatureModalShow (val) {
+      console.log('[ManageBusSummary] signatureModalShow watcher', val)
+      if (val) {
+        this.initSignCanvas()
+      } else {
+        this.destroySignCanvasListeners()
+      }
+    }
   },
   computed: {
     charge_state () {