address-client 3.0.39-aodeToV4 → 3.0.41-aodeToV4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.0.39-aodeToV4",
+  "version": "3.0.41-aodeToV4",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/AddressList.vue

@@ -195,6 +195,9 @@
       f_filialeids:{
         type: String
       },
+      f_orgname:{
+        type: String
+      },
       style: {
         type: String,
         default: 'col-sm-2 '
@@ -276,11 +279,15 @@
   clear(){
     this.$refs.paged.$refs.cri.model = {}
   },
-  getorg (val) {
-    this.f_orgid = this.$login.convertToIn(val)
-    if (!this.f_orgid) {
-      this.f_orgid = this.f_filialeids
+  getorg (val, orgnames) {
+    if(orgnames.length>0){
+      this.f_orgname = orgnames[0].split(' - ')[0]
     }
+    // this.f_orgid = this.$login.convertToIn(val)
+    // if (!this.f_orgid) {
+    //   this.f_orgid = this.f_filialeids
+    // }
+    this.f_orgid = val[0]
     this.f_filialeids = val[0]
   }
   },

package/src/components/AddressManage.vue

@@ -1,12 +1,12 @@
 <template>
   <div id="unit" class="flex-row">
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}">
-      <address-list @select-changed="selected" v-ref:addresslist :style="style"  :f_filialeids.sync="f_filialeids"></address-list>
+      <address-list @select-changed="selected" v-ref:addresslist :style="style"  :f_filialeids.sync="f_filialeids" :f_orgname.sync="f_orgname"></address-list>
     </div>
     <div v-show="useraddressShow"  class="binary-right">
       <div class="flex">
         <user-address v-ref:useraddressmsg
-                      :f_filialeids.sync="f_filialeids" :row="row"></user-address>
+                      :f_filialeids.sync="f_filialeids" :row="row" :f_orgname.sync="f_orgname"></user-address>
 
         <user-address-change v-if="addressId" :address_id="addressId"></user-address-change>
       </div>
@@ -23,6 +23,7 @@
       return {
         //分公司id串
         f_filialeids: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgname,
         area: [],
         street: [],
         residential: [],

package/src/components/UserAddress.vue

@@ -363,7 +363,7 @@
         sliceArea: []
       }
     },
-    props: ['f_filialeids', 'row','operation','usertype'],
+    props: ['f_filialeids','f_orgname', 'row','operation','usertype'],
     ready(){
       this.initdata()
       getAreaConfig(this)
@@ -605,13 +605,13 @@
                 data.f_room = data.f_room_prefix + m + '' + n
               }
               data.f_filialeid = this.f_filialeids
-              data.f_operator = this.$login.f.name
-              data.f_operatorid = this.$login.f.id
+              // data.f_operator = this.$login.f.name
+              // data.f_operatorid = this.$login.f.id
               data.sid = this.model.sid
-              data.f_orgid = this.$login.f.orgid
-              data.f_orgname = this.$login.f.orgs
-              data.f_depid = this.$login.f.depids
-              data.f_depname = this.$login.f.deps
+              data.f_orgid = this.f_filialeids
+              data.f_orgname = this.f_orgname
+              // data.f_depid = this.$login.f.depids
+              // data.f_depname = this.$login.f.deps
               data.f_pcd=this.findbyid(this.pcdslist,this.model.f_pcd_id).f_pcd
               data.f_street=this.findbyid(this.streetslist,this.model.f_street_id).f_street
               data.f_residential_area=this.findbyid(this.areaslist,this.model.f_residential_area_id).f_residential_area
@@ -668,12 +668,12 @@
   async saveonedata(){
     this.model.f_create_person= this.$login.f.name
     this.model.f_filialeid = this.f_filialeids
-    this.model.f_operator = this.$login.f.name
-    this.model.f_operatorid = this.$login.f.id
-    this.model.f_orgid = this.$login.f.orgid
-    this.model.f_orgname = this.$login.f.orgs
-    this.model.f_depid = this.$login.f.depids
-    this.model.f_depname = this.$login.f.deps
+    // this.model.f_operator = this.$login.f.name
+    // this.model.f_operatorid = this.$login.f.id
+    this.model.f_orgid = this.f_filialeids
+    this.model.f_orgname = this.f_orgname
+    // this.model.f_depid = this.$login.f.depids
+    // this.model.f_depname = this.$login.f.deps
     if (this.model.slice_area) {
       if (this.model.slice_area.length > 0) {
         this.model.f_slice_area = this.model.slice_area[0].name

package/src/components/selectAddress/BatchList.vue

@@ -152,6 +152,9 @@ export default {
     f_filialeids:{
       type: String
     },
+    f_orgname:{
+      type: String
+    },
     clear:{
       default:false
     }
@@ -225,8 +228,12 @@ export default {
     clear(){
       this.$refs.paged.$refs.cri.model = {}
     },
-    getorg (val) {
-      this.f_orgid = this.$login.convertToIn(val)
+    getorg (val, orgnames) {
+      if(orgnames.length>0){
+        this.f_orgname = orgnames[0].split(' - ')[0]
+      }
+      // this.f_orgid = this.$login.convertToIn(val)
+      this.f_orgid = val[0]
       this.f_filialeids = val[0]
       this.model.f_filiale_id = val[0]
     },
@@ -269,7 +276,11 @@ export default {
       }
       if (event.target.checked) {
         this.selecteddata.push(row.id)
-        this.rowsdata.push({id:row.id,name:row.f_address})
+        this.rowsdata.push({
+          id:row.id,
+          name:row.f_address,
+          orgid: row.f_orgid,
+          gridman: row.f_gridman})
         if(this.length === this.selecteddata.length){
           this.all = true
         }

package/src/components/selectAddress/BatchOrders.vue

@@ -1,11 +1,11 @@
 <template>
   <div id="unit" class="flex-row">
     <div class="basic-main" style="flex: 1; width:60%">
-      <batch-list @submit="submit"  @cancel="cancel"  :f_filialeids.sync="f_filialeids" v-ref:addresslist></batch-list>
+      <batch-list @submit="submit"  @cancel="cancel"  :f_filialeids.sync="f_filialeids" :f_orgname.sync="f_orgname" v-ref:addresslist></batch-list>
     </div>
     <div v-show="useraddressShow" style="width: 36.6%"  class="binary-right">
       <div class="flex">
-        <user-address v-ref:useraddressmsg :f_filialeids.sync="f_filialeids" :row="row"></user-address>
+        <user-address v-ref:useraddressmsg :f_filialeids.sync="f_filialeids" :f_orgname.sync="f_orgname" :row="row"></user-address>
       </div>
     </div>
   </div>
@@ -24,6 +24,7 @@
       return {
         //分公司id串
         f_filialeids: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgname,
         area: [],
         street: [],
         residential: [],