manage-client 3.2.118 → 3.2.119

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

@@ -0,0 +1 @@
+

package/build/dev-server.js

@@ -13,9 +13,9 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8090'
+var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu = 'http://121.36.106.17:8400'
+var fuwu = 'http://61.150.94.253:8400'
 // var fuwu = 'http://203.57.101.233:9001'
 var system = 'http://192.168.50.4:8400'
 //192.168.
@@ -81,7 +81,7 @@ var proxyTable = {
     target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: bendi
+    target: fuwu
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.118",
+  "version": "3.2.119",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/BusinessManage.vue

@@ -16,6 +16,9 @@
     <tabs header="过户查询" v-if="permission('过户查询')">
       <transfer-query v-if="show.includes('过户查询')" @deal-msg="dealMsg" :data="data"></transfer-query>
     </tabs>
+    <tabs header="记录转移查询" v-if="permission('记录转移')">
+      <transfer-record-query @deal-msg="dealMsg" :data="data"></transfer-record-query>
+    </tabs>
     <tabs header="其他收费查询" v-if="permission('其他收费查询')">
       <other-charge-query v-if="show.includes('其他收费查询')" @deal-msg="dealMsg" :data="data"></other-charge-query>
     </tabs>

package/src/components/sale/businessquery/ChangeMeterQuery.vue

@@ -396,7 +396,7 @@
     </div>
     <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
       <article slot="modal-body">
-        <upload  :blodid="selected.id" v-ref:upload isremark="false" fusetype="换表&清零"></upload>
+        <upload  :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="换表&清零" ></upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

package/src/components/sale/businessquery/TransferRecordQuery.vue

@@ -0,0 +1,179 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex"  v-if="!show" >
+
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <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="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="ttr.f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="ttr.f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">转出方编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.out_userinfo_code"
+                         condition="out_userinfo_code = '{}'" placeholder="转出方编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="转入方编号">转入方编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.in_userinfo_code"
+                         condition="in_userinfo_code = '{}' " placeholder="转入方编号">
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile" sql-name="transferRecordQuery" template-name='转移记录查询导出'
+                                :choose-col="true"></export-excel>
+<!--                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"-->
+<!--                               :defaultfield="$parent.$parent.defaultfield"-->
+<!--                              titletable="过户记录"-->
+<!--                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>-->
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department','operator']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">转出方姓名</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.out_user_name"
+                         placeholder="转出方姓名"
+                         condition="out_user_name like '%{}%'">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">转入方姓名</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.in_user_name"
+                         condition="in_user_name like '%{}%' " placeholder="转入方姓名">
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
+            <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>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">  <nobr>{{row.in_user_name}}</nobr>  </td>
+              <td style="text-align: center;">  <nobr>{{row.in_userinfo_code}}</nobr>  </td>
+              <td style="text-align: center;">  <nobr>{{row.out_user_name}}</nobr>  </td>
+              <td style="text-align: center;">  <nobr>{{row.out_userinfo_code}}</nobr>  </td>
+              <td style="text-align: center;">  <nobr>{{row.f_operate_date}}</nobr>  </td>
+              <td style="text-align: center;">  <nobr>{{row.f_comments}}</nobr>  </td>
+              <td style="text-align: center;">  <nobr>{{row.f_operator}}</nobr>  </td>
+              <td style="text-align: center;">  <nobr>{{row.f_depname}}</nobr>  </td>
+              <td style="text-align: center;">  <nobr>{{row.f_orgname}}</nobr>  </td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import exportConfig from '../config/exportConfig'
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+  }
+  export default {
+    props:['data'],
+    title: '记录转移查询',
+    data() {
+      return {
+        data: {},
+        other:[],
+        footer:[],
+        show:false,
+        rowdata:{},
+        model: new PagedList('rs/sql/transferRecordQuery', 20, ),
+        criteriaShow: false,
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        orgCondtionStr: '',
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        showupload:false,
+        selected:{},
+        sumsmodel: {}
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        if (this.data) {
+          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+        }
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        await this.model.search(args.condition, args.model)
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      }
+    },
+    watch: { },
+    computed: {
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
+        }
+      },
+      getfield() {
+        return exportConfig.transferRecordConfig
+      }
+    }
+  }
+</script>

package/src/components/sale/config/exportConfig.js

@@ -393,6 +393,10 @@ export default{
     'f_user_name': '新客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
   },
+  transferRecordConfig: {
+    'in_userinfo_code': '转入方编号', 'in_user_name': '转入方名称', 'out_userinfo_code': '转出方编号', 'out_user_name': '转出方名称',
+    'f_operate_date': '转移日期',  'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
+  },
   transferPrintConfig: {
     'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_address': '客户地址',
     'f_user_name': '新客户名称', 'f_newuser_phone': '新客户电话', 'f_user_phone': '原客户电话', 'f_transfer_fees': '过户费', 'f_operate_date': '过户日期'

package/src/saleManage.js

@@ -168,6 +168,10 @@ export default function (filiale) {
   Vue.component('transfer-query', (resolve) => {
     require(['./components/sale/businessquery/TransferQuery'], resolve)
   })
+  // 记录转移查询
+  Vue.component('transfer-record-query', (resolve) => {
+    require(['./components/sale/businessquery/TransferRecordQuery'], resolve)
+  })
   // 小区汇总（机表）
   Vue.component('residential-query', (resolve) => {
     require(['./components/sale/businessquery/ResidentialQuery'], resolve)

package/build/tmp/jar/MANIFEST.MF

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