safecheck-client 4.0.2-6 → 4.0.2-60

package/src/filiale/meihekou/android/CheckPlanListArea.vue

@@ -1,190 +1,190 @@
-<style scoped>
-.bg {
-  background-color: blue;
-  height: 1px;
-  border: 0;
-}
-.app-row {
-  background-color: white;
-  padding: 10px 10px 0 10px;
-  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-}
-.search_input {
-  border: 0;
-  outline: none;
-}
-.font{
-  font: 15px PingFang-SC-Medium;
-  color: #666666;
-}
-.input-font{
-  font: 15px PingFang-SC-Medium;
-  color: #333333;
-}
-.btn-font{
-  font:600 16px PingFang-SC-Bold;
-  color: #499EDF;
-}
-.btn-color{
-  background-color: #FFFFFF;
-  border-radius: 10px ;
-  border: 1px solid #499EDF;
-}
-.app-text {
-  font-size: 12px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.yybtn-color{
-  background-color:#499edf;
-  border-radius: 4px ;
-  border: 1px solid #499EDF;
-  color: #FFFFFF;
-  font: 14px PingFang-SC-Bold;
-}
-.qxbtn-color{
-  background-color: #FFFFFF;
-  border-radius: 4px ;
-  color: #499edf;
-  font: 14px PingFang-SC-Bold;
-  border: 1px solid #499EDF;
-}
-
-.button_shrink_top {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_top.png")}
-.button_shrink_bottom {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_bottom.png")}
-.button_shrink_left {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_left.png")}
-.button_shrink_right {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_right.png")}
-</style>
-<template>
-  <div style="height: auto;width: 100%">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-        <div partial>
-          <form>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label  class="font text-left">小区名称：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input  class="search_input input-font" v-model=model.f_residential_area condition="f_residential_area like '%{}%'" />
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label  class="font text-left">楼栋：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input  class="search_input input-font" v-model=model.f_building condition="f_building like '%{}%'" />
-              </div>
-            </div>
-            <div class="row text-center" style="margin-top: 20px;">
-              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="search">查询</button>
-            </div>
-            <div style="height:30px;"></div>
-          </form>
-        </div>
-      </criteria>
-      <list :model="model" partial='list'>
-        <div partial>
-          <div  class="auto app-text" style="margin-top: 5px;">
-            <div class="panel" style="padding: 10px 10px 5px 10px;">
-              <div class="panel-body panel-self" @click="$parent.$parent.$parent.toPlanItem(row)">
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>小区名称:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 74%">{{ row.f_residential_area }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>楼栋:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_building }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>入户:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.checked }}
-                  </p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>到访不遇:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{  row.daofang }}
-                  </p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>拒检:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{  row.jujian }}
-                  </p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>未检:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.no_check }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>总数:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.checked + row.no_check + row.daofang +  row.jujian }}</p>
-                </div>
-                <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>完成率:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">
-                    {{((((row.checked+ row.daofang +  row.jujian) / (row.checked + row.no_check+ row.daofang +  row.jujian))) * 100).toFixed(0) + '%' }}
-                  </p>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </list>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-
-import Vue from 'vue'
-import LocalPagedList from "../../../components/android/LocalPagedList";
-
-export default {
-  title: '小区待办',
-  data() {
-    return {
-      f_orgid: Vue.user.orgid,
-      model: new LocalPagedList(`safe_singleTable_GroupBy`, 20, {
-        items: '"f_residential_area, f_building,'+
-        'SUM( CASE WHEN t2.f_state = \'未检\' THEN 1 ELSE 0 END ) AS no_check,'+
-        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'入户\' THEN 1 ELSE 0 END ) AS  checked,' +
-        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'到访不遇\' THEN 1 ELSE 0 END ) AS daofang,' +
-        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'拒检\' THEN 1 ELSE 0 END ) AS jujian"',
-        tablename: '"t_check_plan t1 LEFT JOIN t_check_plan_item t2 ON t1.id = t2.f_plan_id "',
-        groupitem: '"f_residential_area, f_building"'
-      }),
-      criteriaShow: false
-    }
-  },
-  props: ['planName'],
-  ready(){
-  },
-  methods: {
-    selfSearch (args) {
-      if(this.planName){
-        if(this.planName.toString().trim()){
-          args.condition += " and f_plan_name like '%"+this.planName+"%'"
-        }
-      }
-      this.model.search(args.condition,args.model)
-    },
-    toPlanItem(row) {
-      this.$dispatch('gotoson', {
-        _this: this,
-        title: '安检计划',
-        safe: false
-      })
-      this.$goto('current-create', {planName:this.planName,f_residential_area:row.f_residential_area ,f_building:row.f_building},'self')
-    },
-    hidden() {
-      this.criteriaShow = !this.criteriaShow
-    }
-  }
-}
-</script>
+<style scoped>
+.bg {
+  background-color: blue;
+  height: 1px;
+  border: 0;
+}
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+.search_input {
+  border: 0;
+  outline: none;
+}
+.font{
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+.input-font{
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.btn-font{
+  font:600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+.btn-color{
+  background-color: #FFFFFF;
+  border-radius: 10px ;
+  border: 1px solid #499EDF;
+}
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.yybtn-color{
+  background-color:#499edf;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+  color: #FFFFFF;
+  font: 14px PingFang-SC-Bold;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  color: #499edf;
+  font: 14px PingFang-SC-Bold;
+  border: 1px solid #499EDF;
+}
+
+.button_shrink_top {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_top.png")}
+.button_shrink_bottom {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_bottom.png")}
+.button_shrink_left {width: 35px; height: 35px;  background-size:100%;background-image: url("../../../../static/newStyle/stretch_left.png")}
+.button_shrink_right {width: 35px; height: 35px; background-size:100%;background-image: url("../../../../static/newStyle/stretch_right.png")}
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  class="search_input input-font" v-model=model.f_residential_area condition="f_residential_area like '%{}%'" />
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label  class="font text-left">楼栋：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  class="search_input input-font" v-model=model.f_building condition="f_building like '%{}%'" />
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="search">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial>
+          <div  class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self" @click="$parent.$parent.$parent.toPlanItem(row)">
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>小区名称:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 74%">{{ row.f_residential_area }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>楼栋:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_building }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>入户:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.checked }}
+                  </p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>到访不遇:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{  row.daofang }}
+                  </p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>拒检:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{  row.jujian }}
+                  </p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>未检:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.no_check }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>总数:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.checked + row.no_check + row.daofang +  row.jujian }}</p>
+                </div>
+                <div class="col-xs-6">
+                  <p class="panel-title col-xs-5 text-left font"><b>完成率:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">
+                    {{((((row.checked+ row.daofang +  row.jujian) / (row.checked + row.no_check+ row.daofang +  row.jujian))) * 100).toFixed(0) + '%' }}
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+
+import Vue from 'vue'
+import LocalPagedList from "../../../components/android/LocalPagedList";
+
+export default {
+  title: '小区待办',
+  data() {
+    return {
+      f_orgid: Vue.user.orgid,
+      model: new LocalPagedList(`safe_singleTable_GroupBy`, 20, {
+        items: '"f_residential_area, f_building,'+
+        'SUM( CASE WHEN t2.f_state = \'未检\' THEN 1 ELSE 0 END ) AS no_check,'+
+        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'入户\' THEN 1 ELSE 0 END ) AS  checked,' +
+        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'到访不遇\' THEN 1 ELSE 0 END ) AS daofang,' +
+        'SUM( CASE WHEN t2.f_state = \'已检\' and f_last_check_state=\'拒检\' THEN 1 ELSE 0 END ) AS jujian"',
+        tablename: '"t_check_plan t1 LEFT JOIN t_check_plan_item t2 ON t1.id = t2.f_plan_id "',
+        groupitem: '"f_residential_area, f_building"'
+      }),
+      criteriaShow: false
+    }
+  },
+  props: ['planName'],
+  ready(){
+  },
+  methods: {
+    selfSearch (args) {
+      if(this.planName){
+        if(this.planName.toString().trim()){
+          args.condition += " and f_plan_name like '%"+this.planName+"%'"
+        }
+      }
+      this.model.search(args.condition,args.model)
+    },
+    toPlanItem(row) {
+      this.$dispatch('gotoson', {
+        _this: this,
+        title: '安检计划',
+        safe: false
+      })
+      this.$goto('current-create', {planName:this.planName,f_residential_area:row.f_residential_area ,f_building:row.f_building},'self')
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    }
+  }
+}
+</script>

