sale-client 3.4.207 → 3.5.2

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/package.json

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

package/src/components/revenue/comprehen/Message/AllUser.vue

@@ -144,6 +144,45 @@
                       condition="f_balance <= {}"  style="width: 60%"
                       :size="model.f_balance_cur ? model.f_balance_cur.length  : 4">
             </div>
+            <div class="col-sm-3 form-group">
+              <label for="startDate1" class="font_normal_body">短信区间</label>
+              <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
+                          v-model="model.startDate1"
+                          :value.sync="model.startDate1"
+                          condValue="f_createdate >= '{}'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+              >
+              </datepicker>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label for="endDate1" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+              <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
+                          v-model="model.endDate1"
+                          :value.sync="model.endDate1"
+                          condValue="f_createdate <= '{}'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+              >
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="control-label">短信类型:</label>
+              <v-select id="f_send_type"
+                        v-model="model.f_send_type"
+                        placeholder='短信类型'
+                        :value.sync="model.f_send_type"
+                        :options='$parent.$parent.getsendType'
+                        width="300px"
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">短信条数</label>
+              <v-input :value.sync="$parent.f_sendsums" :expression.sync = 'model.f_sendsums'
+                       condition="f_sendsums {}" v-model="model.f_sendsums"  style="width: 60%"
+                       placeholder="短信条数" ></v-input>
+            </div>
           </div>
         </div>
       </criteria>
@@ -163,6 +202,7 @@
             <th>用户余额</th>
             <th>累购气量</th>
             <th>累购金额</th>
+            <th>短信条数</th>
           </tr>
         </template>
         <template partial='body'>
@@ -179,6 +219,7 @@
           <td style="text-align:center">{{row.f_balance}}</td>
           <td style="text-align:center">{{row.f_total_gas}}</td>
           <td style="text-align:center">{{row.f_total_fee}}</td>
+          <td style="text-align:center">{{row.f_sendsums}}</td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -275,6 +316,8 @@
     self.loadMeterBooks()
     self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    self.$refs.paged.$refs.cri.model.startDate1 = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate1 = self.$login.toStandardDateString() + ' 23:59:59'
   }
 
   export default {
@@ -297,6 +340,7 @@
         fontSizeNum: 0,
         userdefinedMessage: '',
         meterbrands: [{label: '全部', value: ''}],
+        getsendType: this.$appdata.getParam('短信类型'),
         msg: '',
         ids: [],
         pages: [],
@@ -494,7 +538,17 @@
         args.condition = `${args.condition} and f_user_state = '正常'`
         args.condition = `${args.condition} and f_orgid = '${Vue.$login.f.orgid}'`
         console.log('args.model', args.model)
-        this.model.search(args.condition, args.model)
+        let val = '1=1'
+        if (args.model.f_send_type  && args.model.f_send_type.toString() !== '') {
+          val += ` and f_send_type = '${args.model.f_send_type}'`
+        }
+        if (args.model.startDate1  && args.model.startDate1.toString() !== '') {
+          val += ` and f_createdate >= '${args.model.startDate1}'`
+        }
+        if (args.model.endDate1  && args.model.endDate1.toString() !== '') {
+          val += ` and f_createdate <= '${args.model.endDate1}'`
+        }
+        this.model.search(args.condition, args.model,val)
         if (this.isFirst) {
           this.isFirst = false
         } else {

package/src/components/revenue/comprehen/Message/ArrearsList.vue

@@ -112,6 +112,31 @@
                        condition="overdue {}" v-model="model.overdue"  style="width: 60%"
                        placeholder="违约金" v-next-el="cx" ></v-input>
             </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">短信区间</label>
+              <datepicker placeholder="开始日期"
+                          style="width:60%"
+                          class="datepicker"
+                          v-model="model.startDate1"
+                          :value.sync="model.startDate1"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">&emsp;&ensp;至&ensp;&emsp;</label>
+              <datepicker placeholder="结束日期"
+                          style="width:60%"
+                          v-model="model.endDate1"
+                          :value.sync="model.endDate1"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+              ></datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">短信条数</label>
+              <v-input :value.sync="$parent.f_sendsums" :expression.sync = 'model.f_sendsums'
+                       condition="f_sendsums {}" v-model="model.f_sendsums"  style="width: 60%"
+                       placeholder="短信条数" ></v-input>
+            </div>
           </div>
 
 
@@ -137,6 +162,7 @@
             <th>账户结余</th>
             <th>欠费金额</th>
             <th>违约金</th>
+            <th>短信条数</th>
           </tr>
         </template>
         <template partial='body'>
@@ -157,6 +183,7 @@
           <td style="text-align:center">{{row.f_balance.toFixed(2)}}</td>
           <td style="text-align:center">{{row.f_oughtfee_all.toFixed(2)}}</td>
           <td style="text-align:center">{{row.overdue.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.f_sendsums}}</td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -202,7 +229,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/arrearsQuery', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate',condValue:'` 1=1 `',orderitem: '"' + this.orderitem + '"'}),
