sale-client 3.5.156 → 3.5.158

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue

@@ -393,7 +393,7 @@ export default {
         f_remanent_price: 0,
         f_open_type: '',
         f_remanent_money: 0,
-        f_type: '清零',
+        f_type: '气表清零',
         f_comments: '',
         f_othereason: '',
         f_stair_use: '',

package/src/filiale/danxian/components/FilesManage/MeterinfoTest.vue

@@ -177,10 +177,11 @@
                       close-on-select
                       v-el:cc></v-select>
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group" :class="[$m.f_aroundmeter.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">&ensp;表&ensp;&ensp;&ensp;&ensp;向</label>
             <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters' placeholder='左右表' close-on-select
-                      v-model='row.f_aroundmeter'></v-select>
+                      v-model='row.f_aroundmeter' v-ref:f_aroundmeter></v-select>
+            <input type="text" v-show="false" v-model="$refs.f_aroundmeter.selectedItems" v-validate:f_aroundmeter='{required: true }'>
           </div>
           <div class="col-sm-4 form-group" >
             <label for="f_bqf_type" class="font_normal_body">表前阀型号</label>
@@ -201,8 +202,8 @@
                 :options='gasperson' placeholder='通气人'
                 close-on-select></v-select> -->
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error' : '']">
-            <input type="text" v-model="$refs.f_gas_date.value" v-show="false"  v-validate:f_gas_date='{required: true }'>
+          <div class="col-sm-4 form-group">
+            <input type="text" v-model="$refs.f_gas_date.value" v-show="false" >
             <label for="f_gas_date" class="font_normal_body">&ensp;通气日期</label>
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
@@ -588,11 +589,24 @@
         finalDate: '',
         bfrq:10,
         f_factory_date:'',
-        f_scrap_date: ''
+        f_scrap_date: '',
+        f_install_date:''
       }
     },
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
+      // 安装日期默认是建档日期
+      if (this.row.f_install_date == null || this.row.f_install_date == '') {
+        console.log('安装日期赋值了')
+        this.row.f_install_date = Util.toStandardTimeString()
+        this.f_install_date = Util.toStandardTimeString()
+        console.log('安装日期赋值了',this.row.f_install_date)
+        console.log('安装日期赋值了001',this.row.f_install_date)
+      } else {
+        this.f_install_date = this.row.f_install_date
+        console.log('安装日期row值')
+      }
+      // 出厂日期
       if (this.row.f_factory_date == null || this.row.f_factory_date == '') {
         this.row.f_factory_date = Util.toStandardTimeString()
         this.f_factory_date = Util.toStandardTimeString()