sale-client 4.1.99 → 4.2.1-ronghao

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://192.168.50.67:31467/']
+const [ serverRul, localUrl ] = ['http://218.93.226.210:31467/', 'http://218.93.226.210:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/filiale/jinhong/CardMeterCenterInner.vue

@@ -369,6 +369,8 @@
         insurance.f_operator = self.$login.f.name
         insurance.f_operatorid = self.$login.f.id
         insurance.f_orgid = self.$login.f.orgid
+        insurance.f_idnumber = self.row.f_idnumber
+        insurance.f_user_phone = self.row.f_user_phone
         insurance.f_orgname = self.$login.f.orgs
         insurance.f_depid = self.$login.f.depids
         insurance.f_depname = self.$login.f.deps

package/src/filiale/jinhong/IOTMeterCenterInner.vue

@@ -336,6 +336,8 @@ import {HttpResetClass} from 'vue-client'
         param.insurance = Object.assign({}, {}, self.model)
         param.insurance.f_payment = self.model.f_payment[0]
         param.insurance.f_userinfo_code = self.row.f_userinfo_code
+        param.insurance.f_idnumber = self.row.f_idnumber
+        param.insurance.f_user_phone = self.row.f_user_phone
         param.insurance.f_state = '有效'
         param.insurance.f_receivable = self.insurance.f_money_all
         param.insurance.f_user_name = self.row.f_user_name

package/src/filiale/jinhong/MachineMeterCenter.vue

@@ -224,6 +224,8 @@ let asyncMachineMeterCenter = async function (self) {
         insurance.f_state = '有效'
         insurance.f_operat_type = '保险'
         insurance.f_user_name = self.row.f_user_name
+        insurance.f_idnumber = self.row.f_idnumber
+        insurance.f_user_phone = self.row.f_user_phone
         insurance.f_payment = self.data.f_payment.toString()
         insurance.f_userfiles_id = self.row.f_userfiles_id
         insurance.f_operator = self.$login.f.name

package/src/filiale/jinhong/ShowCardSellGasInner.vue

@@ -385,6 +385,8 @@ let initCardGen = async function (self) {
       insurance.f_state = '有效'
       insurance.f_operat_type = '保险'
       insurance.f_user_name = self.row.f_user_name
+      insurance.f_idnumber = self.row.f_idnumber
+      insurance.f_user_phone = self.row.f_user_phone
       insurance.f_userfiles_id = self.row.f_userfiles_id
       insurance.f_operator = self.$login.f.name
       insurance.f_operatorid = self.$login.f.id

package/src/filiale/ronghao/CardMeterChargeCancel.vue

@@ -405,6 +405,11 @@ export default {
           return
         }
       }
+      let b = this.$login.toStandardDateString() + ' 00:00:00'
+      if (this.model.f_date < b && this.model.f_payment.length === 0) {
+        this.$showAlert('请选择退款方式！', 'warning', 1500)
+        return
+      }
       this.show = true
     },
     close () {

package/src/filiale/ronghao/ChangeMeterService.js

@@ -628,7 +628,7 @@ let ChangeMeterService = {
       f_preamount: model.f_preamount,
       f_pregas: model.f_pregas,
       f_totalcost: model.f_totalcost,
-      f_add_gas: model.f_add_gas,
+      f_add_gas: model.addtotal === '是' ? '计入' : '不计入',
       f_total_gas: model.addtotal === '是' ? (row.f_total_gas - 0) + (model.f_pregas - 0) : (row.f_total_gas - 0),
       f_total_fee: model.addtotal === '是' ? (row.f_total_fee - 0) + (model.f_preamount - 0) : (row.f_total_fee - 0),
       f_payment: model.f_payment.toString(),

package/src/filiale/ronghao/HandplanQuery.vue

@@ -642,17 +642,16 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
-            <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-            <!--              用气量合计:&emsp;{{sumsmodel.f_oughtamount}}-->
-            <!--            </td>-->
-            <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-            <!--              气费合计:&emsp;{{sumsmodel.f_oughtfee}}-->
-            <!--            </td>-->
-            <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-            <!--              已交金额合计:&emsp;{{sumsmodel.f_debt_money}}-->
-            <!--            </td>-->
-            <td
-              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              用气量合计:&emsp;{{sumsmodel.f_oughtamount}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              气费合计:&emsp;{{sumsmodel.f_oughtfee}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              已交金额合计:&emsp;{{sumsmodel.f_debt_money}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               欠费金额合计:&emsp;{{ sumsmodel.f_actual_arrears }}
             </td>
             <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
@@ -777,9 +776,9 @@ export default {
       footer: [],
       data: {},
       model: new PagedList('api/af-revenue/sql/salehandplanQuery', 20, {}, {
-        // f_oughtamount: 0,
-        // f_oughtfee: 0,
-        // f_debt_money: 0,
+        f_oughtamount: 0,
+        f_oughtfee: 0,
+        f_debt_money: 0,
         f_actual_arrears: 0
         // f_stair1amount: 0,
         // f_stair1fee: 0,

package/src/filiale/ronghao/uploadFilesHistory.vue

@@ -51,7 +51,7 @@
                   <div class="showtext">分类:&nbsp;<span>{{file.fusetype}}</span></div>
                   <div class="showtext">文件说明:&nbsp;{{file.fremarks}}</div>
                   <div class="flex-row showtext">
-                    <a   target="_blank" :href="file.f_downloadURL">预览</a>
+                    <button  class="btn btn-link" @click.stop="imgShow(file.f_downloadURL)">预览</button>
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     <a   v-show="isDelete == '1'" @click="delet($index,file)">删除</a>
                   </div>
@@ -64,6 +64,19 @@
       </div>
     </div>
   </div>
+  <modal :show.sync="imgshow" v-ref:modal backdrop="true" coverstyle="modalContentRight">
+    <header slot="modal-header" class="modal-header">
+      预览
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <img-self-sale-plus :src="imgfilename"  :list="imgfilename" :width="750" :height="750"></img-self-sale-plus>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
+    </footer>
+  </modal>
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
@@ -78,6 +91,8 @@ export default {
 
         upload_date: '',
         fusetype: [],
+        imgfilename: '',
+        imgshow: false,
         files: [],
         fusetypes: [],
         isDelete: '0', // 删除按钮，可以进行控制（权限等）
@@ -111,6 +126,14 @@ export default {
           this.selfSearch()
         })
       },
+      imgShow (val) {
+        // this.imgfilename = `api/af-revenue/file/image/` + val
+        this.imgfilename = val
+        this.imgshow = true
+      },
+      imgclose () {
+        this.imgshow = false
+      },
       getFiles () {
         this.files = []
         this.userinfo_id = this.row.f_userinfo_id
@@ -185,4 +208,7 @@ export default {
   .showtext{
     height:20px;
   }
+  .modalContentRight {
+    float:right;
+  }
 </style>

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Apr 14 10:14:01 CST 2025
-gradle.version=5.2.1