sale-client 4.2.99 → 4.2.101

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Oct 30 09:31:24 CST 2025
+gradle.version=5.2.1

package/.npmignore

@@ -0,0 +1,12 @@
+src/bootstrap
+.idea/
+.DS_Store
+node_modules/
+dist/
+examples/
+gradle/
+npm-debug.log
+selenium-debug.log
+test/unit/coverage
+test/e2e/reports
+lib/**/lib

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -50,12 +50,12 @@ var devConfig = {
       '/rs/pay': {
         target: 'http://localhost:8080'
       },
-      // '/api/af-revenue': {
-      //   pathRewrite: {
-      //     '/api/af-revenue': '/af-revenue'
-      //   },
-      //   target: "http://localhost:8080"
-      // },
+      '/api/af-revenue': {
+        pathRewrite: {
+          '/api/af-revenue': '/af-revenue'
+        },
+        target: "http://localhost:8080"
+      },
       '/api': {
         target: serverRul
       },

package/package.json

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

package/src/.npmignore

@@ -0,0 +1 @@
+

package/src/filiale/meihekou/ArrearsList.vue

@@ -40,7 +40,9 @@
 
             <div class="span" style="float:right;">
               <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
-              <button class="button_clear button_spacing width-60" @click="$parent.$parent.arrcreate()">生成短信</button>
+              <button class="button_clear button_spacing width-60" @click="$parent.$parent.getsendmodel()">选择模板</button>
+              <button class="button_clear button_spacing width-60" @click="$parent.$parent.defined()">新增模板</button>
+              <button class="button_clear button_spacing width-60" @click="$parent.$parent.arrcreate()" v-if="$parent.$parent.msg">生成短信</button>
               <button v-show="$parent.$parent.rollback" class="button_clear button_spacing width-60" @click="$parent.$parent.retrun()"  v-el:cba>返回</button>
 
               <div
@@ -155,7 +157,7 @@
         </template>
       </data-grid>
     </criteria-paged>
-    <modal :show.sync="arrshow" v-ref:modal backdrop="false">
+    <modal :show.sync="arrshow" v-ref:modal backdrop="false" style="z-index: 1051;">
       <header slot="modal-header" class="modal-header">
         <h4 class="modal-title">短信发送</h4>
       </header>
@@ -180,6 +182,66 @@
         <button v-show="arrshow" type="button" class="btn btn-success" @click='create()'>确认</button>
       </footer>
     </modal>
+  <modal :show.sync="infoshow" width="1100px" title="短信模板选择" style="z-index: 1050;" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body">
+      <criteria-paged :model="model2" v-ref:paged2>
+        <data-grid :model="$parent.$parent.model2" v-ref:grid2  partial='list'>
+          <template partial='head'>
+            <tr>
+              <!--<th style="padding: 0;border: 0">
+                <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
+                       @change="$parent.$parent.$parent.select()" style="width: 22px;height: 22px"/>
+              </th>-->
+              <th><nobr>选择</nobr></th>
+              <th><nobr>短信类型</nobr></th>
+              <th><nobr>模板内容</nobr></th>
+              <th><nobr>模板状态</nobr></th>
+              <th><nobr><b>创建人</b></nobr></th>
+              <th><nobr>操作</nobr></th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center;"><input type="checkbox" v-model="$parent.$parent.$parent.$parent.sendmodelids" :value="row"></td>
+            <td style="text-align: center;">{{row.f_send_type}}</td>
+            <td style="text-align: center;" title="{{row.f_user_defined}}" >{{row.f_user_defined}}</td>
+            <td style="text-align: center;">{{row.f_state }}</td>
+            <td style="text-align: center;"><b>{{row.f_operator}}</b></td>
+            <td style="text-align: center;"><nobr>
+              <a @click='$parent.$parent.$parent.$parent.edit(row)'>编辑</a>&nbsp;&nbsp;&nbsp;&nbsp;<a @click='$parent.$parent.$parent.$parent.senddelete(row)'>删除</a>
+            </nobr></td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success width-60" @click='create1'>确定</button>
+      <button type="button" class="btn btn-default width-60" @click='infoclose'>关闭</button>
+    </footer>
+  </modal>
+  <modal :show.sync="allshow2" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">修正短信内容</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group row" style="height:auto">
+        <label class="label-control">原短信内容：</label>{{msg_old}}
+      </div>
+      <div class="form-group">
+        <label class="label-control">修正为：</label>
+        <div class="row auto">
+          <textarea class="form-control col-sm-4" v-model="msg_new" rows="8" placeholder=""></textarea>
+        </div>
+      </div>
+      <div class="form-group" style="text-align: center;">
+        <h4><b>字数:<span style="color: #5cb85c">{{fontSizeNum}}</span></b></h4>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="allshow2" type="button" class="btn btn-default width-60" @click='closeEdit'>取消</button>
+      <button v-show="allshow2" type="button" class="btn btn-success width-60" @click='createEdit'>修正</button>
+    </footer>
+  </modal>
+  <user-defined-message :show="definedShow" v-ref:printbill v-on:toggle="closeAdd"></user-defined-message>
 </template>
 
 <script>
@@ -196,6 +258,9 @@
         userdefinedMessage: '',
         arrdownDate: '',
         arrshow: false,
+        allshow2: false,
+        msg_old: '',
+        msg_new: '',
         // 小区
         residentialArea: [],
         chonetype: this.$appdata.getParam('付款类型'),
@@ -218,8 +283,10 @@
         filiale: '',
         filialetype: '',
         isFirst: true,
-        msg: `'[梅河燃气]用户编号:'+f_userinfo_code+'截止目前为止，表数'+f_tablebase+'欠费'+f_oughtfee
-               +'元,为了不影响您正常用气，请及时缴费，详询：4660001 。'`
+        model2: new PagedList('api/af-revenue/sql/getSendModel', 30, {orderitem: " \'id desc\'"}),
+        infoshow: false,
+        sendmodelids: [],
+        msg: `用户编号:'+f_userinfo_code+',截止目前，您的燃气账户已欠费'+f_oughtfee_all+'元,为了不影响您正常用气，请及时缴费，详询：4660001 。`
       //   msg: `'尊敬的客户:您'+f_hand_date+'-'
       // +f_hand_date +'月份燃气费为'
       // +f_oughtfee
@@ -268,6 +335,24 @@
         this.residentialArea = house
       },
 
