sale-client 4.3.94 → 4.3.96

package/package.json

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

package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue

@@ -330,22 +330,9 @@ export default {
       this.handcental2 = true
       this.cancelid = megrow.id
     },
-    confirmcenta () {
-      let send = {
-        id: this.cancelid,                                       // 当前记录ID
-        f_cancel_inputtor_id: this.$login.f.id,         // 撤销人id
-        f_cancel_inputtor: this.$login.f.name,         // 撤销人姓名
-        f_instruct_state: '取消发送',
-        f_comments: this.cancelreason
-      }
-      let param = {
-        tablename: 't_instruct',
-        basedata: send
-      }
-      this.$resetpost('api/af-revenue/logic/iot_saveTable', param).then(() => {
-          // this.params.rows.splice(index, 1)
-        console.log('更新成功！')
-      })
+    async confirmcenta () {
+      let sql = `update t_instruct set f_cancel_inputtor = ${this.$login.f.name}, f_cancel_inputtor_id = ${this.$login.f.id},f_comments = ${this.cancelreason},f_instruct_state = '取消发送' WHERE id = ${this.cancelid}`
+      await this.$resetpost('api/af-revenue/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
       this.handcental = false
       this.$refs.paged.$refs.criteria.search()
     },

package/src/plugins/GetSaleParams.js

@@ -176,6 +176,24 @@ let GetSaleParam = {
     }, [])
     return Array.from(new Set(result))
   },
+  getPriceByOrgNoLow (filialeid) {
+    let result = []
+    GetSaleParam.prices.forEach((item) => {
+      if (item.f_state === '有效' && filialeid == item.f_filialeid && (item.f_islow_income == null || item.f_islow_income == 0)) {
+        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 = []
@@ -277,6 +295,44 @@ let GetSaleParam = {
     }
     return Array.from(new Set(result))
   },
+  getPriceAllNoLow (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 && (item.f_islow_income == null || item.f_islow_income == 0)) {
+          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 && (item.f_islow_income == null || item.f_islow_income == 0)) {
+          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

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed May 13 15:19:48 CST 2026
-gradle.version=5.2.1