safecheck-client 3.0.35-6 → 3.0.35-60

package/src/components/android/PhoneSellInfo.vue

@@ -1,113 +1,148 @@
-<template >
-  <div class="panel panel-default auto repair-info-content">
-    <div class="panel-body">
-      <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_charge_state}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  缴费方式: {{row.f_payment}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  购气时间: {{row.f_delivery_date.substring(0,11)}} {{row.f_delivery_date.substring(11,19)}}
-                </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: [],
-        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
-          //tag
-        }
-        //tag
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_delivery_date desc', condition:`f_userinfo_id = '${userinfoid}'`}}).then((row) => {
-          this.model = row.data
-        })
-      },
-      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 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>
+      <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>
+      <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/android/PhoneUpUserinfo.vue

@@ -641,7 +641,11 @@
             userinfoms.userfiles = []
             this.userinfo_old.meterinfo[0].devicesinfo = this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
+            let url = 'rs/logic/filemanage_fileSave'
+            if(Vue.isv4){
+              url ='api/af-revenue/logic/openapi/filemanage_fileSave'
+            }
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url}`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -657,7 +661,11 @@
                 data.f_address = this.userinfo.addressinfo.f_address? this.userinfo.addressinfo.f_address : this.userinfo_old.addressinfo.f_address
                 //
                 data.f_operator = Vue.user.name
-                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {data: data}).then((res2) => {
+                let url1 = 'rs/logic/address_updateuseraddress'
+                if(Vue.isv4){
+                  url1 ='api/af-revenue/logic/openapi/address_updateuseraddress'
+                }
+                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url1}`, {data: data}).then((res2) => {
                   this.$showMessage("修改用户地址信息成功！")
                 }).catch(error => {
                   this.$showMessage("修改用户地址信息！")
@@ -708,7 +716,11 @@
             this.userinfo_old.meterinfo[0].devicesinfo = this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
             //tag)
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
+            let url = 'rs/logic/filemanage_fileSave'
+            if(Vue.isv4){
+              url ='api/af-revenue/logic/openapi/filemanage_fileSave'
+            }
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/${url}`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -1091,8 +1103,11 @@
         pcdlist.data.forEach((result) => {
           this.pcds.push({label: result.f_pcd, value: result})
         })
-        ////tag)
-        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
+        let url = 'rs/logic/filemanage_getFilesDetail'
+        if(Vue.isv4){
+          url ='api/af-revenue/logic/openapi/filemanage_getFilesDetail'
+        }
+        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/${url}`, {
           //f_userinfo_code:'12381344',
           f_userinfo_id: this.f_userinfo_id
         }, {resolveMsg: null, rejectMsg: null})
@@ -1136,7 +1151,11 @@
       console.log(this.showBox)
       if (this.showBox) {
         // 获取调压箱
-        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
+        let url = 'rs/sql/adjustableboxQuery'
+        if(Vue.isv4){
+          url ='api/af-revenue/sql/adjustableboxQuery'
+        }
+        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/${url}`, {data: {condition: '1 = 1'}}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {

package/src/components/android/PhoneotherInfo.vue

@@ -90,14 +90,6 @@
       }
     },
     watch: {
-      'user' (val) {
-        if(this.user){
-          if (!(this.user.isNuN)) {
-            this.model= []
-            this.getmodel()
-          }
-        }
-      },
       'f_userinfo_id'(){
         if(this.f_userinfo_id){
           this.model= []
@@ -106,12 +98,6 @@
       }
     },
     ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        this.getmodel()
-      }
-      if(this.f_userinfo_id){
-        this.getmodel()
-      }
     }
   }
 </script>

package/src/components/android/PhoneotherInfov3.vue

@@ -0,0 +1,118 @@
+<template >
+  <div class="panel panel-default auto repair-info-content">
+    <div class="panel-body">
+      <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_brand_spec}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  品名规格: {{row.f_typename}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  单价: {{row.f_collection}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  数量: {{row.f_number}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收款: {{row.f_money}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  付款方式: {{row.f_payment}}
+                </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_operate_date}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  服务人员: {{row.f_operator}}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <p v-show="model.length == 0 && noExp ">此用户暂无其他收费记录</p>
+      <p v-show="model.length == 0 && !noExp ">{{expMsg}}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  import Vue from 'vue'
+  export default {
+    title: '查询其他收费记录',
+    data () {
+      return {
+        model: [],
+        show: false,
+        row: Object,
+        noExp: false,
+        expMsg: '查询中......'
+      }
+    },
+    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_userinfoid
+          console.log(this.user.f_userinfo_id)
+        }
+        console.log(userinfoid)
+        this.noExp = false
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/otherChargeQuery`, {data: {
+            condition: ` f_orgid in ('${Vue.user.orgid}') and f_userinfo_id =  '${userinfoid}' and f_state = '有效'`,
+            orderitem: "f_operate_date desc"
+          }
+        }).then((row) => {
+          this.model = row.data
+          this.noExp = true
+        })
+      },
+      back(){
+
+      }
+    },
+    watch: {
+      'f_userinfo_id'(){
+        if(this.f_userinfo_id){
+          this.model= []
+          this.getmodel()
+        }
+      }
+    },
+    ready () {
+    }
+  }
+</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/android/PlumberAnnual.vue

