sale-client 3.4.193 → 3.4.196

package/build/dev-server.js

@@ -10,7 +10,7 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://127.0.0.1:8080',bendi1 = 'http://121.36.106.17:8400/'
+var bendi = 'http://192.168.50.4:8400',bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
 var fuwu = 'http://192.168.50.4:8400'
 // var fuwu = 'http://121.36.106.17:8400/'

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -260,6 +260,16 @@
                    :value.sync="row.f_price_ratio"
                    v-validate:meternumber='{required: true }' placeholder='比率'>
           </div>
+          <div class="col-sm-4 form-group" >
+            <label for="f_factory_date" class="font_normal_body">&ensp;出厂日期</label>
+            <datepicker style="width:60%" id="f_factory_date" placeholder="出厂日期" width='100%'
+                        v-model="row.f_factory_date"
+                        :value.sync="row.f_factory_date"
+                        class="datepicker"
+                        :format="'yyyy-MM-dd'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
           <div class="col-sm-4 form-group" >
             <label for="f_scrap_date" class="font_normal_body">&ensp;报废日期</label>
             <datepicker style="width:60%" id="ScrapDate" placeholder="报废日期" width='100%'

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -639,7 +639,8 @@ export default {
           f_position: row.f_position,
           f_install_date: row.f_install_date,
           f_inputtor: row.f_inputtor,
-          f_hand_month: row.f_hand_month
+          f_hand_month: row.f_hand_month,
+          f_usetype: ''
         }
         Object.assign(this.data.meterinfo[0], this.data.meterinfo[0], temp)
         console.log('====1.=====', temp, row)

package/src/components/charge/ChargeManage.vue

@@ -42,15 +42,12 @@
   </div>
 </template>
 <script>
-  import ChargeList from './ChargeList'
   import ChargeOper from './ChargeOper'
   import {HttpResetClass} from 'vue-client'
 
 export default {
     title: '收费(综合)',
-    components: {
-      ChargeList, ChargeOper
-    },
+    components: { ChargeOper },
     data () {
       return {
         sustainMoney: null,

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -140,6 +140,14 @@
         <label class="font_normal_body_new">写卡次数</label>
         <input class="input-underline" style="width:45%" :value="row.f_times" readonly>
       </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">抄表册名</label>
+        <input class="input-underline" style="width:45%" :value="'['+row.f_book_code + '] '+ (row.f_book_name ? row.f_book_name:'')" readonly>
+      </div>
+      <div class="col-sm-4">
+        <label class="font_normal_body_new">抄表册册序号</label>
+        <input class="input-underline" style="width:45%" :value="row.f_meter_book_sort" readonly>
+      </div>
     </div>
     <div class="auto" style="float: right;">
       <button class="button_clear " @click="cancelmain()" >返回</button>

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

@@ -86,6 +86,17 @@
                         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 }'>
+            <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%"
+                      :value-single="true"
+                      :options='bookstates' placeholder='表册状态'
+                      close-on-select
+                      v-el:cc></v-select>
+          </div>
         </div>
 
 
@@ -220,6 +231,9 @@
       }
     },
     computed: {
+      bookstates () {
+        return this.$appdata.getParam('抄表册状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表册状态')] : [{label: '全部', value: ''}, {label: '有效', value: '有效'},{label: '无效', value: '无效'}]
+      },
       dateEdit () {
         return this.model.f_hand_end_date && this.model.f_hand_begin_date && this.model.f_hand_end_date <= this.model.f_hand_begin_date
       }

package/src/components/revenue/base/leftview/Userinfo.vue

@@ -39,6 +39,10 @@
           <label class = "col-sm-5 " >&emsp;备用电话</label>
           <span class = "col-sm-7">{{data?data.f_rent_phone:dafault.f_rent_phone}}</span>
         </div>
+        <div class="row">
+          <label class = "col-sm-5 " >&emsp;用户状态</label>
+          <span class = "col-sm-7">{{data?data.f_user_state:dafault.f_user_state}}</span>
+        </div>
         <div class="row">
           <label class = "col-sm-5 " >&emsp;备注信息</label>
           <span class = "col-sm-7">{{data?data.f_comments:dafault.f_comments}}</span>
