sale-client 3.4.75 → 3.4.79

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Jan 17 13:48:02 CST 2022
-gradle.version=6.1.1
+#Mon Jan 10 21:02:00 CST 2022
+gradle.version=5.5

package/build/dev-server.js

@@ -10,7 +10,7 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://aotesoft.f3322.net:8400/',bendi1 = 'http://119.146.1.106:8300/'
+var bendi = 'http://127.0.0.1:8080/',bendi1 = 'http://119.146.1.106:8300/'
 // 公司测试服务
 var fuwu = 'http://aotesoft.f3322.net:8400/'
 //铜川正式
@@ -95,7 +95,7 @@ var proxyTable = {
   },
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
-    target: 'http://aotesoft.f3322.net:8400/'
+    target: 'http://127.0.0.1:8082'
     // target:fuwu
   }
 }

package/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.75",
+  "version": "3.4.79",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -22,7 +22,6 @@
     "less-loader": "^2.2.3",
     "qrcodejs2": "0.0.2",
     "vue": "^1.0.17",
-    "vue-client": "1.24.39",
     "yarn": "^1.22.10"
   },
   "devDependencies": {
@@ -87,6 +86,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.1.89-14",
     "url-loader": "^0.5.7",
+    "vue-client": "1.24.39",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/chargeBatch/ChargeGroupList.vue

@@ -1,165 +1,164 @@
 <template>
-  <div class="flex" @keyup.enter="search" :style="{height:(oweShow?'auto':'100%')}">
-    <criteria-paged :model="model" v-ref:paged :pager="!oweShow">
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">组织机构</label>
-              <res-select restype='organization'
-                          @res-select="$parent.$parent.getorg"
-                          :is-mul="false"
-                          :initresid='$parent.$parent.curorgid'>
-              </res-select>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">客戶编码</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_customer"
-                     condition="f_customer like '%{}%'" placeholder="客戶编码"/>
-            </div>
-            <div :class="$parent.$parent.style" v-show="!$parent.$parent.listShow">
-              <label class="font_normal_body">客戶名称</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
-                     condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
-            </div>
-
-            <div class="col-sm-3 form-group button-range">
-              <button class="button_search button_spacing" @click="search()">查询</button>
-              <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add()" v-if="!$parent.$parent.chargeToChoose">建档
-              </button>
-              <button class="button_clear button_spacing" @click="clear">清空</button>
-              <div style="float: right" class="button_spacing"
-                   :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
-                   @click="criteriaShow = !criteriaShow"></div>
-            </div>
-            <div class="row" v-show="criteriaShow">
-              <div :class="$parent.$parent.style" v-show="$parent.$parent.listShow">
+  <div id="ChargeGroupList">
+    <div class="flex" @keyup.enter="search" :style="{height:(oweShow?'auto':'100%')}">
+      <criteria-paged :model="model" v-ref:paged :pager="!oweShow">
+        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">组织机构</label>
+                <res-select restype='organization'
+                            @res-select="$parent.$parent.getorg"
+                            :is-mul="false"
+                            :initresid='$parent.$parent.curorgid'>
+                </res-select>
+              </div>
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">客戶编码</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_customer"
+                       condition="f_customer like '%{}%'" placeholder="客戶编码"/>
+              </div>
+              <div :class="$parent.$parent.style" v-show="!$parent.$parent.listShow">
                 <label class="font_normal_body">客戶名称</label>
                 <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
                        condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
               </div>
-              <div :class="$parent.$parent.style">
-                <label class="font_normal_body">客戶地址</label>
-                <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
-                       condition="f_address like '%{}%'" placeholder="客戶地址"/>
-              </div>
-              <div :class="$parent.$parent.style">
-                <label class="font_normal_body">客户电话</label>
-                <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone"
-                       condition="f_user_phone like '%{}%'" placeholder="客户电话"/>
+
+              <div class="col-sm-3 form-group button-range">
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add()" v-if="!$parent.$parent.chargeToChoose">建档
+                </button>
+                <button class="button_clear button_spacing" @click="clear">清空</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
+                     @click="criteriaShow = !criteriaShow"></div>
               </div>
-              <div :class="$parent.$parent.style">
-                <label class="font_normal_body">是否欠费</label>
-                <v-select v-model="model.oughtfee"
-                          :search="fasle"
-                          placeholder='是否欠费'
-                          :value.sync="model.oughtfee"
-                          :options='$parent.$parent.oughtfee'
-                          condition="f_oughtfee_all {}"
-                          close-on-select style="width: 60%"></v-select>
+              <div class="row" v-show="criteriaShow">
+                <div :class="$parent.$parent.style" v-show="$parent.$parent.listShow">
+                  <label class="font_normal_body">客戶名称</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">客戶地址</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder="客戶地址"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">客户电话</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone"
+                         condition="f_user_phone like '%{}%'" placeholder="客户电话"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">是否欠费</label>
+                  <v-select v-model="model.oughtfee"
+                            :search="fasle"
+                            placeholder='是否欠费'
+                            :value.sync="model.oughtfee"
+                            :options='$parent.$parent.oughtfee'
+                            condition="f_oughtfee_all {}"
+                            close-on-select style="width: 60%"></v-select>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid v-if="!$parent.oweShow" @dblclick="$parent.showOwe">
-        <template partial='head'>
-          <tr>
-            <th>
-              <nobr>序号</nobr>
-            </th>
-            <th>
-              <nobr>客戶编码</nobr>
-            </th>
-            <th>
-              <nobr>客戶名称</nobr>
-            </th>
-            <th>
-              <nobr>账户结余</nobr>
-            </th>
-            <th>
-              <nobr>客戶类型</nobr>
-            </th>
-            <th>
-              <nobr>客戶地址</nobr>
-            </th>
-            <th>
-              <nobr>客戶电话</nobr>
-            </th>
-            <th>
-              <nobr>团缴户数</nobr>
-            </th>
-            <th>
-              <nobr>欠费金额</nobr>
-            </th>
-            <th>
-              <nobr>操作</nobr>
-            </th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td style="text-align:center">
-              <nobr>{{ $index + 1 }}</nobr>
-            </td>
-            <td style="text-align:center">
-              <nobr>{{ row.f_customer }}</nobr>
-            </td>
-            <td style="text-align:center">
-              <nobr>{{ row.f_user_name }}</nobr>
-            </td>
-            <td style="text-align:center">
-              <nobr>{{ row.f_balance }}</nobr>
-            </td>
-            <td style="text-align:center">
-              <nobr>{{ row.f_user_type }}</nobr>
-            </td>
-            <td style="text-align:center">
-              <nobr>{{ row.f_address }}</nobr>
-            </td>
-            <td style="text-align:center">
-              <nobr>{{ row.f_user_phone }}</nobr>
-            </td>
-            <td style="text-align:center" v-if="!$parent.$parent.$parent.chargeToChoose">
-              <button @click.stop="$parent.$parent.$parent.operate(row)"
-                      class="btn btn-link"><b>{{ row.sumuserfiles }}</b>
-              </button>
-            </td>
-            <td style="text-align:center" v-else>
-              <nobr>{{ row.sumuserfiles }}</nobr>
-            </td>
-            <td style="text-align:center" v-else>
-              <nobr>{{ row.f_oughtfee_all }}</nobr>
-            </td>
-            <td style="text-align:center">
-              <nobr>
-                <button type="button" name="button" class="btn btn-link"
-                        @click.stop="$parent.$parent.$parent.print(row)">打印明细
+        </criteria>
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid v-if="!$parent.oweShow" @dblclick="$parent.showOwe">
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>序号</nobr>
+              </th>
+              <th>
+                <nobr>客戶编码</nobr>
+              </th>
+              <th>
+                <nobr>客戶名称</nobr>
+              </th>
+              <th>
+                <nobr>账户结余</nobr>
+              </th>
+              <th>
+                <nobr>客戶类型</nobr>
+              </th>
+              <th>
+                <nobr>客戶地址</nobr>
+              </th>
+              <th>
+                <nobr>客戶电话</nobr>
+              </th>
+              <th>
+                <nobr>团缴户数</nobr>
+              </th>
+              <th>
+                <nobr>欠费金额</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center">
+                <nobr>{{ $index + 1 }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_customer }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_name }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_balance }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_type }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_address }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_phone }}</nobr>
+              </td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.chargeToChoose">
+                <button @click.stop="$parent.$parent.$parent.operate(row)"
+                        class="btn btn-link"><b>{{ row.sumuserfiles }}</b>
                 </button>
