address-client 3.0.34-aodeToV4 → 3.0.35-aodeToV4

package/src/components/selectAddress/BatchList.vue

@@ -121,206 +121,209 @@
 </template>
 
 <script>
-  import { PagedList } from 'vue-client'
-  import {HttpResetClass} from 'vue-client'
+import { PagedList } from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-  export default {
-    data () {
-      return {
-        criteriaShow: false,
-        model: new PagedList('api/af-revenue/sql/address_getUserAddress',15,{}),
-        addflag: false,
-        addtitle:'',
+export default {
+  data () {
+    return {
+      criteriaShow: false,
+      model: new PagedList('api/af-revenue/sql/address_getUserAddress',15,{
+        f_filiale_id:'this.f_filiale_id'
+      }),
+      addflag: false,
+      addtitle:'',
 
-        all: false,
-        //row数据
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        f_orgid: '',
+      all: false,
+      //row数据
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
 
-        //文件上传弹框
-        showFile: false,
-        rowsdata:[],
-        selecteddata:[],
-        length:99999999
+      //文件上传弹框
+      showFile: false,
+      rowsdata:[],
+      selecteddata:[],
+      length:99999999
+    }
+  },
+  title: '地址列表',
+  props:{
+    f_filialeids:{
+      type: String
+    },
+    clear:{
+      default:false
+    }
+  },
+  ready(){
+    this.search()
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+
+    //添加方法
+    add(val){
+      if (this.f_filialeids) {
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add',val)
+      } else {
+        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
       }
     },
-    title: '地址列表',
-    props:{
-      f_filialeids:{
-        type: String
-      },
-      clear:{
-        default:false
+    importAddress(){
+      this.showFile = true
+    },
+    // 关闭文件上传对话框
+    closeFile() {
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+    },
+    //修改
+    modify(val){
+      this.$refs.paged.$refs.grid.selectStore.selected = null
+      this.$dispatch('modify',val)
+    },
+    async delete(row){
+      if(row.id){
+        var id = row.id
+        let service = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
+        let userfiles = await this.$resetpost('api/af-revenue/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(service.data.length || userfiles.data.length){
+          this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
+        }else{
+          this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+            this.$dispatch('cancel')
+          })
+        }
       }
     },
-    ready(){
-      this.search()
+
+    search () {
+      this.$refs.paged.$refs.cri.search()
     },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
 
-      //添加方法
-      add(val){
-        if (this.f_filialeids) {
-          this.$refs.paged.$refs.grid.selectStore.selected = null
-          this.$dispatch('add',val)
-        } else {
-          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        }
-      },
-      importAddress(){
-        this.showFile = true
-      },
-      // 关闭文件上传对话框
-      closeFile() {
-        this.showFile = false
-        // 将选的文件清空
-        this.$refs.file.$el.querySelector('input').value = ''
-      },
-      //修改
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      async delete(row){
-        if(row.id){
-          var id = row.id
-          let service = await this.$resetpost('api/af-revenue/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
-          let userfiles = await this.$resetpost('api/af-revenue/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(service.data.length || userfiles.data.length){
-            this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
-          }else{
-            this.$resetdelete('api/af-revenue/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
+    async selfSearch (args) {
+      this.selecteddata = []
+      this.rowsdata = []
+      this.all = false
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      console.log('查询。。。', this.f_orgid)
+
+      args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
+      await this.model.search(args.condition, args.model)
+      this.length = this.model.count
+      console.log(this.length,"============")
+    },
 
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
+    //清空
+    clear(){
+      this.$refs.paged.$refs.cri.model = {}
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+      this.model.f_filiale_id = val[0]
+    },
 
-      async selfSearch (args) {
+    async select() {
+      if(this.all){
         this.selecteddata = []
         this.rowsdata = []
         this.all = false
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
-        }
-        console.log('查询。。。', this.f_orgid)
-
-        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
-        await this.model.search(args.condition, args.model)
-        this.length = this.model.count
-        console.log(this.length,"============")
-      },
-
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
-      },
-
-      async select() {
-        if(this.all){
+        this.length = 99999999
+      }else {
+        this.all = true
+        console.log(this.$refs.paged.$refs.cri.condition,"=============")
+        let HttpReset = new HttpResetClass()
+        await HttpReset.load('POST', 'api/af-revenue/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
+          data: {
+            condition: `${this.$refs.paged.$refs.cri.condition} and a.f_filialeid = '${this.f_filialeids}' `
+          }
+        }, {resolveMsg: null, rejectMsg: '全选获取数据异常，请重试!'}).then((req) => {
           this.selecteddata = []
           this.rowsdata = []
-          this.all = false
-          this.length = 99999999
-        }else {
-          this.all = true
-          console.log(this.$refs.paged.$refs.cri.condition,"=============")
-          let HttpReset = new HttpResetClass()
-          await HttpReset.load('POST', 'api/af-revenue/sql/address_getUserAddress?pageNo=1&pageSize=9999999', {
-            data: {
-              condition: `${this.$refs.paged.$refs.cri.condition} and a.f_filialeid = '${this.f_filialeids}' `
+          req.data.forEach((row, n) => {
+            console.log(row.state,"===========")
+            if(row.state === 'true'){
+              this.selecteddata.push(row.id)
+              this.rowsdata.push({
+                id: row.id,
+                name:row.f_address
+              })
             }
-          }, {resolveMsg: null, rejectMsg: '全选获取数据异常，请重试!'}).then((req) => {
-            this.selecteddata = []
-            this.rowsdata = []
-            req.data.forEach((row, n) => {
-              console.log(row.state,"===========")
-              if(row.state === 'true'){
-                this.selecteddata.push(row.id)
-                this.rowsdata.push({
-                  id: row.id,
-                  name:row.f_address
-                })
-              }
-            })
           })
-        }
-      },
-      selectOne(event, row, i) {
-        if(this.all){
-          this.all = !this.all
-        }
-        if (event.target.checked) {
-          this.selecteddata.push(row.id)
-          this.rowsdata.push({id:row.id,name:row.f_address})
-          if(this.length === this.selecteddata.length){
-            this.all = true
-          }
-        } else {
-          this.all = false
-          this.selecteddata.splice(this.selecteddata.indexOf(row.id),1)
-          this.rowsdata.splice(parseInt(this.selecteddata.indexOf(row.id)),1)
-        }
-      },
-      submit(){
-        console.log('提交信息', this.rowsdata)
-        this.$emit('submit',this.rowsdata)
-      },
-      cancel () {
-        this.$emit('cancel')
+        })
       }
     },
-    events: {
-      onFileUpload: async function (file, res) {
-        console.log("上传完毕"+JSON.stringify(res))
-        let data = {
-          filepath: res.f_downloadpath,
-          user:this.$login.f
+    selectOne(event, row, i) {
+      if(this.all){
+        this.all = !this.all
+      }
+      if (event.target.checked) {
+        this.selecteddata.push(row.id)
+        this.rowsdata.push({id:row.id,name:row.f_address})
+        if(this.length === this.selecteddata.length){
+          this.all = true
         }
-        console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
-          this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
-          //关闭上传框
-          this.closeFile()
-          //重新查询
-          this.init()
-        })
-      },
-      'onFileError'(error) {
-        this.$showAlert(error, 'warning', 2000)
+      } else {
+        this.all = false
+        this.selecteddata.splice(this.selecteddata.indexOf(row.id),1)
+        this.rowsdata.splice(parseInt(this.selecteddata.indexOf(row.id)),1)
       }
     },
-    computed: {
-      ischecked(){
-        return function (row) {
-          return this.all||this.selecteddata.includes(row.id)
-        }
-      },
-      isall(){
-        return function () {
-          return this.all
-        }
+    submit(){
+      console.log('提交信息', this.rowsdata)
+      this.$emit('submit',this.rowsdata)
+    },
+    cancel () {
+      this.$emit('cancel')
+    }
+  },
+  events: {
+    onFileUpload: async function (file, res) {
+      console.log("上传完毕"+JSON.stringify(res))
+      let data = {
+        filepath: res.f_downloadpath,
+        user:this.$login.f
       }
+      console.log("filepath="+JSON.stringify(data))
+      await this.$resetpost(`api/af-revenue/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
+        this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
+        //关闭上传框
+        this.closeFile()
+        //重新查询
+        this.init()
+      })
     },
-    watch:{
-      clear(val){
-        if(val){
-          this.search()
-        }
+    'onFileError'(error) {
+      this.$showAlert(error, 'warning', 2000)
+    }
+  },
+  computed: {
+    ischecked(){
+      return function (row) {
+        return this.all||this.selecteddata.includes(row.id)
+      }
+    },
+    isall(){
+      return function () {
+        return this.all
+      }
+    }
+  },
+  watch:{
+    clear(val){
+      if(val){
+        this.search()
       }
     }
-
   }
+
+}
 </script>

package/src/main.js

@@ -1,23 +1,23 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import { sale } from 'sale-client'
-import { ldap } from 'ldap-clients'
-import address from './address'
-
-Vue.config.silent = true
-
-/** **************************通用组件******************************/
-all()
-address()
-ldap()
-system(false)
-sale()
-require('system-clients/src/styles/less/bootstrap.less')
-
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import { sale } from 'sale-client'
+import { ldap } from 'ldap-clients'
+import address from './address'
+
+Vue.config.silent = true
+
+/** **************************通用组件******************************/
+all()
+address()
+ldap()
+system(false)
+sale()
+require('system-clients/src/styles/less/bootstrap.less')
+
+
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Jul 10 10:01:08 CST 2020
-gradle.version=3.5