address-client 3.0.24-78 → 3.0.24-aode

package/src/components/AddressList.vue

@@ -2,15 +2,17 @@
   <div class="flex" @keyup.enter="search">
     <criteria-paged :model="model" v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+
           <div class="row">
+
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">组织机构</label>
               <res-select
                 restype='organization'
-                          @res-select="$parent.$parent.getorg"
-                          is-mul="false"
-                          :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                is-mul="false"
+                :initresid='$parent.$parent.curorgid'
               >
               </res-select>
             </div>
@@ -26,6 +28,7 @@
                       :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
             </div>
             <!--<div v-if="$parent.$parent.showrightchange" :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.useraddressShow">-->
+
             <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.showrightchange">
               <label class="font_normal_body">楼&emsp;&emsp;号</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
@@ -37,16 +40,7 @@
               <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.add('民用')">添加民用</button>
               <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
               <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-              <button class="button_export button_spacing"  @click="$parent.$parent.importAddress('导入')">模板导入</button>
-              <button class="button_export button_spacing"
-                      v-show="this.$login.r.includes('完善地址')"
-                      @click="$parent.$parent.importAddress('完善')">完善地址</button>
-              <export-excel :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"
-                            sqlurl="rs/logic/exportfile"
-                            sql-name="addressGetAddress"
-                            template-name='地址管理查询导出'
-                            :choose-col="true"></export-excel>
+              <button class="button_export button_spacing"  @click="$parent.$parent.importAddress">导入地址</button>
               <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
             </div>
           </div>
@@ -65,19 +59,19 @@
             <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
               <label class="font_normal_body">楼&emsp;&emsp;号</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
-                      condition="a.f_building like '%{}%'" placeholder="楼号"
+                      condition="a.f_building like '{}'" placeholder="楼号"
                       :size="model.f_building ? model.f_building.length*2 : 6"/>
             </div>
             <div :class="$parent.$parent.style" >
               <label class="font_normal_body">单&emsp;&emsp;元</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_unit" style="width:60%"
-                      condition="a.f_unit like '%{}%'" placeholder="单元"
+                      condition="a.f_unit like '{}'" placeholder="单元"
                       :size="model.f_unit ? model.f_unit.length*2 : 6"/>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">楼&emsp;&emsp;层</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_floor" style="width:60%"
-                      condition="a.f_floor like '%{}%'" placeholder="楼层"
+                      condition="a.f_floor like '{}'" placeholder="楼层"
                       :size="model.f_floor ? model.f_floor.length*2 : 6"/>
             </div>
             <div :class="$parent.$parent.style">
@@ -86,13 +80,6 @@
                       condition="a.f_room like '%{}%'" placeholder="门牌号"
                       :size="model.f_room ? model.f_room.length*2 : 6"/>
             </div>
-<!--            <div :class="$parent.$parent.style">-->
-<!--              <label class="font_normal_body">小&emsp;&emsp;区</label>-->
-<!--              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"-->
-<!--                      condition="a.f_residential_area like '%{}%'" placeholder="小区"-->
-<!--                      :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>-->
-<!--            </div>-->
-
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">地址&emsp;ID</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.id" style="width:60%"
@@ -105,32 +92,15 @@
                       condition="a.f_address like '%{}%'" placeholder="详细地址"
                       :size="model.f_address ? model.f_address.length*2 : 8"/>
             </div>
-            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
-              <label class="font_normal_body">街&emsp;&emsp;道</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_street"
-                      condition="f_street like '%{}%'" placeholder="街道"
-                      :size="model.f_street ? model.f_street.length*2 : 6"/>
-            </div>
             <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">地址状态</label>
