safecheck-client 4.0.0-45 → 4.0.0-48

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.0-45",
+  "version": "4.0.0-48",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/filiale/jinhong/android/PhoneInsuranceRecordList.vue

@@ -77,6 +77,17 @@
                           v-model="model.f_operator" close-on-select clear-button></v-select>
               </div>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-5" style="margin-bottom: 6px">
+                <img src="../../../assets/add.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <span class="text-left font">收费方式</span>
+              </div>
+              <div class="col-xs-7">
+                <v-select :value.sync="model.f_payment" class="input-font" condition="f_payment = '{}'"
+                          :options='$parent.$parent.payTypes' :width="'100%'"
+                          v-model="model.f_payment" close-on-select clear-button></v-select>
+              </div>
+            </div>
             <div class="row text-center app-row">
               <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"
                       @click="$parent.$parent.search()">查询
@@ -121,6 +132,10 @@
                 <p class="panel-title col-xs-3 text-left font">保险类型:</p>
                 <p class="panel-title col-xs-9 text-left input-font">{{ row.f_fee_type }}</p>
               </div>
+              <div class="row">
+                <p class="panel-title col-xs-3 text-left font">收费方式:</p>
+                <p class="panel-title col-xs-9 text-left input-font">{{ row.f_payment }}</p>
+              </div>
               <div class="row">
                 <p class="panel-title col-xs-3 text-left font">开始时间:</p>
                 <p class="panel-title col-xs-9 text-left input-font">{{ row.f_ins_start_date }}</p>
@@ -146,171 +161,172 @@
 </template>
 <script>
 
-  import { HttpResetClass, PagedList } from 'vue-client'
-  import Vue from 'vue'
-  export default {
-    title: '保险登记',
-    props: ['data', 'tabname'],
-    data() {
-      return {
-        operators:[{label:'全部',value:'全部'}],
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/sql/getInsuranceChargesList`, 20,
-          {
-            sort: `'asc'`
-          }
-        )
-      }
-    },
-    async ready() {
-      let dt = new Date()
-      let year = dt.getFullYear()
-      let month = dt.getMonth()-2
-      if(month<=0){
-        year = year -1
-        month = dt.getMonth()+10
-      }
-      let date = dt.getDate()
-      this.$refs.paged.$refs.cri.model.f_ins_start_date = year + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
-      this.initOperators()
-      this.$refs.paged.$refs.cri.model.f_operator = Vue.user.name
-    },
-    methods: {
-      initOperators(){
-        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
-          data: {
-            items: 'f_operator',
-            tablename: 't_userfees',
-            condition: `1=1`,
-            groupitem: 'f_operator'
-          }
-        }, {resolveMsg: null, rejectMsg: null}).then(res => {
-          res.data.forEach(ress => {
-            this.operators.push({
-              label: ress.f_operator,
-              value: ress.f_operator
-            })
+import { HttpResetClass, PagedList } from 'vue-client'
+import Vue from 'vue'
+export default {
+  title: '保险登记',
+  props: ['data', 'tabname'],
+  data() {
+    return {
+      operators:[{label:'全部',value:'全部'}],
+      payTypes: [{label: '请选择', value: ''}, ...this.$appdata.getParam('付款方式')],
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-revenue/sql/getInsuranceChargesList`, 20,
+        {
+          sort: `'asc'`
+        }
+      )
+    }
+  },
+  async ready() {
+    let dt = new Date()
+    let year = dt.getFullYear()
+    let month = dt.getMonth()-2
+    if(month<=0){
+      year = year -1
+      month = dt.getMonth()+10
+    }
+    let date = dt.getDate()
+    this.$refs.paged.$refs.cri.model.f_ins_start_date = year + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
+    this.initOperators()
+    this.$refs.paged.$refs.cri.model.f_operator = Vue.user.name
+  },
+  methods: {
+    initOperators(){
+      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
+        data: {
+          items: 'f_operator',
+          tablename: 't_userfees',
+          condition: `1=1`,
+          groupitem: 'f_operator'
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then(res => {
+        res.data.forEach(ress => {
+          this.operators.push({
+            label: ress.f_operator,
+            value: ress.f_operator
           })
         })
-      },
-      clearCondition() {
-        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
-        })
-      },
-      selfSearch(args) {
-        args.condition += ` and f_state != '无效'`
-        this.model.search(args.condition, args.model)
-      },
-      search() {
-        this.$refs.paged.$refs.cri.search()
-      },
-
+      })
     },
-    events: {
-
+    clearCondition() {
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
+    },
+    selfSearch(args) {
+      args.condition += ` and f_state != '无效'`
+      this.model.search(args.condition, args.model)
+    },
+    search() {
+      this.$refs.paged.$refs.cri.search()
     },
-    watch: {
 
-    }
+  },
+  events: {
+
+  },
+  watch: {
+
   }
+}
 </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/filiale/jinhong/android.js

@@ -1,10 +1,10 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-// 手机特殊目录注册到该文件中
-let specialComp = {
-  'phone-insurance-record-list': (resolve) => { require(['./android/PhoneInsuranceRecordList.vue'], resolve) },
-  'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) }
-}
-exports.specialComp = specialComp
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'phone-insurance-record-list': (resolve) => { require(['./android/PhoneInsuranceRecordList.vue'], resolve) },
+  'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) }
+}
+exports.specialComp = specialComp
+