safecheck-client 4.0.2-5 → 4.0.2-50

package/src/components/android/week/WeekCheckPaper.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="auto">
+    <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/用户ID.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_user_name condition="f_user_name like '%{}%'" style="width: 70%" placeholder="请输入用户名称" />
+              </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 class="font text-left">表 &nbsp;&nbsp; &nbsp;&nbsp; 号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_meternumber condition="f_meternumber = '{}'" style="width: 70%" placeholder="请输入表号" />
+                <button type="button" name="button" class="btn btn-primary" style="width: 25%" @click="$parent.$parent.scan">扫码</button>
+              </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 class="font text-left">基表号：</label>
+              </div>
+              <div class="col-xs-8" >
+                <input class="search_input input-font"
+                       v-model="model.f_base_meternumber" condition="f_base_meternumber 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_address condition="f_address 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>
+              <datepicker id="f_start_date"
+                          placeholder= '起始时间'
+                          :value.sync="model.f_start_date"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_start_date"
+                          class="input-font"
+                          style="width:60%"
+                          condition="wc.f_upload_date >= '{}'"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="reset" readonly="readonly">
+              </datepicker>
+            </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>
+              <datepicker id="f_end_date"
+                          placeholder= '结束时间'
+                          :value.sync="model.f_end_date"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_end_date"
+                          condition="wc.f_upload_date <= '{}'"
+                          class="input-font"
+                          style="width:60%"
+                          :format="'yyyy-MM-dd 23:59:00'"
+                          :show-reset-button="reset" readonly="readonly">
+              </datepicker>
+            </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>
+          </form>
+        </div>
+      </criteria>
+
+      <list :model="model" partial='list'>
+        <div partial>
+          <div @click="$parent.$parent.$parent.inspect(row)" 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_userinfo_id }}</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_user_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_meternumber }}</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_complete }}</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_upload_date }}</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_state }}</p>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+import * as Util from '../../Util'
+
+export default {
+  title: '周检待办',
+  data () {
+    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getWeekPaper`, 20,
+      {
+        f_user_name:'this.f_user_name'
+      })
+    model.f_user_name = `${Vue.user.name}`
+    return {
+      model: model,
+
+    }
+  },
+  ready () {
+  },
+  computed: {
+  },
+  methods:{
+    scan(){
+      HostApp.__this__=this,
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
+    },
+    getCode(){
+      let datapa = HostApp.getCode().data;
+      this.$refs.paged.$refs.cri.model.f_meternumber=datapa
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    inspect (row) {
+      var pardate = {
+        _this:this,
+        tittle:'周检单查看',
+        safe:true
+      }
+      this.$dispatch('gotoson',pardate)
+      this.$goto('step-header-bar', {weekdata: row}, 'self')
+
+    },
+  }
+}
+</script>
+<style scoped>
+.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{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+</style>

package/src/components/android/week/WeekCheckPlan.vue

@@ -0,0 +1,145 @@
+<template>
+  <div class="auto">
+    <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/用户ID.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 '%{}%'" style="width: 70%" placeholder="请输入用户名称" />
+              </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>
+          </form>
+        </div>
+      </criteria>
+
+      <list :model="model" partial='list'>
+        <div partial>
+          <div @click="$parent.$parent.$parent.inspect(row)" 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_total }}</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_inspect_num }}</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_not_examined_num }}</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_efficient_strat }}</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_efficient_end }}</p>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+import * as Util from '../../Util'
+
+export default {
+  title: '周检待办',
+  data () {
+    let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getWeekPlan`, 20,
+      {
+        f_user_name:'this.f_user_name'
+      })
+    model.f_user_name = `${Vue.user.name}`
+    return {
+      model: model,
+    }
+  },
+  ready () {
+  },
+  computed: {
+  },
+  methods:{
+    reload(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    inspect (row) {
+      var pardate = {
+        _this:this,
+        tittle:'周检单详情',
+        safe:true
+      }
+      this.$dispatch('gotoson',pardate)
+      this.$goto('week-check', {planid: row.id}, 'self',this.reload)
+
+    },
+  }
+}
+</script>
+<style scoped>
+.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{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+</style>

package/src/components/checkplan/SelectCheckPlan.vue

@@ -57,6 +57,18 @@
                 :show-rest-button="reset">
               </datepicker>
             </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 class="select_list select"
+                        placeholder='片区/管理站' style="width: 60%"
+                        :value.sync="model.f_slice_area" v-model="model.f_slice_area"
+                        :options='$parent.$parent.sliceArea'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_slice_area='{}'"
+                        :value-single="true">
+              </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-->
@@ -148,6 +160,7 @@
 </template>
 <script>
 import {PagedList} from 'vue-client'
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
 
 
 export default {
@@ -191,6 +204,7 @@ export default {
         f_start_time:'',
         f_end_time:''
       },
+      sliceArea:[],
       checker: this.$login.f,
       checkers: [],
       checkersname: [],
@@ -206,6 +220,29 @@ export default {
     }
   },
   methods: {
+    Mreadibook(val){
+      if (val){
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+            items: 'name',
+            tablename: 't_zone',
+            condition: `parentid = '${val}'`,
+            orderitem: 'id'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.sliceArea=[]
+          this.sliceArea.push({
+            label:'全部',
+            value:''
+          })
+          res.data.forEach(ress=>{
+            this.sliceArea.push({
+              label:ress.name,
+              value:ress.name
+            })
+          })
+
+        })
+      }
+    },
     hidden() {
       this.criteriaShow = !this.criteriaShow
     },