+        model: new PagedList('rs/sql/arrearsQuery', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', startDate1: 'this.model.startDate1', endDate1: 'this.model.endDate1', condValue:'` 1=1 `',orderitem: '"' + this.orderitem + '"'}),
         definedShow: false,
         userdefinedMessage: '',
         arrdownDate: '',
@@ -249,6 +276,8 @@
       asyncArrearsList(this)
       this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.cri.model.startDate1 = this.$login.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.cri.model.endDate1 = this.$login.toStandardDateString() + ' 23:59:59'
       this.search({condition: `1=1 `, model: this.$refs.paged.$refs.cri.model})
     },
     watch: {

package/src/components/revenue/comprehen/Message/MessageList.vue

@@ -6,7 +6,8 @@
           <p class="bg-info text-center" style="padding: 8px;font-size: 20px">短信信息
           </p>
           <div class="row">
-            <div  :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.isdetail}">
+            <!--<div  :class="{'col-sm-3 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.isdetail}">-->
+            <div  class="col-sm-3 form-group">
               <label class="font_normal_body">组织机构</label>
               <res-select :initresid='$parent.$parent.curorgid'
                           @res-select="$parent.$parent.getorg"
@@ -15,30 +16,9 @@
                           style="width: 60%">
               </res-select>
             </div>
-           <div class="form-group col-sm-3">
-             <label class="font_normal_body">短信类型</label>
-             <v-select id="f_send_type"
-                       v-model="model.f_send_type"
-                       placeholder='短信类型'
-                       style="width: 60%"
-                       :value.sync="model.f_send_type"
-                       :options='$parent.$parent.getsendType'
-                       condition= "f_send_type = '{}'"
-                       close-on-select>
-             </v-select>
-           </div>
-           <div class="form-group col-sm-3">
-             <label class="font_normal_body">发送状态</label>
-             <v-select id="f_send"
-                       v-model="model.f_send"
-                       placeholder='发送状态'
-                       style="width: 60%"
-                       :value.sync="model.f_send"
-                       :options='$parent.$parent.sendType'
-                       condition= "f_send = '{}'"
-                       close-on-select>
-             </v-select>
-           </div>
+
+
+
 
 
            <div class="span" style="float:right;">
@@ -61,6 +41,30 @@
            </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">短信类型</label>
+              <v-select id="f_send_type"
+                        v-model="model.f_send_type"
+                        placeholder='短信类型'
+                        style="width: 60%"
+                        :value.sync="model.f_send_type"
+                        :options='$parent.$parent.getsendType'
+                        condition= "f_send_type = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">发送状态</label>
+              <v-select id="f_send"
+                        v-model="model.f_send"
+                        placeholder='发送状态'
+                        style="width: 60%"
+                        :value.sync="model.f_send"
+                        :options='$parent.$parent.sendType'
+                        condition= "f_send = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户编号</label>
               <input  type="text" class="form-control" v-model="model.code" placeholder='用户编号' v-filter v-figure_filter

package/src/filiale/macheng/HandManager.vue

@@ -225,6 +225,9 @@
               <th><nobr><data-order field="f_address" name="基本信息"
                                     :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order></nobr>
               </th>
+              <th>
+                <nobr>片区</nobr>
+              </th>
               <!--<th><nobr><data-order field="f_building" name="楼号"-->
                                     <!--:order.sync="$parent.$parent.$parent.orderFields.f_building"></data-order></nobr>-->
               <!--</th>-->
