sale-client 3.6.507 → 3.6.508

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.507",
+  "version": "3.6.508",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/cardHandManage/cardsHand.vue

@@ -185,6 +185,17 @@
                           condition="f_meter_brand = '{}'"
                 ></v-select>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">使用类型</label>
+                <v-select :value.sync="model.f_use_type"
+                          v-model="model.f_use_type"
+                          :options='usetypes'
+                          placeholder='请选择'
+                          v-model="model.f_use_type"
+                          condition="f_usetype = '{}'"
+                          >
+                </v-select>
+              </div>
               <res-select-group :show-component="['company','department','operator']" :initres="$parent.$parent.initres"
                                 @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               <hl-downdata class="col-sm-1 form-group" :info="model"></hl-downdata>
@@ -275,6 +286,9 @@
               <th>
                 <nobr>状态</nobr>
               </th>
+              <th>
+                <nobr>使用类型</nobr>
+              </th>
               <th>
                 <nobr>操作</nobr>
               </th>
@@ -373,6 +387,7 @@
               </div>
             </td>
             <td style="text-align: center;">{{ row.f_meter_state }}</td>
+            <td style="text-align: center;">{{ row.f_usetype }}</td>
             <td style="text-align: center;">
 
               <!--                        <button type="button" name="button" class="btn btn-link"-->
@@ -798,6 +813,9 @@ export default {
     usertypes () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
     },
+    usetypes (){
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+    },
     userlevels () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')]
     },

package/src/components/revenue/changeInsurance/InsuranceAdd.vue

@@ -197,6 +197,9 @@
           insuranceType: '燃气险',
           insurancestate: '有效'
         },
+        model: {
+          f_ins_start_date: ''
+        },
         paytype: [],
         insurancetype: this.$appdata.getParam('险种'),
         insurancestate: this.$appdata.getParam('保险状态'),
@@ -251,6 +254,7 @@
         }
       }
       this.model.f_buy_date = this.$login.toStandardTimeString()
+      this.$set('model.f_ins_start_date', Util.toStandardDateString())
       this.model.f_ins_start_date = Util.toStandardDateString()
       this.model.f_salecount = 1
       this.model.f_money = 0
@@ -318,7 +322,7 @@
         if(val&& this.model.f_userinfo_id){
           this.model.f_insurance_type = this.model.f_insurance_type == null ? this.config.insuranceType : this.model.f_insurance_type
           this.model.f_state = this.model.f_state == null ? this.config.insurancestate : this.model.f_state
-          this.model.f_ins_start_date = Util.toStandardTimeString()
+          this.model.f_ins_start_date = Util.toStandardDateString()
           console.log('cs===================cs',this.model.f_userinfo_id,this.model.f_ins_start_date)
         }
       }

package/src/filiale/bayan/SafeCheck.vue

@@ -153,153 +153,155 @@
   </modal>
 </template>
 <script>
-  /**
-   *用户信息
-   *安检信息
-   */
+/**
+ *用户信息
+ *安检信息
+ */
 
-  import {HttpResetClass} from 'vue-client'
-  import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
 
