safecheck-client 3.0.33-85 → 3.0.33-86

package/src/components/querycheckpaper/PaperItem.vue

@@ -1,59 +1,59 @@
-<template>
-  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
-    <div class="auto">
-      <partial-view v-ref:pv>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户姓名:</label>
-          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-4 control-label">用户地址:</label>
-          <span class = "col-sm-8">{{rowdata.f_address}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">安检人:</label>
-          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
-          <label class = "col-sm-3 control-label">安检状态:</label>
-          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">入户时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">离开时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
-        </div>
-        <div class="row" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">用户评价:</label>
-          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
-        </div>
-      </partial-view>
-    </div>
-    <check-paper-items :row="rowdata"></check-paper-items>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import co from 'co'
-
-  export default {
-    title: '安检项信息',
-    name: 'CheckPaperItem',
-    props: ['row'],
-    data () {
-      return {
-        rowdata: this.row
-      }
-    },
-    ready () {
-      this.rowdata = this.row
-    },
-    watch: {
-      'row' (val) {
-        this.rowdata = val
-      }
-    }
-  }
-</script>
+<template>
+  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
+    <div class="auto">
+      <partial-view v-ref:pv>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户姓名:</label>
+          <span class = "col-sm-8">{{rowdata.f_user_name}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-4 control-label">用户地址:</label>
+          <span class = "col-sm-8">{{rowdata.f_address}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">安检人:</label>
+          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
+          <label class = "col-sm-3 control-label">安检状态:</label>
+          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">入户时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">离开时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
+        </div>
+        <div class="row" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户评价:</label>
+          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
+        </div>
+      </partial-view>
+    </div>
+    <check-paper-items :row="rowdata"></check-paper-items>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import co from 'co'
+
+  export default {
+    title: '安检项信息',
+    name: 'CheckPaperItem',
+    props: ['row'],
+    data () {
+      return {
+        rowdata: this.row
+      }
+    },
+    ready () {
+      this.rowdata = this.row
+    },
+    watch: {
+      'row' (val) {
+        this.rowdata = val
+      }
+    }
+  }
+</script>

package/src/components/report/HiddenSituation.vue

@@ -1,165 +1,165 @@
-<template>
-  <div id='app' class="basic-main" style="height: 100%">
-    <criteria-paged :model="model" :pager='false'>
-      <criteria partial='criteria' @condition-changed='search' class="search_area">
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div class="col-sm-4 form-group">
-              <role-selector-safe
-                role-name="安检员"
-                role-lable="安&ensp;检&ensp;员"
-                @re-res="$parent.$parent.getRes"
-                :value.sync="model.f_checker_id"
-                v-model="model.f_checker_id"
-                condition="f_checker_name like '%{}%'">
-              </role-selector-safe>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="startDate" class="font_normal_body">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          style="width: 60%;"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd 00:00:00'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label for="endDate" class="font_normal_body">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          style="width: 60%;"
-                          :format="'yyyy-MM-dd 23:59:59'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-4 form-group" style="margin-top: 8px">
-              <button class="button_search button_spacing" @click="search()">查询</button>
-              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
-              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-sm-2 form-group" >
-              <label class="font_normal_body">用气性质</label>
-              <v-select
-                class="select_list select"
-                placeholder='用气性质' style="width: 60%"
-                v-model='model.userType'
-                :value.sync="model.userType"
-                :options='$parent.$parent.userTypes'
-                condition="tuf.f_gasproperties in {} "
-                :multiple="true"
-               ></v-select>
-            </div>
-            <div class="col-sm-2 form-group" >
-              <label class="font_normal_body">气表类型</label>
-              <v-select
-                class="select_list select"
-                placeholder='气表类型' style="width: 60%"
-                v-model='model.tableType'
-                :value.sync="model.tableType"
-                :options='$parent.$parent.tableTypes'
-                condition="tuf.f_meter_classify = '{}'"
-                :value-single="true"
-                close-on-select clear-button></v-select>
-            </div>
-            <div class="col-sm-2 form-group" >
-              <label class="font_normal_body">气表品牌</label>
-              <v-select
-                class="select_list select"
-                placeholder='气表类型' style="width: 60%"
-                v-model='model.tableBrand'
-                :value.sync="model.tableBrand"
-                :options='$parent.$parent.tableBrands'
-                condition="gb.f_meter_brand = '{}'"
-                :value-single="true"
-                close-on-select clear-button></v-select>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">隐患报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
-              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ model.model.endDate }}
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <th colspan='5' style="font-weight: normal;">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </th>
-          </tr>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-
-</template>
-
-<script>
-  import {DataModel, HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '隐患报表',
-    data () {
-
-      let model = new DataModel('rs/report/hiddensituation', {
-        startDate: 'this.model.startDate',
-        endDate: 'this.model.endDate',
-        f_filialeid: 'this.f_filialeid'
-      })
-      model.f_filialeid = '(' + this.$login.f.orgid + ')'
-      return {
-        userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
-        tableTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')],
-        tableBrands: [{label: '全部', value: ''}],
-        filialeNameStr: '',
-        filialeCodeStr: '',
-        userid: this.$login.f.id,
-        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
-        model: model
-      }
-    },
-    methods: {
-      getRes (obj) {
-        this.model.f_filialeid = this.$login.convertToIn(obj.resids)
-      },
-      getTableBrands() {
-        new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
-          {data: {items: "*", tablename: "t_gasbrand", orderitem: "id", condition: ` 1=1 `}},
-          {resolveMsg: null, rejectMsg: null}).then((resp) => {
-          resp.data.forEach((result) => {
-            this.tableBrands.push({label: result.f_meter_brand, value: result.f_meter_brand})
-          })
-        })
-      },
-    },
-    ready () {
-      this.getTableBrands()
-    },
-    computed: {
-      selected () {
-        return this.$refs.grid.selected
-      }
-      // outlets () {
-      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
-      // },
-      // operator () {
-      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
-      // }
-    }
-  }
-</script>
+<template>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false'>
+      <criteria partial='criteria' @condition-changed='search' class="search_area">
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-4 form-group">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id"
+                condition="f_checker_name like '%{}%'">
+              </role-selector-safe>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="startDate" class="font_normal_body">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          style="width: 60%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="endDate" class="font_normal_body">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-4 form-group" style="margin-top: 8px">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
+              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body">用气性质</label>
+              <v-select
+                class="select_list select"
+                placeholder='用气性质' style="width: 60%"
+                v-model='model.userType'
+                :value.sync="model.userType"
+                :options='$parent.$parent.userTypes'
+                condition="tuf.f_gasproperties in {} "
+                :multiple="true"
+               ></v-select>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body">气表类型</label>
+              <v-select
+                class="select_list select"
+                placeholder='气表类型' style="width: 60%"
+                v-model='model.tableType'
+                :value.sync="model.tableType"
+                :options='$parent.$parent.tableTypes'
+                condition="tuf.f_meter_classify = '{}'"
+                :value-single="true"
+                close-on-select clear-button></v-select>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body">气表品牌</label>
+              <v-select
+                class="select_list select"
+                placeholder='气表类型' style="width: 60%"
+                v-model='model.tableBrand'
+                :value.sync="model.tableBrand"
+                :options='$parent.$parent.tableBrands'
+                condition="gb.f_meter_brand = '{}'"
+                :value-single="true"
+                close-on-select clear-button></v-select>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">隐患报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel, HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '隐患报表',
+    data () {
+
+      let model = new DataModel('rs/report/hiddensituation', {
+        startDate: 'this.model.startDate',
+        endDate: 'this.model.endDate',
+        f_filialeid: 'this.f_filialeid'
+      })
+      model.f_filialeid = '(' + this.$login.f.orgid + ')'
+      return {
+        userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
+        tableTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')],
+        tableBrands: [{label: '全部', value: ''}],
+        filialeNameStr: '',
+        filialeCodeStr: '',
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model
+      }
+    },
+    methods: {
+      getRes (obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids)
+      },
+      getTableBrands() {
+        new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
+          {data: {items: "*", tablename: "t_gasbrand", orderitem: "id", condition: ` 1=1 `}},
+          {resolveMsg: null, rejectMsg: null}).then((resp) => {
+          resp.data.forEach((result) => {
+            this.tableBrands.push({label: result.f_meter_brand, value: result.f_meter_brand})
+          })
+        })
+      },
+    },
+    ready () {
+      this.getTableBrands()
+    },
+    computed: {
+      selected () {
+        return this.$refs.grid.selected
+      }
+      // outlets () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+      // },
+      // operator () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+      // }
+    }
+  }
+</script>

