sale-client 3.6.288 → 3.6.290

package/build/versionCheck.js

@@ -1,25 +1,26 @@
-function isVersionGreaterThan(version1, version2) {
+function isVersionGreaterThan (version1, version2) {
   const v1parts = version1.split('.')
   const v2parts = version2.split('.')
-
+  let flag = false
   for (let i = 0; i < v1parts.length; ++i) {
-    if (v2parts.length === i) {
-      return true
+    if (v1parts[i] > v2parts[i]) {
+      flag = true
+      break
     }
-    return v1parts[i] >= v2parts[i]
   }
 
-  return v1parts.length !== v2parts.length
+  return flag
 }
 
 const pkg = require('../package.json')
 const checkVersion = () => {
   const {devDependencies} = pkg
   if (devDependencies && devDependencies['system-clients']) {
-    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.93')) {
+    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
       console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
       console.log('\x1b[41m\x1b[30m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
       console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
+      console.log('\x1b[41m\x1b[30m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
       console.log('\x1b[41m\x1b[30m%s\x1b[0m', '请查看营收后台升级日志：http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
     }
   }

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -92,6 +92,7 @@
           <tr>
             <th>序号</th>
             <th>用户编号</th>
+            <th>用户姓名</th>
             <th>银行名称</th>
             <th>燃气方订单号</th>
             <th>银行方订单号</th>
@@ -107,6 +108,7 @@
         <template partial='body'>
           <td style="text-align: center;">{{$index+1}}</td>
           <td>{{row.f_userinfo_code}}</td>
+          <td>{{row.f_user_name}}</td>
           <th>{{row.f_bank_name?row.f_bank_name:row.bankname}}</th>
           <td>{{row.f_serial_id}}</td>
           <td>{{row.f_trade_number}}</td>
@@ -180,8 +182,8 @@
         f_orgid: this.$login.f.orgid,
         curorgid: [this.$login.f.orgid],
         model: new PagedList('rs/sql/bankPayment', 20, {bankname: 'this.model.f_bank_name[0]', startDate: 'this.model.startDate', endDate: 'this.model.endDate', orderitem: '"delivery_date DESC "'}, {f_collection: '', f_total_charge: ''}),
-        bodydata: ['f_userinfo_code', 'f_bank_name', 'f_serial_id', 'f_trade_number', 'f_collection', 'f_total_charge', 'f_operate_date', 'f_state', 'msg'],
-        header: ['用户编号', '银行名称', '燃气方流水号', '银行流水号', '燃气方金额', '银行金额', '燃气方日期', '银行日期', '燃气方记录是否有效', '对账信息']
+        bodydata: ['f_userinfo_code', 'f_user_name', 'f_bank_name', 'f_serial_id', 'f_trade_number', 'f_collection', 'f_total_charge', 'f_operate_date', 'f_state', 'msg'],
+        header: ['用户编号', '用户姓名', '银行名称', '燃气方流水号', '银行流水号', '燃气方金额', '银行金额', '燃气方日期', '银行日期', '燃气方记录是否有效', '对账信息']
 
       }
     },

package/src/components/revenue/comprehen/TotalSplit/TotalSplitManage.vue

@@ -1,9 +1,9 @@
 <template>
-  <div>
-    <div class="col-sm-6">
+  <div class="binary">
+    <div class="binary-left">
       <all-user-files v-ref:alluser :row="row" @select-changed="selected"></all-user-files>
     </div>
-    <div class="col-sm-6">
+    <div class="binary-right">
       <div class="flex">
         <strong class="bg-info text-center">可选择的分表信息</strong>
         <split-list v-ref:split :data="row" @refresh="refreshView"></split-list>

package/src/components/revenue/comprehen/handAudit/MeterReadAudit.vue

@@ -134,6 +134,7 @@
             <th>审核人</th>
             <th>审核状态</th>
             <th>审核时间</th>
+            <th>审核原因</th>
             <th>操作</th>
           </tr>
         </template>
@@ -166,6 +167,7 @@
           <td style="text-align:center" v-if="row.f_hand_state !== '有效'">未通过</td>
           <td style="text-align:center" v-if="row.f_meter_state === '已抄表' && row.f_hand_state === '有效'">已通过</td>
           <td style="text-align:center">{{ row.f_audit_date }}</td>
+          <td style="text-align:center">{{ row.f_examinereason }}</td>
           <td style="text-align: center" v-if="row.f_meter_state === '待审核' && row.f_hand_state === '有效'">
             <button type="button" class="button_search button_spacing width-60"
                     v-if="row.f_last_tablebase === row.f_meter_base"
@@ -233,7 +235,9 @@ export default {
         label: '未通过',
         value: ` f_hand_state = '无效'`
       }, {label: '已通过', value: `f_meter_state = '已抄表' and f_hand_state ='有效'`}],
-      meterbooks: [{label: '全部', value: ''}]
+      meterbooks: [{label: '全部', value: ''}],
+      //待更新不通过原因的人的id
+      update_f_examinereason_id : ''
     }
   },
   ready () {
@@ -343,12 +347,20 @@ export default {
         // this.row = row
         // this.pushdata.openid = row.f_open_id
         // this.show = true
+        // 1、不通过操作执行
         let sql = `UPDATE t_handplan SET f_hand_state = '无效',f_audit_person = '${this.$login.f.name}',f_audit_date = getDate() WHERE id = ${row.id}`
         await this.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
         this.search()
+        // 2、不通过原因弹窗
+        this.show = true
+        this.update_f_examinereason_id = row.id
       }
     },
     async confirm () {
+      //更新不通过原因
+      let update = `UPDATE t_handplan SET f_examinereason ='${this.pushdata.cause}' where id = ${this.update_f_examinereason_id}`
+      await this.$resetpost('rs/logic/runSQL', {sql: update}, {resolveMsg: '原因提交成功', rejectMsg: '操作失败'})
+      console.log(update)
       await this.$resetpost('rs/logic/weixinHanPlanAudit', this.row, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
       await this.$resetpost('http://www.hunanhongdaranqi.com/weixin/rs/logic/meterReadFailed', this.pushdata, {
         resolveMsg: null,

package/src/filiale/macheng/HandManager.vue

@@ -696,12 +696,12 @@
           'f_user_name': '客户姓名',
           'f_residential_area': '小区名称',
           'f_address': '客户地址',
-          'f_zones' : '片区',
+          'f_zones': '片区',
           'f_user_phone': '客户电话',
           'f_meternumber': '表号',
           'f_meter_base': '上期底数',
           'avggas': '平均用气量',
-          'f_adjustable_name': '本期底数'
+          'f_table_base': '本期底数'
         },
         config: {
           // 导出列要和查询列相同
@@ -716,7 +716,7 @@
             'f_meternumber': '表号',
             'avggas': '平均用气量',
             'f_meter_base': '上期底数',
-            'f_adjustable_name': '本期底数',
+            'f_table_base': '本期底数',
             'f_inputtor': '抄表员',
             'f_balacne': '上期结余',
             'f_last_input_date': '上次抄表',