address-client 3.2.109 → 3.2.110-jinhuang

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.109",
+  "version": "3.2.110-jinhuang",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -80,7 +80,7 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "ldap-clients": "3.0.48",
-    "system-clients": "3.2.87",
+    "system-clients": "3.2.95",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.150",
     "vue-hot-reload-api": "^1.2.0",

package/src/components/AddressList.vue

@@ -139,7 +139,6 @@
         <template partial='head'>
           <th><nobr>序号</nobr></th>
           <th><nobr>客户编号</nobr></th>
-          <th><nobr>客户名称</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>区/县</nobr></th>
           <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
           <th><nobr>街道/乡镇</nobr></th>
@@ -158,7 +157,6 @@
         <template partial='body'>
           <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
-          <td style="text-align:center"><nobr>{{row.f_user_name}}</nobr></td>
           <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
           <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>

package/src/components/UserAddress.vue

@@ -4,10 +4,8 @@
       <p class="bg-info text-center" style="padding: 8px;">{{usertype ? '特殊地址管理' : '民用地址管理'}}</p>
       <div class="auto select-overspread form-horizontal">
         <div class="form-group" v-if="!usertype&&!model.id&&!config.hasnumber">
-          <input type="radio" id="true" value="one" v-model="onedata">
-          <label for="true">单户</label>
-          <input type="radio" id="false" value="more" v-model="onedata">
-          <label for="false">多户</label>
+          <input type="radio" id="true" value="more" v-model="onedata">
+          <label for="true">多户</label>
         </div>
         <!--单个录入-->
         <div v-if="onedata=='one'" class="row">
@@ -210,16 +208,16 @@
                       close-on-select search="true">
             </v-select>
           </div>
-<!--          <div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']">-->
-<!--            <label class="font_normal_body">片&emsp;&emsp;区</label>-->
-<!--            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"-->
-<!--                  >-->
-<!--            <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"-->
-<!--                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"-->
-<!--                      close-on-select v-ref:slice>-->
-<!--            </v-select>-->
-<!--          </div>-->
-
+          <!--          <div class="col-sm-6 form-group " :class="[$v.slice.required ? 'has-error' : 'has-success']">-->
+          <!--            <label class="font_normal_body">片&emsp;&emsp;区</label>-->
+          <!--            <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"-->
+          <!--                  >-->
+          <!--            <v-select :value.sync="model.f_slice_area" v-model="model.f_slice_area" :value-single="true"-->
+          <!--                      :options='sliceArea' placeholder='片区/管理站' filer-key="name"-->
+          <!--                      close-on-select v-ref:slice>-->
+          <!--            </v-select>-->
+          <!--          </div>-->
+          <div class="col-sm-6 form-group"></div>
           <div class="col-sm-6 form-group "
                :class="[$v.f_building_start.integernum || $v.f_building_start.dctest ?'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">起始楼号</label>
@@ -406,7 +404,7 @@
           f_lat: '' //纬度
         },
         //判读是否为单个数据录入
-        onedata: 'one',
+        onedata: 'more',
         //选中所有地址
         addresslist: [],
         usertype:false,
@@ -419,7 +417,7 @@
         sliceArea: []
       }
     },
-    props: ['f_filialeids', 'row','operation','usertype'],
+    props: ['f_filialeids', 'row','operation','usertype','selectdata','user'],
     ready(){
       this.initdata()
       getAreaConfig(this)
@@ -725,9 +723,9 @@
             resolveMsg: '地址保存成功',
             rejectMsg: '地址保存失败'
           }
-          this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗？，如有已经存在的，将会重复添加！！！', ['confirm', 'cancel']).then((res) => {
+          this.$showMessage('确定要批量添加'+this.addresslist.length+'户地址吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('api/af-revenue/logic/address_adduserlist',{data: {addlist:this.addresslist}},msg).then((req) => {
+              this.$resetpost('rs/logic/importAddress',{datas: {addlist:this.addresslist}, user: this.$login.f, selectdata: this.selectdata},msg).then((req) => {
                 this.cleardara()
                 this.$dispatch('confirm')
               })

package/src/main.js

@@ -10,7 +10,7 @@ Vue.config.silent = true
 
 /** **************************通用组件******************************/
 all()
-address("lixianV3")
+address()
 system(false)
 ldap()
 sale()

package/build/tmp/jar/MANIFEST.MF

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