safecheck-client 4.0.0-9 → 4.0.0-90

package/src/components/android/PaperFeedback.vue

@@ -97,7 +97,7 @@
       </div>
     </div>
     <div class="form-group col-sm-12 col-xs-12 col-md-12 " :class="style__">
-      <input type="checkbox" v-model="paper.f_read_instructions"/><label class="text-left font">我已阅读须知内容</label>
+      &ensp;&ensp;<input type="checkbox" v-model="paper.f_read_instructions" style="transform: scale(1.5);"/><label class="text-left font">我已阅读须知内容</label>
 
     </div>
     <div class="form-group col-sm-12 col-xs-12 col-md-12 " :class="style__">
@@ -1219,6 +1219,8 @@ export default {
         this.paper.f_blacklist = "否"
         this.$showMessage("取消该用户限制购气成功！")
       } else {
+        this.showmodelthree = false
+        this.deleteenabled = true
         this.$showMessage("网络异常，请稍后再试！")
       }
     },
@@ -1249,7 +1251,7 @@ export default {
         limit_value = Vue.config.safecheck.ApproveConfig.limit_value
         limit_amount = Vue.config.safecheck.ApproveConfig.limit_amount
       }
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
         data: {
           data:this.$parent.$parent.data,
           item:this.$parent.$parent.data.item,
@@ -1273,21 +1275,21 @@ export default {
           "f_limit_amount":limit_amount,
           'f_limit_type':'气量'
         }
-      }, {resolveMsg: null, rejectMsg: null})
-
-      ////tag)
-      if (res2.data.code == 200) {
+      }, {resolveMsg: null, rejectMsg: null}).then(res2=>{
         this.showmodel = false
         this.enabled = true
         this.paper.f_blacklist = "是"
         this.$showMessage("将该用户限制购气成功！")
-      } else if (res2.data.msg == '数据增加重复') {
-        this.showmodel = false
-        this.enabled = true
-        this.$showMessage("该用户已被限制购气，请勿重复提交！")
-      } else {
-        this.$showMessage("网络异常，请稍后再试！")
-      }
+      }).catch(error=>{
+        if (error.status== 601){
+          this.showmodel = false
+          this.enabled = true
+          this.paper.f_blacklist = "是"
+          this.$showMessage("该用户已被限制购气，请勿重复提交！")
+        }else {
+          this.$showMessage("网络异常，请稍后再试！")
+        }
+      })
     },
     cancel() {
       this.backlistisselect = false

package/src/components/android/PaperFeedbackTemp.vue

@@ -1143,7 +1143,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         ////tag)
         ////tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1201,7 +1201,7 @@
           limit_times = Vue.config.safecheck.ApproveConfig.limit_times
           limit_value = Vue.config.safecheck.ApproveConfig.limit_value
         }
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
           data: {
             data:this.$parent.$parent.data,
             item:this.$parent.$parent.data.item,

package/src/components/android/PhoneUpUserinfo.vue

@@ -630,6 +630,16 @@
             userinfoms.f_orgname_record = Vue.user.orgs
             userinfoms.f_depid_record = Vue.user.depids
             userinfoms.f_depname_record = Vue.user.deps
+            this.userinfo_old.baseinfo.base.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
+            this.userinfo_old.baseinfo.base.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+            this.userinfo_old.baseinfo.base.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
+            this.userinfo_old.baseinfo.base.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
+            this.userinfo_old.addressinfo.f_iscity = this.userinfo.addressinfo.f_iscity
+            this.userinfo_old.addressinfo.f_building = this.userinfo.addressinfo.f_building
+            this.userinfo_old.addressinfo.f_unit = this.userinfo.addressinfo.f_unit
+            this.userinfo_old.addressinfo.f_floor = this.userinfo.addressinfo.f_floor
+            this.userinfo_old.addressinfo.f_room = this.userinfo.addressinfo.f_room
+            this.userinfo_old.addressinfo.f_address = this.userinfo.addressinfo.f_address
             this.userinfo_old.meterinfo[0].f_gas_person = this.userinfo.meterinfo[0].f_gas_person
             this.userinfo_old.meterinfo[0].f_gas_date = this.userinfo.meterinfo[0].f_gas_date
             this.userinfo_old.meterinfo[0].f_adjustable_id = this.userinfo.meterinfo[0].f_adjustable_id
@@ -694,6 +704,16 @@
             userinfoms.f_orgname_record = Vue.user.orgs
             userinfoms.f_depid_record = Vue.user.depids
             userinfoms.f_depname_record = Vue.user.deps
+            this.userinfo_old.baseinfo.base.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
+            this.userinfo_old.baseinfo.base.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+            this.userinfo_old.baseinfo.base.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
+            this.userinfo_old.baseinfo.base.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
+            this.userinfo_old.addressinfo.f_iscity = this.userinfo.addressinfo.f_iscity
+            this.userinfo_old.addressinfo.f_building = this.userinfo.addressinfo.f_building
+            this.userinfo_old.addressinfo.f_unit = this.userinfo.addressinfo.f_unit
+            this.userinfo_old.addressinfo.f_floor = this.userinfo.addressinfo.f_floor
+            this.userinfo_old.addressinfo.f_room = this.userinfo.addressinfo.f_room
+            this.userinfo_old.addressinfo.f_address = this.userinfo.addressinfo.f_address
             this.userinfo_old.meterinfo[0].f_gas_person = this.userinfo.meterinfo[0].f_gas_person
             this.userinfo_old.meterinfo[0].f_gas_date = this.userinfo.meterinfo[0].f_gas_date
             this.userinfo_old.meterinfo[0].f_adjustable_id = this.userinfo.meterinfo[0].f_adjustable_id

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>

package/src/components/android/PlumberAnnualDetail.vue

@@ -1,65 +1,65 @@
-<template>
-  <div>
-    <label>{{f_repairman}}{{f_plan_year}}任务月完成情况</label>
-    <button type="button" class="btn btn-default" @click="this.$goto('plumber-annual', {}, 'master-router')">&lt;&lt;</button>
-    <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_plan_year}}</td>
-        <td>{{row.f_plan_month}}</td>
-        <td>{{row.checked}}</td>
-        <td>{{row.checking}}</td>
-        <td>{{row.unchecked}}</td>
-      </template>
-    </data-grid>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import co from 'co'
-import Vue from 'vue'
-
-let aggCheckerTaskDetail = function * (self) {
-    let result = yield self.$post(Vue.url + 'sql/统计维修员年任务明细?pageNo=1&pageSize=9999', {
-        data: {
-            f_repairman: self.f_repairman,
-            f_plan_year: self.f_plan_year,
-            f_subcompany: Vue.user.f_subcompany
-        }
-    }, {
-        resolveMsg: null,
-        rejectMsg: '提取任务出错'
-    })
-    self.$set("model.rows", result.data)
-}
-
-export default {
-  title: '维修员年任务明细',
-  props: ['f_repairman', 'f_plan_year'],
-  data() {
-    return {
-      model: {
-        rows: []
-      }
-    }
-  },
-  ready () {
-    this.getPlan()
-  },
-  methods: {
-    getPlan () {
-      let fp = aggCheckerTaskDetail(this)
-      co(fp)
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <label>{{f_repairman}}{{f_plan_year}}任务月完成情况</label>
+    <button type="button" class="btn btn-default" @click="this.$goto('plumber-annual', {}, 'master-router')">&lt;&lt;</button>
+    <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_plan_year}}</td>
+        <td>{{row.f_plan_month}}</td>
+        <td>{{row.checked}}</td>
+        <td>{{row.checking}}</td>
+        <td>{{row.unchecked}}</td>
+      </template>
+    </data-grid>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import co from 'co'
+import Vue from 'vue'
+
+let aggCheckerTaskDetail = function * (self) {
+    let result = yield self.$post(Vue.url + 'sql/统计维修员年任务明细?pageNo=1&pageSize=9999', {
+        data: {
+            f_repairman: self.f_repairman,
+            f_plan_year: self.f_plan_year,
+            f_subcompany: Vue.user.f_subcompany
+        }
+    }, {
+        resolveMsg: null,
+        rejectMsg: '提取任务出错'
+    })
+    self.$set("model.rows", result.data)
+}
+
+export default {
+  title: '维修员年任务明细',
+  props: ['f_repairman', 'f_plan_year'],
+  data() {
+    return {
+      model: {
+        rows: []
+      }
+    }
+  },
+  ready () {
+    this.getPlan()
+  },
+  methods: {
+    getPlan () {
+      let fp = aggCheckerTaskDetail(this)
+      co(fp)
+    }
+  }
+}
+</script>

package/src/components/android/PlumberMonthly.vue

@@ -1,84 +1,84 @@
-<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>
-        <label for="c_plan_month">月份：</label>
-        <v-select id="c_plan_month" :value.sync="c_plan_month"
-        :options='c_month_list' close-on-select clear-button></v-select>
-        <button type="button" class="btn btn-default" @click="search">刷新</button>
-      </div>
-    </form>
-    <data-grid :model="model" partial='list' v-ref:grid>
-      <template partial='head'>
-        <tr>
-          <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>
-      </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.$resetpost(Vue.url + 'sql/统计维修员月任务?pageNo=1&pageSize=9999', {
-        data: {
-            id: Vue.user.id,
-            org_id: Vue.user.parentid,
-            f_subcompany: Vue.user.f_subcompany,
-            f_ym: self.c_plan_year[0] + '-' + (self.c_plan_month[0].length > 1 ? self.c_plan_month[0] : '0' + self.c_plan_month[0])
-        }
-    }, {
-        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+''})
-    let moptions = []
-    for(let i=1; i<=12; i++)
-      moptions.push({label: i + '', value: i + ''})
-    return {
-      c_plan_year: options[0].value,
-      c_year_list: options,
-      c_month_list: moptions,
-      c_plan_month: moptions[new Date().getMonth()].value,
-      model: {
-        rows: [],
-      }
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    search () {
-      let fp = aggCheckerTask(this)
-      co(fp)
-    }
-  }
-}
-</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>
+        <label for="c_plan_month">月份：</label>
+        <v-select id="c_plan_month" :value.sync="c_plan_month"
+        :options='c_month_list' close-on-select clear-button></v-select>
+        <button type="button" class="btn btn-default" @click="search">刷新</button>
+      </div>
+    </form>
+    <data-grid :model="model" partial='list' v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <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>
+      </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.$resetpost(Vue.url + 'sql/统计维修员月任务?pageNo=1&pageSize=9999', {
+        data: {
+            id: Vue.user.id,
+            org_id: Vue.user.parentid,
+            f_subcompany: Vue.user.f_subcompany,
+            f_ym: self.c_plan_year[0] + '-' + (self.c_plan_month[0].length > 1 ? self.c_plan_month[0] : '0' + self.c_plan_month[0])
+        }
+    }, {
+        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+''})
+    let moptions = []
+    for(let i=1; i<=12; i++)
+      moptions.push({label: i + '', value: i + ''})
+    return {
+      c_plan_year: options[0].value,
+      c_year_list: options,
+      c_month_list: moptions,
+      c_plan_month: moptions[new Date().getMonth()].value,
+      model: {
+        rows: [],
+      }
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    search () {
+      let fp = aggCheckerTask(this)
+      co(fp)
+    }
+  }
+}
+</script>