@@ -118,7 +122,8 @@
           f_input_date: '****年**月**日',
           f_hand_date: '****年**月**日',
           f_rent_phone: '************',
-          f_comments: '**'
+          f_comments: '**',
+          f_user_state: '****'
         },
         model: null,
         showselectncuserinfo:false,

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -125,6 +125,14 @@
           <label class = "col-sm-5 " >左&ensp;右&ensp;表</label>
           <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
         </div>
+        <div class="row">
+          <label class = "col-sm-5 " >抄表册名</label>
+          <span class = "col-sm-7">{{data?'['+data.f_book_code + '] '+ (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >抄表册册序号</label>
+          <span class = "col-sm-7">{{data?data.f_meter_book_sort:dafault.f_meter_book_sort}}</span>
+        </div>
         <div class="row">
           <label class = "col-sm-5 " >安装位置</label>
           <span class = "col-sm-7">{{data?data.f_position:dafault.f_position}}</span>

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="basic-main" style="height: 98%">
+    <div class="flex">
     <criteria-paged :model="model" v-ref:paged>
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
@@ -126,22 +127,43 @@
             <span v-if="row.msg === '对账成功'">正常</span>
           </td>
         </template>
-        <template partial='foot'>
-          <td style="text-align: center;">合计</td>
-          <td style="text-align: center;"></td>
-          <td style="text-align: center;"></td>
-          <td style="text-align: center;"></td>
-          <td style="text-align: center;"></td>
-          <td style="text-align: center;">{{model.sums.f_collection.toFixed(2)}}</td>
-          <td style="text-align: center;">{{model.sums.f_total_charge.toFixed(2)}}</td>
-          <td style="text-align: center;"></td>
-          <td style="text-align: center;"></td>
-          <td style="text-align: center;"></td>
-          <td style="text-align: center;"></td>
-          <td style="text-align: center;"></td>
-        </template>
+        <!--<template partial='foot'>-->
+          <!--<td style="text-align: center;">合计</td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;">{{model.sums.f_collection.toFixed(2)}}</td>-->
+          <!--<td style="text-align: center;">{{model.sums.f_total_charge.toFixed(2)}}</td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+          <!--<td style="text-align: center;"></td>-->
+        <!--</template>-->
       </data-grid>
     </criteria-paged>
+    <table class="table-hover">
+      <tr style="position: relative" class="table-bordered">
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+          汇总信息
+        </td>
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+          燃气方金额汇总:&emsp;{{model.sums.f_collection.toFixed(2)}}
+        </td>
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+          银行金额汇总:&emsp;{{model.sums.f_total_charge.toFixed(2)}}
+        </td>
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+          差额汇总:&emsp;{{((model.sums.f_total_charge -0) - (model.sums.f_collection.toFixed(2) -0)).toFixed(2)}}
+        </td>
+      </tr>
+    </table>
+    </div>
   </div>
 </template>
 <script>

package/src/components/revenue/comprehen/Maintenance/otherRecords/OtherMaintenanceLists.vue

@@ -42,6 +42,11 @@
                 <input type="text" class="input_search"  style="width: 60%" v-model="model.f_state"
                        condition="f_state = '{}'" placeholder='状态'>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">支付流水号</label>
+                <input type="text" class="input_search"  style="width: 60%" v-model="model.f_serial_id"
+                       condition="f_serial_id = '{}'" placeholder='支付流水号'>
+              </div>
               <div
                 :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
                 class="form-group">
@@ -61,6 +66,13 @@
               <div class="span" style="float:right;">
                 <import-excel template-name="其他收费导入模板" logic-name="otherImport" import-json="othercharge.json" ></import-excel>
                 <button class="button_search" @click="search()">查 询</button>
+                <export-excel v-if="$parent.$parent.authArr.includes('其他收费导出权限')"
+                              :data="{condition: $parent.$parent.excelCondition}"
+                              :field="$parent.$parent.fields"
+                              sqlurl="rs/logic/saleExport" sql-name="querylists"
+                              template-name='其他收费导出'
+                              :choose-col="true">
+                </export-excel>
                 <!--<div
                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                   @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>-->
@@ -78,6 +90,7 @@
               <th><nobr>客户地址</nobr></th>
               <th><nobr>缴费类型</nobr></th>
               <th><nobr>缴费金额</nobr></th>
+              <th><nobr>支付流水号</nobr></th>
               <th><nobr>收据类型</nobr></th>
               <th><nobr>收费时间</nobr></th>
               <th><nobr>操作人</nobr></th>
@@ -90,6 +103,7 @@
             <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
             <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
             <td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>
+            <td style="text-align: center;"><nobr>{{row.f_serial_id}}</nobr></td>
             <td style="text-align: center;"><nobr>{{row.f_bill_style}}</nobr></td>
             <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
             <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
@@ -117,7 +131,19 @@ const myMap = new Map()
         da: {
           rows: []
         },
-
+        fields: {
+          'f_userinfo_code': '用户编号',
+          'f_user_name': '用户姓名',
+          'f_user_phone': '用户电话',
+          'f_address': '用户地址',
+          'f_payment': '缴费类型',
+          'f_collection': '缴费金额',
+          'f_serial_id': '支付流水号',
+          'f_bill_style': '收据类型',
+          'f_operate_date': '收费时间',
+          'f_operator': '操作人'
+        },
+        excelCondition: '',
         priceSplit: false,
         criteriaShow: false
         // imgshow:false,
@@ -151,6 +177,7 @@ const myMap = new Map()
           args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
         }
         console.log('查询。。。')
+        this.excelCondition = args.condition
         this.model.search(args.condition, args.model)
       }
     },

