manage-client 1.22.33-ca → 1.22.37-ca

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "1.22.33-ca",
+  "version": "1.22.37-ca",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -401,7 +401,6 @@ let readySomething = async function (self) {
   self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
   self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
   self.$refs.paged.$refs.cri.model.f_state = ['有效']
-  self.$refs.paged.$refs.cri.model.f_second_state = '否'
   await self.$MagLoadParams.loadParam(self.$login.f)
   self.initParams()
   /* await self.$refs.paged.$refs.cri.search()

package/src/components/sale/filesquery/DeviceQuery.vue

@@ -82,7 +82,7 @@
               <v-select :value.sync="model.f_second_state"
                         v-model="model.f_second_state"
                         :search="false"
-                        condition=" f_second_state {} "
+                        :value-single="true"
                         :options='$parent.$parent.second_states' placeholder='请选择'
               ></v-select>
             </div>
@@ -236,7 +236,7 @@ export default {
     return {
       model: new PagedList('rs/sql/deviceQuery', 20),
       criteriaShow: true,
-      second_states: [{label: '全部', value: ''},{label: '否', value: ' is null '}, {label: '是', value: ' is not null'}],
+      second_states: [{label: '全部', value: ''},{label: '否', value: '否'}, {label: '是', value: '是'}],
       filialeNameStr: null,
       filialeCodeStr: this.$login.f.f_orgids,
       userid: this.$login.f.id,
@@ -258,7 +258,6 @@ export default {
     }
   },
   ready() {
-    this.$refs.paged.$refs.cri.model.f_second_state = ' is null '
     readySomething(this).then(() => {
       this.$emit('ready')
     }).catch((error) => {
@@ -267,6 +266,13 @@ export default {
   },
   methods: {
     selfSearch(args) {
+      if(this.$refs.paged.$refs.cri.model.f_second_state){
+        if(this.$refs.paged.$refs.cri.model.f_second_state==='是'){
+          args.condition = `${args.condition} and f_second_state is not null`
+        }else {
+          args.condition = `${args.condition} and f_second_state is null`
+        }
+      }
       this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       console.log('合计字段', this.sumsmodel)

package/src/components/sale/filesquery/MeterQuery.vue

@@ -313,7 +313,6 @@ export default {
     }
   },
   ready(){
-    this.$refs.paged.$refs.cri.model.f_second_state = '否'
     readySomething(this).then(() => {
       this.$emit('ready')
     }).catch((error) => {