safecheck-client 4.0.2-5 → 4.0.2-50

package/src/filiale/jinhong/pc/PaperList.vue

@@ -41,7 +41,7 @@
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
                   v-model="model.f_check_start"
-                  condition="f_offsite_time > ='{} 00:00:00'">
+                  condition="f_offsite_time >= '{} 00:00:00'">
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"   >
@@ -340,6 +340,9 @@
               <th>
                 <nobr>备注</nobr>
               </th>
+              <th>
+                <nobr>安检备注</nobr>
+              </th>
               <th>
                 <nobr>开户时间</nobr>
               </th>
@@ -382,6 +385,7 @@
             <td style="text-align: center">{{ row.f_offsite_time }}</td>
             <td style="text-align: center">{{ row.f_checker_name }}</td>
             <td style="text-align: center">{{ row.f_repair_approved_note }}</td>
+            <td style="text-align: center">{{ row.f_comments }}</td>
             <td style="text-align: center">{{ row.f_gas_date }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approved_by }}</td>
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">{{ row.f_approvedstart_time }}</td>

package/src/filiale/jinhong/pc/checkPlanList.vue

@@ -22,29 +22,18 @@
               <input type="text" class="input_search" v-model="model.f_address"
                      style="width: 95%" placeholder="客户地址" condition="i.f_address like '%{}%'">
             </div>
-            <div class="form-group col-sm-1" >
-              <datepicker
-                placeholder='创建起始'
-                style="width:100%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM-dd'"
-                :show-rest-button="reset"
-                :value.sync="model.f_starcreate_time"
-                v-model="model.f_starcreate_time"
-                condition="i.f_create_time >='{} 00:00:00'">
-              </datepicker>
-            </div>
-            <div class="form-group col-sm-1" style="margin-left: 6px;margin-right: 6px;">
-              <datepicker
-                placeholder='创建结束'
-                :disabled-days-of-week="[]"
-                style="width:100%"
-                :format="'yyyy-MM-dd'"
-                :show-rest-button="reset"
-                :value.sync="model.f_endcreate_time"
-                v-model="model.f_endcreate_time"
-                condition="i.f_create_time  <='{} 00:00:00'">
-              </datepicker>
+            <div class="form-group col-sm-1 upuserinfo_sel" >
+              <v-select v-model="model.f_meter_book_num"
+                        :multiple="true" :options='$parent.$parent.checkBooks'
+                        :value.sync="model.f_meter_book_num"
+                        class="select select_list"
+                        @select-search="$parent.$parent.select_book"
+                        :width="'95%'"
+                        :timeout="500"
+                        placeholder='安检册选择'
+                        condition="i.f_check_book_id in {}" >
+              </v-select>
+
             </div>
             <!--<div class="form-group col-sm-1" >
               <v-select :width="'95%'"
@@ -137,6 +126,33 @@
                       condition="i.f_last_check_date  <='{} 00:00:00'">
                     </datepicker>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">创建起始:</label>
+                    <datepicker
+                      placeholder='创建起始'
+                      style="width:60%"
+                      :disabled-days-of-week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_starcreate_time"
+                      v-model="model.f_starcreate_time"
+                      condition="i.f_create_time >='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">创建起始:</label>
+                    <datepicker
+                      placeholder='创建起始'
+                      :disabled-days-of-week="[]"
+                      style="width:60%"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_endcreate_time"
+                      v-model="model.f_endcreate_time"
+                      condition="i.f_create_time  <='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+
 <!--                  <div class="form-group col-sm-4" >-->
 <!--                    <label class="font_normal_body">创建起始:</label>-->
 <!--                    <datepicker-->
@@ -235,6 +251,7 @@
         opt:[{label:"测试",value:"测试"}],
         showCondtion:false,
         checkAll:false,
+        checkBooks:[],
         checkes:[],
         checkResults:[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}],
         checkState:[{label:'全部',value:''},{label:'未检',value:'未检'},{label:'已检',value:'已检'}],