package/src/components/revenue/comprehen/Maintenance/otherRecords/specificInformation.vue

@@ -34,7 +34,7 @@
 <!--          </div>-->
           <div class="col-sm-4">
             <label class="font_normal_body">缴费金额</label>
-            <input type="text" v-model="total"  disabled=disabled  style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_collection"  disabled=disabled  style="width: 60%" class="input_search">
           </div>
             <div class="col-sm-4">
               <label class="font_normal_body">收费时间</label>
@@ -56,6 +56,10 @@
                       close-on-select></v-select>
             <!--                      @click="selectoperator"-->
           </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" >支付流水号</label>
+            <input type="text" v-model="model.f_serial_id"  style="width: 60%" class="input_search">
+          </div>
           <div class="col-sm-12 form-group">
             <label class="font_normal_body">备&emsp;&emsp;注</label>
             <input type="text" v-model="model.f_comments"  style="width: 60%" class="input_search">
@@ -168,12 +172,14 @@
         recordList2: [],
         // 其他记录
         fileNameSet: {
-          payment: '缴费类型',
-          bill_style: '收据类型',
-          collection: '缴费金额',
-          operate_date: '缴费时间',
+          f_payment: '缴费类型',
+          f_bill_style: '收据类型',
+          f_collection: '缴费金额',
+          f_serial_id: '支付流水号',
+          f_operate_date: '缴费时间',
+          f_comments: '备注',
           name: '用户姓名',
-          operator: '操作人'
+          f_operator: '操作人'
         },
         // 其他记录明细
         fileNameSet2: {
@@ -314,7 +320,7 @@
               modifitime: Util.toStandardTimeString(),
               fieldname: item,
               state: '有效',
-              othercharge_id:this.model.oid,
+              othercharge_id:this.model.id,
               operator: this.$login.f.name != '' ? this.$login.f.name : '',
               f_operator : this.$login.f.name,
               f_operatorid : this.$login.f.id,
@@ -328,7 +334,7 @@
             console.log(car2)
           }
         }