-              <v-select :value.sync="model.f_address_state"
-                        class="select_list select"
-                        v-model="model.f_address_state"
-                        condition="a.f_address_state = '{}'"
-                        :options='$parent.$parent.getaddresstate' placeholder='地址状态'
-                        close-on-select>
-              </v-select>
-            </div>
-            <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">状&emsp;&emsp;态</label>
-              <v-select :value.sync="model.f_state"
-                        class="select_list select"
-                        v-model="model.f_state"
-                        condition="a.f_state {}"
-                        :options='$parent.$parent.getstate' placeholder='地址状态'
-                        close-on-select>
-              </v-select>
+              <label class="font_normal_body">特殊地址</label>
+                <v-select :value.sync="model.f_special"
+                          v-model="model.f_special"
+                          :options='$parent.$parent.specialoptions' placeholder='请选择'
+                          condition=" {} "
+                          close-on-select></v-select>
             </div>
+
           </div>
         </div>
       </criteria>
@@ -139,17 +109,15 @@
           <tr>
             <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>
+            <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 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>
+            <th><nobr>单元</nobr></th>
+            <th><nobr>楼层</nobr></th>
+            <th><nobr>门牌号</nobr></th>
             <th><nobr>详细地址</nobr></th>
-            <th><nobr>地址状态</nobr></th>
-            <th><nobr>状态</nobr></th>
             <th><nobr>时间</nobr></th>
             <th><nobr>操作</nobr></th>
           </tr>
@@ -158,23 +126,20 @@
           <tr>
             <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</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_pcd}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
-            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
-            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
-            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
-            <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_address_state}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_state ==='作废'?'作废':'有效'}}</nobr></td>
             <td style="text-align:center"><nobr>{{row.f_create_date}}</nobr></td>
             <td style="text-align:center">
-             <!-- <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
-              <button v-if="!row.f_useraddress_id" type="button" name="button" class="btn btn-danger"
-                      style="padding: 5px 12px"
+              <!-- <button type="button" name="button" class="btn btn-link"
+                       @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
+              <button type="button" name="button" class="btn btn-link"
                       @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
             </td>
           </tr>
@@ -183,8 +148,7 @@
       </data-grid>
     </criteria-paged>
   </div>
-  <work-busy :is-busy='isbusy'></work-busy>
-  <modal :show.sync="showFile" width="480px" v-ref:modal backdrop="true">
+  <modal :show.sync="showFile" v-ref:modal backdrop="true">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
       <h4 class="modal-title">选择文件</h4>
@@ -194,54 +158,32 @@
         <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
       </div>
     </article>
-    <footer slot="modal-footer" class="modal-footer" style="display: none"></footer>
+    <footer slot="modal-footer" class="modal-footer"></footer>
   </modal>
+  <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
+
 </template>
 
 <script>
   import { PagedList } from 'vue-client'
-  let readyGen = async function (self) {
-    self.getfield = self.config.excelHeaders
-  }
+
   export default {
     data () {
       return {
+        iswork: false,
         criteriaShow: false,
         model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
-        config: {
-          // 导出列要和查询列相同
-          excelHeaders: {
-            'f_user_name':'用户姓名',
-            'f_userinfo_code':'用户编号',
-            'id':'地址ID',
-            'f_pcd':'区/县',
-            'f_slice_area':'片区',
-            'f_street':'街道',
-            'f_residential_area':'小区',
-            'f_building':'楼号',
-            'f_unit':'单元',
-            'f_floor':'楼层',
-            'f_room':'门牌号',
-            'f_address':'详细地址',
-            'f_address_state':'地址状态',
-            'f_create_date':'时间',
-            'f_state':'状态'
-          },
-        },
-        isbusy:false,
         addflag: false,
         addtitle:'',
-        other: [],
-        footer: [],
-        getfield: {},
-        imptype:'',
+
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
-        getstate:[{label:'全部',value:''},{label:'有效',value:" = '有效' or a.f_state is null"},{label:'作废',value:" = '作废'"}],
+
         //文件上传弹框
         showFile: false,
-        showrightchange:true
+        showrightchange:true,
+        specialoptions:[{label:"全部",value:""},{label:"是",value:"a.f_special ='1'"},{label:"否",value:"a.f_special is null"}]
       }
     },
     title: '地址列表',
@@ -255,27 +197,9 @@
       }
     },
     ready(){
-      readyGen(this)
       this.search()
     },
     methods: {
-      getotherfooter() {
-        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other = [];
-        this.footer = [];
-        // let exportdata = this.getCondition;
-        let otherInData = [];
-        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-        let footerData = [], exportfield = this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for (var field in self.sumsmodel) {
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
@@ -289,8 +213,7 @@
           this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
         }
       },
-      importAddress(val){
-        this.imptype = val
+      importAddress(){
         this.showFile = true
       },
       // 关闭文件上传对话框
@@ -305,77 +228,80 @@
         this.$dispatch('modify',val)
       },
       async delete(row){
-        if(row.id >= 0){
-          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})
-          if(userfiles.data.length){
-            this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
+
+      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 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)
+           return
         }
