sale-client 3.4.72 → 3.4.76

package/src/components/Hello.vue

@@ -1,39 +1,39 @@
-<template>
-  <div class="hello">这是自己
-    <h1>Welcome to Your Vue.js App{{msg}} </h1>
-  </div>
-</template>
-
-<script>
-export default {
-  title: 'Hello',
-  name: 'hello',
-  props: ['msg'],
-  methods: {
-    toTable () {
-      this.$back()
-    }
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h1, h2 {
-  font-weight: normal;
-}
-
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-
-a {
-  color: #42b983;
-}
-</style>
+<template>
+  <div class="hello">这是自己
+    <h1>Welcome to Your Vue.js App{{msg}} </h1>
+  </div>
+</template>
+
+<script>
+export default {
+  title: 'Hello',
+  name: 'hello',
+  props: ['msg'],
+  methods: {
+    toTable () {
+      this.$back()
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+h1, h2 {
+  font-weight: normal;
+}
+
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+
+a {
+  color: #42b983;
+}
+</style>

package/src/components/List.vue

@@ -1,51 +1,51 @@
-<template>
-  <div class="flex">
-    <div class="auto">
-      <ul class="nav nav-tabs">
-        <li role="presentation"  @click="h1()" id="1"><a href="#">档案</a></li>
-        <li role="presentation" @click="h2()" id="2"><a href="#">小区-地址</a></li>
-        <li role="presentation"  @click="h3()" id="3"><a href="#">单位-地址</a></li>
-      </ul>
-    </div>
-    <div style="margin-top:10px;" id="hh" class="span">
-      <route :comp="{name: 'civil-search'}" v-if = "r1"></route>
-      <route :comp="{name: 'Address-search'}" v-if = "r2"></route>
-      <route :comp="{name: 'unit-search'}" v-if = "r3"></route>
-    </div>
-  </div>
-</template>
-<script>
-/**
-*档案管理查询列表
-*/
-export default {
-  title: '档案管理',
-  data () {
-    return {
-      r1: true,
-      r2: false,
-      r3: false
-    }
-  },
-  methods: {
-    h1 () {
-      this.r1 = true
-      this.r2 = false
-      this.r3 = false
-      this.r4 = false
-    },
-    h2 () {
-      this.r1 = false
-      this.r2 = true
-      this.r3 = false
-      this.r4 = false
-    },
-    h3 () {
-      this.r1 = false
-      this.r2 = false
-      this.r3 = true
-      this.r4 = false
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex">
+    <div class="auto">
+      <ul class="nav nav-tabs">
+        <li role="presentation"  @click="h1()" id="1"><a href="#">档案</a></li>
+        <li role="presentation" @click="h2()" id="2"><a href="#">小区-地址</a></li>
+        <li role="presentation"  @click="h3()" id="3"><a href="#">单位-地址</a></li>
+      </ul>
+    </div>
+    <div style="margin-top:10px;" id="hh" class="span">
+      <route :comp="{name: 'civil-search'}" v-if = "r1"></route>
+      <route :comp="{name: 'Address-search'}" v-if = "r2"></route>
+      <route :comp="{name: 'unit-search'}" v-if = "r3"></route>
+    </div>
+  </div>
+</template>
+<script>
+/**
+*档案管理查询列表
+*/
+export default {
+  title: '档案管理',
+  data () {
+    return {
+      r1: true,
+      r2: false,
+      r3: false
+    }
+  },
+  methods: {
+    h1 () {
+      this.r1 = true
+      this.r2 = false
+      this.r3 = false
+      this.r4 = false
+    },
+    h2 () {
+      this.r1 = false
+      this.r2 = true
+      this.r3 = false
+      this.r4 = false
+    },
+    h3 () {
+      this.r1 = false
+      this.r2 = false
+      this.r3 = true
+      this.r4 = false
+    }
+  }
+}
+</script>

package/src/components/SellGasCharge/FakaList.vue

@@ -1,23 +1,23 @@
-<template>
-  <div class="flex">
-    <user-work defbtn="发卡售气" :no-read="true" :no-batch="true"></user-work>
-  </div>
-</template>
-
-<script>
-// import { PagedList } from 'vue-client'
-export default {
-  title: '发卡售气',
-  data () {
-    return {
-      // btns: ['补卡管理', '发卡售气', '换表管理', '过户', '表具停用', '表具启用', '超用收费', '其他收费'],
-      // operatebtn: ['冲正', '票据补打']
-    }
-  }
-}
-</script>
-<style lang="less">
-#tooltip div{
-  height: auto;
-}
-</style>
+<template>
+  <div class="flex">
+    <user-work defbtn="发卡售气" :no-read="true" :no-batch="true"></user-work>
+  </div>
+</template>
+
+<script>
+// import { PagedList } from 'vue-client'
+export default {
+  title: '发卡售气',
+  data () {
+    return {
+      // btns: ['补卡管理', '发卡售气', '换表管理', '过户', '表具停用', '表具启用', '超用收费', '其他收费'],
+      // operatebtn: ['冲正', '票据补打']
+    }
+  }
+}
+</script>
+<style lang="less">
+#tooltip div{
+  height: auto;
+}
+</style>

package/src/components/UserFiles/admissibility.vue

@@ -1,46 +1,46 @@
-<template>
-  <div class="auto">
-    <div class="row" style="display: flex;justify-content: center;" v-if="billshow" id="testbill">
-      {{{ admiss.data}}}
-    </div>
-    <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
-      <report-print id='testbill' v-if="billshow" top='55mm' left='60mm' width='100%' height='80%' style='td,th{font-size: 10pt!important;border: 0;font-size: 19px;} tdright {text-align:right}'
-       :notrepeat="true" v-if= 'bill.data && clean.f_bill_id'></report-print>
-      <button class="btn btn-default" @click="clean()">取消</button>
-    </div>
-  </div>
-</template>
-<script>
-/**
-*票据补打
-*/
-import { DataModel } from 'vue-client'
-export default {
-  title: '机表发卡',
-  data () {
-    return {
-      admiss: new DataModel('rs/report/machineCard_bill2'),
-      billshow: false
-    }
-  },
-  props: ['data'],
-  watch: {
-    'data' (val) {
-      if (val) {
-        console.log(val, val)
-        this.billshow = true
-      }
-    }
-  },
-  methods: {
-    clean () {
-      this.$dispatch('hiddenModal')
-    }
-  },
-  events: {
-    'print-success' () {
-      this.$dispatch('hiddenModal')
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto">
+    <div class="row" style="display: flex;justify-content: center;" v-if="billshow" id="testbill">
+      {{{ admiss.data}}}
+    </div>
+    <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
+      <report-print id='testbill' v-if="billshow" top='55mm' left='60mm' width='100%' height='80%' style='td,th{font-size: 10pt!important;border: 0;font-size: 19px;} tdright {text-align:right}'
+       :notrepeat="true" v-if= 'bill.data && clean.f_bill_id'></report-print>
+      <button class="btn btn-default" @click="clean()">取消</button>
+    </div>
+  </div>
+</template>
+<script>
+/**
+*票据补打
+*/
+import { DataModel } from 'vue-client'
+export default {
+  title: '机表发卡',
+  data () {
+    return {
+      admiss: new DataModel('rs/report/machineCard_bill2'),
+      billshow: false
+    }
+  },
+  props: ['data'],
+  watch: {
+    'data' (val) {
+      if (val) {
+        console.log(val, val)
+        this.billshow = true
+      }
+    }
+  },
+  methods: {
+    clean () {
+      this.$dispatch('hiddenModal')
+    }
+  },
+  events: {
+    'print-success' () {
+      this.$dispatch('hiddenModal')
+    }
+  }
+}
+</script>

package/src/components/charge/business/DigitalCharge.vue

@@ -4,14 +4,14 @@
       <validator name='v'>
         <form novalidate class="form-horizontal">
           <div class="row">
-            <div class="col-sm-4">
-              <label for="f_paytype" class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
-              <v-select id="f_payment"
-                        v-model="f_payment"
+            <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
+              <label class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
+              <input type="text" v-show="false" v-model="$refs.payment.selectedItems"  v-validate:payment='{required: true }'>
+              <v-select v-model="model.f_payment"
                         placeholder='请选择'
                         :value.sync="model.f_payment"
-                        :options='paytype'
-                        close-on-select clear-button></v-select>
+                        close-on-select
+                        :options='paytype' clear-button v-ref:payment></v-select>
             </div>
             <div class="col-sm-4"
                  :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">