-        let condition = this.model.oid
+        let condition = this.model.id
         await this.$resetpost('rs/logic/operationRecord', {data: {recordlist3: this.recordList3, condition: condition}}, {
           resolveMsg: '修改成功',
           rejectMsg: '未通过，修改出错!!!'
@@ -339,18 +345,19 @@
       },
       // 修改其他记录
       async save () {
-        // let condition = " f_collection='" + this.model.collection + "' , f_unitprice='"+ this.model.collection+"' where f_othercharge_id= '"+this.model.oid+"'"
-        this.model.collection = this.total
+        // let condition = " f_collection='" + this.model.collection + "' , f_unitprice='"+ this.model.collection+"' where f_othercharge_id= '"+this.model.id+"'"
+        this.model.f_collection = this.total
         let param={
           f_user_name:this.model.f_user_name,
           f_comments:this.model.f_comments,
           f_payment:this.model.f_payment,
           f_collection:this.model.f_collection,
           f_bill_style:this.model.f_bill_style,
+          f_serial_id:this.model.f_serial_id?this.model.f_serial_id:'',
           f_operate_date:this.model.f_operate_date,
           f_operator:this.model.f_operator,
-          f_operatorid:this.model.f_operatorid?this.model.operatorid:'',
-          id:this.model.oid
+          f_operatorid:this.model.f_operatorid?this.model.f_operatorid:'',
+          id:this.model.id
         }
         await this.$resetpost('rs/logic/saveotherrecord',{data:param}, {
           resolveMsg: '修改成功',

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -329,7 +329,7 @@ import {HttpResetClass} from 'vue-client'
     self.getaddress()
   }
   export default {
-    title: '物联综合操作',
+    title: '批量开关阀',
     name: 'WebMeterBatchOperationValve',
     data () {
       return {

package/src/filiale/qianneng/ChangeMeter.vue

@@ -502,14 +502,14 @@ export default {
     },
     async confirm () {
       let msg = ''
-      if (this.row.f_meter_type.includes('机表')) {
+      if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
         if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
-          msg = '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录'
+          msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
         }
       }
-      if (this.row.f_meter_type.includes('机表') && msg) {
+      if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
             let data = {
@@ -525,6 +525,7 @@ export default {
               f_serial_number: this.model.f_serial_number,
               f_meterbase: this.model.f_using_base_old,
               f_meter_brand: this.row.f_meter_brand,
+              f_meter_classify: this.row.f_meter_type,
               f_price_id: this.row.f_price_id
             }
             this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
@@ -664,14 +665,14 @@ export default {
         this.Iotjisuan()
       }
       let msg = ''
-      if (this.row.f_meter_type.includes('机表')) {
+      if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
         if ((parseInt(this.model.f_using_base_old) > parseInt(this.row.f_meter_base))) {
-          msg = '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录'
+          msg = (this.row.f_meter_type === '机表' ? '该用户表底数大于上次抄表底数，请确定是否继续生成欠费记录' : '该用户表底数大于上次抄表底数，请确定是否进行结算')
         } else if (this.row.f_capacity && this.row.f_capacity > 0 && (parseInt(this.model.f_using_base_old) < parseInt(this.row.f_meter_base))) {
           msg = '该用户表底数大于上次抄表底数，且已超越最大量程，请确定是否继续生成欠费记录'
         }
       }
-      if (this.row.f_meter_type.includes('机表') && msg) {
+      if ((this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) && msg) {
         this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
             let data = {
@@ -687,11 +688,16 @@ export default {
               f_serial_number: this.model.f_serial_number,
               f_meterbase: this.model.f_using_base_old,
               f_meter_brand: this.row.f_meter_brand,
+              f_meter_classify: this.row.f_meter_type,
               f_price_id: this.row.f_price_id
             }
             this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
-              this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+              if (this.row.f_meter_type.includes('物联网表')) {
+                this.$dispatch('refresh')
+              } else {
+                this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
+              }
             })
           }
         })

package/src/filiale/qianneng/FilesManage/FileUserFiles.vue

@@ -236,15 +236,13 @@
                               condition="f_usetype = '{}'" placeholder='使用类型'
                               v-model='model.f_usetype'></v-select>
                   </div>
-                  <div
-                          :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                          class="form-group">
-                    <label class="font_normal_body">用户等级</label>
-                    <v-select :options='$parent.$parent.userlevel' :search='true'
-                              :value.sync="model.userlevel"
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">抄&ensp;表&ensp;册</label>
+                    <v-select :value.sync="model.f_book_name" v-model="model.f_book_name"
+                              :options='$parent.$parent.meterbooks' placeholder='抄表册'
+                              style="width:60%"
                               close-on-select
-                              condition="f_user_level = '{}'" placeholder='用户等级'
-                              v-model='model.userlevel'></v-select>
+                              condition="f_meter_book_num = '{}'"></v-select>
                   </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -338,8 +336,8 @@
                   <th v-if="!$parent.$parent.$parent.createFile">
                     <nobr>状态</nobr>
                   </th>
-                  <th v-if="!$parent.$parent.$parent.createFile">
-                    <nobr>用户等级</nobr>
+                  <th >
+                    <nobr>抄表册</nobr>
                   </th>
                   <th>
                     <nobr>入户证号</nobr>
@@ -373,7 +371,7 @@
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_state}}</td>
-                <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_level}}</td>
+                <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_book_name}}</td>
                 <td style="text-align: center;">{{row.f_enter_number}}</td>
                 <td style="text-align: center;">
                   <button type="button" name="button" class="button_search-2 button_spacing width-60"
