address-client 3.2.88 → 3.2.90

package/build/dev-server.js

@@ -10,85 +10,85 @@ var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'https://qnjtkf.cn:8401/#', str2 = 'https://qnjtkf.cn:8401/#'
-var str3 = 'https://qnjtkf.cn:8401/#'
+var str = 'http://127.0.0.1:8288', str2= 'http://192.168.50.4:8400/'
+var str3= 'http://192.168.50.4:8400/'
 var proxyTable = {
-  // '/rs/entity': {
-  //   target: str3
-  //   // secure:true,
-  //   // changeOrigin:true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  // '/webapps': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic/getLogin': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/logic/getInitData': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/logic/getSaleInitData': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // // '/rs/logic':{
-  // //   target: str3,
-  // //   secure:true,
-  // //   changeOrigin:true
-  // //   // target: 'http://127.0.0.1:8080'
-  // // },
-  // '/rs/vue': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/user': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/db': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/search': {
-  //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/data': {
+  '/rs/entity': {
+    target: str
+    // secure:true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/webapps':{
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/logic/getLogin': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/logic/getInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true,
+  },
+  '/rs/logic/getSaleInitData': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  // '/rs/logic':{
   //   target: str3,
-  //   secure: true,
-  //   changeOrigin: true
-  // },
-  // '/rs/sql': {
-  //   target: str
-  //   // secure: true,
-  //   // changeOrigin:true
-  //   // target: 'http://127.0.0.1:8080'
-  // },
-  // '/rs/logic': {
-  //   target: str
-  //   // secure: true,
-  //   // changeOrigin:true
+  //   secure:true,
+  //   changeOrigin:true
   //   // target: 'http://127.0.0.1:8080'
   // },
+  '/rs/vue': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/user': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/db': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/search': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/data': {
+    target: str3,
+    secure:true,
+    changeOrigin:true
+  },
+  '/rs/sql': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
+  '/rs/logic': {
+    target: str
+    // secure: true,
+    // changeOrigin:true
+    // target: 'http://127.0.0.1:8080'
+  },
   '/rs': {
     // target: 'http://192.168.50.199:8300'
     target: str3,
-    secure: true,
-    changeOrigin: true
+    secure:true,
+    changeOrigin:true
   }
 }
 
@@ -104,7 +104,7 @@ var hotMiddleware = require('webpack-hot-middleware')(compiler)
 // force page reload when html-webpack-plugin template changes
 compiler.plugin('compilation', function (compilation) {
   compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
+    hotMiddleware.publish({ action: 'reload' })
     cb()
   })
 })
