sale-client 3.6.537 → 3.6.539

package/package.json

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

package/src/components/common/searchuploadfile/uploadFilesHistory.vue

@@ -114,7 +114,7 @@ export default {
       getFiles () {
         this.files = []
         this.userinfo_id = this.row.f_userinfo_id
-        let condition = `CONVERT(varchar(200),f_blobid) = '${this.userinfo_id}' `
+        let condition = `f_blobid = '${this.userinfo_id}' `
         if (this.upload_date !== '') {
           condition += `and CONVERT( VARCHAR ( 100 ), f_uploaddate, 23 )='${this.upload_date}' `
         }

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -224,20 +224,42 @@ export default {
               rejectMsg: '删除设备失败'
             }).then((res) => {
               this.devicesinfonew.splice(index, 1)
+              this.$nextTick(() => {
+                this.changeDate()
+              })
             })
           }
         })
       } else {
         this.devicesinfonew.splice(index, 1)
+        this.$nextTick(() => {
+          this.changeDate()
+        })
       }
     },
     addDevice () {
       console.log('设备信息', this.devicesinfonew)
-      this.devicesinfonew.push({
+      const newDevice = {
         f_devices_type: '调压器',
-        f_input_date: this.$login.toStandardTimeString()
+        f_input_date: this.$login.toStandardTimeString(),
+      }
+      this.devicesinfonew.push(newDevice)
+      this.$nextTick(() => {
+        this.changeDate()
       })
     }
+  },
+  watch: {
+    show_devices (newVal) {
+      if (newVal) {
+        // 弹窗打开时，自动为所有"切断阀"设备执行一次 expireDate
+        this.devicesinfonew.forEach((row, index) => {
+          if (row.f_devices_type === '切断阀') {
+            this.expireDate(index)
+          }
+        })
+      }
+    }
   }
 }
 </script>

package/src/filiale/yangchun/EticketPrint.vue

@@ -18,9 +18,9 @@
   </div>
 </template>
 <script>
-import {HttpResetClass} from 'vue-client'
+// import {HttpResetClass} from 'vue-client'
 import Vue from 'vue'