-  let asyncReady = async function (self) {
-    // 获取配置信息
-    try {
-      let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
-      Vue.config = res.data
-    } catch (error) {
-      // 忽略704,文件找不到异常R
-      if (error.status !== 704) {
-        throw error
-      }
+let asyncReady = async function (self) {
+  // 获取配置信息
+  try {
+    let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+    Vue.config = res.data
+  } catch (error) {
+    // 忽略704,文件找不到异常R
+    if (error.status !== 704) {
+      throw error
     }
   }
-  let getSafeCheckGen = async function (self) {
-    // 获取安检信息
-    try {
-      let http = new HttpResetClass()
-      let param = {
-        f_userfiles_id: self.data.f_userfiles_id,
-        f_userinfo_id: self.data.f_userinfo_id
-      }
-      if (self.data.f_olduserinfo_code) {
-        param.f_olduserinfo_code = self.data.f_olduserinfo_code
-      }
-      let getSafeCheck = await http.load('POST', 'rs/logic/getSafecheck', param, {resolveMsg: null, rejectMsg: null})
-      if (!(JSON.stringify(getSafeCheck.data) == '{}')) {
-        self.model = {}
-        self.model = Object.assign({}, self.model, getSafeCheck.data)
-        self.hasCheck = 1
-      } else {
-        self.hasCheck = 0
-      }
-    } catch (error) {
-      self.hasCheck = 0
+}
+let getSafeCheckGen = async function (self) {
+  // 获取安检信息
+  try {
+    let http = new HttpResetClass()
+    let param = {
+      f_userfiles_id: self.data.f_userfiles_id,
+      f_userinfo_id: self.data.f_userinfo_id
     }
-
-    if (new Date(self.model.f_next_check_date) < new Date(self.nowdate)) {
-      self.style = 'text-align: center;border: #E9E9E9 solid 1px;color:red'
+    if (self.data.f_olduserinfo_code) {
+      param.f_olduserinfo_code = self.data.f_olduserinfo_code
+    }
+    let getSafeCheck = await http.load('POST', 'rs/logic/getSafecheck', param, {resolveMsg: null, rejectMsg: null})
+    if (!(JSON.stringify(getSafeCheck.data) == '{}')) {
+      self.model = {}
+      self.model = Object.assign({}, self.model, getSafeCheck.data)
+      self.hasCheck = 1
     } else {
-      self.style = 'text-align: center;border: #E9E9E9 solid 1px;'
+      self.hasCheck = 0
     }
+  } catch (error) {
+    self.hasCheck = 0
   }
 
-  export default {
-    title: '安检信息',
-    data () {
-      return {
-        model: {},
-        style: 'text-align: center;border: #E9E9E9 solid 1px;',
-        nowdate: this.$login.toStandardTimeString(),
-        hasCheck: -1,
-        imgshow: false,
-        imgshow2: false,
-        showimg1: '',
-        showimg2: '',
-        showimg3: '',
-        nextCheckDateShow: true,
-        showimg4: ''
-      }
-    },
-    props: ['data'],
-    ready () {
-      getSafeCheckGen(this)
-      if (this.$appdata.getSingleValue('是否显示下次安检时间') == '否') {
-        this.nextCheckDateShow = false
-      }
-    },
-    methods: {
-      change (row) {
-        asyncReady(this).then(() => {
-          console.log("1234658", row)
-          row.f_upload_state = '已传'
-          this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
-        }).catch(
-          (respanse) => {
-            alert ('获取配置文件失败')
-          })
-      },
-      showpicture2 () {
-        this.imgshow2 = true
-      }
+  if (new Date(self.model.f_next_check_date) < new Date(self.nowdate)) {
+    self.style = 'text-align: center;border: #E9E9E9 solid 1px;color:red'
+  } else {
+    self.style = 'text-align: center;border: #E9E9E9 solid 1px;'
+  }
+}
+
+export default {
+  title: '安检信息',
+  data () {
+    return {
+      model: {},
+      style: 'text-align: center;border: #E9E9E9 solid 1px;',
+      nowdate: this.$login.toStandardTimeString(),
+      hasCheck: -1,
+      imgshow: false,
+      imgshow2: false,
+      showimg1: '',
+      showimg2: '',
+      showimg3: '',
+      nextCheckDateShow: true,
+      showimg4: ''
+    }
+  },
+  props: ['data'],
+  ready () {
+    getSafeCheckGen(this)
+    if (this.$appdata.getSingleValue('是否显示下次安检时间') == '否') {
+      this.nextCheckDateShow = false
+    }
+  },
+  methods: {
+    change (row) {
+      asyncReady(this).then(() => {
+        console.log('1234658', row)
+        row.f_upload_state = '已传'
+        this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+      }).catch(() => {
+        this.$showAlert('获取配置文件失败')
+      })
     },
-    watch: {
-      'data' () {
-        if (this.data == null) {
+    showpicture2 () {
+      this.imgshow2 = true
+    }
+  },
+  watch: {
+    'data': {
+      handler (newVal, oldVal) {
+        if (newVal == null) {
           this.hasCheck = 0
           this.model = {}
         } else {
           getSafeCheckGen(this)
         }
-      }
+      },
+      deep: true
     }
   }
+}
 </script>
 <style scoped>
-  .img {
-    border: 1px solid #9773ed;
-    width: auto;
-    height: auto;
-    float: left;
-    text-align: center;
-    margin: 6px;
-  }
+.img {
+  border: 1px solid #9773ed;
+  width: auto;
+  height: auto;
+  float: left;
+  text-align: center;
+  margin: 6px;
+}
 
-  img {
-    margin: 6px;
-  }
+img {
+  margin: 6px;
+}
 
 
-  .container{
-    margin: 10px auto;
-    width: 80%;
-    height: auto;
-  }
-  div::-webkit-scrollbar {
-    width: 0 !important;
-    height: 0 !important;
-  }
+.container{
+  margin: 10px auto;
+  width: 80%;
+  height: auto;
+}
+div::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+}
 
-  div{
-    -ms-overflow-style: none;
-    overflow: -moz-scrollbars-none;
-  }
-  .divmask {
-    pointer-events: none;
-  }
-  .app-header {
-    border-radius: 50%;
-    background: rgba(73, 158, 223, 0.4);
-    color: #FFF;
-    padding: 20px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -20px;
-    position: absolute;
-    top: 10%;
-    right: 2%;
-    height: 8%;
-  }
+div{
+  -ms-overflow-style: none;
+  overflow: -moz-scrollbars-none;
+}
+.divmask {
+  pointer-events: none;
+}
+.app-header {
+  border-radius: 50%;
+  background: rgba(73, 158, 223, 0.4);
+  color: #FFF;
+  padding: 20px;
+  text-align: center;
+  font-size: 1.2em;
+  z-index: 10;
+  opacity:0.5;
+  bottom: 50px;
+  margin-top: -20px;
+  position: absolute;
+  top: 10%;
+  right: 2%;
+  height: 8%;
+}
 </style>