@@ -113,7 +113,7 @@ compiler.plugin('compilation', function (compilation) {
 Object.keys(proxyTable).forEach(function (context) {
   var options = proxyTable[context]
   if (typeof options === 'string') {
-    options = {target: options}
+    options = { target: options }
   }
   app.use(proxyMiddleware(context, options))
 })

package/package.json

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

package/src/App.vue

@@ -1,60 +1,16 @@
-<template>
-  <app-base class="bg" @click="isTimeOut">
-    <div class='flex'>
-      <article>
-        <route :comp="{name: 'login'}"></route>
-      </article>
-    </div>
-  </app-base>
-</template>
-
-<script>
-import Vue from 'vue'
-export default {
-  data () {
-    return {
-      lastTime: null, // 最后一次点击的时间
-      currentTime: null, // 当前点击的时间
-      // 获取一次不在获取控制
-      getConfig: false,
-      config: {
-        timeOut: 0, // 单位: 分钟
-        exitPrompt: '因您长时间未操作, 请重新登陆!'
-      },
-    }
-  },
-  ready () {
-    Vue.mmType = 'nginx'
-    Vue.HWQMM = [51, 150, 231, 300, 565, 708, 721, 952, 738, 560, 935, 912, 1274, 1148, 840, 1440]
-  },
-  created () {
-    this.lastTime = new Date().getTime()
-  },
-  methods: {
-    async isTimeOut () {
-      // 获取config配置
-      if (!this.getConfig && this.$login.f && this.$login.f.dir) {
-        await this.$getConfig(this, 'App')
-        this.getConfig = true
-      }
-      // 无配置,不开启
-      if (this.config.timeOut <= 0) return
-      // 记录这次点击的时间
-      this.currentTime = new Date().getTime()
-      // 判断上次最后一次点击的时间和这次点击的时间间隔是否大于超时时间
-      if (this.currentTime - this.lastTime > (this.config.timeOut * 60 * 1000)) {
-        // 如果是登录状态
-        if (this.$login.f.id) {
-          await this.$showMessage(this.config.exitPrompt)
-          window.location.reload()
-        } else {
-          this.lastTime = new Date().getTime()
-        }
-      } else {
-        // 如果在超时时间内点击，则把这次点击的时间记录覆盖掉之前存的最后一次点击的时间
-        this.lastTime = new Date().getTime()
-      }
-    }
-  }
-}
-</script>
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <route :comp="{name: 'login'}"></route>
+        <!--<address-model :isshow="true" :isbasch="false"></address-model>-->
+      </article>
+    </div>
+  </app-base>
+</template>
+
+<script>
+  export default {
+
+  }
+</script>

package/src/address.js

@@ -55,6 +55,13 @@ export default function (filiale) {
   Vue.component('street-manage-list', (resolve) => { require(['./components/StreetManageList'], resolve) })
   // 新增/修改 街道办信息
   Vue.component('add-street-manage-msg', (resolve) => { require(['./components/AddStreetManageMsg'], resolve) })
+  // 社区管理
+  Vue.component('community-manage', (resolve) => { require(['./components/CommunityManage'], resolve) })
+  // 街道办列表
+  Vue.component('community-manage-list', (resolve) => { require(['./components/CommunityManageList'], resolve) })
+  // 新增/修改 街道办信息
+  Vue.component('add-community-manage-msg', (resolve) => { require(['./components/AddCommunityManageMsg'], resolve) })
+
   // 分公司特殊页面注册替换
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/sale`).specialComp

package/src/components/AddCommunityManageMsg.vue

@@ -0,0 +1,215 @@
+<template>
+  <div class="span">
+    <validator name='v'>
+      <p class="bg-info text-center" style="padding: 8px;">{{ businesstype }}社区</p>
+      <div class="auto select-overspread form-horizontal">
+        <div style="text-align:right;margin-top:6px;" class="col-sm-12">
+          <!-- 社区-->
+          <div class="row">
+            <div class="col-sm-6 form-group"
+                 :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">街道/乡镇</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="communitymodel.f_street_id"
+                     v-validate:f_street_id='{required: true }'>
+              <v-select
+                :value.sync="communitymodel.f_street_id" :value-single="true"
+                :options='streetlist' placeholder='请选择'
+                close-on-select search="true">
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group"
+                 :class="[$v.f_community_code.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">社区编号</label>
+              <input type="text" v-model="communitymodel.f_community_code"
+                     @change="communityyanzheng"
+                     class="input_search" style="width:60%" placeholder="社区编号"
+                     v-validate:f_community_code='{required: true }'>
+            </div>
+            <div class="col-sm-6 form-group "
+                 :class="[$v.f_community_name.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">社区名称</label>
+              <input type="text" v-model="communitymodel.f_community_name"
+                     class="input_search" style="width:60%" placeholder="社区名称"
+                     v-validate:f_community_name='{required: true }'>
+            </div>
+            <div class="col-sm-6 form-group"
+                 :class="[$v.f_community_director.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">社区负责人</label>
+              <input type="text" v-show="false" v-model="communitymodel.f_community_director"
+                     v-validate:f_community_director='{required: true }'>
+              <v-select :value.sync="communitymodel.f_community_director"
+                        :value-single="true"
+                        :options='directors'
+                        placeholder='请选择'
+                        close-on-select
+                        search="true">
+              </v-select>
+            </div>
+            <div class="col-sm-6 form-group"
+                 :class="[$v.f_director_phone.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">负责人电话</label>
+              <input type="text" v-model="communitymodel.f_director_phone"
+                     class="input_search" style="width:60%" placeholder="负责人电话"
+                     v-validate:f_director_phone='{required: true }'>
+            </div>
+            <div class="col-sm-12 form-group">
+              <label class="font_normal_body " style="">备&emsp;&emsp;注</label>
+              <textarea class="input_textarea" rows="3" style="margin-top:25px;width:80%;height: auto;"
+                        v-model="communitymodel.f_comments"></textarea>
+            </div>
+          </div>
+          <div class="row">
+            <div style="margin-top:40px;text-align:right;">
+              <button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
+              <button class="button_clear button_spacing" @click="cancel()">取消</button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </validator>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+// let getAreaConfig = async function (self) {
+//   // 获取气价里面的配置
+//   await self.$getConfig(self, 'StreetManage')
+//   console.log('原地址配置', self.config)
+//   console.log('获取地址配置', self.config)
+//   Object.assign(self.model, self.config)
+// }
+export default {
+  title: '社区信息添加',
+  data() {
+    return {
+      //初始化省市区数据
+      config: {
+        hasnumber: true
+      },
+      streetlist: [],
+      directors: this.$appdata.getParam('社区负责人') ? this.$appdata.getParam('社区负责人') : [],
+      //街道办
+      communitymodel: {
+        f_pcd_id: '',
+        f_street_manage_id: '',
+        slice_area: null,
+        f_slice_area: null,
+        f_adjustable_id: null,
+        f_community_name: '',
+        f_comments: '',
+        f_community_code: '',
+        f_director_phone: '',
+        f_community_director: ''
+      }
+    }
+  },
+  props: ['f_filialeids', 'businesstype'],
+  ready() {
+    this.initdata()
+  },
+  methods: {
+    async communityyanzheng() {
+      console.log(this.communitymodel.f_community_code)
+      let res = await this.$resetpost('rs/sql/address_singleTableOrderBy', {
+        data: {
+          items: '*',
+          tablename: 't_community',
+          orderitem: 'id',
+          condition: `f_community_code = '${this.communitymodel.f_community_code}'`
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      if (res.data.length > 0) {
+        if (res.data[0].id != this.communitymodel.id) {
+          this.$showAlert('当前社区编号编号已存在', 'warning', 2000)
+          this.communitymodel.f_community_code = ''
+        }
+      }
+    },
+    //根据名字找数据
+    findbyid(list, name) {
+      var result
+      list.forEach((row, n) => {
+        if (name == row.id) {
+          result = row.data
+        }
+      })
+      return result
+    },
+    //初始化数据
+    initdata() {
+      this.streetlist = []
+      console.log("街道准备")
+      let HttpReset = new HttpResetClass()
+      HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        data: {
+          items: '*',
+          tablename: 't_street',
+          orderitem: 'id',
+          condition: ` f_filialeid = '${this.f_filialeids}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'}).then((req) => {
+        let redata = []
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_street,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        this.streetlist = redata
+      })
+    },
+    // //省/市/区变化
+    // pcdChange(val) {
+    //   console.log("省/市/区变化", val)
+    //   this.$resetValidation()
+    // },
+    //保存
+    async confirm() {
+      await this.savestreet()
+      this.clearData()
+      this.$dispatch('confirm')
+    },
+    //保存街道
+    async savestreet() {
+      this.communitymodel.f_filialeid = this.f_filialeids
+      this.communitymodel.f_operator = this.$login.f.name
+      this.communitymodel.f_operatorid = this.$login.f.id
+      this.communitymodel.f_orgid = this.$login.f.orgid
+      this.communitymodel.f_orgname = this.$login.f.orgs
+      this.communitymodel.f_depid = this.$login.f.depids
+      this.communitymodel.f_depname = this.$login.f.deps
+      this.communitymodel.f_street = this.findbyid(this.streetlist, this.communitymodel.f_street_id).f_street
+      console.log('获取社区model', this.communitymodel)
+      await this.$resetpost('rs/logic/address_updateCommunityManage', this.communitymodel)
+    },
+    cancel() {
+      this.clearData()
+      this.$dispatch('cancel')
+    },
+    clearData() {
+      this.communitymodel = {
+        f_pcd_id: '',
+        f_slice_area: '',
+        f_adjustable_id: '',
+        f_street_manage_name: '',
+        f_street_manage_number: '',
+        f_comments: ''
+      }
+    }
+  },
+  watch: {
+    'f_filialeids'() {
+      if (this.communitymodel.f_filialeid) {
+        if (this.communitymodel.f_filialeid != this.f_filialeids) {
+          this.$dispatch('cancel')
+        }
+      }
+      this.initdata()
+    }
+  }
+}
+</script>