sale-client 4.2.35 → 4.2.37

package/src/filiale/jinhong/plugins/GetSaleParams.js

@@ -1,302 +1,302 @@
-import Vue from 'vue'
-let GetSaleParam = {
-
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.GetSaleParam = Vue.prototype.$GetSaleParam = GetSaleParam
-  },
-
-  // 气表
-  gasbrands: [],
-
-  // 气价
-  prices: [],
-
-  // 调压箱
-  adjustables: [],
-  meterNumber: [],
-  // 抄表册
-  meterbooks: [],
-  bookcodes: [],
-  inputtors: [],
-  auditor: [],
-  saleMan: [],
-  async initinputtor () {
-    let res = await Vue.resetpost('api/af-revenue/sql/sale_getAlluserRes?pageNo=1&pageSize=999999', {data: {
-      condition: ' 1=1'
-    }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！', newly: true})
-    console.log('resdata:', res.data)
-    if (res.data) {
-      GetSaleParam.inputtors = res.data
-    }
-  },
-  getresinputtor (orgid) {
-    console.log('11111111111-------,', orgid)
-    let inputtors = []
-    console.log('1GetSaleParam.inputtors-------,', GetSaleParam.inputtors)
-    if (GetSaleParam.inputtors.length > 0) {
-      let arr = GetSaleParam.inputtors.filter((res) => {
-        if (res.rolestr != null && res.rolestr != '') {
-          return res.rolestr.indexOf('抄表员') > -1 && res.f_orgid == orgid
-        }
-      })
-
-      arr.forEach((res) => {
-        inputtors.push({label: res.name, value: res.name})
-      })
-    }
-    return inputtors
-  },
-  getAllMeterNumber () {
-    let param = {
-      f_orgid: this.$login.f.orgid
-    }
-    this.$resetpost('api/af-revenue/logic/getAllMeterNumber', param, {
-      resolveMsg: null,
-      rejectMsg: '获取表号失败！！'
-    }).then(res => {
-      this.meterNumber = []
-      if (res.data.length > 0) {
-        res.data.forEach(item => {
-          this.meterNumber.push({label: item.label, value: item.value})
-        })
-      }
-    })
-    return this.meterNumber
-  },
-  getAudit (orgid) {
-    console.log('11111111111-------,', orgid)
-    let auditor = []
-    console.log('1GetSaleParam.inputtors-------,', GetSaleParam.inputtors)
-    if (GetSaleParam.inputtors.length > 0) {
-      let arr = GetSaleParam.inputtors.filter((res) => {
-        if (res.rolestr != null && res.rolestr != '') {
-          return res.rolestr.indexOf('审核人员') > -1 && res.f_orgid == orgid
-        }
-      })
-      arr.forEach((res) => {
-        auditor.push({label: res.name, value: res.name})
-      })
-    }
-    return auditor
-  },
-  getSaleMan (orgid) {
-    let saleMan = []
-    if (GetSaleParam.inputtors.length > 0) {
-      let arr = GetSaleParam.inputtors.filter((res) => {
-        if (res.rolestr != null && res.rolestr != '') {
-          return res.rolestr && res.f_orgid == orgid
-        }
-      })
-      arr.forEach((res) => {
-        saleMan.push({label: res.name, value: res.name})
-      })
-    }
-    return saleMan
-  },
-  getGasstyle (key) {
-    return GetSaleParam.gasbrands.key
-  },
-  getGasbrand () {
-    return GetSaleParam.gasbrands
-  },
-  getAdjustable () {
-    return GetSaleParam.adjustables
-  },
-  getMeterBooks () {
-    return GetSaleParam.meterbooks
-  },
-  getBookCodes () {
-    return GetSaleParam.bookcodes
-  },
-  getAdjustable (val) {
-    // 数组去重
-    let arr = []
-    if (val) {
-      GetSaleParam.adjustables.forEach((item, next) => {
-        if (item.value.f_orgid == val) {
-          item.value.risers=[]
-          var params=[]
-          if(item.value.f_riser_codes){
-            var param=(item.value.f_riser_codes||'').split(' , ')
-            param.forEach((item)=>{
-              params.push({label:item,value:item})
-            })
-            item.value.risers=params
-          }else{
-            item.value.risers=[]
-          }
-
-          arr.push(item)
-        }
-      })
-    } else {
-      GetSaleParam.adjustables.forEach((item, next) => {
-        arr.push(item)
-      })
-    }
-    let hash = {}
-    let result = arr.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-  },
-  getPriceByOrg (filialeid) {
-    let result = []
-    GetSaleParam.prices.forEach((item) => {
-      if (item.f_state === '有效' && filialeid == item.f_filialeid) {
-        let value = {
-          label: item.f_price_name,
-          value: item
-        }
-        result.push(value)
-      }
-    })
-    let hash = {}
-    result = result.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-  },
-  getOnlyPrice () {
-    // 数组去重
-    let arr = []
-    GetSaleParam.prices.forEach((item, next) => {
-      if (item.f_state === '有效') {
-        let value = {
-          label: item.f_price_name,
-          value: item
-        }
-        arr.push(value)
-      }
-    })
-    let hash = {}
-    let result = arr.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-  },
-  getPrice (object) {
-    console.log('参数。。。', object)
-    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
-    if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
-      return
-    }
-    let result = []
-
-    console.log('获取价格。。。', object.filter, GetSaleParam.prices)
-
-    // 做筛选
-    if (object.filter) {
-      GetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
-          object.f_gasproperties === item.f_gasproperties &&
-          object.f_price_type === item.f_price_type &&
-          object.filter == item.f_filialeid) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          result.push(value)
-        }
-      })
-    } else {
-      GetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          console.log('进来了1111')
-          result.push(value)
-        }
-      })
-    }
-    // 数组去重
-    let hash = {}
-    result = result.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-  },
-  getPriceAll (object) {
-    console.log('参数。。。', object)
-    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
-    if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
-      return
-    }
-    let result = []
-
-    console.log('获取价格。。。', object.filter, GetSaleParam.prices)
-
-    // 做筛选
-    if (object.filter) {
-      GetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
-          object.f_gasproperties === item.f_gasproperties &&
-          object.f_price_type === item.f_price_type &&
-          object.filter == item.f_filialeid) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          result.push(value)
-        }
-      })
-    } else {
-      GetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          console.log('进来了1111')
-          result.push(value)
-        }
-      })
-    }
-    return Array.from(new Set(result))
-  },
-  getPriceAllOther (object) {
-    console.log('参数。。。', object)
-    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
-    if (!object.f_price_type) {
-      return
-    }
-    let result = []
-
-    console.log('获取价格。。。', object.filter, GetSaleParam.prices)
-
-    // 做筛选
-    if (object.filter) {
-      GetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_price_type === item.f_price_type &&
-          object.filter == item.f_filialeid) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          result.push(value)
-        }
-      })
-    } else {
-      GetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' && object.f_price_type === item.f_price_type) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          console.log('进来了1111')
-          result.push(value)
-        }
-      })
-    }
-    return Array.from(new Set(result))
-  }
-}
-
-export default GetSaleParam
+import Vue from 'vue'
+let GetSaleParam = {
+
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.GetSaleParam = Vue.prototype.$GetSaleParam = GetSaleParam
+  },
+
+  // 气表
+  gasbrands: [],
+
+  // 气价
+  prices: [],
+
+  // 调压箱
+  adjustables: [],
+  meterNumber: [],
+  // 抄表册
+  meterbooks: [],
+  bookcodes: [],
+  inputtors: [],
+  auditor: [],
+  saleMan: [],
+  async initinputtor () {
+    let res = await Vue.resetpost('api/af-revenue/sql/sale_getAlluserRes?pageNo=1&pageSize=999999', {data: {
+      condition: ' 1=1'
+    }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！', newly: true})
+    console.log('resdata:', res.data)
+    if (res.data) {
+      GetSaleParam.inputtors = res.data
+    }
+  },
+  getresinputtor (orgid) {
+    console.log('11111111111-------,', orgid)
+    let inputtors = []
+    console.log('1GetSaleParam.inputtors-------,', GetSaleParam.inputtors)
+    if (GetSaleParam.inputtors.length > 0) {
+      let arr = GetSaleParam.inputtors.filter((res) => {
+        if (res.rolestr != null && res.rolestr != '') {
+          return res.rolestr.indexOf('抄表员') > -1 && res.f_orgid == orgid
+        }
+      })
+
+      arr.forEach((res) => {
+        inputtors.push({label: res.name, value: res.name})
+      })
+    }
+    return inputtors
+  },
+  getAllMeterNumber () {
+    let param = {
+      f_orgid: this.$login.f.orgid
+    }
+    this.$resetpost('api/af-revenue/logic/getAllMeterNumber', param, {
+      resolveMsg: null,
+      rejectMsg: '获取表号失败！！'
+    }).then(res => {
+      this.meterNumber = []
+      if (res.data.length > 0) {
+        res.data.forEach(item => {
+          this.meterNumber.push({label: item.label, value: item.value})
+        })
+      }
+    })
+    return this.meterNumber
+  },
+  getAudit (orgid) {
+    console.log('11111111111-------,', orgid)
+    let auditor = []
+    console.log('1GetSaleParam.inputtors-------,', GetSaleParam.inputtors)
+    if (GetSaleParam.inputtors.length > 0) {
+      let arr = GetSaleParam.inputtors.filter((res) => {
+        if (res.rolestr != null && res.rolestr != '') {
+          return res.rolestr.indexOf('审核人员') > -1 && res.f_orgid == orgid
+        }
+      })
+      arr.forEach((res) => {
+        auditor.push({label: res.name, value: res.name})
+      })
+    }
+    return auditor
+  },
+  getSaleMan (orgid) {
+    let saleMan = []
+    if (GetSaleParam.inputtors.length > 0) {
+      let arr = GetSaleParam.inputtors.filter((res) => {
+        if (res.rolestr != null && res.rolestr != '') {
+          return res.rolestr && res.f_orgid == orgid
+        }
+      })
+      arr.forEach((res) => {
+        saleMan.push({label: res.name, value: res.name})
+      })
+    }
+    return saleMan
+  },
+  getGasstyle (key) {
+    return GetSaleParam.gasbrands.key
+  },
+  getGasbrand () {
+    return GetSaleParam.gasbrands
+  },
+  getAdjustable () {
+    return GetSaleParam.adjustables
+  },
+  getMeterBooks () {
+    return GetSaleParam.meterbooks
+  },
+  getBookCodes () {
+    return GetSaleParam.bookcodes
+  },
+  getAdjustable (val) {
+    // 数组去重
+    let arr = []
+    if (val) {
+      GetSaleParam.adjustables.forEach((item, next) => {
+        if (item.value.f_orgid == val) {
+          item.value.risers=[]
+          var params=[]
+          if(item.value.f_riser_codes){
+            var param=(item.value.f_riser_codes||'').split(' , ')
+            param.forEach((item)=>{
+              params.push({label:item,value:item})
+            })
+            item.value.risers=params
+          }else{
+            item.value.risers=[]
+          }
+
+          arr.push(item)
+        }
+      })
+    } else {
+      GetSaleParam.adjustables.forEach((item, next) => {
+        arr.push(item)
+      })
+    }
+    let hash = {}
+    let result = arr.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+  },
+  getPriceByOrg (filialeid) {
+    let result = []
+    GetSaleParam.prices.forEach((item) => {
+      if (item.f_state === '有效' && filialeid == item.f_filialeid) {
+        let value = {
+          label: item.f_price_name,
+          value: item
+        }
+        result.push(value)
+      }
+    })
+    let hash = {}
+    result = result.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+  },
+  getOnlyPrice () {
+    // 数组去重
+    let arr = []
+    GetSaleParam.prices.forEach((item, next) => {
+      if (item.f_state === '有效') {
+        let value = {
+          label: item.f_price_name,
+          value: item
+        }
+        arr.push(value)
+      }
+    })
+    let hash = {}
+    let result = arr.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+  },
+  getPrice (object) {
+    console.log('参数。。。', object)
+    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
+    if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
+      return
+    }
+    let result = []
+
+    console.log('获取价格。。。', object.filter, GetSaleParam.prices)
+
+    // 做筛选
+    if (object.filter) {
+      GetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
+          object.f_gasproperties === item.f_gasproperties &&
+          object.f_price_type === item.f_price_type &&
+          object.filter == item.f_filialeid) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          result.push(value)
+        }
+      })
+    } else {
+      GetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          console.log('进来了1111')
+          result.push(value)
+        }
+      })
+    }
+    // 数组去重
+    let hash = {}
+    result = result.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+  },
+  getPriceAll (object) {
+    console.log('参数。。。', object)
+    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
+    if (!object.f_user_type || !object.f_gasproperties || !object.f_price_type) {
+      return
+    }
+    let result = []
+
+    console.log('获取价格。。。', object.filter, GetSaleParam.prices)
+
+    // 做筛选
+    if (object.filter) {
+      GetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' && object.f_user_type === item.f_user_type &&
+          object.f_gasproperties === item.f_gasproperties &&
+          object.f_price_type === item.f_price_type &&
+          object.filter == item.f_filialeid) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          result.push(value)
+        }
+      })
+    } else {
+      GetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' && object.f_user_type === item.f_user_type && object.f_gasproperties === item.f_gasproperties && object.f_price_type === item.f_price_type) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          console.log('进来了1111')
+          result.push(value)
+        }
+      })
+    }
+    return Array.from(new Set(result))
+  },
+  getPriceAllOther (object) {
+    console.log('参数。。。', object)
+    // 目前支持三个字段并都有值 f_user_type,f_gasproperties,f_price_type
+    if (!object.f_price_type) {
+      return
+    }
+    let result = []
+
+    console.log('获取价格。。。', object.filter, GetSaleParam.prices)
+
+    // 做筛选
+    if (object.filter) {
+      GetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' && object.f_price_type === item.f_price_type &&
+          object.filter == item.f_filialeid) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          result.push(value)
+        }
+      })
+    } else {
+      GetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' && object.f_price_type === item.f_price_type) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          console.log('进来了1111')
+          result.push(value)
+        }
+      })
+    }
+    return Array.from(new Set(result))
+  }
+}
+
+export default GetSaleParam