@@ -256,6 +293,8 @@ export default {
     this.model.id = this.$login.f.id
     this.model.f_subcompany = this.$login.f.f_fengongsi
     this.model.f_filialeid = this.$login.f.orgid
+    this.Mreadibook(this.$login.f.orgid)
+
   },
 
   watch: {

package/src/components/defects/DefectModal.vue

@@ -1,101 +1,101 @@
-<template>
-  <modal :show.sync="$parent.show" v-ref:modal>
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        隐患处理
-      </h4>
-    </div>
-    <div slot="modal-body" class="modal-body">
-      <div class="row auto">
-      <div class="form-group">
-        <label class="col-sm-12 control-label">隐患级别：</label>
-        <div class="col-sm-12">{{defect.f_defect_level}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label text-left">隐患：</label>
-        <div class="col-sm-12">{{defect.f_defect}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">部位：</label>
-        <div class="col-sm-12">{{defect.f_device_type}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理方式：</label>
-        <div class="col-sm-12">
-          <radio-group :value.sync="defect.f_resolve_type" type="success" buttons="false" disabled="disabled">
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='现场处理'" value="现场处理">现场处理</radio>
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='用户处理'" value="用户处理">用户处理</radio>
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='维修处理'"  value="维修处理">维修处理</radio>
-        </radio-group></div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">整改结果：</label>
-        <div class="col-sm-12">
-          <v-select id="f_ratification" :value.sync="f_ratification"
-                    :options='ratifications' close-on-select clear-button></v-select></div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理人：</label>
-        <div class="col-sm-12">
-          <input type="text" class="form-control" v-model="defect.f_ratifiedpeople" maxlength="20">
-          <!--<chooser :userid.sync='f.id' v-model="defect.f_ratifiedpeople" resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理时间：</label>
-        <div class="col-sm-12"><datepicker id="f_end"
-                      :value.sync="defect.f_ratifieddate"
-                      :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"></datepicker></div>
-        </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">备注：</label>
-        <div class="col-sm-12"><textarea  class="form-control"  v-model="defect.f_remark" rows="3"></textarea></div>
-      </div>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-default" @click="$parent.todo(defect)" v-if="!defect.flag">保存</button>
-      <button type="button" class="btn btn-default" @click="$parent.undo">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import Vue from 'vue'
-  import * as Util from '../Util'
-  import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
-  import Radio from 'vue-client/src/vue-strap/src/radioBtn'
-
-  export default {
-        title:'隐患处理',
-        props:['defect','f'],
-    data(){
-          return {
-            model: {},
-            chosenOrg:{id:0},
-            ratifications:[
-                {label: '请选择处理结果', value: null},
-                {label: '未处理', value: '未处理'},
-                {label: '已处理', value: '已处理'},
-              ],
-          }
-    },
-    components: {
-      RadioGroup,
-      Radio
-    },
-    watch:{
-         'f_ratification'(val){
-            if(this.defect.f_ratification)
-              this.defect.f_ratification = this.f_ratification[0]
-          },
-          'defect'(val){
-            this.defect.id = this.defect.defectid
-            this.f_ratification = this.defect.ratification
-            this.defect.f_remark = this.defect.remark
-        }
-     },
-    }
-</script>
-
+<template>
+  <modal :show.sync="$parent.show" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        隐患处理
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row auto">
+      <div class="form-group">
+        <label class="col-sm-12 control-label">隐患级别：</label>
+        <div class="col-sm-12">{{defect.f_defect_level}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label text-left">隐患：</label>
+        <div class="col-sm-12">{{defect.f_defect}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">部位：</label>
+        <div class="col-sm-12">{{defect.f_device_type}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理方式：</label>
+        <div class="col-sm-12">
+          <radio-group :value.sync="defect.f_resolve_type" type="success" buttons="false" disabled="disabled">
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='现场处理'" value="现场处理">现场处理</radio>
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='用户处理'" value="用户处理">用户处理</radio>
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='维修处理'"  value="维修处理">维修处理</radio>
+        </radio-group></div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">整改结果：</label>
+        <div class="col-sm-12">
+          <v-select id="f_ratification" :value.sync="f_ratification"
+                    :options='ratifications' close-on-select clear-button></v-select></div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理人：</label>
+        <div class="col-sm-12">
+          <input type="text" class="form-control" v-model="defect.f_ratifiedpeople" maxlength="20">
+          <!--<chooser :userid.sync='f.id' v-model="defect.f_ratifiedpeople" resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
+        </div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理时间：</label>
+        <div class="col-sm-12"><datepicker id="f_end"
+                      :value.sync="defect.f_ratifieddate"
+                      :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"></datepicker></div>
+        </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">备注：</label>
+        <div class="col-sm-12"><textarea  class="form-control"  v-model="defect.f_remark" rows="3"></textarea></div>
+      </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-default" @click="$parent.todo(defect)" v-if="!defect.flag">保存</button>
+      <button type="button" class="btn btn-default" @click="$parent.undo">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
+  import Radio from 'vue-client/src/vue-strap/src/radioBtn'
+
+  export default {
+        title:'隐患处理',
+        props:['defect','f'],
+    data(){
+          return {
+            model: {},
+            chosenOrg:{id:0},
+            ratifications:[
+                {label: '请选择处理结果', value: null},
+                {label: '未处理', value: '未处理'},
+                {label: '已处理', value: '已处理'},
+              ],
+          }
+    },
+    components: {
+      RadioGroup,
+      Radio
+    },
+    watch:{
+         'f_ratification'(val){
+            if(this.defect.f_ratification)
+              this.defect.f_ratification = this.f_ratification[0]
+          },
+          'defect'(val){
+            this.defect.id = this.defect.defectid
+            this.f_ratification = this.defect.ratification
+            this.defect.f_remark = this.defect.remark
+        }
+     },
+    }
+</script>
+