package/src/components/task/RepairAnnual.vue

@@ -1,79 +1,79 @@
-<template>
-  <div class="flex">
-    <form class="form-inline">
-      <div class="form-group">
-        <label for="c_plan_year">年份：</label>
-        <v-select id="c_plan_year" :value.sync="c_plan_year"
-        :options='c_year_list' close-on-select clear-button></v-select>
-        <button type="button" class="btn btn-default" @click="search()">查询</button>
-      </div>
-      <div class="form-group">
-        部门:
-        <chooser :userid.sync='f.id' resource-type="organization" :width='200' :select-data.sync='model.chosenOrg'></chooser>
-      </div>
-      {{model.chosenOrg.fullname}}
-    </form>
-    <div class="span">
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>维修员</th>
-            <th>已维修</th>
-            <th>在维修</th>
-            <th>未维修</th>
-            <th></th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td>{{row.f_repairman}}</td>
-          <td>{{row.checked}}</td>
-          <td>{{row.checking}}</td>
-          <td>{{row.unchecked}}</td>
-          <td v-on:click.stop.prevent='$parent.$parent.showDetail(row)'><span class="glyphicon glyphicon-option-horizontal"></span></td>
-        </template>
-      </data-grid>
-    </span>
-    <div style="height:50px;"></div>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '维修员年任务',
-  props: ['f'],
-  data() {
-    let options = []
-    let year = (new Date()).getFullYear()
-    for(let i = year - 8; i <= year +1; i++ )
-      options.push({label: i+'', value: i+''})
-    let model = new PagedList('rs/sql/跟踪维修员年任务', 20, {id: 'this.id', org_id: 'this.chosenOrg.id', f_plan_year: 'this.f_plan_year', f_subcompany: 'this.f_subcompany'})
-    model.chosenOrg = {id:0}
-    return {
-      c_plan_year: year + '',
-      c_year_list: options,
-      model: model
-    }
-  },
-  ready () {
-    this.model.id = this.f.id
-    this.model.chosenOrg.id = this.f.parent.id
-    this.model.f_plan_year = this.c_plan_year[0]
-    this.model.f_subcompany = Vue.f_subcompany
-    this.$watch('c_plan_year', function (val) {
-        this.model.f_plan_year = val[0]
-    })
-  },
-  methods: {
-    showDetail (row) {
-      this.$goto('repair-annual-detail', {f_plan_year: this.model.f_plan_year, f_repairman: row.f_repairman, f_subcompany: this.model.f_subcompany}, 'self')
-    },
-    search () {
-      this.model.rows = []
-      this.model.search()
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex">
+    <form class="form-inline">
+      <div class="form-group">
+        <label for="c_plan_year">年份：</label>
+        <v-select id="c_plan_year" :value.sync="c_plan_year"
+        :options='c_year_list' close-on-select clear-button></v-select>
+        <button type="button" class="btn btn-default" @click="search()">查询</button>
+      </div>
+      <div class="form-group">
+        部门:
+        <chooser :userid.sync='f.id' resource-type="organization" :width='200' :select-data.sync='model.chosenOrg'></chooser>
+      </div>
+      {{model.chosenOrg.fullname}}
+    </form>
+    <div class="span">
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>维修员</th>
+            <th>已维修</th>
+            <th>在维修</th>
+            <th>未维修</th>
+            <th></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td>{{row.f_repairman}}</td>
+          <td>{{row.checked}}</td>
+          <td>{{row.checking}}</td>
+          <td>{{row.unchecked}}</td>
+          <td v-on:click.stop.prevent='$parent.$parent.showDetail(row)'><span class="glyphicon glyphicon-option-horizontal"></span></td>
+        </template>
+      </data-grid>
+    </span>
+    <div style="height:50px;"></div>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '维修员年任务',
+  props: ['f'],
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    for(let i = year - 8; i <= year +1; i++ )
+      options.push({label: i+'', value: i+''})
+    let model = new PagedList('rs/sql/跟踪维修员年任务', 20, {id: 'this.id', org_id: 'this.chosenOrg.id', f_plan_year: 'this.f_plan_year', f_subcompany: 'this.f_subcompany'})
+    model.chosenOrg = {id:0}
+    return {
+      c_plan_year: year + '',
+      c_year_list: options,
+      model: model
+    }
+  },
+  ready () {
+    this.model.id = this.f.id
+    this.model.chosenOrg.id = this.f.parent.id
+    this.model.f_plan_year = this.c_plan_year[0]
+    this.model.f_subcompany = Vue.f_subcompany
+    this.$watch('c_plan_year', function (val) {
+        this.model.f_plan_year = val[0]
+    })
+  },
+  methods: {
+    showDetail (row) {
+      this.$goto('repair-annual-detail', {f_plan_year: this.model.f_plan_year, f_repairman: row.f_repairman, f_subcompany: this.model.f_subcompany}, 'self')
+    },
+    search () {
+      this.model.rows = []
+      this.model.search()
+    }
+  }
+}
+</script>