safecheck-client 3.0.34-50 → 3.0.34-52

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.34-50",
+  "version": "3.0.34-52",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/android/AreaSelect.vue

@@ -0,0 +1,208 @@
+<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;
+}
+table {
+  text-align: center;
+  white-space: nowrap;
+  font-size: 12px;
+  width: 50%;
+  border-collapse: collapse;
+  margin: 20px 0;
+  margin: auto;
+}
+th, td {
+  padding: 12px;
+  border-bottom: 1px solid #ddd;
+}
+th {
+  background-color: #f2f2f2;
+}
+tr:hover {background-color: #f5f5f5;}
+.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>
+<style>
+.clear-select-with .dropdown-menu{
+  left: 0px !important;
+  width: 200% !important;
+}
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_userinfo_code" 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/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class="font text-left">小区地址：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_userinfo_code" class="search_input input-font"
+                       v-model=model.f_area_address condition="f_area_address 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>
+              <img @click="$parent.$parent.getNewOrder" src="../../assets/shuaxindaiban1.png" style="float: right;margin-right: 3%;width: 40px;padding: 5px; float:right">
+            </div>
+            <div class="col-sm-12">
+            </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="">
+                <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-5 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_area_address }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <table>
+                    <tr>
+                      <td style="color: #00A3F0">{{row.jihuazongshu}}</td>
+                      <td style="color: #3CC51F">{{row.yijian}}</td>
+                      <td style="color: coral">{{row.weijian}}</td>
+                      <td style="color: red">{{row.daofangbuyu}}</td>
+                    </tr>
+                    <tr>
+                      <th>计划总户数</th>
+                      <th>已检户数</th>
+                      <th>未检户数</th>
+                      <th>到访不遇户数</th>
+                    </tr>
+                  </table>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import LocalPagedList from '../../plugins/LocalPagedList'
+export default {
+  title: '安检待办',
+  props: ['row'],
+  data() {
+    return {
+      model:new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}),
+    }
+  },
+  ready(){
+    this.getAllPlanName()
+  },
+  methods: {
+    gotoAreaSelect(row){
+      let _this = this
+      let pardate = {
+        _this:_this,
+        title:'待办工作',
+        safe:true
+      }
+      _this.$dispatch('gotoson',pardate)
+      _this.$goto('area-select', {row: row}, 'self')
+
+    },
+    search(args){
+      let condition = '1=1'
+      this.model.rows = []
+      let criteria = {
+        items: `tcpi.f_residential_area,COUNT(tcpi.id) as jihuazongshu,sum( CASE WHEN tcpi.f_state = '未检' THEN 1 ELSE 0 END ) as weijian,sum( CASE WHEN tcpi.f_state = '已检' THEN 1 ELSE 0 END ) as yijian,sum( CASE WHEN tcpi.f_last_check_state = '到访不遇' THEN 1 ELSE 0 END ) as daofangbuyu`,
+        tablename: 't_check_plan_item tcpi ',
+        condition: args.condition || condition,
+        groupitem: 'tcpi.f_residential_area'
+      }
+      let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
+      this.model.rows = result.data.rows
+    },
+    getAllAreaName(){
+      let criteria = {
+        items: 'f_residential_area',
+        tablename: 't_check_plan_item',
+        condition: `f_residential_area IS NOT NULL AND f_residential_area != '' AND f_state <> '已检'`,
+        groupitem: 'f_residential_area'
+      }
+      let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
+      if(result.code == 200){
+        result.data.rows.forEach(item => this.residentialAreaOptions.push({label:item.f_residential_area,value:item.f_residential_area}))
+      }
+    },
+  }
+}
+</script>

package/src/components/android/BuildingSelect.vue

@@ -0,0 +1,217 @@
+<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;
+}
+table {
+  text-align: center;
+  white-space: nowrap;
+  font-size: 12px;
+  width: 50%;
+  border-collapse: collapse;
+  margin: 20px 0;
+  margin: auto;
+}
+th, td {
+  padding: 12px;
+  border-bottom: 1px solid #ddd;
+}
+th {
+  background-color: #f2f2f2;
+}
+tr:hover {background-color: #f5f5f5;}
+.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>
+<style>
+.clear-select-with .dropdown-menu{
+  left: 0px !important;
+  width: 200% !important;
+}
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class="font text-left">楼栋：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_userinfo_code" class="search_input input-font"
+                       v-model=model.f_residential_area condition="f_building like '%{}%'" />
+                <v-select
+                  id="f_building"
+                  :value.sync="model.f_building"
+                  class="input-font"
+                  :options='$parent.$parent.buildOptions'
+                  placeholder='计划名称'
+                  :width="'60%'"
+                  v-model="model.f_building"
+                  condition="f_building = '{}'"
+                  close-on-select clear-button>
+                </v-select>
+              </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>
+              <img @click="$parent.$parent.getNewOrder" src="../../assets/shuaxindaiban1.png" style="float: right;margin-right: 3%;width: 40px;padding: 5px; float:right">
+            </div>
+            <div class="col-sm-12">
+            </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="">
+                <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-5 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_area_address }}</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-12">
+                  <table>
+                    <tr>
+                      <td style="color: #00A3F0">{{row.jihuazongshu}}</td>
+                      <td style="color: #3CC51F">{{row.yijian}}</td>
+                      <td style="color: coral">{{row.weijian}}</td>
+                      <td style="color: red">{{row.daofangbuyu}}</td>
+                    </tr>
+                    <tr>
+                      <th>计划总户数</th>
+                      <th>已检户数</th>
+                      <th>未检户数</th>
+                      <th>到访不遇户数</th>
+                    </tr>
+                  </table>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import LocalPagedList from '../../plugins/LocalPagedList'
+export default {
+  title: '安检待办',
+  props: ['row'],
+  data() {
+    return {
+      buildOptions:[],
+      model:new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}),
+    }
+  },
+  ready(){
+    this.getAllPlanName()
+  },
+  methods: {
+    gotobuildingSelect(row){
+      let _this = this
+      let pardate = {
+        _this:_this,
+        title:'待办工作',
+        safe:true
+      }
+      _this.$dispatch('gotoson',pardate)
+      _this.$goto('area-select', {row: row}, 'self')
+
+    },
+    search(args){
+      let condition = '1=1'
+      this.model.rows = []
+      let criteria = {
+        items: `tcpi.f_residential_area,COUNT(tcpi.id) as jihuazongshu,sum( CASE WHEN tcpi.f_state = '未检' THEN 1 ELSE 0 END ) as weijian,sum( CASE WHEN tcpi.f_state = '已检' THEN 1 ELSE 0 END ) as yijian,sum( CASE WHEN tcpi.f_last_check_state = '到访不遇' THEN 1 ELSE 0 END ) as daofangbuyu`,
+        tablename: 't_check_plan_item tcpi ',
+        condition: args.condition || condition,
+        groupitem: 'tcpi.f_residential_area'
+      }
+      let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
+      this.model.rows = result.data.rows
+    },
+    getBuildOptions(){
+      let criteria = {
+        items: 'f_building',
+        tablename: 't_check_plan_item',
+        condition: `f_building IS NOT NULL AND f_building != '' AND f_state <> '已检' AND f_residential_area = '${f_residential_area}'`,
+        groupitem: 'f_building order by f_building+0'
+      }
+      let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
+      if(result.code == 200){
+        result.data.rows.forEach(item => this.buildOptions.push({label:item.f_building,value:item.f_building}))
+      }
+      this.buildOptions.sort((a,b)=>{
+        return Number(a.label)- Number(b.label)
+      })
+    },
+  }
+}
+</script>