address-client 3.0.23-24-aode → 3.0.23-28-aode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.0.23-24-aode",
+  "version": "3.0.23-28-aode",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/address.js

@@ -1,49 +1,49 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-// import 'babel-polyfill'
-
-export default function () {
-  Vue.config.silent = false
-  /** ********************** pc端 *********************** **/
-  Vue.component('address-select', (resolve) => { require(['./components/AddressModel'], resolve) })
-  Vue.component('address-model', (resolve) => { require(['./components/AddressModel'], resolve) })
-// 添加地址
-  Vue.component('address-add-address', (resolve) => { require(['./components/AddressAddAddress'], resolve) })
-//  地址树
-  Vue.component('address-tree', (resolve) => { require(['./components/AddressTree'], resolve) })
-  //小区树
-  Vue.component('area-tree', (resolve) => { require(['./components/AreaTree'], resolve) })
-  /** ********************** 新地址管理 *********************** **/
-  //地址建档
-  Vue.component('address-files', (resolve) => { require(['./components/AddressFiles'], resolve) })
-  //小区建档
-  Vue.component('area-files', (resolve) => { require(['./components/AreaFiles'], resolve) })
-  //街道列表
-  Vue.component('street-list', (resolve) => { require(['./components/StreetList'], resolve) })
-  //城市管理（包含街道，省区县的添加）
-  Vue.component('city-manage', (resolve) => { require(['./components/CityManage'], resolve) })
-  //街道区县添加
-  Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
-  //小区列表
-  Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
-  // 使用该小区的用户信息
-  Vue.component('area-user', (resolve) => { require(['./components/areauser/AreaUser.vue'], resolve) })
-  //小区管理（包含修改表具，小区的添加）
-  Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
-  //单位管理（）
-  Vue.component('company-manage', (resolve) => { require(['./components/CompanyManage'], resolve) })
-  //小区添加
-  Vue.component('add-area-msg', (resolve) => { require(['./components/AddAreaMsg'], resolve) })
-  //地址管理父组件
-  Vue.component('address-manage', (resolve) => { require(['./components/AddressManage'], resolve) })
-  //地址列表
-  Vue.component('address-list', (resolve) => { require(['./components/AddressList'], resolve) })
-  //地址管理
-  Vue.component('user-address', (resolve) => { require(['./components/UserAddress'], resolve) })
-  //地址变更记录
-  Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
-  //批量置换接单
-  Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
-
-}
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+// import 'babel-polyfill'
+
+export default function () {
+  Vue.config.silent = false
+  /** ********************** pc端 *********************** **/
+  Vue.component('address-select', (resolve) => { require(['./components/AddressModel'], resolve) })
+  Vue.component('address-model', (resolve) => { require(['./components/AddressModel'], resolve) })
+// 添加地址
+  Vue.component('address-add-address', (resolve) => { require(['./components/AddressAddAddress'], resolve) })
+//  地址树
+  Vue.component('address-tree', (resolve) => { require(['./components/AddressTree'], resolve) })
+  //小区树
+  Vue.component('area-tree', (resolve) => { require(['./components/AreaTree'], resolve) })
+  /** ********************** 新地址管理 *********************** **/
+  //地址建档
+  Vue.component('address-files', (resolve) => { require(['./components/AddressFiles'], resolve) })
+  //小区建档
+  Vue.component('area-files', (resolve) => { require(['./components/AreaFiles'], resolve) })
+  //街道列表
+  Vue.component('street-list', (resolve) => { require(['./components/StreetList'], resolve) })
+  //城市管理（包含街道，省区县的添加）
+  Vue.component('city-manage', (resolve) => { require(['./components/CityManage'], resolve) })
+  //街道区县添加
+  Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
+  //小区列表
+  Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
+  // 使用该小区的用户信息
+  Vue.component('area-user', (resolve) => { require(['./components/areauser/AreaUser.vue'], resolve) })
+  //小区管理（包含修改表具，小区的添加）
+  Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
+  //单位管理（）
+  Vue.component('company-manage', (resolve) => { require(['./components/CompanyManage'], resolve) })
+  //小区添加
+  Vue.component('add-area-msg', (resolve) => { require(['./components/AddAreaMsg'], resolve) })
+  //地址管理父组件
+  Vue.component('address-manage', (resolve) => { require(['./components/AddressManage'], resolve) })
+  //地址列表
+  Vue.component('address-list', (resolve) => { require(['./components/AddressList'], resolve) })
+  //地址管理
+  Vue.component('user-address', (resolve) => { require(['./components/UserAddress'], resolve) })
+  //地址变更记录
+  Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
+  //批量置换接单
+  Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
+
+}

package/src/components/AddressList.vue

@@ -160,6 +160,8 @@
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>
   </modal>
+  <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
+
 </template>
 
 <script>
@@ -168,6 +170,7 @@
   export default {
     data () {
       return {
+        iswork: false,
         criteriaShow: false,
         model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
         addflag: false,
@@ -228,10 +231,10 @@
 
       if(row.id){
         var id = row.id
-        let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
+        let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
         let isdelete = await this.$resetpost('rs/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
         if(userfiles.data.length){
-          this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
+          this.$showAlert('该地址下已有正常/待开通表具档案,无法删除！','warning',1000)
            return
         }
         if(isdelete.data.length){
@@ -278,24 +281,22 @@
   },
   events: {
     onFileUpload: async function (file, res) {
+      this.$showAlert('文件上传成功','success',1000);
+      this.iswork = true
       console.log("上传完毕"+JSON.stringify(res))
       let data = {
         filepath: res.f_downloadpath,
         user:this.$login.f
       }
-      console.log("filepath="+JSON.stringify(data))
-      await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
-        if(res.data.type=="success"){
-        this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
-      }else{
-        this.$showMessage(res.data.msg);
+      this.closeFile();
+      try{
+        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+          this.$showAlert("导入成功",'success', 2000);
+          this.iswork = false
+          this.init()
+        })
+      }catch(e){
       }
-
-      //关闭上传框
-      this.closeFile()
-      //重新查询
-      this.init()
-    })
     },
     'onFileError'(error) {
       this.$showAlert(error, 'warning', 2000)