@@ -473,8 +471,8 @@ let loadParamGem = async function (self) {
     self.headers.username = Vue.$login.f.name
     self.headers.username = Vue.$login.guid()
     await self.$LoadParams.loadParam(self.f_filialeid)
-    // await self.$LoadParams.loadMeterBook(self.f_filialeid)
-    // await self.search()
+    await self.$LoadParams.loadMeterBook(self.f_filialeid)
+    self.loadMeterBooks()
     self.initAdjustables()
   }
 
@@ -510,6 +508,7 @@ let loadParamGem = async function (self) {
       return {
         iswork: false,
         isShowDetailInfo: false,
+        meterbooks:[{label: '全部',value: ''}],  //抄表册
         config: {
           createType: ['address', 'area'],  // 建档方式： address-地址建档  area-小区建档
           hasLimit: true
@@ -608,6 +607,9 @@ let loadParamGem = async function (self) {
       }
   },
     methods: {
+      loadMeterBooks () {
+        this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
+      },
       getRes (obj) {
         console.log("-----------------")
         this.orgcondition = obj

package/src/filiale/qianneng/FilesManage/MeterinfoTest.vue

@@ -263,6 +263,16 @@
                    :value.sync="row.f_price_ratio"
                    v-validate:meternumber='{required: true }' placeholder='比率'>
           </div>
+          <div class="col-sm-4 form-group" >
+            <label for="f_factory_date" class="font_normal_body">&ensp;出厂日期</label>
+            <datepicker style="width:60%" id="f_factory_date" placeholder="出厂日期" width='100%'
+                        v-model="row.f_factory_date"
+                        :value.sync="row.f_factory_date"
+                        class="datepicker"
+                        :format="'yyyy-MM-dd'"
+                        :show-reset-button="true">
+            </datepicker>
+          </div>
           <div class="col-sm-4 form-group" >
             <label for="f_scrap_date" class="font_normal_body">&ensp;报废日期</label>
             <datepicker style="width:60%" id="ScrapDate" placeholder="报废日期" width='100%'

package/src/filiale/qianneng/OtherChargeNew.vue

@@ -100,14 +100,15 @@
 
 
           <div class="row" style="margin-top:10px;">
-            <div class="col-sm-4">
+            <div class="col-sm-4"  :class="[$v.payment.required ? 'has-error' : 'has-success']">
               <label for="f_paytype" class="font_normal_body" title="参数名称：付款方式">收款方式</label>
               <v-select id="f_payment"
                         v-model="f_payment"
                         placeholder='请选择'
                         :value.sync="model.f_payment"
                         :options='paytype'
-                        close-on-select clear-button>
+                        close-on-select clear-button
+                        v-validate:payment='{required: true }'>
               </v-select>
             </div>
             <div class="col-sm-4">