-      },
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-      selfSearch (args) {
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
+        if(isdelete.data.length){
+          this.$showAlert('该地址下已有正在工作的置换单,无法删除！','warning',1000)
+          return
         }
-        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
-        this.model.search(args.condition, args.model)
-      },
+        this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+          this.$dispatch('cancel')
+        })
+      }
+  },
 
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
+  search () {
+    this.$refs.paged.$refs.cri.search()
+  },
+
+  selfSearch (args) {
+        debugger
+    //去除空格
+    for(let key in args.model){
+      if(args.model[key] instanceof  String){
+        args.model[key] = args.model[key].trim();
       }
-    },
-    events: {
-      onFileUpload: async function (file, res) {
-        this.isbusy = true
-        console.log("上传完毕"+JSON.stringify(res))
-        let data = {
-          filepath: res.f_downloadpath,
-          user:this.$login.f,
-          type :this.imptype
-        }
-        console.log("filepath="+JSON.stringify(data))
+    }
+    if (!this.f_orgid) {
+      this.getorg([this.$login.f.orgid])
+    }
+    console.log("xxx"+this.f_filialeids)
+    args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+    this.model.search(args.condition, args.model)
+  },
+
+  //清空
+  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
+    }
+    this.f_filialeids = val[0]
+  }
+  },
+  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
+      }
+      this.closeFile();
+      try{
         await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
-          this.isbusy = false
-          if(res.data.type=="success"){
-            this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
-          }else{
-            this.$showMessage(res.data.msg);
-          }
-          //关闭上传框
-          this.closeFile()
-          //重新查询
+          this.$showAlert("导入成功",'success', 2000);
+          this.iswork = false
           this.init()
-        }).catch(error=>{
-          this.isbusy = false
         })
-      },
-      'onFileError'(error) {
-        this.$showAlert(error, 'warning', 2000)
+      }catch(e){
       }
     },
-    computed: {
-      //地址状态下拉框
-      getaddresstate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
-      },
-      getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + `and a.f_filialeid = '${this.f_filialeids}'`}
-      }
+    'onFileError'(error) {
+      this.$showAlert(error, 'warning', 2000)
     }
+  }
 
   }
 </script>

package/src/components/AddressManage.vue

@@ -53,7 +53,7 @@
           this.$refs.useraddressmsg.usertype=obj.val.f_user_type
           this.$refs.useraddressmsg.operation='modify'
           this.$refs.useraddressmsg.onedata='one'
-          this.$refs.useraddressmsg.model=Object.assign({},this.$refs.useraddressmsg.model,obj.val)
+          this.$refs.useraddressmsg.model=Object.assign({},obj.val)
           if(obj.val.f_special=='1'){
             this.$refs.useraddressmsg.usertype = true
           }else{

package/src/components/AddressTree.vue

@@ -420,7 +420,7 @@
       }
     },
     events: {
-      onFile: function (file, res) {
+      onFileUpload: function (file, res) {
         console.log("上传完毕"+JSON.stringify(res))
         let data = {
           filepath: res.f_downloadpath,