sale-client 3.5.7 → 3.5.10

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

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

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

@@ -0,0 +1 @@
+

package/build/dev-server.js

@@ -10,16 +10,10 @@ 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://121.36.106.17:8400/'
-// var bendi = 'http://192.168.50.4:8300/',bendi1 = 'http://121.36.106.17:8400/'
-// var bendi = 'http://192.168.50.4:8400/',bendi1 = 'http://121.36.106.17:8400/'
-// var bendi = 'http://139.214.92.34:8301/',bendi1 = 'http://121.36.106.17:8400/'
+var bendi = 'http://127.0.0.1:8072',bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-// var fuwu = 'http://192.168.89.62:8400'
+var fuwu = 'http://192.168.50.4:8400'
 // var fuwu = 'http://121.36.106.17:8400/'
-var fuwu = 'http://192.168.50.4:8400/'
-// var fuwu = 'http://192.168.50.4:8300/'
-// var fuwu = 'http://139.214.92.34:8301/'
 //铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
 //铜川测试

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.7",
+  "version": "3.5.10",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.27",
+    "address-client": "3.2.29",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
@@ -88,7 +88,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.0-2",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.52",
+    "vue-client": "1.24.55",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/common/userinfo_detail/ic_detail/ChargeRecordQuery.vue

@@ -28,7 +28,7 @@
             <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.f_curbalance}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
-            <td style="text-align:center;white-space:nowrap;">{{row.f_operate_date}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.operate_date}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
             <td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
           </tr>

package/src/components/revenue/base/rightview/CardList.vue

@@ -50,10 +50,10 @@
                   style="cursor: pointer;">
               <div class="col-sm-11">
 <!--                <div class="row"  v-if="row.f_state==='冲正' " style="color: red">-->
-                <!--                  <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
-                <!--                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>-->
-                <!--                  <span class="col-sm-4">{{row.type}}</span>-->
-                <!--                </div>-->
+<!--                  <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
+<!--                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>-->
+<!--                  <span class="col-sm-4">{{row.type}}</span>-->
+<!--                </div>-->
                 <div class="row">
                   <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>
                   <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
@@ -62,19 +62,21 @@
               </div>
               <div class="col-sm-1" v-if="$parent.$parent.$parent.isOperate" title="涉及权限:冲正权限">
                 <dropdown class="auto"
-                          v-if="(row.type ==='机表收费撤销' || row.type ==='卡表收费撤销' || row.type ==='物联网收费撤销' || row.type ==='其他收费撤销' || row.type ==='气损收费撤销' ||
-                           row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' ||
+                          v-if="(row.type ==='机表收费撤销' || row.type ==='卡表收费撤销' || row.type ==='物联网收费撤销' || row.type ==='其他收费撤销'
+                          || row.type ==='气损收费撤销' || row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' ||
+                          row.type === '用户退费' || row.type === '机表收费' || row.type === '数码表收费' ||
                           row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' ||
                           row.type === '换表' || row.state === 1 || row.type==='调价补费' || row.type==='卡表赠气' ||
                           row.type==='物联网赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='卡表赠气'||
                           row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||
                           row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ||
-                          row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气'  || row.type === '清零补气' || row.type === '换表补气'
-                          ) && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'||row.type === '过户'">
-                  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
+                          row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气'  || row.type === '清零补气' ||
+                          row.type === '换表补气') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
+                  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button"
+                          v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
                     <span class="glyphicon glyphicon-th-list"></span>
                   </button>
-                  <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ||row.type === '过户'">
+                  <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
 <!--                    <li-->
 <!--                      v-if="row.type === '换新表' || row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气'  || row.type === '清零补气' || row.type === '换表补气'-->
 <!--                      || row.type === '补卡' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' ||  row.type === '数码表收费' || row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' || row.type === '换表' || row.type === '过户'|| row.type==='预存缴费'|| row.type==='退费'|| row.type==='调价补费'  ||row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ">-->

package/src/filiale/shaoguan/FilesManageNew/UserGeneralInfoTest.vue

@@ -9,7 +9,7 @@
           <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
         </div>
         <file-user-essential-info-new :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
-                             @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info-new>
+                                      :f_filialeid="f_filialeid"   @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info-new>
       </div>
 
       <div style="height: auto;width: 100%">
@@ -85,6 +85,7 @@ export default {
   components: {UserPaperInfoTest},
   data () {
     return {
+      f_filialeid: '',
       config: {
         adddevices: false,
         f_building_suffix: '栋',
@@ -160,6 +161,7 @@ export default {
   ready () {
     this.blodid = '临时id' + Date.now()
     console.log('ready，，，', this.row)
+    debugger
     if (this.row) { // 修改用户
       this.areaGen(this.row)
     } else if (!this.row) { // 小区批量建档

package/src/filiale/shaoguan/UserEssentialInfoTest.vue

@@ -198,7 +198,7 @@
     </validator>
     <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
-        <file-address-manage-new :is-select="isSelect" :fileinfo="addressinfo"
+        <file-address-manage-new :is-select="isSelect" :fileinfo="addressinfo" :f_filialeid="f_filialeid"
                              @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage-new>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -224,11 +224,12 @@
 
     export default {
       title: '基本信息',
-      props: ['baseinfo', 'addressinfo', 'isedit'],
+      props: ['baseinfo', 'addressinfo', 'isedit', 'f_filialeid'],
       data () {
         return {
           showselectaddress: false,
           site: '',
+          f_filialeid: '',
           areas: [],
           streets: [],
           residentials: [],