package/src/filiale/meihekou/android/CurrentCreate.vue

@@ -215,6 +215,17 @@
                         v-model="model.f_last_state"
                         close-on-select clear-button></v-select>
             </div>
+            <div class="row app-row" v-show="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/上传状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_upload_state" class="font text-left">上传状态：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select id="f_upload_state" :value.sync="model.f_upload_state" class="input-font"
+                          :options='$parent.$parent.upload_states' placeholder='请选择上传状态'
+                          v-model="model.f_upload_state" condition="ti.f_upload_state='{}'" close-on-select clear-button></v-select>
+              </div>
+            </div>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-6">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -856,6 +867,11 @@ export default {
         condition += " and ti.f_enter_number like '%"+this.$refs.paged.$refs.cri.model.f_enter_number+"%'"
       if(this.$refs.paged.$refs.cri.model.f_check_version)
         condition += " and ti.f_check_version <= "+this.$refs.paged.$refs.cri.model.f_check_version
+
+      if(this.$refs.paged.$refs.cri.model.f_upload_state[0])
+        condition += ` and ti.f_upload_state = '${this.$refs.paged.$refs.cri.model.f_upload_state[0]}'`
+
+
       //tag
       this.model.search("ti.f_no_checkplan = '有计划安检'" + condition)
     },