sale-client 3.6.338 → 3.6.339

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Jul 12 17:16:43 CST 2024
+#Mon Jul 08 09:48:59 CST 2024
 gradle.version=5.2.1

package/SaleClient.iml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
+<module external.linked.project.id="SaleClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.1-11" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

package/package.json

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

package/src/components/charge/business/OtherChargeAudit.vue

@@ -163,7 +163,7 @@ export default {
     }
   },
   ready () {
-    readyGen(this)
+    // readyGen(this)
   },
   methods: {
     loadMeterBooks () {
@@ -180,7 +180,7 @@ export default {
     },
     selfSearch (args) {
       if (!this.orgCondtionStr) {
-        args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        args.condition = `${args.condition}` + ' and f_orgid in ' + `('`+this.$login.f.orgid+`')`
       } else {
         args.condition = `${args.condition}` + this.orgCondtionStr
       }

package/src/components/revenue/base/leftview/ServiceSubstitution.vue

@@ -104,9 +104,11 @@ export default {
           }, {resolveMsg: null, rejectMsg: null})
           this.model = result.data[0]
           console.log('看看维修情况', result, this.model)
-        }
-        if (this.model) {
-          this.pared = 1
+          if (this.model) {
+            this.pared = 1
+          } else {
+            this.pared = 0
+          }
         } else {
           this.pared = 0
         }

package/src/filiale/qianneng/revenue/sms/MessageReport.vue

@@ -93,18 +93,15 @@ export default {
         console.log(res.data)
         if (res.data.success) {
           this.$showMessage(`成功生成短信${res.data.success}条,生成失败${res.data.fail}条`)
-          // this.$refs.list.search()
-          this.$refs.message.$refs.paged.$refs.cri.search()
-          this.$refs.message.model.condition = 'convert(varchar(10),f_create_date,120) = ' + "'" + this.$login.toStandardDateString() + "'"
-          this.$refs.list.ids = []
-          this.$refs.message.ids = []
+          this.$refs.messagelist.$refs.paged.$refs.cri.search()
+          this.$refs.messagelist.ids = []
+        } else {
+          this.$showMessage(`短信生成失败`)
         }
-
       }).catch((error) => {
-        this.$refs.message.$refs.paged.$refs.cri.search()
-        this.$refs.message.model.condition = 'convert(varchar(10),f_create_date,120) = ' + "'" + this.$login.toStandardDateString() + "'"
-        this.$refs.list.ids = []
-        this.$refs.message.ids = []
+        this.$showMessage(`短信生成失败`)
+        this.$refs.messagelist.$refs.paged.$refs.cri.search()
+        this.$refs.messagelist.ids = []
       })
     },
     'success' () {

package/src/filiale/yangchun/machineHandAudit.vue

@@ -91,7 +91,7 @@
                           style="width: 60%"
                           multiple="true"
                           :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                          close-on-select v-el:cc>
+                           v-el:cc>
                 </v-select>
               </div>
               <div class="col-sm-2 form-group">
@@ -125,7 +125,7 @@
                           style="width:60%"
                           multiple="true"
                           :options='$parent.$parent.inputtores' placeholder='抄表员'
-                          close-on-select
+
                           v-el:cc></v-select>
               </div>
 

package/src/plugins/LogicService.js

@@ -278,7 +278,7 @@ let LogicService = {
     return Vue.resetpost('rs/logic/messageBatchOperate', data, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})
   },
   createCustomMessage (data) {
-    return Vue.resetpost('rs/customMessage/send', {data: data}, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})
+    return Vue.resetpost('rs/customMessage/send', {data: data}, {resolveMsg: null, rejectMsg: null})
   },
   createMessageNew (data) {
     return Vue.resetpost('rs/logic/messageBatchOperateNew', data, {resolveMsg: '生成短信成功', rejectMsg: '生成短信失败'})