safecheck-client 4.0.0-84 → 4.0.0-86

package/src/components/querycheckpaper/CheckPaperList.vue

@@ -1,130 +1,130 @@
-<template>
-  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
-    <div class="auto">
-      <partial-view v-ref:pv>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class="col-sm-3 control-label">用户编号:</label>
-          <span class="col-sm-9">{{ rowdata.f_userinfo_code }}</span>
-        </div>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class="col-sm-3 control-label">用户姓名:</label>
-          <span class="col-sm-9">{{ rowdata.f_user_name }}</span>
-        </div>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class="col-sm-3 control-label">用户类型:</label>
-          <span class="col-sm-9">{{ rowdata.f_user_type }}</span>
-        </div>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class="col-sm-3 control-label">用户地址:</label>
-          <span class="col-sm-9">{{ rowdata.f_address }}</span>
-        </div>
-      </partial-view>
-    </div>
-    <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-      <template partial='head'>
-        <tr>
-          <th>安检人</th>
-          <!--          <th>安检开始时间</th>-->
-          <th>安检结束时间</th>
-          <th>安检上传时间</th>
-          <th>安检状态</th>
-          <!--          <th>隐患情况</th>-->
-          <th>操作</th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <tr style="text-align: center">
-          <td style="text-align: center">{{ row.f_checker_name }}</td>
-          <!--          <td>{{row.f_onsite_time}}</td>-->
-          <td style="text-align: center">{{ row.f_offsite_time }}</td>
-          <td style="text-align: center">{{ row.f_upload_date }}</td>
-          <td style="text-align: center">{{ row.f_entry_status }}</td>
-          <!--          <td>{{$parent.$parent.getDefect(row.f_defect_content)}}</td>-->
-          <td style="text-align: center">
-            <button class="button_spacing button_search-1" @click='$parent.$parent.goDetail(row)'>查看</button>
-          </td>
-        </tr>
-      </template>
-    </data-grid>
-  </div>
-</template>
-
-<script>
-import {PagedList} from 'vue-client'
-import Vue from "vue";
-import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
-
-let asyncReady = async function (self) {
-  // 获取配置信息
-  try {
-    let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
-    self.delConfigKey(res.data)
-    Vue.config.safecheck=res.data
-    console.log('获取配置结果===', res.data)
-  } catch (error) {
-    // 忽略704,文件找不到异常R
-    if (error.status !== 704) {
-      throw error
-    }
-  }
-}
-
-export default {
-  title: '安检记录列表',
-  props: ['row'],
-  data() {
-    return {
-      rowdata: this.row,
-      model: new PagedList('api/af-safecheck/sql/查找安检单', 10, {
-        f_filialeid: "''",
-        f_plan_id: "''",
-        f_approved: "''",
-        f_entry_status: "''",
-        f_no_checkplan: "''",
-        orderitem: "'f_offsite_time desc'"
-      })
-    }
-  },
-  ready() {
-    //tag
-    this.rowdata = this.row
-    var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
-    if (this.row.filialeCon){
-      condition += ` and ${this.row.filialeCon}`
-    }
-     this.model.params.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
-    this.model.search(condition)
-  },
-  watch: {
-    'row'(val) {
-      if (val) {
-        this.rowdata = val
-        var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
-        if (this.row.filialeCon){
-          condition += ` and ${this.row.filialeCon}`
-        }
-        this.model.search(condition)
-
-      }
-    }
-  },
-  methods: {
-    getDefect(val) {
-      if (val) {
-        try {
-          var defect = JSON.parse(val)
-          return defect.result
-        } catch (e) {
-          //tag
-          return '正常'
-        }
-      }
-      return '正常'
-    },
-    goDetail(row) {
-      row.f_upload_state = '已传'
-      this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
-    }
-  }
-}
-</script>
+<template>
+  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
+    <div class="auto">
+      <partial-view v-ref:pv>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class="col-sm-3 control-label">用户编号:</label>
+          <span class="col-sm-9">{{ rowdata.f_userinfo_code }}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class="col-sm-3 control-label">用户姓名:</label>
+          <span class="col-sm-9">{{ rowdata.f_user_name }}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class="col-sm-3 control-label">用户类型:</label>
+          <span class="col-sm-9">{{ rowdata.f_user_type }}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class="col-sm-3 control-label">用户地址:</label>
+          <span class="col-sm-9">{{ rowdata.f_address }}</span>
+        </div>
+      </partial-view>
+    </div>
+    <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>安检人</th>
+          <!--          <th>安检开始时间</th>-->
+          <th>安检结束时间</th>
+          <th>安检上传时间</th>
+          <th>安检状态</th>
+          <!--          <th>隐患情况</th>-->
+          <th>操作</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr style="text-align: center">
+          <td style="text-align: center">{{ row.f_checker_name }}</td>
+          <!--          <td>{{row.f_onsite_time}}</td>-->
+          <td style="text-align: center">{{ row.f_offsite_time }}</td>
+          <td style="text-align: center">{{ row.f_upload_date }}</td>
+          <td style="text-align: center">{{ row.f_entry_status }}</td>
+          <!--          <td>{{$parent.$parent.getDefect(row.f_defect_content)}}</td>-->
+          <td style="text-align: center">
+            <button class="button_spacing button_search-1" @click='$parent.$parent.goDetail(row)'>查看</button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import Vue from "vue";
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+
+let asyncReady = async function (self) {
+  // 获取配置信息
+  try {
+    let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
+    self.delConfigKey(res.data)
+    Vue.config.safecheck=res.data
+    console.log('获取配置结果===', res.data)
+  } catch (error) {
+    // 忽略704,文件找不到异常R
+    if (error.status !== 704) {
+      throw error
+    }
+  }
+}
+
+export default {
+  title: '安检记录列表',
+  props: ['row'],
+  data() {
+    return {
+      rowdata: this.row,
+      model: new PagedList('api/af-safecheck/sql/查找安检单', 10, {
+        f_filialeid: "''",
+        f_plan_id: "''",
+        f_approved: "''",
+        f_entry_status: "''",
+        f_no_checkplan: "''",
+        orderitem: "'f_offsite_time desc'"
+      })
+    }
+  },
+  ready() {
+    //tag
+    this.rowdata = this.row
+    var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
+    if (this.row.filialeCon){
+      condition += ` and ${this.row.filialeCon}`
+    }
+     this.model.params.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
+    this.model.search(condition)
+  },
+  watch: {
+    'row'(val) {
+      if (val) {
+        this.rowdata = val
+        var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
+        if (this.row.filialeCon){
+          condition += ` and ${this.row.filialeCon}`
+        }
+        this.model.search(condition)
+
+      }
+    }
+  },
+  methods: {
+    getDefect(val) {
+      if (val) {
+        try {
+          var defect = JSON.parse(val)
+          return defect.result
+        } catch (e) {
+          //tag
+          return '正常'
+        }
+      }
+      return '正常'
+    },
+    goDetail(row) {
+      row.f_upload_state = '已传'
+      this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+    }
+  }
+}
+</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('/api/af-safecheck/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", `/api/af-safecheck/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('/api/af-safecheck/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", `/api/af-safecheck/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>