safecheck-client 3.0.35-42 → 3.0.35-44

package/src/filiale/zhongsheng/pc/CheckPlanAreaList.vue

@@ -108,6 +108,9 @@
               <label for="f_checker_name">安检员</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">档案数量</label>
+              <label style="float: right">计划用户数:{{$parent.$parent.plan_num}}</label>
+              <label style="float: right">已检数:{{$parent.$parent.yes_safe_num}}</label>
+              <label style="float: right">未检数:{{$parent.$parent.no_safe_num}}</label>
             </div>
           </div>
         </div>
@@ -198,6 +201,9 @@ export default {
       listflag:false,
       nameflag:false,
       criteriaShow: false,
+      plan_num:0,
+      yes_safe_num:0,
+      no_safe_num:0,
       f_check_start:'',
       f_check_end:'',
       planName:[{label: '全部', value: ''}],
@@ -307,13 +313,17 @@ export default {
       if (!this.f_orgid) {
         this.getorg([this.$login.f.orgid])
       }
+      let condition = '1=1'
       if (this.f_orgid) {
         args.condition = `f_filialeid  in ${this.f_orgid} and ${args.condition}`
+        condition += ` and tcpi.f_filialeid  in ${this.f_orgid}`
       }
       if(this.f_check_start){
+        condition += ` and f_plan_year>=${new Date(this.f_check_start).getFullYear()} and f_plan_month>=${new Date(this.f_check_start).getMonth()+1} `
         args.condition += ` and f_year>=${new Date(this.f_check_start).getFullYear()} and f_month>=${new Date(this.f_check_start).getMonth()+1} `
       }
       if(this.f_check_end){
+        condition += ` and f_plan_year<=${new Date(this.f_check_end).getFullYear()} and f_plan_month<=${new Date(this.f_check_end).getMonth()+1} `
         args.condition += ` and f_year<=${new Date(this.f_check_end).getFullYear()} and f_month<=${new Date(this.f_check_end).getMonth()+1} `
       }
       this.$refs.paged.$refs.grid.$el.scrollTop = 0
@@ -322,10 +332,32 @@ export default {
         this.$showMessage("请至少选择一项进行汇总")
         return
       }
+      if (args.model.f_residential_area){
+        condition += ` and tcpi.f_residential_area like '%${args.model.f_residential_area}%'`
+      }
+      if (args.model.f_plan_name){
+        condition += ` and tcp.id = '${args.model.f_plan_name}'`
+      }
       this.model.paramSource = {groupName: `'${this.groupNameForSql}'`}
       this.model.search(args.condition, args.model)
+      this.initNum(condition)
+    },
+    initNum(condition){
+      new HttpResetClass().load('POST', `rs/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "count(0) as num,sum(case when f_state = '已检' then 1 else 0 end) as yj,sum(case when f_state = '未检' then 1 else 0 end) as wj",
+          tablename: "t_check_plan_item tcpi left join t_check_plan tcp on tcpi.f_plan_id = tcp.id",
+          condition: `${condition}`,
+          orderitem: "1"
+        }
+      }, {resolveMsg: null, rejectMsg: null}).then(response=>{
+        this.plan_num = response.data[0].num || 0
+        this.yes_safe_num = response.data[0].yj || 0
+        this.no_safe_num = response.data[0].wj || 0
+      }).catch(error=>{
+        debugger
+      })
     },
-
     // 拼接groupName1
     getGroupName1 () {
       var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('siyang')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('bayan')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})