@@ -1,83 +1,83 @@
-<template>
-  <div>
-    <form>
-      <div class="form-group">
-        <label for="c_plan_year">年份：</label>
-        <v-select id="c_plan_year" :value.sync="c_plan_year"
-        :options='c_year_list' close-on-select clear-button></v-select>
-      </div>
-    </form>
-    <data-grid :model="model" partial='list' v-ref:grid>
-      <template partial='head'>
-        <tr>
-          <th>维修员</th>
-          <th>已维修</th>
-          <th>在维修</th>
-          <th>未维修</th>
-          <th></th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <td>{{row.f_repairman}}</td>
-        <td>{{row.checked}}</td>
-        <td>{{row.checking}}</td>
-        <td>{{row.unchecked}}</td>
-        <td v-on:click.stop.prevent='$parent.$parent.showDetail(row)'><span class="glyphicon glyphicon-option-horizontal"></span></td>
-      </template>
-    </data-grid>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-
-let aggCheckerTask = function * (self) {
-    let result = yield self.$post(Vue.url + 'sql/统计维修员年任务?pageNo=1&pageSize=9999', {
-        data: {
-            id: Vue.user.id,
-            org_id: Vue.user.parentid,
-            f_plan_year: self.c_plan_year[0],
-            f_subcompany: Vue.user.f_subcompany
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '维修员年任务',
-  data() {
-    let options = []
-    let year = (new Date()).getFullYear()
-    options.push({label: year+'', value: year+''})
-    year++
-    options.push({label: year+'', value: year+''})
-    return {
-      c_plan_year: options[0].value,
-      c_year_list: options,
-      model: {
-        rows: [],
-      }
-    }
-  },
-  ready () {
-    this.$watch('c_plan_year', function (val) {
-        this.getPlan()
-    })
-    this.getPlan()
-  },
-  methods: {
-    getPlan () {
-      let fp = aggCheckerTask(this)
-      co(fp)
-    },
-    showDetail (row) {
-      this.$parent.$goto('plumber-annual-detail', {f_plan_year: this.c_plan_year[0], f_repairman: row.f_repairman}, 'master-router')
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <form>
+      <div class="form-group">
+        <label for="c_plan_year">年份：</label>
+        <v-select id="c_plan_year" :value.sync="c_plan_year"
+        :options='c_year_list' close-on-select clear-button></v-select>
+      </div>
+    </form>
+    <data-grid :model="model" partial='list' v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>维修员</th>
+          <th>已维修</th>
+          <th>在维修</th>
+          <th>未维修</th>
+          <th></th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td>{{row.f_repairman}}</td>
+        <td>{{row.checked}}</td>
+        <td>{{row.checking}}</td>
+        <td>{{row.unchecked}}</td>
+        <td v-on:click.stop.prevent='$parent.$parent.showDetail(row)'><span class="glyphicon glyphicon-option-horizontal"></span></td>
+      </template>
+    </data-grid>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+
+let aggCheckerTask = function * (self) {
+    let result = yield self.$post(Vue.url + 'sql/统计维修员年任务?pageNo=1&pageSize=9999', {
+        data: {
+            id: Vue.user.id,
+            org_id: Vue.user.parentid,
+            f_plan_year: self.c_plan_year[0],
+            f_subcompany: Vue.user.f_subcompany
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '维修员年任务',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    options.push({label: year+'', value: year+''})
+    year++
+    options.push({label: year+'', value: year+''})
+    return {
+      c_plan_year: options[0].value,
+      c_year_list: options,
+      model: {
+        rows: [],
+      }
+    }
+  },
+  ready () {
+    this.$watch('c_plan_year', function (val) {
+        this.getPlan()
+    })
+    this.getPlan()
+  },
+  methods: {
+    getPlan () {
+      let fp = aggCheckerTask(this)
+      co(fp)
+    },
+    showDetail (row) {
+      this.$parent.$goto('plumber-annual-detail', {f_plan_year: this.c_plan_year[0], f_repairman: row.f_repairman}, 'master-router')
+    }
+  }
+}
+</script>