apply-clients 3.3.42 → 3.3.46

package/src/components/android/Process/Processes/AppBuildSign.vue

@@ -0,0 +1,38 @@
+<template>
+  <app-sign></app-sign>
+</template>
+<script>
+import {getNowDate,isEmpty} from '../../../Util'
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+
+export default {
+  title: '施工签字',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+    }
+  },
+  ready () {
+    console.log('===========施工签字================')
+  },
+  methods: {
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped lang="less">
+</style>

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -9,7 +9,7 @@
                 restype='organization'
                 :initresid='$parent.$parent.curorgid'
                 @res-select="$parent.$parent.getorg"
-                is-mul="false"
+                :is-mul="false"
               ></res-select>
             </div>
             <div class="form-group col-sm-3">
@@ -138,23 +138,17 @@
                 :parentresid="$parent.$parent.curorgid"
                 :initresid='$parent.$parent.curdepid'
                 @res-select="$parent.$parent.getdep"
-                is-mul="false"
+                :is-mul="true"
               ></res-select>
             </div>
-            <div class="form-group col-sm-3" v-if="false">
+            <div class="form-group col-sm-3">
               <label class="font_normal_body">人&emsp;&emsp;员：</label>
               <res-select
                 restype='user'
                 :parentresid="$parent.$parent.curdepid"
                 :initresid='$parent.$parent.curuserid'
                 @res-select="$parent.$parent.getuser"
-                is-mul="false"></res-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">收费人员：</label>
-              <input type="text" class="input_search" style="width: 60%" placeholder='收费人员' v-model="model.f_charge_collectors"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="cr.f_charge_collectors like '%{}%'">
+                :is-mul="true"></res-select>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">缴费状态：</label>
@@ -306,14 +300,16 @@ export default {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
         this.$refs.cp.$refs.cri.model[key] = ''
       })
+      this.curdepid = []
+      this.curuserid = []
     },
     searchCondition (args) {
-      args.condition = args.condition + ` and cr.f_orgid = '${this.curorgid[0]}'`
+      args.condition = args.condition + ` and cr.f_orgid in (${this.curorgid})`
       if (this.curdepid.length > 0) {
-        args.condition = args.condition + ` and cr.f_depid = '${this.curdepid[0]}'`
+        args.condition = args.condition + ` and cr.f_depid in (${this.curdepid})`
       }
       if (this.curuserid.length > 0) {
-        args.condition = args.condition + ` and cr.f_charge_collectors_id = '${this.curuserid[0]}'`
+        args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
       }
       this.model.search(args.condition, args.model)
     },
@@ -325,7 +321,7 @@ export default {
     async getChargeAll () {
       let http = new HttpResetClass()
       let data = {
-        condition: this.model.condition + ` and cr.f_orgid = '${this.curorgid[0]}'`
+        condition: this.model.condition
       }
       let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
 
@@ -354,15 +350,13 @@ export default {
       this.curdepid = []
       this.curuserid = []
       this.search()
-    }
+    },
+
   },
   computed: {
     getCondition () {
       return {
-        condition: this.$refs.cp.$refs.cri.condition,
-        data: {
-          orgid: this.$login.f.orgid
-        }
+        condition: this.model.condition,
       }
     }
   }

package/src/components/product/Material/MaterialDetailed.vue

@@ -224,7 +224,7 @@ export default {
   computed: {
     getCondition () {
       return {
-        condition: this.$refs.cp.$refs.cri.condition
+        condition: this.model.condition
       }
     }
   }