sale-client 3.6.304 → 3.6.305

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu May 30 16:51:32 CST 2024
+gradle.version=4.4

package/package.json

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

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

@@ -4,7 +4,6 @@
         <template partial='head' >
           <tr>
             <th><nobr>序号</nobr></th>
-
             <th><nobr>气量</nobr></th>
             <th><nobr>应交</nobr></th>
             <th><nobr>付款方式</nobr></th>
@@ -12,6 +11,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>
@@ -28,6 +28,7 @@
             <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.f_curbalance}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_write_card}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.operate_date}}</td>
             <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
             <td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
@@ -80,6 +81,7 @@
           resolveMsg: null
         })
         this.model.rows = record.data
+        console.log('record.data------------>',record.data)
         this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') : false
         if (this.hasCardCental && this.model.rows.length > 0 && (this.model.rows[0].type == '发卡售气' || this.model.rows[0].type == '卡表收费')) {
           let checkdata = this.model.rows[0].operate_date.substr(0, 10)

package/src/filiale/rizhao/otherinfo.vue

@@ -1,92 +1,92 @@
-<template>
-  <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
-<!--    <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>-->
-    <safe-check :data="data"></safe-check>
-    <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>
-    <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
-  </div>
-</template>
-
-<script>
-/**
-*客户相关信息
-*/
-
-import MixPriceInfo from '../../components/revenue/base/leftview/MixPriceInfo'
-import SafeCheck from '../../components/revenue/base/leftview/SafeCheck'
-import ServiceRepair from '../../components/revenue/base/leftview/ServiceRepair'
-export default {
-  title: '客户相关信息',
-  data () {
-    return {
-      name: ''
-    }
-  },
-  components: {MixPriceInfo, SafeCheck, ServiceRepair},
-  props: {
-    data: {
-      type: Object
-    },
-    cardData: {
-      type: Object,
-      default: function () {
-        return {}
-      }
-    },
-    state:{
-      type: String,
-      default:null
-    }
-  },
-  ready () {
-    this.getAuthority()
-  },
-  methods: {
-    getAuthority () {
-      if (this.$login.r.find(value => value == '维修情况查询')) {
-        this.name = '维修情况查询'
-        console.log(this.name)
-      }
-      console.log('查看权限', this.$login.r)
-    },
-    dealMsg (obj) {
-      this.$dispatch('deal-msg', obj)
-    },
-    setstate(state){
-      this.$dispatch('setstate',state)
-    }
-  }
-}
-</script>
-<style lang="less">
-  #mulit-info-class {
-    width: 280px;
-    margin-right: 20px;
-    overflow-y: auto;
-    > div {
-      height: auto;
-      margin-bottom: 8px;
-    }
-  }
-  // 内容显示样式
-  .control-label {
-    height: 23px;
-    border-right: 1px solid #F2F6FA;
-    margin-bottom: 0;
-    text-align: left;
-  }
-
-  .info-content {
-    padding:6px;
-    span {
-      padding-left: 5px;
-    }
-  }
-// 信息区域的表格显示紧凑
-  .self-table > tbody > tr > td {
-    padding: 3px;
-    text-align: center;
-  }
-</style>
+<template>
+  <div class="flex" style="height: 90%;overflow-y: scroll">
+    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
+<!--    <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>-->
+    <safe-check :data="data"></safe-check>
+    <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>
+    <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
+  </div>
+</template>
+
+<script>
+/**
+*客户相关信息
+*/
+
+import MixPriceInfo from '../../components/revenue/base/leftview/MixPriceInfo'
+import SafeCheck from '../../components/revenue/base/leftview/SafeCheck'
+import ServiceRepair from '../../components/revenue/base/leftview/ServiceRepair'
+export default {
+  title: '客户相关信息',
+  data () {
+    return {
+      name: ''
+    }
+  },
+  components: {MixPriceInfo, SafeCheck, ServiceRepair},
+  props: {
+    data: {
+      type: Object
+    },
+    cardData: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    state:{
+      type: String,
+      default:null
+    }
+  },
+  ready () {
+    this.getAuthority()
+  },
+  methods: {
+    getAuthority () {
+      if (this.$login.r.find(value => value == '维修情况查询')) {
+        this.name = '维修情况查询'
+        console.log(this.name)
+      }
+      console.log('查看权限', this.$login.r)
+    },
+    dealMsg (obj) {
+      this.$dispatch('deal-msg', obj)
+    },
+    setstate(state){
+      this.$dispatch('setstate',state)
+    }
+  }
+}
+</script>
+<style lang="less">
+  #mulit-info-class {
+    width: 280px;
+    margin-right: 20px;
+    overflow-y: auto;
+    > div {
+      height: auto;
+      margin-bottom: 8px;
+    }
+  }
+  // 内容显示样式
+  .control-label {
+    height: 23px;
+    border-right: 1px solid #F2F6FA;
+    margin-bottom: 0;
+    text-align: left;
+  }
+
+  .info-content {
+    padding:6px;
+    span {
+      padding-left: 5px;
+    }
+  }
+// 信息区域的表格显示紧凑
+  .self-table > tbody > tr > td {
+    padding: 3px;
+    text-align: center;
+  }
+</style>