system-phone 3.1.41 → 3.1.43

package/src/components/PhoneSellInfo.vue

@@ -1,148 +1,148 @@
-<template >
-  <div class="panel panel-default auto repair-info-content">
-    <div class="panel-body" v-show="show">
-      <div class="panel panel-default well" v-for="row in model">
-        <div class="bg-info">
-          <div class="row form-group">
-            <div class="col-xs-12 col-sm-12 col-md-12">
-              <div class="row">
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  购气量: {{row.f_pregas}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  购气金额: {{row.f_preamount}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  收费状态: {{row.f_state}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  收款: {{row.f_collection}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  缴费方式: {{row.f_payment}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  营业网点: {{row.f_depname}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  操作员: {{row.f_operator}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  购气时间: {{row.f_operate_date}}
-                </div>
-
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="panel panel-default well">
-        <div className="bg-info">
-          <div className="row form-group">
-            <div className="col-xs-12 col-sm-12 col-md-12">
-              <div className="row">
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  总购气量: {{ f_pregas_count }}
-                </div>
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  总购气金额: {{ f_preamount_count }}
-                </div>
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  购气次数: {{ model.length }}
-                </div>
-              </div>
-            </div>
-            </div>
-        </div>
-      </div>
-      <p v-show="model.length == 0 ">此用户暂无购气记录</p>
-    </div>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import co from 'co'
-  export default {
-    title: '查询用户',
-    data () {
-      return {
-        model: [],
-        f_pregas_count: 0,
-        f_preamount_count: 0,
-        show: false,
-        row: Object
-      }
-    },
-    props: {
-      user: {
-        type: Object
-      },
-      f_userinfo_id:''
-    },
-    methods: {
-      getmodel () {
-        let userinfoid
-        if(this.f_userinfo_id){
-          userinfoid = this.f_userinfo_id
-        }else{
-          userinfoid = this.user.f_userinfo_id
-          console.log(this.user.f_userinfo_id)
-        }
-        console.log(userinfoid)
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_state = '有效' and f_userinfo_id = '${userinfoid}'`}},{resolveMsg : null,rejectMsg :null}).then((row) => {
-          this.model = row.data
-          row.data.forEach(item => {
-            this.f_pregas_count += item.f_pregas
-            this.f_preamount_count += item.f_preamount
-          })
-          this.show=true
-        })
-      },
-      back(){
-
-      }
-    },
-    watch: {
-      'user' (val) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        if(this.user){
-          if (!(this.user.isNuN)) {
-            this.model= []
-            this.getmodel()
-          }
-        }
-      },
-      'f_userinfo_id'(){
-        if(this.f_userinfo_id){
-          this.model= []
-          this.getmodel()
-        }
-      }
-    },
-    ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        this.getmodel()
-      }
-      if(this.f_userinfo_id){
-        this.getmodel()
-      }
-    }
-  }
-</script>
-<style>
-  .app-botton {
-    position:fixed;
-    background: #87b2dd;
-    color: #FFF;
-    padding: 8px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -10px;
-    height: 40px;
-  }
-</style>
+<template >
+  <div class="panel panel-default auto repair-info-content">
+    <div class="panel-body" v-show="show">
+      <div class="panel panel-default well" v-for="row in model">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  购气量: {{row.f_pregas}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  购气金额: {{row.f_preamount}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收费状态: {{row.f_state}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收款: {{row.f_collection}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  缴费方式: {{row.f_payment}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  营业网点: {{row.f_depname}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  操作员: {{row.f_operator}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  购气时间: {{row.f_operate_date}}
+                </div>
+
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="panel panel-default well">
+        <div className="bg-info">
+          <div className="row form-group">
+            <div className="col-xs-12 col-sm-12 col-md-12">
+              <div className="row">
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  总购气量: {{ f_pregas_count }}
+                </div>
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  总购气金额: {{ f_preamount_count }}
+                </div>
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  购气次数: {{ model.length }}
+                </div>
+              </div>
+            </div>
+            </div>
+        </div>
+      </div>
+      <p v-show="model.length == 0 ">此用户暂无购气记录</p>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  export default {
+    title: '查询用户',
+    data () {
+      return {
+        model: [],
+        f_pregas_count: 0,
+        f_preamount_count: 0,
+        show: false,
+        row: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      f_userinfo_id:''
+    },
+    methods: {
+      getmodel () {
+        let userinfoid
+        if(this.f_userinfo_id){
+          userinfoid = this.f_userinfo_id
+        }else{
+          userinfoid = this.user.f_userinfo_id
+          console.log(this.user.f_userinfo_id)
+        }
+        console.log(userinfoid)
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_state = '有效' and f_userinfo_id = '${userinfoid}'`}},{resolveMsg : null,rejectMsg :null}).then((row) => {
+          this.model = row.data
+          row.data.forEach(item => {
+            this.f_pregas_count += item.f_pregas
+            this.f_preamount_count += item.f_preamount
+          })
+          this.show=true
+        })
+      },
+      back(){
+
+      }
+    },
+    watch: {
+      'user' (val) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        if(this.user){
+          if (!(this.user.isNuN)) {
+            this.model= []
+            this.getmodel()
+          }
+        }
+      },
+      'f_userinfo_id'(){
+        if(this.f_userinfo_id){
+          this.model= []
+          this.getmodel()
+        }
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_id) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        this.getmodel()
+      }
+      if(this.f_userinfo_id){
+        this.getmodel()
+      }
+    }
+  }
+</script>
+<style>
+  .app-botton {
+    position:fixed;
+    background: #87b2dd;
+    color: #FFF;
+    padding: 8px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -10px;
+    height: 40px;
+  }
+</style>

package/src/components/Test.vue

@@ -1,14 +1,14 @@
-<template>
-  <div>
-    <h1>Hello Test {{msg}}</h1>
-  </div>
-</template>
-<script>
-  export default {
-    title: "test",
-    props: ['msg'],
-    data () {
-      return {}
-    }
-  }
-</script>
+<template>
+  <div>
+    <h1>Hello Test {{msg}}</h1>
+  </div>
+</template>
+<script>
+  export default {
+    title: "test",
+    props: ['msg'],
+    data () {
+      return {}
+    }
+  }
+</script>

package/src/filiale/liaoyuan/LoginApp.vue

@@ -193,6 +193,15 @@ export default {
     },
     async confirm() {
       this.loaderShow = true
+      let ip ='';
+      const rest = await fetch(`${this.$androidUtil.getProxyUrl()}/rs/systemUrl/getIp`);
+      const ipData = await rest.json();
+      ip=ipData.ip;
+      const userData2 = {name: this.ename, password: this.password,ip: ip,device_type:'PHONE'}
+      await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getLogin`, userData2, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       console.log('Vue.android：' + Vue.android)
       const userData = {username: this.ename, password: this.password}
       console.log('获取登陆信息：' + userData)

package/src/filiale/liaoyuan/SystemSetUp.vue

@@ -0,0 +1,352 @@
+<template>
+  <div class="nav-bgcolor">
+    <div class="auto">
+      <div class="row nav-bgcolor">
+        <div class="col-xs-6  manbiankuang" v-for="tab in tabs" @click="gotopage(tab.link,tab.name)">
+          <img class="imgs" :src="imgback(tab.name)">
+          <p></p>
+          <p class="pagesfoot">{{ tab.name }}</p>
+          <p></p>
+        </div>
+      </div>
+    </div>
+    <modal :show.sync="show" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header text-center">
+        <h4 class="modal-title">清除项选择</h4>
+        <input type="checkbox" class="" id="f_operator" v-model="all">
+        <label for="f_operator" class="font-size">全选</label>
+      </header>
+      <article slot="modal-body" v-if="show">
+        <div class="auto col-sm-11 col-xs-11 col-xs-offset-1 col-md-offset-1" style="margin-top: 10px;">
+          <div class="col-sm-4 col-xs-4" v-for="f in fields">
+            <input type="checkbox" class="" :id="'export-col-'+$index" v-model="modelval" :value="$key">
+            <label :for="'export-col-'+$index" class="font-size">{{ f }}</label>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <center>
+          <button v-show="show" type="button" class="btn btn-default" @click='close()'>取消</button>
+          <button v-show="show" type="button" class="btn btn-success" @click='clear()'>确定</button>
+        </center>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+
+  export default {
+    title: '系统设置',
+    data() {
+      return {
+        version: '1.0',
+        titleName: '系统设置',
+        all: false,
+        flag: true,
+        show: false,
+        fields: {},
+        dataclear: [],
+        tabs: this.getTabs(),
+        //tabs:[{name:"清空数据"}],
+        modelval: [],
+        text: '导航组件this',
+        beforeName: '系统设置',
+      }
+    },
+    ready() {
+      this.version = HostApp.getAppVersion().data
+      // if(Vue.config.safecheck.clearPhone){
+      //   let cleartable=Vue.config.safecheck.clearPhone.cleardata
+      //   for (let i = 0; i < cleartable.length; i++) {
+      //     this.fields[cleartable[i].module]=cleartable[i].module
+      //   }
+      // }
+    },
+    methods: {
+      versionShow() {
+        this.$showMessage('系统版本：' + this.version)
+      },
+      // clear(){
+      //   let cleartable=Vue.config.safecheck.clearPhone.cleardata
+      //   console.log(this.modelval)
+      //   for (let i = 0; i < cleartable.length; i++) {
+      //     for (let j = 0; j < this.modelval.length; j++) {
+      //       if (cleartable[i].module==this.modelval[i]){
+      //         this.dataclear=Object.assign([],this.dataclear,cleartable[i].tables)
+      //       }
+      //     }
+      //   }
+      //   console.log(this.dataclear)
+      //   this.cleandata()
+      // },
+      close() {
+        this.show = false
+        this.all = false
+        this.flag = true
+        this.modelval = []
+      },
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        console.log('看看选择的顺序。。。', sortModel)
+        console.log('看看选择的顺序。。。', this.modelval)
+        if (sortModel.length == this.modelval.length - 1) {
+          this.flag = false
+          console.log("66666666666666")
+          this.all = false
+        }
+        console.log(Object.keys(this.fields).length)
+        if (sortModel.length == Object.keys(this.fields).length) {
+          this.all = true
+        }
+        this.modelval = sortModel
+      },
+      imgback(val) {
+        return require('../../assets/' + val + '.png')
+      },
+      getTabs() {
+        for (let funs in Vue.user.functions) {
+          if (Vue.user.functions[funs].link == 'system-setup') {
+            return Vue.user.functions[funs].children
+          }
+        }
+      },
+      gotopage(link, name) {
+        if (name == '清空数据') {
+          this.cleanalldata()
+          return
+        }
+        if (name == '系统版本') {
+          this.versionShow()
+          return
+        }
+          // else if (name == '清除数据'){
+          //   this.openclear()
+        // }
+        else if (name == '声音开关') {
+          this.voiceSwitch()
+        } else if (name == '导出数据') {
+          this.outdata()
+        } else if (name == '退出系统') {
+          HostApp.back_home()
+        } else if (name == '删除照片') {
+          const result = HostApp.deletePic()
+          if (result){
+            this.$showMessage('删除成功!共删除照片'+result.delete_pic_ok+'张!')
+          }
+        } else if (name == '返回桌面') {
+          HostApp.back_home()
+        } else if (name == '退出登录') {
+          this.$showMessage('即将返回登陆界面！', ['confirm', 'cancel']).then(async (res) => {
+            if (res === 'confirm') {
+              try {
+                let ip = '';
+                const rest = await fetch(`${this.$androidUtil.getProxyUrl()}/rs/systemUrl/getIp`);
+                const ipData = await rest.json();
+                ip = ipData.ip;
+                let data = {
+                  userid: Vue.user.id,
+                  username: Vue.user.name,
+                  usertelephone: Vue.user.f_user_telephone,
+                  ip: ip?ip:'未知',
+                  device_type: 'PHONE'
+                }
+                ress = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/logout`, data, {
+                  resolveMsg: null,
+                  rejectMsg: null
+                })
+              }catch (e) {
+                return
+              }finally {
+                this.$androidUtil.setPreference('f_repairman_id', 'x')
+                this.$androidUtil.setPreference('f_repairman_name', 'x')
+                this.$androidUtil.setPreference('f_orgid', '')
+                this.$androidUtil.setPreference('f_role_name', '')
+                this.$dispatch('gologin')
+              }
+            }
+          })
+        } else {
+          console.log('进入子组件')
+          let safe = true
+          if (name == '打卡'){
+            safe = false
+          }
+          var prpdata = {
+            _this:this,
+            title:name,
+            safe
+          }
+          this.$dispatch('gotoson',prpdata)
+          this.$goto(link)
+        }
+      },
+      cleanalldata() {
+        this.$showMessage('此操作为清理数据，无法恢复！', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let result = this.$androidUtil.bzLogic('clearPhoneData', {flag: 0})
+            console.log((result.result))
+            if (result.result == '成功') {
+              this.$showMessage('清除数据完成!')
+            } else {
+              this.$showMessage('清除数据失败!')
+            }
+          }
+        })
+      },
+      // 清空数据
+      cleandata() {
+        console.log("88888888888")
+        this.$showMessage('此操作为清理数据，无法恢复！', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let result = this.$androidUtil.bzLogic('clearPhoneDataNew', {tables: this.dataclear})
+            console.log((result.result))
+            if (result.result == '成功') {
+              this.$showMessage('清除数据完成!')
+            } else {
+              this.$showMessage('清除数据失败!')
+            }
+            this.close()
+          }
+        })
+      },
+      // 导出数据
+      openclear() {
+        this.show = true
+      },
+      voiceSwitch() {
+        console.log("进入声音开关")
+        let voicedata = this.$androidUtil.getPreference('f_voiceSwitch')
+        console.log(voicedata)
+        let voicechange = '开启'
+        if (voicedata == "true") {
+          console.log("进入判断")
+          voicechange = '关闭'
+        }
+        this.$showMessage('此操作为' + voicechange + '提示音,请再次确认！', ['confirm', 'cancel']).then((res) => {
+          if (res == 'confirm') {
+            if (voicechange == '关闭') {
+              this.$androidUtil.setPreference('f_voiceSwitch', "false")
+              this.$showMessage('提示音关闭成功!')
+            } else {
+              this.$androidUtil.setPreference('f_voiceSwitch', "true")
+              this.$showMessage('提示音开启成功!')
+            }
+          }
+        })
+      },
+      outdata() {
+        HostApp.backupDatabase()
+        this.$showMessage('数据导出成功!')
+      },
+      //取消自动登录
+      cancelAutoLogin() {
+        let auto = this.$androidUtil.getPreference('autoLogin')
+        if (auto) {
+          this.$androidUtil.setPreference('autoLogin', false)
+          this.$showMessage('已取消自动登录!')
+        } else {
+          this.$showMessage('当前已处于非自动登录!')
+        }
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = Object.keys(this.fields)
+        } else {
+          console.log(this.flag)
+          if (this.flag) {
+            this.modelval = []
+          }
+        }
+        this.flag = true
+      },
+      'modelval.length'() {
+        this.sortModelval()
+      }
+    }
+  }
+
+</script>
+<style scoped>
+  .flex-between {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .flex-between span {
+    padding-right: 10px;
+  }
+
+  .flex-full {
+    flex: 1;
+  }
+
+  .name {
+    font: 15px PingFang-SC-Medium;
+    color: #666666;
+  }
+
+  .imgs {
+    width: 35px;
+    margin-top: 15px;
+  }
+
+  .plan {
+    border-bottom: 0.5px solid #EAEAEA;
+    border-right: 0.5px solid #EAEAEA;
+    height: 120px;
+  }
+
+  .manbiankuang {
+    width: 44%;
+    margin-top: 15px;
+    margin-left: 4%;
+    border: 1px solid #e3e3e3;
+    border-radius: 10px 10px 10px 10px;
+    text-align: center;
+    background-color: #ffffff;
+  }
+
+  .user {
+    border-bottom: 0.5px solid #EAEAEA;
+    border-right: 0.5px solid #EAEAEA;
+    border-left: 0.5px solid #EAEAEA;
+    height: 120px;
+  }
+
+  .safecheck {
+    border-bottom: 0.5px solid #EAEAEA;
+    border-left: 0.5px solid #EAEAEA;
+    height: 120px;
+  }
+
+  .appointment {
+    border-top: 0.5px solid #EAEAEA;
+    border-right: 0.5px solid #EAEAEA;
+    height: 120px;
+  }
+
+  .search {
+    border-top: 0.5px solid #EAEAEA;
+    border-right: 0.5px solid #EAEAEA;
+    border-left: 0.5px solid #EAEAEA;
+    height: 120px;
+  }
+
+  .upload {
+    border-top: 0.5px solid #EAEAEA;
+    border-left: 0.5px solid #EAEAEA;
+    height: 120px;
+  }
+
+
+</style>