manage-client 3.2.209-1 → 3.2.210

package/build/dev-server.js

@@ -16,10 +16,10 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
-var bendi = 'http://203.57.101.233:8400/'
+// var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var system = 'http://192.168.50.4:8400'
+var bendi = 'http://192.168.50.4:8400'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -27,9 +27,9 @@ var proxyTable = {
   '/rs/logic/exportfile': {
     target: bendi
   },
-  // '/rs/sql/otherChargeQuery': {
-  //   target: 'http://localhost:8080/'
-  // },
+  '/rs/sql/inspectListNew': {
+    target: 'http://localhost:8080/'
+  },
   // '/rs/sql/BusinessType': {
   //   target: 'http://localhost:8080/'
   // },

package/package.json

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

package/src/filiale/WEINAN/CancellationQuery.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
+    <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
         <criteria-paged :model="model" v-ref:paged @sort="sort">
@@ -178,7 +178,7 @@
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
               <td style="text-align: center;" v-if="row.f_state === '销户'&& row.num== 1">
-                <nobr><a href="#" @click="$parent.$parent.$parent.enable(row)">启用</a></nobr>
+                <nobr><a href="#" @click="$parent.$parent.$parent.enable(row)">启用</a> | <a href="#" @click="$parent.$parent.$parent.modifyAddress(row)">修改地址</a></nobr>
               </td>
               <td style="text-align: center;" v-else>
               </td>
@@ -203,6 +203,13 @@
         <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
       </div>
     </div>
+    <div class="binary-right" v-show="useraddressShow">
+      <div class="flex">
+        <user-address v-ref:useraddressmsg
+                      :f_filialeids.sync="f_filialeids"></user-address>
+
+        <user-address-change v-if="addressId" :address_id="addressId"></user-address-change>
+      </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.f_userinfo_id" v-ref:upload isupload="false" takeimg="false"  fusetype="销户" :isremark="false" style="width:auto" ></upload>
@@ -269,6 +276,9 @@
         bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_sendsuccess"],
         orgCondtionStr: '',
         show:false,
+        f_filialeids: this.$login.f.orgid,
+        useraddressShow: false,
+        addressId: '',
         rowdata:{},
         enableData: {
           f_reason: ''
@@ -310,6 +320,27 @@
       })
     },
     methods: {
+      modifyAddress(obj) {
+        this.addressId=obj.addrid
+        this.useraddressShow=true
+        this.$refs.useraddressmsg.cleardara()
+        this.$refs.useraddressmsg.initdata()
+        this.$refs.useraddressmsg.usertype=obj.f_user_type
+        this.$refs.useraddressmsg.operation='modify'
+        this.$refs.useraddressmsg.onedata='one'
+        this.$refs.useraddressmsg.model=Object.assign({},this.$refs.useraddressmsg.model,obj)
+        if(obj.f_special=='1'){
+          this.$refs.useraddressmsg.usertype = true
+        }else{
+          this.$refs.useraddressmsg.usertype = false
+        }
+        if (obj.f_slice_area) {
+          this.$refs.useraddressmsg.model.slice_area = [{
+            name: this.$refs.useraddressmsg.model.f_slice_area,
+            code: this.$refs.useraddressmsg.model.f_area_code
+          }]
+        }
+      },
       enable(row) {
         Object.assign(this.enableData, row)
         this.enbaleShow = true
@@ -481,6 +512,17 @@
       getfield() {
         return exportConfig.CancellationConfig
       }
+    },
+    events: {
+      'cancel' () {
+        this.addressId=null
+        this.useraddressShow = false
+      },
+      'confirm' () {
+        this.addressId=null
+        this.useraddressShow = false
+        this.search()
+      },
     }
   }
 </script>