safecheck-client 3.0.35-1 → 3.0.35-11

package/src/filiale/bayan/pc/PlanManage.vue

@@ -488,6 +488,7 @@
             isSend:false,
             createPlan:{
               f_outlets:'',
+              f_class:'',
               f_end_time:'',
               f_start_time:'',
               f_plan_name:'',
@@ -638,6 +639,7 @@
             f_plan_name:'',
               f_plan_year:'',
               f_plan_month:'',
+            f_class:'',
             f_outlets:'',
               isShare:'否',
               f_issued:'否',

package/src/filiale/bayan/pc/SelectCheckPlan.vue

@@ -66,6 +66,30 @@
                         close-on-select
                         condition="f_check_type = '{}'"></v-select>
             </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body" >区&emsp;&emsp;域</label>
+              <v-select :value.sync="model.f_quyu" :value-single="true" v-model="model.f_quyu"
+                        :options='$parent.$parent.quyus' placeholder='区域' class="select_list select" style="width: 60%"
+                        @change="$parent.$parent.quyuChange"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body" >营&ensp;业&ensp;厅</label>
+              <v-select :value.sync="model.f_bumen" :value-single="true" v-model="model.f_bumen"
+                        :options='$parent.$parent.bumens' placeholder='营业厅'
+                        @change="$parent.$parent.bumenChange" class="select_list select" style="width: 60%"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">小&emsp;&emsp;组</label>
+              <v-select :value.sync="model.f_team" :value-single="true" v-model="model.f_team"
+                        :options='$parent.$parent.teams' placeholder='小组'
+                        @change="$parent.$parent.teamChange" class="select_list select" style="width: 60%"
+                        close-on-select>
+              </v-select>
+            </div>
             <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
             <!--<label class="font_normal_body">安检起始</label>-->
             <!--<datepicker-->
@@ -92,6 +116,7 @@
                                    progress="safeGetExportProgress"
                                    sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <button type="button" class="button_search button_spacing" @click="$parent.$parent.cleamsg()">清空</button>
               <!--<div class="button_spacing"-->
               <!--:class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"-->
               <!--@click="$parent.$parent.hidden()">-->
@@ -185,6 +210,9 @@ export default {
     }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
     model.f_filialeids = '('+this.$login.f.orgid+')'
     return {
+      quyus: [{label: '请选择', value: ''}, ...this.$appdata.getParam('区域')],
+      bumens: [{label: '请选择', value: ''}],
+      teams: [{label: '请选择', value: ''}],
       checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
       excelHeaders:{
         'f_checker': '安检员',
@@ -228,6 +256,36 @@ export default {
     }
   },
   methods: {
+    cleamsg(){
+      this.$refs.paged.$refs.cri.model= {}
+    },
+    bumenChange(val) {
+      if (val) {
+        this.teams = this.$appdata.getParam(`工单-` + val) ? [{
+          label: '请选择',
+          value: ''
+        }, ...this.$appdata.getParam(`工单-` + val)] : [{label: '请选择', value: ''}]
+      }else {
+        this.checkers = this.allCheckers
+      }
+    },
+    teamChange(val) {
+      if (val) {
+        this.checkers = this.$appdata.getParam(val) ? [...this.$appdata.getParam(val)] : [{label: '请选择', value: ''}]
+      }else {
+        this.checkers = this.allCheckers
+      }
+    },
+    quyuChange(val) {
+      if (val) {
+        this.bumens = this.$appdata.getParam(val) ? [{
+          label: '请选择',
+          value: ''
+        }, ...this.$appdata.getParam(val)] : [{label: '请选择', value: ''}]
+      }else {
+        this.checkers = this.allCheckers
+      }
+    },
     hidden() {
       this.criteriaShow = !this.criteriaShow
     },

package/src/filiale/huaran/android/CheckPlanDown.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="auto">
+
+    <div class="auto">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+          <div partial>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/档案信息.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_plan_name" class="font text-left">计划名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input id="f_plan_name" class="search_input input-font"
+                       v-model="model.f_plan_name" condition="f_plan_name 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: 45%;" @click="search">查询</button>
+            </div>
+            <!--<div class="row app-btn">-->
+            <!--<button class="btn btn-primary col-xs-6" type="button"  @click="search"><span class="glyphicon  glyphicon-search" style="margin-right: 20px;">查询</span></button>-->
+            <!--</div>-->
+            <div style="height:30px;"></div>
+          </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">
+                  <div class="row">
+                    <p class="panel-title col-xs-4 text-left font">计划名称</p>
+                    <p class="panel-title col-xs-8 text-left input-font">{{ row.f_plan_name }}</p>
+                  </div>
+                  <div class="row">
+                    <p class="panel-title col-xs-4 text-left font">计划时间</p>
+                    <p class="panel-title col-xs-8 text-left input-font">{{ row.f_plan_year }}/{{row.f_plan_month}}</p>
+                  </div>
+                  <!--<div class="row">-->
+                  <!--<p class="panel-title col-xs-4 text-left font">生成人员</p>-->
+                  <!--<p class="panel-title col-xs-8 text-left input-font">{{ row.f_create_operator }}/{{row.f_plan_month}}</p>-->
+                  <!--</div>-->
+                  <!--<div class="row">-->
+                  <!--<p class="panel-title col-xs-4 text-left font">下发人员</p>-->
+                  <!--<p class="panel-title col-xs-8 text-left input-font">{{ row.f_send_operator }}/{{row.f_plan_month}}</p>-->
+                  <!--</div>-->
+                  <div class="row text-right" >
+                    <button type="button" class="btn yybtn-color" v-on:click.stop.prevent='$parent.$parent.$parent.downloadHand(row)' v-if="$parent.$parent.$parent.isDown(row)">下载</button>&nbsp;
+                  </div>
+                </div>
+              </div>
+
+            </div>
+          </div>
+        </list>
+      </criteria-paged>
+    </div>
+    <!--<div class="row text-center" style="margin-top: 20px;">-->
+    <!--<button type="' 正在进行共享计划下载，请确认！' btn-lg btn-font btn-color" style="width: 45%;" @click="downHand()">共享计划下载</button>-->
+    <!--&lt;!&ndash;<button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="database()">数据库导出</button>&ndash;&gt;-->
+    <!--</div>-->
+    <!-- <div class="auto" style="padding-top: 20px;" v-if='show'>
+      <p class="text-warning" style="padding: 0 10px">正在下载抄表单...</p>
+    </div> -->
+    <!-- <hand-info v-if="show" :data="handinfo"></hand-info> -->
+    <!-- <div class="auto" v-if="!show">
+      <p class="text-warning" style="padding: 0 10px">
+        暂无可操作的抄表信息
+      </p>
+    </div> -->
+  </div>
+  <!--  <back-page :need-back='true'  @flag="$back()"></back-page>-->
+</template>
+<script>
+import { PagedList } from 'vue-client'
+import co from 'co'
+import Vue from 'vue'
+// const downloadHand = function * (self, row) {
+//
+// }
+
+export default {
+  title: '共享计划下载',
+  data () {
+    return {
+      model: new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/getShareCheckPlan`,5,{f_fengongsi:`'${Vue.user.orgid}'`,f_fengongsi_name:`'${Vue.user.orgs.split('.').pop()}'`}),
+      checkPlanInfo: [],
+      localcheckPlanInfo:[]
+    }
+  },
+  ready () {
+
+    this.getlocalCheckPlan()
+  },
+  methods: {
+    reload() {
+      //tag
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+    },
+    getlocalCheckPlan() {
+      let value = this.$androidUtil.path({alias: 'getLocalCheckPlan', data: {}})
+      //tag
+      this.localcheckPlanInfo = value.data
+      // this.$androidUtil.path({alias: 'getLocalCheckPlan', data:{}}).then((value)=>{
+      //   //tag
+      //   this.localcheckPlanInfo = value.data
+      // })
+    },
+    downloadHand(row) {
+      HostApp.__this__ =this
+      this.$showMessage('正在进行共享计划下载，请确认！', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          HostApp.logicWithHint({
+            'logic': 'DownCheckPlanInfo',
+            'callback': 'javascript: HostApp.__this__.downloadHandCallback()',
+            'data': {id: row.id},
+            'backresult': 1
+          })
+        }
+      })
+    },
+    downloadHandCallback(jo) {
+      // 安卓端
+      //tag
+      if (jo.state == 'ok') {
+        let result = JSON.parse(jo.result)
+        if (result.state == 0) {
+          if (result.data.length > 0) {
+            this.getlocalCheckPlan()
+            this.$showMessage('下载成功，您可前往计划导航进行查看！')
+          } else {
+            this.$showMessage('无可下载的共享计划！')
+          }
+        } else {
+          this.$showMessage('下载失败！')
+        }
+      } else {
+        this.$showMessage('下载失败，请重试！')
+      }
+    }
+  },
+  computed: {
+    isDown () {
+      return function (row) {
+        for (let info of this.localcheckPlanInfo) {
+          if (info.id == row.id) {
+            return false
+          }
+        }
+        return true
+      }
+    }
+  }
+}
+</script>
+<style>
+.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;
+}
+
+</style>

package/src/filiale/huaran/android.js

@@ -1,12 +1,13 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'check-plan-down': (resolve) => { require(['./android/CheckPlanDown'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/shanxian/android/AddPlanItem.vue

@@ -223,7 +223,7 @@
   export default {
     title: '安检员B',
     data () {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int) desc,f_room"',f_check_type:'this.f_check_type[0]',
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int) desc,f_unit,CAST(floor1 as int) desc,f_room"',f_check_type:'this.f_check_type[0]',
         f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
       model.f_sign = ['']
       model.f_user_type = ''

package/src/filiale/shanxian/android/SafecheckOrderV.vue

@@ -507,7 +507,7 @@
         // 5秒后启用点击事件
         setTimeout(function () {
           $("#savebut").removeClass("noclickbut");
-        }, 5000);
+        }, 8000);
       },
       timeSet(val) {
         if (!val) {