sale-client 3.6.574 → 3.6.575

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue +1 -1
  3. package/src/main.js +1 -1
  4. package/src/plugins/CardService.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.574",
3
+ "version": "3.6.575",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue CHANGED
@@ -154,7 +154,7 @@
154
154
  <button v-if="$login.r.includes('取消指令')" @click="$parent.$parent.$parent.backSend(row)" class="button_search" style="margin-left:1rem" v-el:cba>取消指令</button>
155
155
  </nobr>
156
156
  </td>
157
- <td style="text-align:center;" v-if="row.f_instruct_state !== '待发送' && row.f_instruct_state !== '取消发送'">
157
+ <td style="text-align:center;" v-if="row.f_instruct_state !== '待发送' && row.f_instruct_state !== '取消发送' && row.f_instruct_state !== '执行成功'">
158
158
  <nobr>
159
159
  {{row.f_receive_state}}
160
160
 
package/src/main.js CHANGED
@@ -2,7 +2,7 @@ import Vue from 'vue'
2
2
  import all from 'vue-client/src/all'
3
3
  import App from './App'
4
4
  import system from 'system-clients/src/system'
5
- import FilialeSale from './filiale/bayan/sale'
5
+ import FilialeSale from './filiale/shimen/sale'
6
6
  import sale from './sale'
7
7
  import address from 'address-client/src/address'
8
8
  import ldap from 'ldap-clients/src/ldap'
package/src/plugins/CardService.js CHANGED
@@ -660,7 +660,7 @@ let sendCardSaleGasGenremanent = async function (model, row) {
660
660
  // 组织写卡数据
661
661
  let params = {
662
662
  factory: row.f_alias,
663
- kmm: '0', // 2019-12-22 查旭说的。给一个0 卡密码，写卡后返回新密码, 不论补卡还是先开户都没有密码
663
+ kmm: row.f_card_password ? row.f_card_password : '0', // 2019-12-22 查旭说的。给一个0 卡密码，写卡后返回新密码, 不论补卡还是先开户都没有密码
664
664
  kzt: '0', // 卡状态，0开户卡，1用户卡（0新开户，1补卡）
665
665
  kh: result.data.cardnumber, // 卡号
666
666
  yhh: row.f_meterid ? row.f_meterid : 0, // 用户号，档案中自己输