sale-client 3.4.176 → 3.4.177

package/package.json

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

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

@@ -84,14 +84,14 @@
           </template>
           <template partial='body'>
             <td style="text-align: center;"><nobr>{{$index + 1}}</nobr></td>
-            <td style="text-align: center;"><nobr>{{row.userinfo_code}}</nobr></td>
-            <td style="text-align: center;"><nobr>{{row.name}}</nobr></td>
-            <td style="text-align: center;"><nobr>{{row.address}}</nobr></td>
-            <td style="text-align: center;"><nobr>{{row.payment}}</nobr></td>
-            <td style="text-align: center;"><nobr>{{row.collection}}</nobr></td>
-            <td style="text-align: center;"><nobr>{{row.bill_style}}</nobr></td>
-            <td style="text-align: center;"><nobr>{{row.operate_date}}</nobr></td>
-            <td style="text-align: center;"><nobr>{{row.operator}}</nobr></td>
+            <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
+            <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+            <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_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>
           </template>
         </data-grid>
       </criteria-paged>

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

@@ -107,7 +107,7 @@
           // }
       },
       async querydefc () {
-        let condition = " o.f_userinfo_id= '" + this.model.info_id + "'  and o.id='" + this.model.id + "'"
+        let condition = " o.f_userinfo_id= '" + this.model.f_userinfo_id + "'  and o.id='" + this.model.id + "'"
         console.log('获取明细记录')
         let res = await this.$resetpost('rs/sql/querydetail', {
           data: {

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

@@ -4,12 +4,12 @@
         <div class="row">
           <div class="col-sm-4">
             <label class="font_normal_body">用户姓名</label>
-            <input type="text" v-model="model.name" disabled=disabled style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_user_name" disabled=disabled style="width: 60%" class="input_search">
           </div>
           <div class="col-sm-4">
             <label class="font_normal_body">付款方式</label>
-            <v-select :value.sync="model.payment" :value-single="true"
-                      v-model="model.payment"
+            <v-select :value.sync="model.f_payment" :value-single="true"
+                      v-model="model.f_payment"
                       class="select_list select"
                       :options='payments'
                       close-on-select>
@@ -21,8 +21,8 @@
 <!--          </div>-->
           <div class="col-sm-4">
             <label class="font_normal_body">收据类型</label>
-            <v-select :value.sync="model.bill_style" :value-single="true"
-                      v-model="model.bill_style"
+            <v-select :value.sync="model.f_bill_style" :value-single="true"
+                      v-model="model.f_bill_style"
                       class="select_list select"
                       :options='bill_styles'
                       close-on-select>
@@ -41,16 +41,16 @@
               <datepicker id="operate_date"
                           placeholder="收费时间"
                           style="width:60%"
-                          v-model="model.operate_date"
-                          :value.sync="model.operate_date"
+                          v-model="model.f_operate_date"
+                          :value.sync="model.f_operate_date"
                           :format="'yyyy-MM-dd HH:mm:ss'"
               >
               </datepicker>
             </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body" title="参数:操作人员">操作人员</label>
-            <v-select :value.sync="model.operator"
-                      v-model="model.operator"
+            <v-select :value.sync="model.f_operator"
+                      v-model="model.f_operator"
                       :value-single="true"  @change="selectoperator()"
                       :options='foperator'
                       close-on-select></v-select>
@@ -195,6 +195,7 @@
     ready () {
       this.cou()
       this.oldmodel = JSON.parse(JSON.stringify(this.model))
+      console.log(this.model)
     },
     created () {
     },
@@ -341,14 +342,14 @@
         // 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 param={
-          f_user_name:this.model.name,
+          f_user_name:this.model.f_user_name,
           f_comments:this.model.f_comments,
-          f_payment:this.model.payment,
-          f_collection:this.model.collection,
-          f_bill_style:this.model.bill_style,
-          f_operate_date:this.model.operate_date,
-          f_operator:this.model.operator,
-          f_operatorid:this.model.operatorid?this.model.operatorid:'',
+          f_payment:this.model.f_payment,
+          f_collection:this.model.f_collection,
+          f_bill_style:this.model.f_bill_style,
+          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
         }
         await this.$resetpost('rs/logic/saveotherrecord',{data:param}, {

package/src/components/revenue/comprehen/Message/AllUser.vue

@@ -306,8 +306,8 @@
         sendmodelids: [],
         // 小区
         residentialArea: [],
-        whether: [{ label: '欠费', value: '欠费' },
-          { label: '全部', value: '全部' }],
+        whether: [{ label: '全部', value: '全部' },
+          { label: '欠费', value: '欠费' }],
         getusertype: [{ label: '全部', value: '' },
 
           { label: '民用', value: '民用' },

package/src/components/revenue/comprehen/Message/ArrearsList.vue

@@ -106,6 +106,12 @@
                        condition="f_oughtfee {}" v-model="model.f_oughtfee"  style="width: 60%"
                        placeholder="应交金额" v-next-el="cx" ></v-input>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">违约金</label>
+              <v-input :value.sync="$parent.overdue" :expression.sync = 'model.overdue'
+                       condition="overdue {}" v-model="model.overdue"  style="width: 60%"
+                       placeholder="违约金" v-next-el="cx" ></v-input>
+            </div>
           </div>
 
 
@@ -130,6 +136,7 @@
             <th>应交金额</th>
             <th>账户结余</th>
             <th>欠费金额</th>
+            <th>违约金</th>
           </tr>
         </template>
         <template partial='body'>
@@ -138,7 +145,7 @@
                    :value="row.f_userinfo_id">
           </td>
           <td>{{$index+1}}</td>
-          <td style="text-align:center">{{row.f_userinfo_id}}&nbsp;&nbsp;{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}</td>
+          <td style="text-align:center">{{row.f_userinfo_code}}&nbsp;&nbsp;{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}</td>
           <td style="text-align:center">{{row.f_userinfo_code}}</td>
           <td style="text-align:center">{{row.f_user_type}}</td>
           <td style="text-align:center">{{row.f_residential_area}}</td>
@@ -149,6 +156,7 @@
           <td style="text-align:center">{{row.f_oughtfee.toFixed(2)}}</td>
           <td style="text-align:center">{{row.f_balance.toFixed(2)}}</td>
           <td style="text-align:center">{{row.f_oughtfee_all.toFixed(2)}}</td>
+          <td style="text-align:center">{{row.overdue.toFixed(2)}}</td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -205,8 +213,8 @@
         criteriaShow: false,
         ids: [],
         pages: [],
-        whether: [{ label: '欠费', value: '欠费' },
-          { label: '全部', value: '全部' }],
+        whether: [{ label: '全部', value: '全部' },
+          { label: '欠费', value: '欠费' }],
         f_whether: '欠费',
         meters: [
           {label: '全部', value: ''},