@@ -278,6 +281,7 @@
             <td>{{row.f_user_id}}</td>
             <td>{{row.f_meternumber}}</td>
             <td>{{row.f_user_name}}&nbsp;&nbsp;{{row.f_address}}</td>
+            <td>{{row.f_zones}}</td>
             <!--<td>{{row.f_building}}</td>-->
             <!--<td>{{row.f_unit}}</td>-->
             <!--<td>{{row.f_room}}</td>-->
@@ -692,6 +696,7 @@
           'f_user_name': '客户姓名',
           'f_residential_area': '小区名称',
           'f_address': '客户地址',
+          'f_zones' : '片区',
           'f_user_phone': '客户电话',
           'f_meternumber': '表号',
           'f_meter_base': '上期底数',
@@ -706,6 +711,7 @@
             'f_user_name': '客户姓名',
             'f_residential_area': '小区名称',
             'f_address': '客户地址',
+            'f_zones': '片区',
             'f_user_phone': '客户电话',
             'f_meternumber': '表号',
             'avggas': '平均用气量',

package/src/filiale/qianneng/MessageList.vue

@@ -6,7 +6,8 @@
           <p class="bg-info text-center" style="padding: 8px;font-size: 20px">短信信息
           </p>
           <div class="row">
-            <div  :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.isdetail}">
+            <!--<div  :class="{'col-sm-2 form-group':!$parent.$parent.$parent.isdetail,'col-sm-3 form-group':$parent.$parent.isdetail}">-->
+            <div  class="col-sm-3 form-group">
               <label class="font_normal_body">组织机构</label>
               <res-select :initresid='$parent.$parent.curorgid'
                           @res-select="$parent.$parent.getorg"
@@ -15,30 +16,8 @@
                           style="width: 60%">
               </res-select>
             </div>
-           <div class="form-group col-sm-3">
-             <label class="font_normal_body">短信类型</label>
-             <v-select id="f_send_type"
-                       v-model="model.f_send_type"
-                       placeholder='短信类型'
-                       style="width: 60%"
-                       :value.sync="model.f_send_type"
-                       :options='$parent.$parent.getsendType'
-                       condition= "f_send_type = '{}'"
-                       close-on-select>
-             </v-select>
-           </div>
-           <div class="form-group col-sm-3">
-             <label class="font_normal_body">发送状态</label>
-             <v-select id="f_send"
-                       v-model="model.f_send"
-                       placeholder='发送状态'
-                       style="width: 60%"
-                       :value.sync="model.f_send"
-                       :options='$parent.$parent.sendType'
-                       condition= "f_send = '{}'"
-                       close-on-select>
-             </v-select>
-           </div>
+
+
 
 
            <div class="span" style="float:right;">
@@ -61,6 +40,30 @@
            </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">短信类型</label>
+              <v-select id="f_send_type"
+                        v-model="model.f_send_type"
+                        placeholder='短信类型'
+                        style="width: 60%"
+                        :value.sync="model.f_send_type"
+                        :options='$parent.$parent.getsendType'
+                        condition= "f_send_type = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">发送状态</label>
+              <v-select id="f_send"
+                        v-model="model.f_send"
+                        placeholder='发送状态'
+                        style="width: 60%"
+                        :value.sync="model.f_send"
+                        :options='$parent.$parent.sendType'
+                        condition= "f_send = '{}'"
+                        close-on-select>
+              </v-select>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户编号</label>
               <input  type="text" class="form-control" v-model="model.code" placeholder='用户编号' v-filter v-figure_filter

package/src/main.js

@@ -1,18 +1,18 @@
-import Vue from 'vue'
-import App from './App'
-import sale from './sale'
-import { address } from 'address-client'
-import { ldap } from 'ldap-clients'
-import VueClipboard from 'vue-clipboard2'
-Vue.use(VueClipboard)
-Vue.config.silent = true
-// 新打包写法
-Vue.use(sale, {filiale: 'rizhao'})
-address()
-ldap()
-require('system-clients/src/styles/less/bootstrap.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import sale from './sale'
+import { address } from 'address-client'
+import { ldap } from 'ldap-clients'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
+Vue.config.silent = true
+// 新打包写法
+Vue.use(sale, {filiale: 'tongchuan'})
+address()
+ldap()
+require('system-clients/src/styles/less/bootstrap.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Apr 02 10:09:16 CST 2021
-gradle.version=3.5.1

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-