@@ -253,7 +270,7 @@
     },
     props:["selectplan","userlogin"],
     ready(){
-
+      this.getCheckBook()
     },
     computed:{
       exportParameter(){
@@ -265,6 +282,38 @@
       }
     },
     methods:{
+      select_book(text){
+        //tag
+        let pcdText=text?` and f_check_book_name  like '%${text}%'`:''
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_check_book",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          //tag)
+          if(res.data.length>0){
+            this.checkBooks = []
+            res.data.forEach((result)=>{
+              this.checkBooks.push({label:result.f_check_book_name,value:result.id})
+            })
+          }
+          //tag)
+        })
+      },
+      getCheckBook(){
+        this.checkBooks=[]
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=1000`, {
+          data: {
+            items: 'id,f_check_book_name,f_check_book_type',
+            tablename: 't_check_book',
+            condition: `f_orgid = '${this.userlogin.orgid}'`,
+            orderitem: 'id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res => {
+          res.data.forEach(ress => {
+            this.checkBooks.push({
+              label: ress.f_check_book_name,
+              value: ress.id
+            })
+          })
+        })
+      },
       clear(){
         this.model.f_plan_id = '';
         this.model.f_userinfo_code = '';

package/src/filiale/jinhong/pc.js

@@ -8,6 +8,7 @@ let specialComp = {
   'check-plan-list': (resolve) => {require(['./pc/checkPlanList.vue'], resolve)},
   'plan-manage': (resolve) => {require(['./pc/PlanManage.vue'], resolve)},
   'check-book-list': (resolve) => {require(['./pc/CheckBookList.vue'], resolve)},
+  'new-check-paper': (resolve) => {require(['./pc/NewCheckpaper'], resolve)},
   'select-check-plan': (resolve) => {require(['./pc/SelectCheckPlan.vue'], resolve)}
 
 }

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

@@ -1,198 +1,198 @@
-<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='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  class="font text-left">计划名称：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input  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: 25%;" @click="$parent.$parent.selfSearch">查询</button>
-              <img style="float: right;margin-right: 3% " @click="$parent.$parent.getNewOrder" src="../../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
-              <!--              <div style="float: right;margin-right: 3% " class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>-->
-            </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.f_plan_name)">
-                <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_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_create_time }}</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( `androidCheckPlanList`,20, {condition:'this.condition'}),
-      criteriaShow: false
-    }
-  },
-  ready(){
-  },
-  methods: {
-    search(args) {
-      // args.condition += ` and tu.f_orgid in ${Vue.user.orgid}`
-      this.model.search(args.condition, args.model)
-    },
-    selfSearch () {
-      let condition = "1=1 "
-      if(this.$refs.paged.$refs.cri.model.f_plan_name){
-        if(this.$refs.paged.$refs.cri.model.f_plan_name.toString().trim()){
-          condition += " and f_plan_name like '%"+this.$refs.paged.$refs.cri.model.f_plan_name+"%'"
-        }
-      }
-      console.log('condition ===> '+ condition)
-      this.model.search(condition)
-    },
-    toPlanItem(planName) {
-      this.$dispatch('gotoson', {
-        _this: this,
-        title: '计划列表',
-        safe: false
-      })
-      this.$goto('check-plan-list-area', {planName},'self')
-    },
-    getNewOrder(){
-      HostApp.__this__ = this
-      HostApp.logicWithHint({
-        // logic别名，key必须为logic
-        'logic': 'SafeCheckServiceTimeOut',
-        // 回调执行方法名，key必须为callback
-        'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
-        // logic执行需要的业务参数
-        'data': {params: ''},
-        // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
-        // 执行回调方法传入key为backresult
-        // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
-        'backresult': 1
-      })
-    },
-    getNewOrderCallBack() {
-      this.selfSearch()
-    },
-    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='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  class="font text-left">计划名称：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input  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: 25%;" @click="$parent.$parent.selfSearch">查询</button>
+              <img style="float: right;margin-right: 3% " @click="$parent.$parent.getNewOrder" src="../../../assets/shuaxindaiban1.png" style="width: 40px;padding: 5px; float:right">
+              <!--              <div style="float: right;margin-right: 3% " class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>-->
+            </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.f_plan_name)">
+                <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_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_create_time }}</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( `androidCheckPlanList`,20, {condition:'this.condition'}),
+      criteriaShow: false
+    }
+  },
+  ready(){
+  },
+  methods: {
+    search(args) {
+      // args.condition += ` and tu.f_orgid in ${Vue.user.orgid}`
+      this.model.search(args.condition, args.model)
+    },
+    selfSearch () {
+      let condition = "1=1 "
+      if(this.$refs.paged.$refs.cri.model.f_plan_name){
+        if(this.$refs.paged.$refs.cri.model.f_plan_name.toString().trim()){
+          condition += " and f_plan_name like '%"+this.$refs.paged.$refs.cri.model.f_plan_name+"%'"
+        }
+      }
+      console.log('condition ===> '+ condition)
+      this.model.search(condition)
+    },
+    toPlanItem(planName) {
+      this.$dispatch('gotoson', {
+        _this: this,
+        title: '计划列表',
+        safe: false
+      })
+      this.$goto('check-plan-list-area', {planName},'self')
+    },
+    getNewOrder(){
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        // logic别名，key必须为logic
+        'logic': 'SafeCheckServiceTimeOut',
+        // 回调执行方法名，key必须为callback
+        'callback': 'javascript:HostApp.__this__.getNewOrderCallBack()',
+        // logic执行需要的业务参数
+        'data': {params: ''},
+        // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
+        // 执行回调方法传入key为backresult
+        // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
+        'backresult': 1
+      })
+    },
+    getNewOrderCallBack() {
+      this.selfSearch()
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    }
+  }
+}
+</script>