-                <button type="button" name="button" class="btn btn-link"
-                        @click.stop="$parent.$parent.$parent.export(row)">导出明细
-                </button>
-              </nobr>
-            </td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-
-  <export-excel
-    :isshow="false" :data="getCondition" :field="getfield" :choose-col="true" v-ref:excel
-    sqlurl="rs/logic/saleExport" sql-name="batchOweQuery" template-name='团体欠费明细导出'>
-  </export-excel>
+              </td>
+              <td style="text-align:center" v-else>
+                <nobr>{{ row.sumuserfiles }}</nobr>
+              </td>
+              <td style="text-align:center" v-else>
+                <nobr>{{ row.f_oughtfee_all }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.print(row)">打印明细
+                  </button>
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.export(row)">导出明细
+                  </button>
+                </nobr>
+              </td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+      <print-data :sum-field="getfield" :model="printModel" :field="getfield" :printview="true"
+                  :defaultfield="defaultfield" titletable="团体欠费明细报表" v-ref:printdata>
+      </print-data>
+    </div>
 
-  <print-data :sum-field="getfield" :model="$parent.model" :field="getfield"
-              :sumone = "false" :defaultfield="$parent.$parent.defaultfield"
-              titletable="缴费记录报表" :starthead="$parent.$parent.getstart"
-              :sumsmodel="$parent.$parent.sumsmodel">
-  </print-data>
+    <export-excel
+      :isshow="false" :data="getCondition" :field="getfield" :choose-col="true" v-ref:excel
+      sqlurl="rs/logic/saleExport" sql-name="batchOweQuery" template-name='团体欠费明细导出'>
+    </export-excel>
 
-  <owe-record-query v-if="oweShow" :f_civill_id="f_civill_id"></owe-record-query>
+    <owe-record-query v-if="oweShow" :f_civill_id="f_civill_id"></owe-record-query>
+  </div>
 </template>
 
 <script>
@@ -194,7 +193,9 @@ export default {
           'overdue': '滞纳金',
           'f_oughtfee_all': '合计欠费'
         }
-      }
+      },
+      defaultfield: [],
+      printModel: new PagedList('rs/sql/batchOweQuery', 20)
     }
   },
   title: '档案查询',