package/src/filiale/meihekou/batch/batchEditFiles.vue

@@ -305,3 +305,15 @@
     }
   }
 </script>
+
+<style scoped>
+.auto {
+  min-height: 900px; /* 给足够的高度让下拉框显示 */
+  overflow: visible !important;
+}
+
+/* 确保下拉菜单显示完整 */
+.v-select .dropdown-menu {
+  z-index: 1050 !important;
+}
+</style>

package/src/filiale/meihekou/handOperate.vue

@@ -243,8 +243,9 @@ export default {
         'f_audit_date': '审核时间',
         'f_orgname': '所属公司',
         'f_depname': '所属部门',
-        'f_operator':'操作人',
-        'f_operatorid':'操作人ID'
+        'f_operator': '操作人',
+        'f_operatorid': '操作人ID',
+        'f_comments': '备注'
       }
     }
   },
@@ -330,12 +331,12 @@ export default {
       if (this.model.f_meter_classify.indexOf('卡表') >= 0) {
         this.model.f_result_state = this.model.f_hand_state
         this.model.f_hand_date = this.model.f_input_date
-        await this.$resetpost('api/af-revenue/entity/t_cardhand', this.model, {
+        await this.$resetpost('api/af-revenue/entity/save/t_cardhand', this.model, {
           resolveMsg: '修改成功',
           rejectMsg: '未通过，修改出错!!!'
         })
       } else {
-        await this.$resetpost('api/af-revenue/entity/t_handplan', this.model, {
+        await this.$resetpost('api/af-revenue/entity/save/t_handplan', this.model, {
           resolveMsg: '修改成功',
           rejectMsg: '未通过，修改出错!!!'
         })