safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/components/android/CheckPlanSelect.vue

@@ -0,0 +1,229 @@
+<style scoped>
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+
+.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;
+}
+
+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;
+}
+</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/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_plan_name" class="font text-left">计划名称：</label>
+              </div>
+              <v-select id="f_plan_name" :value.sync="model.f_plan_name" class="input-font"
+                        :options='$parent.$parent.planNameOptions' placeholder='计划名称' :width="'60%'"
+                        v-model="model.f_plan_name" condition="f_plan_name = '{}'" close-on-select clear-button>
+              </v-select>
+            </div>
+            <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>
+              <v-select id="f_plan_name" :value.sync="model.f_safecheck_type" class="input-font"
+                        :options='$parent.$parent.safecheckTypes' placeholder='计划类型' :width="'60%'"
+                        v-model="model.f_safecheck_type" condition="f_safecheck_type = '{}'" close-on-select
+                        clear-button>
+              </v-select>
+            </div>
+            <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>
+              <datepicker id="f_start_date" style="width: 30%;" :value.sync="model.f_start_date"
+                          :disabled-days-of-Week="[]" v-model="model.f_start_date" class="input-font"
+                          :format="'yyyy-MM-dd 00:00:00'" condition="f_issue_time >= '{}'">
+              </datepicker>-
+              <datepicker id="f_end_date" style="width: 30%;" :value.sync="model.f_end_date"
+                          :disabled-days-of-Week="[]" v-model="model.f_end_date" class="input-font"
+                          :format="'yyyy-MM-dd 23:59:00'" condition="f_issue_time <= '{}'">
+              </datepicker>
+            </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="$parent.$parent.$parent.gotoAreaSelect(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-5 text-left input-font" style="width: 74%">{{
+                      row.f_plan_name }}</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_safecheck_type }}</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_issue_time }}</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: 'current-create',
+  data() {
+    return {
+      planNameOptions: [{ label: '请选择', value: '' },],
+      safecheckTypes: [{ label: '请选择', value: '' }, { label: '年度安检', value: '年度安检' }, { label: '抽检', value: '抽检' }],
+      model: new LocalPagedList('androidGetuserinfo', 20, { condition: 'this.condition' }),
+    }
+  },
+  ready() {
+    this.getAllPlanName()
+  },
+  methods: {
+    getNewOrder() {
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        'logic': 'SafeCheckServiceTimeOut',
+        'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
+        'data': { params: '' },
+        'backresult': 1
+      })
+      HostApp.logicWithHint({
+        'logic': 'FreshPlanItem',
+        'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
+        'data': { params: '' },
+        'backresult': 1
+      })
+    },
+    getNewOrderCallBack() {
+      this.model.search()
+    },
+    gotoAreaSelect(row) {
+      var _this = this
+      _this.$goto('area-select-safe', { row: row }, 'self', _this.$back)
+    },
+    search(args) {
+      let condition = '1=1'
+      this.model.rows = []
+      let criteria = {
+        items: `tcp.id,tcp.f_plan_name,tcp.f_issue_time,tcp.f_safecheck_type,COUNT(tcp.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 tcp LEFT JOIN t_check_plan_item tcpi ON tcp.id = tcpi.f_plan_id',
+        condition: args.condition || condition,
+        groupitem: 'tcp.id,tcp.f_plan_name,tcp.f_issue_time,tcp.f_safecheck_type'
+      }
+      let result = HostApp._executeTask({ 'type': 'sql', 'data': { 'alias': 'safe_singleTable_GroupBy', 'criteria': criteria } })
+      this.model.rows = result.data.rows
+    },
+    getAllPlanName() {
+      let criteria = {
+        items: 'f_plan_name',
+        tablename: 't_check_plan',
+        condition: `f_plan_name IS NOT NULL AND f_plan_name != ''`,
+        groupitem: 'f_plan_name'
+      }
+      let result = HostApp._executeTask({ 'type': 'sql', 'data': { 'alias': 'safe_singleTable_GroupBy', 'criteria': criteria } })
+      if (result.code == 200) {
+        result.data.rows.forEach(item => this.planNameOptions.push({ label: item.f_plan_name, value: item.f_plan_name }))
+      }
+    },
+  }
+}
+</script>

package/src/components/android/CheckerMonthly.vue

@@ -34,7 +34,7 @@ import co from 'co'
 import Vue from 'vue'
 
 let aggCheckerTask = function * (self) {
-    let result = yield self.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/统计安检员月任务?pageNo=1&pageSize=9999` , {
+    let result = yield self.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/统计安检员月任务?pageNo=1&pageSize=9999` , {
         data: {
             id: Vue.user.id,
             org_id: Vue.user.parentid,

package/src/components/android/CivilCurrentCreate.vue

@@ -522,7 +522,7 @@
         check:'',
         plan:'',
         planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -662,7 +662,7 @@
         this.check=''
       },
       async okput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
 
             condition:`i.id='`+this.needid+`'`,
             f_plan_id:this.planid,
@@ -675,7 +675,7 @@
         await this.getNewOrder()
       },
       async manyokput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             columnName:"i.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -697,7 +697,7 @@
         if(this.plan){
           condition += ` and f_plan_name like '%${this.plan}%'`
         }
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
             condition:condition,
             f_filialeids:this.f_filialeids,
             groupitem:'',
@@ -750,7 +750,7 @@
           })
         }},
       genuineReserve () {
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/PCbookingCheck`,{data:{
+        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/PCbookingCheck`,{data:{
             id:this.tempItem.id,
             f_prearranged_date:this.tempItem.f_prearranged_date,
             f_remark:this.tempItem.f_remark
@@ -770,7 +770,7 @@
       inspect(row) {
         var _this = this
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: {
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/singleTable`, {data: {
             items: 'id',
             tablename: 't_check_plan_item',
             condition:  `id  = '${row.id}'`
@@ -779,7 +779,7 @@
           this.getcheckplandata = getcheckplan.data[0]
           if(this.getcheckplandata){
             if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
-              _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
+              _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
                 row['f_plan_meters'] = response.data
                 var pardate = {
                   _this:_this,

package/src/components/android/ClockIn.vue

@@ -43,7 +43,7 @@ export default {
   methods: {
     async getTodayClockInRecord(){
       const today = toStandardDateString()
-      let res = await this.$resetpost('rs/sql/singleTable', {
+      let res = await this.$resetpost('api/af-safecheck/sql/singleTable', {
         data: {
           tablename: 't_work_record',
           condition: `f_user_id = ${Vue.user.id} and f_onsite_time >= '${today} 00:00:00' and f_onsite_time <= '${today} 23:59:59'`
@@ -80,7 +80,7 @@ export default {
         }
         record.f_offsite_time = now
       }
-      this.$resetpost('rs/logic/saveWorkRecord', record).then((res) => {
+      this.$resetpost('api/af-safecheck/logic/saveWorkRecord', record).then((res) => {
         if (res.data.id){
           record.id = res.data.id
         }

package/src/components/android/CurrentCreate.vue

@@ -520,7 +520,7 @@
         check:'',
         plan:'',
         planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -656,7 +656,7 @@
         this.check=''
       },
       async okput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             condition:`i.id='`+this.needid+`'`,
             f_plan_id:this.planid,
             switchCheckAll:false,
@@ -669,7 +669,7 @@
         await this.getNewOrder()
       },
       async manyokput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             columnName:"i.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -691,7 +691,7 @@
         if(this.plan){
           condition += ` and f_plan_name like '%${this.plan}%'`
         }
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
             condition:condition,
             f_filialeids:this.f_filialeids,
             groupitem:'',
@@ -774,7 +774,7 @@
       inspect(row) {
         var _this = this
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
             items: 'id',
             tablename: 't_check_plan_item',
             condition:  `id  = '${row.id}'`,
@@ -784,7 +784,7 @@
           this.getcheckplandata = getcheckplan.data[0]
           if(this.getcheckplandata){
             if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
-              _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
+              _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
                 row['f_plan_meters'] = response.data
                 var pardate = {
                   _this:_this,
@@ -985,7 +985,7 @@
         criteria = {
           items: 'count(id) count',
           tablename: 't_check_plan_item',
-          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`,
+          condition: `(f_complete = '' or f_complete is null or f_complete = '未完成') AND f_state = '已检'`,
           groupitem: 'f_state'
         }
         result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})