sale-client 3.4.78 → 3.4.82

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/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Apr 02 10:09:16 CST 2021
-gradle.version=3.5.1
+#Fri Jan 21 16:32:44 CST 2022
+gradle.version=5.2.1

package/build/dev-server.js

@@ -10,15 +10,15 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://127.0.0.1:8080/', bendi1 = 'http://119.146.1.106:8300/'
+var bendi = 'http://127.0.0.1:6666/sale',bendi1 = ''
 // 公司测试服务
-var fuwu = 'http://121.36.106.17:8400'
+var fuwu = 'http://192.168.50.4:8400/'
 //铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
-// 铜川测试
+//铜川测试
 // var fuwu = 'http://61.134.55.234:9999/'
 // var fuwu = 'http://60.222.250.39:8300/'
-// 韶关
+//韶关
 // var fuwu = 'http://119.146.1.106:8300/'
 // 巩义测试服务
 // var fuwu = 'http://192.168.0.227:8400'
@@ -29,12 +29,12 @@ var fuwu = 'http://121.36.106.17:8400'
 // var fuwu = 'http://139.214.92.34:8301/'
 
 var proxyTable = {
-  // '/rs/logic/saleExport': {
-  //   target: fuwu
-  // },
-  // '/rs/logic/saleGetExportProgress': {
-  //   target: fuwu
-  // },
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
   '/files': {
     target: fuwu
   },
@@ -53,7 +53,7 @@ var proxyTable = {
   '/rs/logic/getSaleInitData': {
     target: fuwu
   },
-  '/invoice': {
+  '/invoice':{
     target: fuwu
   },
   // 用户登录服务地址
@@ -87,6 +87,9 @@ var proxyTable = {
   '/rs/sql/manage_getstreetlist': {
     target: fuwu
   },
+  '/rs/sql/arrearsQuery':{
+    target: 'http://127.0.0.1:8079'
+  },
   '/rs/report': {
     target: 'http://127.0.0.1:8079'
   },

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -548,7 +548,7 @@ export default {
           f_aroundmeter: '',
           f_garbage_fee: '否',
           f_meter_base: '',
-          f_initial_base: '',
+          f_initial_base: 0,
                 // 通气人
           f_gas_person: '',
           f_adjustable: '', // 调压箱

package/src/components/archives/ArchivesList.vue

@@ -1,205 +1,205 @@
-<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">
-                <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>
-          </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>-->
-          </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">-->
-<!--              <nobr>-->
-<!--                <button type="button" name="button" class="btn btn-link"-->
-<!--                        @click.stop="$parent.$parent.$parent.modify(row)">修改-->
-<!--                </button>-->
-<!--              </nobr>-->
-<!--            </td>-->
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-
-  <owe-record-query v-if="oweShow" :f_civill_id="f_civill_id"></owe-record-query>
-</template>
-
-<script>
-import {PagedList} from 'vue-client'
-
-export default {
-  data () {
-    return {
-      model: new PagedList('rs/sql/ncarchivesQuery', 20),
-      // 公司下拉
-      curorgid: [this.$login.f.orgid],
-      f_orgid: '',
-      f_civill_id: null,
-      oweShow: false
-    }
-  },
-  title: '档案查询',
-  props: {
-    f_filialeids: {
-      type: String
-    },
-    style: {
-      type: String,
-      default: 'col-sm-2 form-group'
-    },
-    // 控制在修改数据时显示少的查询条件,剩余隐藏
-    listShow: {
-      type: Boolean,
-      default: false
-    },
-    // 收费时的展示控制
-    chargeToChoose: {
-      type: Boolean,
-      default: false
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    showOwe (row) {
-      if (this.chargeToChoose) {
-        this.f_civill_id = row.id
-        this.oweShow = true
-      }
-    },
-    search () {
-      this.$refs.paged.$refs.cri.search()
-    },
-    add () {
-      if (this.f_filialeids) {
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('add')
-      } else {
-        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-      }
-    },
-    operate (val) {
-      this.$dispatch('operate', val)
-    },
-    selfSearch (args) {
-      if (!this.f_orgid) {
-        this.getorg([this.$login.f.orgid])
-      }
-      args.condition = `${args.condition} and f_orgid in ${this.f_orgid}`
-      this.oweShow = false
-      this.model.search(args.condition, args.model)
-      this.$refs.paged.$refs.grid.selectInit()
-      this.$dispatch('newsearch')
-    },
-    getorg (val) {
-      this.f_orgid = this.$login.convertToIn(val)
-      this.f_filialeids = val[0]
-    }
-  }
-
-}
-</script>
+<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">
+                <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>
+          </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>-->
+          </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">-->
+<!--              <nobr>-->
+<!--                <button type="button" name="button" class="btn btn-link"-->
+<!--                        @click.stop="$parent.$parent.$parent.modify(row)">修改-->
+<!--                </button>-->
+<!--              </nobr>-->
+<!--            </td>-->
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+
+  <owe-record-query v-if="oweShow" :f_civill_id="f_civill_id"></owe-record-query>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      model: new PagedList('rs/sql/ncarchivesQuery', 20),
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
+      f_civill_id: null,
+      oweShow: false
+    }
+  },
+  title: '档案查询',
+  props: {
+    f_filialeids: {
+      type: String
+    },
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    // 控制在修改数据时显示少的查询条件,剩余隐藏
+    listShow: {
+      type: Boolean,
+      default: false
+    },
+    // 收费时的展示控制
+    chargeToChoose: {
+      type: Boolean,
+      default: false
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    showOwe (row) {
+      if (this.chargeToChoose) {
+        this.f_civill_id = row.id
+        this.oweShow = true
+      }
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    add () {
+      if (this.f_filialeids) {
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add')
+      } else {
+        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+      }
+    },
+    operate (val) {
+      this.$dispatch('operate', val)
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      args.condition = `${args.condition} and f_orgid in ${this.f_orgid}`
+      this.oweShow = false
+      this.model.search(args.condition, args.model)
+      this.$refs.paged.$refs.grid.selectInit()
+      this.$dispatch('newsearch')
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+    }
+  }
+
+}
+</script>