safecheck-client 4.0.0-3 → 4.0.0-31

package/src/components/android/Insurance/PhoneInsurancePurchase.vue

@@ -41,7 +41,7 @@
               </div>
               <div class="col-xs-7">
                 <input type="text" class="form-control" v-model="model.f_address" placeholder="请输入客户地址"
-                       condition="f_address like '%{}%'" />
+                       condition="ads.f_address like '%{}%'" />
               </div>
             </div>
             <div class="row text-center app-row">
@@ -76,11 +76,11 @@
                 <p class="panel-title col-xs-3 text-left font">客户电话:</p>
                 <p class="panel-title col-xs-9 text-left input-font">{{ row.f_user_phone }}</p>
               </div>
-              <div class="row">
-                <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"
-                        @click="$parent.$parent.$parent.inspect(row)">去登记
-                </button>
-              </div>
+              <!--              <div class="row">-->
+              <!--                <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"-->
+              <!--                        @click="$parent.$parent.$parent.inspect(row)">去登记-->
+              <!--                </button>-->
+              <!--              </div>-->
             </div>
           </div>
         </div>
@@ -91,192 +91,202 @@
 <script>
 
 
-  import { HttpResetClass, PagedList } from 'vue-client'
-  export default {
-    title: '保险登记',
-    data() {
-      return {
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getInsuranceList`, 20,
-          {
-            sort: `'asc'`
-          }
-        ),
-        orderFields: {
-          f_book_name: 'asc'
-        },
-        isShowRealityArrears: false,
-        criteriaShow: false,
-        booknames: [],//表册名
-        show: false
+import { HttpResetClass, PagedList } from 'vue-client'
+export default {
+  title: '保险登记',
+  props: {
+    f_userinfo_id: {
+      type: String,
+      default: ""
+    }
+  },
+  data() {
+    return {
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/sql/getInsuranceList`, 20,
+        {
+          sort: `'asc'`
+        }
+      ),
+      orderFields: {
+        f_book_name: 'asc'
+      },
+      isShowRealityArrears: false,
+      criteriaShow: false,
+      booknames: [],//表册名
+      show: false
+    }
+  },
+  async ready() {
+    if (this.f_userinfo_id){
+      this.search()
+    }
+  },
+  methods: {
+    switchPage(type) {
+      if (type === 'last' && this.currentPage > 1) {
+        this.currentPage--
+        this.search()
+        return
+      }
+      if (type === 'next' && this.currentPage < this.totalPage) {
+        this.currentPage++
+        this.search()
+        return
       }
     },
-    async ready() {
-      await getInitDate(this)
+    // 返回到抄表待办界面，主动刷新一次
+    clearCondition() {
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
+      this.$refs.paged.$refs.cri.model['f_meter_classify'] = ''
     },
-    methods: {
-      switchPage(type) {
-        if (type === 'last' && this.currentPage > 1) {
-          this.currentPage--
-          this.search()
-          return
-        }
-        if (type === 'next' && this.currentPage < this.totalPage) {
-          this.currentPage++
-          this.search()
-          return
-        }
-      },
-      // 返回到抄表待办界面，主动刷新一次
-      clearCondition() {
-        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
-        })
-        this.$refs.paged.$refs.cri.model['f_meter_classify'] = ''
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      async selfSearch(args) {
-
-        await this.model.search(args.condition, args.model)
-      },
-      search() {
-        this.$refs.paged.$refs.cri.search()
-      },
-      inspect(param) {
-        var propData = {
-          _this: this,
-          title: '保险登记详情',
-          safe: false
-        }
-        param.tabname = this.tabname
-        this.$dispatch('gotoson', propData)
-        this.$goto('phone-insurance-purchase-detail', { data: param, model: param }, 'self', this.search)
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    async selfSearch(args) {
+      if (this.f_userinfo_id){
+        args.condition += ` and ui.f_userinfo_id = '${this.f_userinfo_id}'`
       }
+      await this.model.search(args.condition, args.model)
     },
-    events: {
-      'select'(val) {
-        val.model = this.model
-        this.$dispatch('changepage', val, 'save')
-      },
-      'phonehand-success'(type) {
+    search() {
+      this.$refs.paged.$refs.cri.search()
+    },
+    inspect(param) {
+      var propData = {
+        _this: this.$parent.$parent,
+        title: '保险登记详情',
+        safe: false
+      }
+      param.tabname = this.tabname
+      this.$dispatch('gotoson', propData)
+      this.$parent.$parent.$goto('phone-insurance-purchase-detail', { data: param, model: param }, 'self', this.search)
+    }
+  },
+  events: {
+    'select'(val) {
+      val.model = this.model
+      this.$dispatch('changepage', val, 'save')
+    },
+    'phonehand-success'(type) {
+      this.search()
+    }
+  },
+  watch: {
+    'currentPage'(val) {
+      if (this.currentPage !== val) {
         this.search()
       }
     },
-    watch: {
-      'currentPage'(val) {
-        if (this.currentPage !== val) {
-          this.search()
-        }
-      },
-      'tabname'() {
+    'tabname'() {
 
-      },
-      'model.f_userinfo_id'(val) {
-        if (val === '') {
-          this.search()
-        }
+    },
+    'model.f_userinfo_id'(val) {
+      if (val === '') {
+        this.search()
       }
     }
   }
+}
 </script>
 <style>
-  .bg {
-    background-color: blue;
-    height: 1px;
-    border: 0;
-  }
+.bg {
+  background-color: blue;
+  height: 1px;
+  border: 0;
+}
 
-  .app-row {
-    background-color: white;
-    padding: 10px 10px 0 10px;
-    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-  }
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
 
-  .search_input {
-    border: 0;
-    outline: none;
-  }
+.search_input {
+  border: 0;
+  outline: none;
+}
 
-  .font {
-    font: 15px PingFang-SC-Medium;
-    color: #666666;
-  }
+.font {
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
 
-  .input-font {
-    font: 15px PingFang-SC-Medium;
-    color: #333333;
-  }
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
 
-  .btn-font {
-    font: 600 16px PingFang-SC-Bold;
-    color: #499EDF;
-  }
+.btn-font {
+  font: 600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
 
-  .btn-color {
-    background-color: #FFFFFF;
-    border-radius: 10px;
-    border: 1px solid #499EDF;
-  }
+.btn-color {
+  background-color: #FFFFFF;
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+}
 
-  .app-text {
-    font-size: 12px;
-  }
+.app-text {
+  font-size: 12px;
+}
 
-  .panel-self {
-    border-radius: 10px;
-    border: 1px solid #499EDF;
-    background-color: #F8F8F8;
-  }
+.panel-self {
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+  background-color: #F8F8F8;
+}
 
-  .yybtn-color {
-    background-color: #499edf;
-    border-radius: 4px;
-    border: 1px solid #499EDF;
-    color: #FFFFFF;
-    font: 14px PingFang-SC-Bold;
-  }
+.yybtn-color {
+  background-color: #499edf;
+  border-radius: 4px;
+  border: 1px solid #499EDF;
+  color: #FFFFFF;
+  font: 14px PingFang-SC-Bold;
+}
 
-  .qxbtn-color {
-    background-color: #FFFFFF;
-    border-radius: 4px;
-    color: #499edf;
-    font: 14px PingFang-SC-Bold;
-    border: 1px solid #499EDF;
-  }
+.qxbtn-color {
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  color: #499edf;
+  font: 14px PingFang-SC-Bold;
+  border: 1px solid #499EDF;
+}
 
-  .sort-caret {
-    display: inline-block;
-    width: 0;
-    height: 0;
-    border: 0;
-    content: "";
-    position: absolute;
-    left: 3px;
-    z-index: 2;
-  }
+.sort-caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  border: 0;
+  content: "";
+  position: absolute;
+  left: 3px;
+  z-index: 2;
+}
 
-  .descending {
-    bottom: -30px;
-    border-top: 5px solid #97a8be;
-    border-bottom: none;
-    border-right: 5px solid transparent;
-    border-left: 5px solid transparent;
-  }
+.descending {
+  bottom: -30px;
+  border-top: 5px solid #97a8be;
+  border-bottom: none;
+  border-right: 5px solid transparent;
+  border-left: 5px solid transparent;
+}
 
-  .ascending {
-    border-right: 5px solid transparent;
-    border-left: 5px solid transparent;
-    top: 9px;
-    border-top: none;
-    border-bottom: 5px solid #97a8be;
-  }
+.ascending {
+  border-right: 5px solid transparent;
+  border-left: 5px solid transparent;
+  top: 9px;
+  border-top: none;
+  border-bottom: 5px solid #97a8be;
+}
 
-  .ascend .ascending {
-    border-bottom-color: #48576a;
-  }
+.ascend .ascending {
+  border-bottom-color: #48576a;
+}
 
-  .descend .descending {
-    border-top-color: #48576a;
-  }
+.descend .descending {
+  border-top-color: #48576a;
+}
 </style>

package/src/components/android/Insurance/PhoneInsurancePurchaseDetail.vue

@@ -70,7 +70,7 @@
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">
         <datepicker :value.sync="model.f_ins_start_date" v-model="model.f_ins_start_date" :format="'yyyy-MM-dd'"
-                    placeholder="请选择投保日期" style="width: 60%">
+                    placeholder="请选择投保日期" style="width: 60%" @change="changeExpirationDate">
         </datepicker>
       </div>
     </div>
@@ -80,7 +80,7 @@
         <span class="text-left font">购买年限</span>
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">
-        <input type="number" placeholder="购买年限" style="width: 60%" class="form-control show-font" v-model="model.f_salecount">
+        <input type="number" placeholder="购买年限" style="width: 60%" class="form-control show-font" v-model="model.f_salecount" @change="changeExpirationDate">
       </div>
     </div>
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
@@ -138,72 +138,68 @@
   </div>
 </template>
 <script>
-  import { HttpResetClass } from 'vue-client'
-  import * as Util from '../../../components/Util'
-  import Vue from 'vue'
-  export default {
-    title: '手机单户抄表',
-    data() {
-      return {
-        create_date:Util.getNowDate(),
+import { HttpResetClass } from 'vue-client'
+import * as Util from '../../../components/Util'
+import Vue from 'vue'
+export default {
+  title: '手机单户抄表',
+  data() {
+    return {
+      create_date:Util.getNowDate(),
         isCommit:false
-      }
-    },
-    props: {
-      data: {
-        type: Object,
-        default: function () {
-          return {
-          }
+    }
+  },
+  props: {
+    data: {
+      type: Object,
+      default: function () {
+        return {
         }
-      },
-      model: {
-        type: Object,
-        default: {}
       }
     },
-    ready() {
-      new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-        data: {
+    model: {
+      type: Object,
+      default: {}
+    }
+  },
+  ready() {
+    new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+      data: {
           items: '*',
           tablename: 't_userinfo',
           condition: `f_userinfo_id  = '${this.model.f_userinfo_id}'`,
-          orderitem: '1'
-        }
-      }).then(response => {
-        this.model = Object.assign({}, this.model, response.data[0])
-        // if(response.data[0].f_ins_stop_date && new Date(response.data[0].f_ins_stop_date) >= new Date() && response.data[0].f_ins_stop_date != Util.toStandardDateString()){
-        //   this.$showMessage('当前保险未过期,请核验后再处理。')
-        //   this.isCommit = true
-        // }
-        this.model.f_last_insexpiration_date = response.data[0].f_ins_stop_date
-      })
-      this.model.f_money = ''
-      this.model.f_fee_type = ''
-      this.model.f_insurance_type = '燃气险'
-      this.model.f_comments = ''
-      this.model.f_salecount = 1
-      this.model.f_ins_number = ''
-      this.model.f_ins_start_date = Util.toStandardDateString()
-    },
-    methods: {
-      commit() {
-        if (!this.model.f_money){
-          this.$showMessage('金额未填写，请填写后重新尝试。')
-          return
-        }
-        if (!this.model.f_ins_start_date){
-          this.$showMessage('投保日期未选择，请选择后重新尝试。')
-          return
-        }
-        if (!this.model.f_expiration_date){
-          this.$showMessage('到期日期未选择，请选择后重新尝试。')
-          return
-        }
-        if (!this.model.f_insurance_type){
-          this.$showMessage('保险险种未填写，请填写后重新尝试。')
-          return
-        }
+        orderitem: '1'
+      }
+    }).then(response => {
+      this.model = Object.assign({}, this.model, response.data[0])
+      this.model.f_last_insexpiration_date = response.data[0].f_ins_stop_date
+    })
+    this.model.f_money = ''
+    this.model.f_fee_type = ''
+    this.model.f_insurance_type = '燃气险'
+    this.model.f_comments = ''
+    this.model.f_salecount = 1
+    this.model.f_ins_number = ''
+    this.model.f_ins_start_date = Util.toStandardDateString()
+  },
+  methods: {
+    commit() {
+      if (!this.model.f_money){
+        this.$showMessage('金额未填写，请填写后重新尝试。')
+        return
+      }
+      if (!this.model.f_ins_start_date){
+        this.$showMessage('投保日期未选择，请选择后重新尝试。')
+        return
+      }
+      if (!this.model.f_expiration_date){
+        this.$showMessage('到期日期未选择，请选择后重新尝试。')
+        return
+      }
+      if (!this.model.f_insurance_type){
+        this.$showMessage('保险险种未填写，请填写后重新尝试。')
+        return
+      }
         let commit_data = this.model
         commit_data.f_buy_date = this.create_date
         commit_data.f_total_ins_charge = ''
@@ -215,74 +211,70 @@
         commit_data.f_orgname = Vue.user.orgs
         commit_data.f_depid = Vue.user.depids
         commit_data.f_depname = Vue.user.deps
-        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/saveInsInfo`, { data: commit_data }).then(response => {
+        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/saveInsInfo`, { data: commit_data }).then(response => {
           this.$showMessage('提交成功')
+          this.$back()
         }).catch(error => {
           this.$showMessage('提交失败')
           this.isCommit = false
         })
-      },
     },
-    watch: {
-      'model.f_ins_start_date'(new_var, old_var) {
-        if (new_var) {
-          this.model.f_expiration_date = Number(new_var.substring(0, 4)) + Number(this.model.f_salecount) + new_var.substring(4)
-        } else {
-          this.model.f_expiration_date = Number(old_var.substring(0, 4)) + Number(this.model.f_salecount) + old_var.substring(4)
-        }
-      },
-      'model.f_salecount'(new_var) {
-        if (new_var) {
-          this.model.f_expiration_date = Number(this.model.f_ins_start_date.substring(0, 4)) + Number(new_var) + this.model.f_ins_start_date.substring(4)
-        } else {
-          this.model.f_expiration_date = Number(this.model.f_ins_start_date.substring(0, 4)) + Number(new_var) + this.model.f_ins_start_date.substring(4)
-        }
+    changeExpirationDate(){
+      if (this.model.f_ins_start_date && this.model.f_salecount){
+        let factoryDate = new Date(this.model.f_ins_start_date)
+        let scrapDate = new Date(factoryDate)
+        scrapDate.setFullYear(factoryDate.getFullYear() + parseInt(this.model.f_salecount))
+        let year = scrapDate.getFullYear()
+        let month = (scrapDate.getMonth() + 1).toString().padStart(2, '0')
+        let day = scrapDate.getDate().toString().padStart(2, '0')
+        this.model.f_expiration_date = `${year}-${month}-${day}`
       }
     }
   }
+}
 </script>
 <style scoped>
-  .mt-5 {
-    margin-top: 5px;
-  }
+.mt-5 {
+  margin-top: 5px;
+}
 
-  .mt-10 {
-    margin-top: 10px;
-  }
+.mt-10 {
+  margin-top: 10px;
+}
 
-  .mt-20 {
-    margin-top: 20px;
-  }
+.mt-20 {
+  margin-top: 20px;
+}
 
-  .app-row {
-    background-color: white;
-    padding: 10px 10px 0 10px;
-    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-  }
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
 
-  .app-row-none-border {
-    background-color: white;
-    padding: 10px 10px 0 10px;
-  }
+.app-row-none-border {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+}
 
-  .font {
-    font: 15px PingFang-SC-Medium;
-    color: #666666;
-  }
+.font {
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
 
-  .show-font {
-    font: 15px PingFang-SC-Medium;
-    color: #333333
-  }
+.show-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333
+}
 
-  .btn-font {
-    font: 600 16px PingFang-SC-Bold;
-    color: #499EDF;
-  }
+.btn-font {
+  font: 600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
 
-  .btn-color {
-    background-color: #FFFFFF;
-    border-radius: 10px;
-    border: 1px solid #499EDF;
-  }
+.btn-color {
+  background-color: #FFFFFF;
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+}
 </style>

package/src/components/android/Insurance/PhoneInsuranceRecordList.vue

@@ -142,7 +142,7 @@
     props: ['data', 'tabname'],
     data() {
       return {
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getInsuranceChargesList`, 20,
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/sql/getInsuranceChargesList`, 20,
           {
             sort: `'asc'`
           }