@@ -222,6 +223,12 @@ export default {
     this.search()
   },
   methods: {
+    // 打印
+    async print (row) {
+      let condition = `p.f_civill_id = ${row.id}`
+      await this.printModel.search(condition)
+      this.$refs.printdata.printData()
+    },
     // 导出
     export (row) {
       this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
@@ -265,3 +272,10 @@ export default {
 
 }
 </script>
+<style lang="less">
+  #ChargeGroupList {
+    .button_export {
+      display: none;
+    }
+  }
+</style>

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -2,9 +2,9 @@
   <div class="binary flex" >
     <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
       <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel"></user-base-info-new></div>
-      <saletabbut  v-if="row" v-ref:list :active="-1" style="height:72%;margin-top: 1%">
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%">
         <saletab header="流水查询" v-if="permission('流水查询')">
-          <record-query-user :row="row" v-if="show == '流水查询'" @deal-msg="dealMsg"></record-query-user>
+          <record-query-user :row="row"></record-query-user>
         </saletab>
         <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
           <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>

package/src/components/revenue/HandManager/MeterBookUser.vue

@@ -290,6 +290,7 @@
             'f_meternumber': '表号',
             'f_address': '客户地址',
             'f_inputtor': '抄表员',
+            'f_meter_book_sort': '册内排序',
             'f_metertitles': '表箱号',
             'f_meter_base': '表底数',
             'f_user_type': '用户类型',

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue

@@ -33,9 +33,9 @@
               <label id="label" class="font_normal_body">*证件号码</label>
               <input type="text"  v-model="model.f_newidnumber" v-validate:f_newidnumber='{identityCardValid: true}' class="input_search" style="width:80%" placeholder="新身份证号">
             </div>
-            <div class="col-sm-8" v-if="model.f_newcredentials[0] !== '身份证'"> <!---->
+            <div class="col-sm-8" v-if="model.f_newcredentials[0] !== '身份证'">
               <label class="font_normal_body">&nbsp;证件号码</label>
-              <input type="text"  v-model="model.f_newidnumber" class="input_search" style="width:80%" placeholder="新身份证号" >
+              <input type="text"  v-model="model.f_newidnumber" class="input_search" style="width:80%" placeholder="新证件号" >
             </div>
             <div class="col-sm-4">
               <label id="label" for="f_print" class="font_normal_body">&nbsp;打印格式</label>
@@ -46,6 +46,11 @@
                         :options='printstyle'
                         close-on-select clear-button></v-select>
             </div>
+            <div class="col-sm-8">
+              <label for="f_contract" class="font_normal_body">*合同编号</label>
+              <input type="text" v-model="model.f_contract_id" class="input_search" style="width:80%"
+                     placeholder="合同编号">
+            </div>
           </div>
           <div class="row" style="margin-top:10px;">
             <div  class="col-sm-4" :class="[$v.f_transfer_fees.dctest ? 'has-error' : 'has-success']">
@@ -267,6 +272,7 @@
           f_idnumber: this.model.f_newidnumber ? this.model.f_newidnumber : '',
           f_user_phone: this.model.f_newuser_phone ? this.model.f_newuser_phone : '',
           f_rent_phone: this.model.f_newrent_phone ? this.model.f_newrent_phone : '',
+          f_contract_id: this.model.f_contract_id ? this.model.f_contract_id : '',
           f_cost_type: this.model.f_paymenttype[0],
           version: this.row.userinfo_version,
           infobank: {