sale-client 3.6.40 → 3.6.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.40",
+  "version": "3.6.42",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue

@@ -142,7 +142,7 @@
                         @click="$parent.$parent.$parent.kp(row)">开票
                 </button>
                 <button class="btn btn-link" v-if="row.f_bill_state==='开票失败'"
-                        @click="$parent.$parent.$parent.kp(row)">重新开票
+                        @click="$parent.$parent.$parent.Rekp(row)">重新开票
                 </button>
                 <!--                <button class="btn btn-link" v-if="['查询失败','等待查询'].includes(row.f_bill_state)"-->
                 <!--                        @click="$parent.$parent.$parent.fp_search(row)">电票查询-->
@@ -208,6 +208,15 @@ export default {
   ready () {
   },
   methods: {
+    async Rekp (row) {
+      this.eticket_show = true
+      row.f_paper_name = row.f_user_name
+      row.f_email = row.f_mail_push
+      row.f_taxpayer_id = row.f_pay_id
+      row.f_address_phone = row.f_buy_address_phone
+      row.f_paper_accoun = row.f_buy_openbank
+      await this.$refs.eticketbill.openETicket(row.f_sell_id, row, row.f_charge_type)
+    },
     search () {
       this.$refs.paged.$refs.cri.search()
     },
@@ -237,7 +246,7 @@ export default {
     },
     kp (row) {
       this.eticket_show = true
-      this.$refs.eticketbill.openEticketGen(row.id)
+      this.$refs.eticketbill.openETicket(row.f_sell_id, row, row.f_charge_type)
     },
     eticket_toggle () {
       this.eticket_show = false

package/src/filiale/gehua/OtherChargeNew.vue

@@ -168,7 +168,7 @@
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
       </validator>
-      <upload :blodid="blodid" v-if="config.showupload"  isremark="true" fusetype="其他收费"></upload>
+      <upload :blodid="row.f_userinfo_id"  v-if="config.showupload"  isremark="true" fusetype="其他收费"></upload>
     </div>
     <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>
     <mis-pos-pay v-ref:mispospay :payment="model.f_payment" :row="row" :money="model.f_collection"></mis-pos-pay>

package/src/filiale/rizhao/HighMeterCard.vue

@@ -14,7 +14,6 @@
           <button class="btn btn-info" @click="cam_switch(1)">打开视频1</button>
           <button class="btn btn-info" @click="cam_switch(2)">打开视频2</button>
           <button class="btn btn-info" @click="reloadVideo()">重载视频</button>
-<!--          <button class="btn btn-info" @click="CloseVideo()">关闭</button>-->
           <div style="display: inline-block;margin-left: 570px">
             <strong class="operation">读取身份证:</strong>
             <button class="btn btn-info readIDCard" @click=Begin()>读身份证</button>
@@ -217,13 +216,6 @@ export default {
          setTimeout(this.onLoad,2000)
        })
     },
-    CloseVideo(){
-      window.location.href = 'cameraServicetis:0'
-      let url = `http://127.0.0.1:38088/video=close&camidx=${this.capID}`
-      this.$resetpost(url).then((res)=>{
-        setTimeout(this.onLoad,2000)
-      })
-    },
     openApp () {
       window.location.href = 'cameraServicetis:0' // 启动 CameraService 服务程序
 
@@ -508,9 +500,9 @@ export default {
     // //设置颜色模式 只针对截图
     bb () {
       let camidx = 0
-      if (this.cameraurl === 'http://127.0.0.1:38088/video=stream&camidx=0') {
+      if (this.capID === 1) {
         camidx = 0
-      } else if (this.cameraurl === 'http://127.0.0.1:38088/video=stream&camidx=1') {
+      } else if (this.capID === 2) {
         camidx = 1
       } else {
         this.$showAlert('请先打开视频', 'warning', 2000)
@@ -945,14 +937,13 @@ export default {
       document.getElementById('Police').value = msg.issueOrgan
       document.getElementById('ActivityLFrom').value = msg.validStart
       document.getElementById('ActivityLTo').value = msg.validEnd
-      // document.getElementById('DeviceNo').value = msg.validEnd
       document.getElementById('PhotoBuffer').value = msg.fingerBase64
       document.getElementById('PhotoDisplay').src = 'data:image/jpg;base64,' + msg.photoBase64
       this.IdCardInfo = msg
     },
     close () {
+
       this.show = !this.show
-      this.CloseVideo()
     },
     getSatate(){
       this.$resetpost('http://127.0.0.1:38088/video=status').then((res)=>{

package/src/filiale/wenxi/UserGeneralInfoTest.vue

@@ -332,6 +332,7 @@ export default {
       if (this.fileSaveData.userinfo.f_userinfo_id) {
         if (this.row.f_user_state === '预备' && this.fileSaveData.userinfo.f_user_state === '正常') {
           this.fileSaveData.userinfo.f_createfile_person = this.$login.f.name
+          this.fileSaveData.userinfo.f_open_date = this.$login.toStandardTimeString()
           this.fileSaveData.modifyReason = this.reason = '建档（档案信息完善）'
         } else {
           this.reason = '其他'