-import axios from "axios";
+import axios from 'axios'
 
 export default {
   title: '电子发票',
@@ -94,7 +94,7 @@ export default {
           // f_end_date: model.f_end_date,
           f_userinfo_id: model.f_userinfo_id,
           org_id: this.$login.f.orgid,
-          bz: model.f_eticket_reason ? model.f_eticket_reason : null,
+          bz: model.f_remarks ? model.f_remarks : null,
           loginInfo: {
             operator: Vue.$login.f.name,
             operator_id: Vue.$login.f.id,

package/src/filiale/yangchun/EticketV4/EticketOpenCard.vue

@@ -68,7 +68,8 @@
             <th>客户地址</th>
             <th>客户电话</th>
             <th>缴费类型</th>
-            <th>实收金额</th>
+            <th>总金额</th>
+            <th>抵扣金额</th>
             <th>收款人</th>
             <th>收款部门</th>
             <th>是否开过票</th>
@@ -88,6 +89,7 @@
             <th style="text-align:center">{{ row.f_phone }}</th>
             <th style="text-align:center">{{ row.f_type }}</th>
             <th style="text-align:center">{{ row.f_collection }}</th>
+            <th style="text-align:center">{{ row.f_current_deduct_amount || 0 }}</th>
             <th style="text-align:center">{{ row.f_operator }}</th>
             <th style="text-align:center">{{ row.f_depname }}</th>
             <th style="text-align:center">{{ row.is_bill }}</th>

package/src/filiale/yangchun/EticketV4/EticketOpenJBPage.vue

@@ -68,7 +68,8 @@
             <th>客户地址</th>
             <th>客户电话</th>
             <th>应交气量</th>
-            <th>应交金额</th>
+            <th>总金额</th>
+            <th>抵扣金额</th>
             <th>上期底数</th>
             <th>本期底数</th>
             <th>是否开过票</th>
@@ -88,6 +89,7 @@
             <th style="text-align:center">{{ row.f_phone }}</th>
             <th style="text-align:center">{{ row.f_oughtamount }}</th>
             <th style="text-align:center">{{ row.f_oughtfee }}</th>
+            <th style="text-align:center">{{ row.f_current_deduct_amount || 0 }}</th>
             <th style="text-align:center">{{ row.f_last_tablebase }}</th>
             <th style="text-align:center">{{ row.f_tablebase }}</th>
             <th style="text-align:center">{{ row.is_bill }}</th>

package/src/filiale/yangchun/EticketV4/EticketOpenPage.vue

@@ -57,7 +57,8 @@
             <th>客户电话</th>
             <th>纳税人识别号码</th>
             <th>气量</th>
-            <th>金额</th>
+            <th>总金额</th>
+            <th>抵扣金额</th>
             <th>用户类型</th>
             <th>用气性质</th>
             <th>气表类型</th>
@@ -76,6 +77,7 @@
             <th style="text-align:center">{{ row.f_taxpayer_id }}</th>
             <th style="text-align:center">{{ row.gas }}</th>
             <th style="text-align:center">{{ row.money }}</th>
+            <th style="text-align:center">{{ row.deduct_amount || 0 }}</th>
             <th style="text-align:center">{{ row.f_user_type }}</th>
             <th style="text-align:center">{{ row.f_gasproperties }}</th>
             <th style="text-align:center">{{ row.f_meter_classify }}</th>
@@ -232,6 +234,7 @@ export default {
       // if (!this.row.f_paper_name) {
       this.row.f_paper_name = this.row.f_user_name
       // }
+      this.row.f_paper_account = `${this.row.f_paper_bank || ''} ${this.row.f_paper_account || ''}`.trim()
       if (!this.row.f_address_phone) {
         this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
       }
@@ -248,8 +251,8 @@ export default {
       let HttpReset = new HttpResetClass()
       let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
         data: {
-          orderitem: 'f_userinfo_id',
-          condition: `f_userinfo_id = '${[...new Set(this.selecteds.map(item => item.f_userinfo_id))][0]}'`
+          orderitem: 'f_userinfo_code',
+          condition: `tu.f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
         }
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.row = row.data[0]
@@ -257,6 +260,7 @@ export default {
       if (!this.row.f_paper_name) {
         this.row.f_paper_name = this.row.f_user_name
       }
+      this.row.f_paper_account = `${this.row.f_paper_bank || ''} ${this.row.f_paper_account || ''}`.trim()
       if (!this.row.f_address_phone) {
         this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
       }
@@ -269,7 +273,6 @@ export default {
 
       // this.row = row.data[0]
 
-      console.log('选中的： ', this.model.condition)
       console.log('先看下条件是啥： ', this.model.condition)
 
       // 因为需要合并，所以这里需要根据查询结算记录

package/src/filiale/yangchun/EticketV4/SpecialQueryEticket.vue

@@ -85,6 +85,7 @@
             <th>气量</th>
             <th>应交金额</th>
             <th>实收金额</th>
+            <th>抵扣款金额</th>
             <th>收费类型</th>
             <th>收费时间</th>
             <th>操作</th>
@@ -102,6 +103,7 @@
           <td style="text-align:center">{{row.f_pregas}}</td>
           <td style="text-align:center">{{row.f_preamount}}</td>
           <td style="text-align:center">{{row.f_collection}}</td>
+          <td style="text-align:center">{{row.f_current_deduct_amount || 0}}</td>
           <td style="text-align:center">{{row.f_type}}</td>
           <td style="text-align:center">{{row.f_operate_date}}</td>
           <td>
@@ -348,7 +350,7 @@ export default {
   },
   computed: {
     chargetypes () {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费类型')]
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('开票业务类型')]
     }
   },
   watch: {