sale-client 3.6.385 → 3.6.386-2

package/package.json

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

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -3,7 +3,7 @@
     <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
       <form class="form-horizontal select-overspread ">
         <div class="row">
-          <div class="col-sm-4 form-group " :class="[$v.f_user_name.required ? 'has-error' : '']"
+          <div class="col-sm-4 form-group " :class="[!baseinfo.base.f_user_name ? 'has-error' : '']"
                v-if="getConfigShowItem('f_user_name')">
             <label for="f_user_name" class="font_normal_body">*{{getConfigLabelName('f_user_name','用户姓名')}}</label>
             <input type="text" v-model="baseinfo.base.f_user_name"

package/src/components/revenue/HandManager/MeterBookAdd.vue

@@ -86,9 +86,9 @@
                         style="width: 60%" v-model="model.f_hand_end_date">
             </datepicker>
           </div>
-          <div :class="[$v.f_period.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_period" v-show="false"
-                   v-validate:f_period='{required: true }'>
+          <div :class="[$v.f_book_state.required ? 'has-error' : 'has-success']" class="col-sm-6 form-group">
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_book_state" v-show="false"
+                   v-validate:f_book_state='{required: true }'>
             <label class="font_normal_body">表&emsp;册&emsp;状&emsp;态&emsp;</label>
             <v-select :value.sync="model.f_book_state" v-model='model.f_book_state'
                       style="width:55%"

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

@@ -16,7 +16,6 @@
 <script>
   import TabButton from './../comprehen/common/TabButton'
   import Tabs from './../comprehen/common/Tabs'
-  import CardHandAudit from './cardHandAudit.vue'
 export default {
     name: 'cardHandManager',
     title: '卡表抄表管理',
@@ -35,7 +34,7 @@ export default {
         show: [true]
       }
     },
-    components: {CardHandAudit, Tabs, TabButton},
+    components: {Tabs, TabButton},
     ready () {
       console.log(this.$refs.list)
     },

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

@@ -115,6 +115,42 @@
                               v-model="model.f_expiration_date" style="width: 55%">
                   </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">保险开始时间</label>
+                  <datepicker :format="'yyyy-MM-dd 00:00:00'"
+                              :value.sync="model.f_shengxiao_start_date"
+                              placeholder="保险开始时间大于"
+                              condition="f_shengxiao_date >= '{}'"
+                              v-model="model.f_shengxiao_start_date" style="width: 55%">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">保险开始时间</label>
+                  <datepicker :format="'yyyy-MM-dd 23:59:59'"
+                              :value.sync="model.f_shengxiao_end_date"
+                              placeholder="保险开始时间小于"
+                              condition="f_shengxiao_date <= '{}'"
+                              v-model="model.f_shengxiao_end_date" style="width: 55%">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">保险截至时间</label>
+                  <datepicker :format="'yyyy-MM-dd 00:00:00'"
+                              :value.sync="model.f_expiration_start_date"
+                              placeholder="保险截至时间大于"
+                              condition="f_expiration_date >= '{}'"
+                              v-model="model.f_expiration_start_date" style="width: 55%">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">保险截至时间</label>
+                  <datepicker :format="'yyyy-MM-dd 23:59:59'"
+                              :value.sync="model.f_expiration_end_date"
+                              placeholder="保险截至时间小于"
+                              condition="f_expiration_date <= '{}'"
+                              v-model="model.f_expiration_end_date" style="width: 55%">
+                  </datepicker>
+                </div>
 
               </div>
             </div>

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue

@@ -230,7 +230,7 @@
   let asyncTransferManage = async function (self) {
     await self.$getConfig(self, 'TransferManage')
     console.log('过户config', self.config)
-
+    self.model.f_new_people_num = self.config.f_new_people_num
     self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     self.model.f_payment = [self.config.payment]
     self.mulPrint = self.config.printType instanceof Array
@@ -247,13 +247,14 @@
     data () {
       return {
         config: {
-          showupload:true,  //默认显示上传附件
+          showupload: true,  // 默认显示上传附件
           hasPrint: false,  // 默认打票
           hasAcceptance: false,
           hasBillManage: false,  // 默认不启用发票管理
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           payment: '现金缴费',
           f_contract_id: '',
+          f_new_people_num: 4, //默认人口数
           printType: '普通收据' // 收据/电子票/专用发票/国税发票
         },
         bankinfo: false,
@@ -313,7 +314,7 @@
         papertype: this.$appdata.getParam('票据类型'),
         printstyle: this.$appdata.getParam('打印格式'),
         credentials: this.$appdata.getParam('证件类型'),
-        loaduserflag :false,
+        loaduserflag: false
       }
     },
     ready () {