sale-client 3.5.44 → 3.5.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.44",
+  "version": "3.5.46",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -88,7 +88,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.6-1",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.61",
+    "vue-client": "1.24.67",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

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

@@ -123,7 +123,7 @@
         </div>
         <div  class="col-sm-4">
           <label class="font_normal_body_new">是否自动阀控</label>
-          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '是' : '否'" readonly>
+          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '否' : '是'" readonly>
         </div>
       </div>
       <div v-if="row.f_collection_type == '按气量'" >

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -120,15 +120,15 @@
           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">
-          气量合计:&emsp;{{model.sums.f_pregas}}
-        </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          金额合计:&emsp;{{model.sums.f_preamount}}
-        </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          应交合计:&emsp;{{model.sums.f_oughtfee}}
-        </td>
+<!--        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+<!--          气量合计:&emsp;{{model.sums.f_pregas}}-->
+<!--        </td>-->
+<!--        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+<!--          金额合计:&emsp;{{model.sums.f_preamount}}-->
+<!--        </td>-->
+<!--        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+<!--          应交合计:&emsp;{{model.sums.f_oughtfee}}-->
+<!--        </td>-->
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           实收合计:&emsp;{{model.sums.f_collection}}
         </td>
@@ -176,7 +176,7 @@ let reprintGen = function * (self, row) {
         model: new PagedList('rs/sql/sale_ChargeQuery', 20, {}, {
           f_preamount: 0,
           f_pregas: 0,
-          f_oughtfee :0,
+          f_oughtfee: 0,
           f_collection: 0
         }),
         show: false,
@@ -185,10 +185,10 @@ let reprintGen = function * (self, row) {
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('缴费状态')] : [],
-          types: this.$appdata.getParam('收费类型') ? [{
-              label: '全部',
-              value: ''
-          }, ...this.$appdata.getParam('收费类型')] : [],
+        types: this.$appdata.getParam('收费类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('收费类型')] : [],
         // 控制单选
         radio: [],
         // 选中的页

package/src/components/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -156,9 +156,9 @@
         <!--<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
           <!--欠费气量合计:&emsp;{{model.sums.f_totalowe_gas}}-->
         <!--</td>-->
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          欠费金额合计:&emsp;{{model.sums.f_qianfei_fee}}
-        </td>
+<!--        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">-->
+<!--          欠费金额合计:&emsp;{{model.sums.f_qianfei_fee}}-->
+<!--        </td>-->
       </tr>
     </table>
   </div>

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

@@ -156,12 +156,12 @@
         </div>
         </div>
       </criteria>
-      <data-grid class="list_area table_sy" :model="model" partial='list' v-ref:grid>
+      <data-grid class="list_area table_sy" :model="model" partial='list' v-ref:grid :optional="true">
         <template partial='head'>
-          <th>
-            <input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"
-                   @change="$parent.$parent.$parent.select()"/>
-          </th>
+          <!--<th>-->
+            <!--<input type="checkbox" id="f_operator" v-model="$parent.$parent.$parent.all[model.pageIndex-1]"-->
+                   <!--@change="$parent.$parent.$parent.select()"/>-->
+          <!--</th>-->
           <th><nobr>序号</nobr></th>
           <th><nobr>客户编号</nobr></th>
           <th><nobr>客户名称</nobr></th>
@@ -175,10 +175,10 @@
           <th><nobr>表底数</nobr></th>
         </template>
         <template partial='body'>
-          <td>
-            <input :id="'body'+model.pageIndex" type='checkbox' @change="$parent.$parent.$parent.selectOne($event,row,$index)"
-                   :checked="$parent.$parent.$parent.ischecked(model.pageIndex-1,$index)"/>
-          </td>
+          <!--<td>-->
+            <!--<input :id="'body'+model.pageIndex" type='checkbox' @change="$parent.$parent.$parent.selectOne($event,row,$index)"-->
+                   <!--:checked="$parent.$parent.$parent.ischecked(model.pageIndex-1,$index)"/>-->
+          <!--</td>-->
           <td>{{$index+1}}</td>
           <td>{{row.f_userinfo_code}}</td>
           <td>{{row.f_user_name}}</td>

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

@@ -47,13 +47,18 @@
       },
       'add-tobook-confirm' (model) {
         model.userfilesids = []
+        this.rowsdata = this.$refs.mbpeople_list.$refs.paged.$refs.grid.getRowData()
         let msg = '确认将选中的用户全部移入表册？'
         var alluser=[]
         if (this.rowsdata === null || this.rowsdata.length == 0) {
           this.$showAlert('请勾选用户！！', 'warning', 3000)
         } else {
-          model.userfilesids = this.rowsdata
-          alluser = this.$refs.mbpeople_list.rowsdata[0]
+          let userfilesids = []
+          this.rowsdata.forEach((row) => {
+            userfilesids.push(row.f_userfiles_id + '')
+          })
+          model.userfilesids = userfilesids
+          alluser = this.rowsdata
           // 变成可以直接使用的格式
           this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {

package/src/filiale/guangxi/OtherGas.vue

@@ -9,6 +9,15 @@
               <input class="input_search" style="width:60%" type="number" @blur="pregas"
                      v-validate:f_pregas='{ dctest: [0, ">=" ]}' v-model="model.f_pregas" placeholder="应补气量" v-ref:f_pregas>
             </div>
+            <div class="col-sm-4">
+              <label class=" font_normal_body">上次气量是否上表:</label>
+              <div style="display: inline-block;padding-top: 7px">
+                <input type="radio" id="true1" name="filllast" value="1" v-model="filllast">
+                <label for="true1">是</label>
+                <input type="radio" id="false1" name="filllast" value="0" v-model="filllast">
+                <label for="false1">否</label>
+              </div>
+            </div>
             <div class="col-sm-4">
               <label for="f_add_gas" class="font_normal_body">是否入累计</label>
               <v-select id="f_add_gas"
@@ -35,6 +44,15 @@
               <label for="f_preamount" class=" font_normal_body">应补金额:</label>
               <input  class="input_search" style="width:60%" type="number" min = "0" v-model="model.f_preamount" placeholder="金额">
             </div>
+            <div class="col-sm-4">
+              <label class=" font_normal_body">上次气量是否上表:</label>
+              <div style="display: inline-block;padding-top: 7px">
+                <input type="radio" id="true2" name="filllast" value="1" v-model="filllast">
+                <label for="true2">是</label>
+                <input type="radio" id="false2" name="filllast" value="0" v-model="filllast">
+                <label for="false2">否</label>
+              </div>
+            </div>
             <div class="col-sm-4">
               <label for="f_add_gas" class="font_normal_body">是否入累计:</label>
               <v-select v-model="model.f_add_gas"
@@ -180,6 +198,16 @@ let otherGasGen = async function (self) {
       if (!(self.row.f_hascard == null) && !(self.row.f_share_times == null) && self.row.f_meter_type == '物联网表' && self.row.f_hascard == '是' && self.row.f_share_times == '是') {
         params.cs = self.row.f_times + 1
       }
+      // 如果上次气量上表，就把上次气量变成上上次气量，上上次变为上上上次
+      if(self.filllast == '1'){
+        params.csql = params.ccsql
+        params.lastmoney = params.lastlastmoney
+        params.ccsql = params.cccsql
+        params.lastlastmoney = params.lastlastlastmoney
+      }
+      // 删除多余参数
+      delete params.cccsql
+      delete params.lastlastlastmoney
       console.log('获取其他补气写卡参数，，', params)
 
       let url = (getLastOper.data.last_oper === '补卡' || getLastOper.data.last_oper === '换表')
@@ -223,6 +251,7 @@ export default {
   data () {
     return {
       isGas: false,
+      filllast: '0',
       config: {
         hasPrint: false,  // 默认打票
         hasBillManage: false,  // 默认不启用发票管理

package/src/plugins/CommonService.js

@@ -213,6 +213,8 @@ let CommonService = {
       lastmoney: cardParams.data.scje,
       ccsql: cardParams.data.ssc,
       lastlastmoney: cardParams.data.sscje,
+      cccsql: cardParams.data.sssc ? cardParams.data.sssc : null,
+      lastlastlastmoney: cardParams.data.ssscje ? cardParams.data.ssscje : null,
       ljgql: cardParams.data.f_pregas,
       ljyql: cardParams.data.f_pregasall,
       yhh: cardParams.data.f_meterid,