+      closeEdit () {
+        this.allshow2 = false
+      },
+      createEdit () {
+        this.allshow2 = false
+        let setpos = {
+          id: this.rowEdit.id,
+          f_user_defined: this.msg_new.replace(/'/g,`''`)
+        }
+        this.$resetpost('api/af-revenue/entity/save/t_send_model', setpos, {resolveMsg: '模板修正成功', rejectMsg: '模板修正失败'})
+        this.rowEdit = ''
+        this.msg_new = ''
+        this.msg_old = ''
+        this.sendmodelids = []
+        let condition = "f_state=\'有效\' and f_orgid = \'" + Vue.$login.f.orgid + "\' and f_send_type = \'欠费\'"
+        this.model2.search(condition)
+      },
+
       retrun () {
         this.alllist = false
         this.$dispatch('allchange6')
@@ -285,7 +370,12 @@
           this.$showAlert('发送截至时间不能为空！', 'danger', 3000)
         } else {
           console.log('this.model.condition=====>', this.model.condition)
-          this.$dispatch('create', this.model.condition, this.userdefinedMessage, this.arrdownDate,null,this.$refs.paged.$refs.cri.model.startDate,this.$refs.paged.$refs.cri.model.endDate)
+          if (!this.userdefinedMessage) {
+            this.userdefinedMessage = this.msg
+          }
+          this.$dispatch('create', this.model.condition, '', this.arrdownDate,'欠费通知',this.$refs.paged.$refs.cri.model.startDate,this.$refs.paged.$refs.cri.model.endDate,this.userdefinedMessage)
+          this.arrdownDate = ''
+          this.userdefinedMessage = ''
         }
       },
       search (args) {
@@ -304,6 +394,49 @@
           this.alllist = true
         }
       },
