sale-client 3.6.569 → 3.6.570

package/package.json

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

package/src/filiale/tongchuan/WebMeterList.vue

@@ -189,6 +189,7 @@
             <th><nobr>领用人</nobr></th>
             <th><nobr>领用时间</nobr></th>
             <th><nobr>领用电话</nobr></th>
+            <th><nobr>出厂日期</nobr></th>
           </tr>
         </template>
         <template partial='body' >
@@ -221,7 +222,8 @@
           <td style="text-align: center" >{{row.f_receive}}</td>
           <td style="text-align: center" >{{row.f_receive_unit}}</td>
           <td style="text-align: center" >{{row.f_receive_date}}</td>
-          <td style="text-align: center" >{{row.f_receive_date}}</td>
+          <td style="text-align: center" >{{row.f_receive_phone}}</td>
+          <td style="text-align: center" >{{row.f_product_date}}</td>
 
 
         </template>

package/src/filiale/zhongyi/HandplanQuery.vue

@@ -679,7 +679,7 @@
     console.log('开始查询')
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
     // 抄表员
-    if (!this.$login.f.f_role_name.includes("管理员")){
+    if (!this.$login.f.f_role_name.includes("抄表主管")){
       self.$refs.paged.$refs.cri.model.f_inputtor = self.$login.f.name
     }
   }
@@ -762,7 +762,7 @@
     },
     ready() {
       console.log('登录信息---------------->', this.$login.f)
-      console.log('登录信息-------111--------->', this.$login.f.f_role_name.includes("管理员"))
+      console.log('登录信息-------111--------->', this.$login.f.f_role_name.includes("抄表主管"))
       this.getShowInputor()
       this.getaddress()
       readySomething(this).then(() => {
@@ -774,7 +774,7 @@
     },
     methods: {
       getShowInputor(){
-        if (this.$login.f.f_role_name.includes("管理员")){
+        if (this.$login.f.f_role_name.includes("抄表主管")){
           this.showinputor = true
         }
       },
@@ -870,7 +870,7 @@
 
       async getinputtores () {
         // 获取抄表员
-        if (this.$login.f.f_role_name.includes("管理员")){
+        if (this.$login.f.f_role_name.includes("抄表主管")){
           let rs = []
           if (this.$login.f.f_gasman.length > 0) {
             for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
@@ -1006,9 +1006,9 @@
       async getRes(condition,obj) {
         console.log("condition:----------",condition)
         console.log("obj:----------",obj)
-        if (!this.$login.f.f_role_name.includes("管理员")){
+        if (!this.$login.f.f_role_name.includes("抄表主管")){
           this.orgCondtionStr = condition + ` and f_inputtor = '${this.$login.f.name}'`
-        }else if (this.$login.f.f_role_name.includes("部门管理员")) {
+        }else if (this.$login.f.f_role_name.includes("部门抄表主管")) {
           this.orgCondtionStr = condition + ` and f_depid = '${this.$login.f.depids}'`
         }else {
             this.orgCondtionStr = condition
@@ -1149,7 +1149,7 @@
         // 获取抄表员
         console.log('获取抄表员', this.$login.f)
         let rs = []
-        if (this.$login.f.f_role_name.includes("管理员")){
+        if (this.$login.f.f_role_name.includes("抄表主管")){
           if (this.$login.f.f_gasman.length > 0) {
             for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
               let temp = {