sale-client 3.5.18 → 3.5.21

package/src/filiale/dongguan/sale.js

@@ -4,5 +4,8 @@ import Vue from "vue";
 let specialComp = {
   // 机表抄表
   'high-meter-idcard': (resolve) => { require(['./components/HighMeterCard'], resolve) },
+  // 用户基本信息
+  'user-base-info-new': (resolve) => { require(['./components/common/userinfo_detail/UserBaseInfoNew'], resolve) },
+  'user-meterinfodetail': (resolve) => { require(['./components/meterinfodetail'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/guangxi/CardService.js

@@ -293,6 +293,8 @@ let cardAndGasCancelGen = async function (model, xmodel, row) {
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         await rollbackGen(result, model, row)
       } else {
+        // 更新 上次写卡气量
+        await modify(row.f_userfiles_id, params.ql, '2')
         Vue.showAlert('撤销成功', 'success', 2000)
         return result
       }
@@ -532,6 +534,8 @@ let offlineWriteGen = async function (row) {
 
         throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
       } else {
+        // 更新 上次写卡气量
+        await getParamGen(row.f_userfiles_id, param.ql)
         // 写卡成功 更新收费记录
         let update = {
           id: row.unWriteSell[0].id,
@@ -668,6 +672,8 @@ let sendCardSaleGasGen = async function (model, row) {
         // 数据回滚操作
         throw `卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`
       } else {
+        // 更新 上次写卡气量
+        await modify(row.f_userfiles_id, params.ql)
         // 写卡成功
         // 更新卡密码
         await Vue.CommonService.updatePassword(row, cardRes)
@@ -845,6 +851,8 @@ let sellgasGen = async function (model, row) {
       if (!cardParams || !result || cardRes.data.Err || cardRes.data.Exception) {
         throw `卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`
       } else {
+        // 更新 上次写卡气量
+        await modify(row.f_userfiles_id, params.ql)
         // 更新卡密码
         await Vue.CommonService.updatePassword(row, cardRes)
         Vue.showAlert('售气成功', 'success', 2000)
@@ -909,6 +917,15 @@ let getParamGen = async function (cardid, alias, f_user_id, f_userfiles_id) {
   return Vue.resetpost('rs/logic/stairCard', {data: data}, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
 }
 
+let modify = async function (userfilesID, gas, type = '1') {
+  let data = {
+    f_gas: gas,
+    f_userfiles_id: userfilesID,
+    type
+  }
+  return Vue.resetpost('rs/logic/modifySCGas', {data: data}, {resolveMsg: null, rejectMsg: '获取写卡参数失败'})
+}
+
 let sendCardSaleGasGenremanent = async function (model, row) {
   // 1.存库  2.写卡
   let result = null

package/src/filiale/meihekou/MeterinfoTest.vue

@@ -36,7 +36,7 @@
             <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
                    v-validate:brand='{required: true }'>
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">*气表型号</label>
@@ -44,7 +44,7 @@
                    v-validate:model='{required: true }'>
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel' :disabled='row.gasbrand.length === 0 ' v-ref:model></v-select>
+                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
             <label for="pricename" class="font_normal_body">*气价名称</label>
@@ -379,7 +379,7 @@ let meterBookGen = function * (self) {
         isiot: true
       }
     },
-    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id'],
+    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'curuser'],
     ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
       this.row = Object.assign(this.row, this.meter, {})

package/src/filiale/qianneng/eticket/EticketPrint.vue

@@ -132,11 +132,12 @@ export default {
             id: ticket_id,
             f_bill_code: req.fpDm,
             f_bill_number: req.fpHm,
-            f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
-            f_sign_result: req.msg,
+            f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
+            f_sign_url: req.shareurl,
+            f_sign_result: req.sharecode,
             f_bill_state: req.status
           }
-          this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
+          this.eticket_src = 'https://qnjtkf.cn:7400' + model.f_bill_url
         } else if (req.status === '开票中') {
           model = {
             id: ticket_id,
@@ -303,11 +304,12 @@ export default {
                   f_eticket_id: ticket_id,
                   f_bill_code: req.fpDm,
                   f_bill_number: req.fpHm,
-                  f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
-                  f_sign_result: req.msg,
+                  f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
+                  f_sign_url: req.shareurl,
+                  f_sign_result: req.sharecode,
                   f_bill_state: req.status
                 })
-                this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
+                this.eticket_src = 'https://qnjtkf.cn:7400' + req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download')
               } else if (req && req.status !== '开票中') {
                 clearInterval(interval)
                 // TODO 失败后保存发票详情

package/src/filiale/tongchuan/common/userinfo_detail/iot_detail/WatchCollection.vue

@@ -48,8 +48,8 @@
               <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>-->
 
               <th><nobr>磁干扰异常</nobr></th>
               <th><nobr>补偿状态</nobr></th>
@@ -69,8 +69,8 @@
               <th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
               <th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
               <th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>
+<!--              <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>-->
+<!--              <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>-->
               <th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
               <th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
             </tr>

package/src/main.js

@@ -11,7 +11,7 @@ Vue.config.silent = true
 
 all()
 system(false)
-sale()
+sale('dongguan')
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')