+      edit (row) {
+        this.allshow2 = true
+        this.rowEdit = row
+        this.msg_old = row.f_user_defined
+        this.msg_new = row.f_user_defined
+      },
+      senddelete (row) {
+        let setpos = {
+          id: row.id,
+          f_state: '无效'
+        }
+        this.$resetpost('api/af-revenue/entity/save/t_send_model', setpos, {resolveMsg: '模板删除成功', rejectMsg: '模板删除失败'})
+        let condition = "f_state=\'有效\' and f_orgid = \'" + Vue.$login.f.orgid + "\' and f_send_type = \'欠费\'"
+        this.model2.search(condition)
+      },
+      getsendmodel () {
+        let condition = `f_state='有效' and f_send_type = '欠费'`
+        let res = this.model2.search(condition)
+        console.log('---------------------' + res)
+        console.log('this.model2:', this.model2)
+        this.infoshow = true
+      },
+
+      infoclose () {
+        this .userdefinedMessage = false
+        this.infoshow = false
+        this.sendmodelids = []
+      },
+      create1 () {
+        console.log('kaishi ===', this.sendmodelids)
+        if (this.arrdownDate === '' || this.arrdownDate === null) {
+          if (this.sendmodelids.length !== 1) {
+            this.$showAlert('短信模板未选择或选择多个！', 'danger', 3000)
+          } else {
+            console.log('kaishi ===', this.sendmodelids[0])
+            this.userdefinedMessage = this.sendmodelids[0].f_user_defined
+            this.sendmodelids = []
+            this.msg = this.userdefinedMessage
+            this.infoshow = false
+            this.arrshow = true
+          }
+        }
+      },
 
       arrcreate () {
         this.arrshow = true
@@ -311,7 +444,11 @@
       defined () {
         this.definedShow = true
       },
+      closeAdd () {
+        this.definedShow = false
+      },
       close () {
+        this.userdefinedMessage = ''
         this.arrshow = false
         this.definedShow = false
       },
@@ -344,6 +481,11 @@
         }
       }
     },
+    events: {
+      'definedMessage' (val) {
+        this.definedShow = false
+      }
+    },
     computed: {
 
     }

package/src/filiale/meihekou/HandManager.vue

@@ -42,7 +42,7 @@
               </div>
 
               <div class="span" style="float:right;">
-                <button class="button_search button_spacing" style="width:90px"  @click="$parent.$parent.danhuShow()">4单户抄表</button>
+                <button class="button_search button_spacing" style="width:90px"  @click="$parent.$parent.danhuShow()">单户抄表</button>
 
                 <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>

package/src/filiale/meihekou/MessageList.vue

@@ -303,8 +303,8 @@ export default {
       sendType: [{label: '全部', value: ''}, ...this.$appdata.getParam('发送状态') ? this.$appdata.getParam('发送状态') : {}],
       getsendType: this.$appdata.getParam('短信类型'),
       replyType: this.$appdata.getParam('评价级别'),
-      bodydata: ['f_user_name', 'code', 'f_phone', 'f_send_type', 'f_content', 'f_send', 'f_sendtime', 'f_statedetail', 'f_reply_type', 'f_reply_content', 'f_reply_content'],
-      header: ['用户姓名', '用户编号', '电话号码', '短信类型', '短信内容', '发送状态', '发送时间', '状态报告', '评价级别', '回执状态', '评价内容'],
+      bodydata: ['f_user_name', 'code', 'f_phone', 'f_send_type', 'f_content', 'f_send', 'f_senddate', 'f_operator'],
+      header: ['用户姓名', '用户编号', '电话号码', '短信类型', '短信内容', '发送状态', '发送时间', '操作人'],
       showFile: false,
       leftmsg:0
     }