safecheck-client 3.0.32-20 → 3.0.32-21

package/src/filiale/qingjian/pc.js

@@ -1,15 +1,15 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
-  'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
-
-
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
+  'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
+
+
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/wensu/android/CurrentCreate.vue

@@ -777,7 +777,7 @@
             this.$showMessage("网络异常,请检查网络后再试！")
           })
         }else{
-          this.$showMessage("该安检单已被上传！请联系营业厅进行核查")
+          this.$showMessage("该安检单已被上传！")
         }
       },
       makeAPhoneCall(phoneNumber) {

package/src/filiale/wensu/pc/checkUserList.vue

@@ -408,10 +408,9 @@
               args.condition +=` and ${this.uploadCodeCondition}`
             }
             if(args.model.f_last_check_state){
+              args.condition += ` and ua.f_last_check_state  = '${args.model.f_last_check_state}'`
               if (args.model.f_last_check_state == '未检'){
                 args.condition += ` and (ua.f_last_check_date  is null or ua.f_last_check_date  is null) `
-              }else {
-                args.condition += ` and ua.f_last_check_state  = '${args.model.f_last_check_state}'`
               }
             }
             if(args.model.f_start_time){

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('fugou')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('qingjian');
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/filiale/fugou/pc/AddToCheckBook.vue

@@ -1,160 +0,0 @@
-<template>
-  <div id='AddTobook'>
-    <div class="auto select-overspread">
-      <validator name='v'>
-        <ul class="nav nav-tabs">
-          <p class="bg-info text-center" style="padding: 8px;">{{tabstitles[$parent.$refs.tabs.active]}}</p>
-        </ul>
-        <div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;" v-show="!($parent.$refs.tabs.active == 2)">
-          <div class="row" style="text-align: center">
-
-            <div class="col-sm-12 form-group" :class="[$v.f_check_book_num.required ? 'has-error' : '']">
-              <label class="font_normal_body" style="width: 26%;">目标片区</label>
-              <input type="text" v-model="model.f_check_book_num" v-show="false"
-                     v-validate:f_check_book_num='{required: true }'>
-              <v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
-                        :options='checkbook' placeholder='片区'
-                        :value-single="true" :search="true"
-                        style="width:60%"
-                        close-on-select></v-select>
-            </div>
-          </div>
-        </div>
-        <div class="row"  v-show="!($parent.$refs.tabs.active == 2)">
-          <div style="float:right;margin-top: 250px;margin-right: 20px;">
-            <button @click="confirm()" class="btn button_search" style="width: 70px" :disabled='!$v.valid'>
-              <span class="glyphicon glyphicon-floppy-disk"></span>保存
-            </button>
-          </div>
-        </div>
-      </validator>
-    </div>
-  </div>
-
-</template>
-
-<script>
-  import * as Util from '../../../components/Util'
-  import {HttpResetClass} from "vue-client";
-  import bus from "../../../bus";
-  export default {
-    name: 'AddTobook',
-
-    data () {
-      return {
-        model:{
-          f_check_book_num:''
-        },
-        checkbook: [],
-        checkbooks:[],
-        tabstitles:['请选择小区添加到目标片区','请选择单位添加到目标片区','用户无法单独添加到片区内']
-      }
-    },
-    created () {
-    },
-    ready () {
-      // this.close()
-      new HttpResetClass().load('POST','rs/sql/safe_singleTable_OrderBy',{data: {
-          items: 'id,f_check_book_name,f_check_book_type,f_user_type',
-          tablename: 't_check_book',
-          condition: `1=1`,
-          orderitem: 'id'
-        }}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-        console.log("checkbook", res.data)
-        res.data.forEach(item=>{
-          this.checkbooks.push({
-            f_user_type:item.f_user_type,
-            booktype:item.f_check_book_type,
-            label:item.f_check_book_name,
-            value:item.id
-          })
-        })
-        this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
-      })
-    },
-    methods: {
-       selectbook(val){
-
-      },
-      close () {
-
-      },
-
-      confirm () {
-         if (!this.model.f_check_book_num){
-           this.$showMessage('请选择片区')
-           return
-         }
-        console.log(this.$parent.$refs.tabs.active)
-        console.log(this.$parent.bookList)
-        console.log(this.$parent.bookAll)
-        console.log(this.$parent.bookCondition)
-        let userCondition = ''
-        if(this.$parent.bookAll){
-          if(!this.$parent.bookCondition){
-            this.$showMessage("请先查询")
-            return
-          }else{
-            userCondition = this.$parent.bookCondition
-          }
-        }else if(this.$parent.bookList.length > 0){
-          userCondition = this.$parent.$refs.tabs.active ===0? 'ta.id in (' + this.$parent.bookList.toString() + ')':
-            'tc.id in (' + this.$parent.bookList.toString() + ')'
-        }else{
-          this.$showMessage(this.$parent.$refs.tabs.active===0?'请选择小区':'请选择单位')
-          return;
-        }
-        if(this.$parent.$refs.tabs.active ===0){
-          new HttpResetClass().load('POST', 'rs/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
-                f_check_book_type:'小区',condition:userCondition}},
-            {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
-            if(res && res.data){
-              this.model.f_check_book_num = ""
-              this.$showMessage("本次成功添加"+res.data+"个小区",['confirm']).then(res=>{
-                if(res==='confirm'){
-                  console.log("刷新了")
-                  bus.$emit('fresh-area')
-                }
-              })
-            }else{
-              this.$showMessage("添加失败")
-            }
-          })
-        }else{
-          new HttpResetClass().load('POST', 'rs/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
-                f_check_book_type:'单位',condition:userCondition}},
-            {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
-            if(res && res.data){
-              this.model.f_check_book_num = ""
-              this.$showMessage("本次成功添加"+res.data+"个单位",['confirm']).then(res=>{
-                if(res==='confirm'){
-                  console.log("刷新了")
-                  bus.$emit('fresh-area')
-                }
-              })
-            }else{
-              this.$showMessage("添加失败")
-            }
-          })
-        }
-      }
-    },
-    watch:{
-      '$parent.$refs.tabs.active'(val){
-        if(val =='0'){
-          this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
-        }else{
-          this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='非民用')
-        }
-        this.model.f_check_book_num = ''
-      }
-    },
-    computed: {
-
-    }
-  }
-</script>
-
-<style lang="less">
-
-</style>

package/src/filiale/fugou/pc/CheckBook.vue

@@ -1,301 +0,0 @@
-<template>
-  <!--安检综合查询主界面-->
-  <div id="unit" class="flex-row" :class="{'binary':showItem || showItemUser}">
-    <div :class="{'basic-main':!(showItem || showItemUser),'binary-left':showItem || showItemUser}">
-      <!--展示查询界面-->
-      <check-book-list class="flex" :tempval="hidden" :style="style" :style2="style2" :showtype="showtype" @select-changed="selected"
-                         @canel-main="close"
-                         @addbook="addbook"
-                         :needprops="needProps"
-                         @showdetails="showdetails"
-                       v-ref:checkbook></check-book-list>
-    </div>
-    <div class="binary-right" v-if="showItemUser || showItem">
-      <div class="flex">
-        <check-book-user style="height: 100%" :row="rowData" v-if="showItemUser && rowData.f_check_book_type==='用户'"></check-book-user>
-        <check-book-area style="height: 100%"    @showuser="showuser"  :row="rowData" :needprops="needProps" v-if="showItemUser && rowData.f_user_type==='民用'"></check-book-area>
-        <check-book-company style="height: 100%"    @showuser="showusercompany"  :row="rowData" :needprops="needProps" v-if="showItemUser && rowData.f_user_type==='非民用'"></check-book-company>
-        <check-book-details style="height: 100%" :row="rowData" :showtype="showtype" v-if="showItem"></check-book-details>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-<script>
-import {HttpResetClass} from "vue-client";
-
-export default {
-  title: '片区管理',
-  name: 'CheckPaperSearchUser',
-  props:['showtype'],
-  data () {
-    return {
-      style: 'col-sm-2 form-group',
-      style2: 'col-sm-4 form-group',
-      showItemUser: false,
-      hidden: true,
-      barwidth: '100%',
-      showItem: false,
-      rowData: {},
-      needProps:{
-        meter_gasbrand:[],
-        checkBooks:[],
-        entry_status:[],
-        userTypes:[],
-        userStates:[],
-        gasproperties:[],
-        areaList:[],
-        sliceArea:[],
-        cbc:[],
-        meterbooks:[],
-        checker:[],
-      },
-    }
-  },
-  ready(){
-    this.init()
-  },
-  methods: {
-    init(){
-      this.getCheckBook()
-      this.setConList()
-      this.loadpage()
-      this.getGasbrand()
-      this.searchChecker()
-    },
-    //查询安检员selectChanged
-    async searchChecker(){
-      let res=await new HttpResetClass().load('POST', '/rs/search', {
-        source: 'tool.getChildrenOfResName($安检员$)',
-        userid: this.$login.f.id
-      }, {resolveMsg: null, rejectMsg: null})
-      this.needProps.checker=[]
-      res.data.forEach((resRow) => {
-        if(resRow.orgid==this.$login.f.orgid){
-          this.needProps.checker.push({label:resRow.name,value:resRow})
-        }
-      })
-    },
-    getGasbrand(){
-      this.needProps.meter_gasbrand=[]
-      new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_GroupBy`, {
-        data: {
-          items: 'id,f_meter_brand',
-          tablename: 't_gasbrand',
-          condition: `f_orgid = '${this.$login.f.orgid}'`,
-          groupitem: 'id,f_meter_brand'
-        }
-      }, {resolveMsg: null, rejectMsg: null}).then(res => {
-        this.needProps.meter_gasbrand.push({label: '全部', value: ''})
-        //console.log('res=', JSON.stringify(res))
-        res.data.forEach(ress => {
-          //console.log('ress=', JSON.stringify(ress))
-          this.needProps.meter_gasbrand.push({
-            label: ress.f_meter_brand,
-            value: ress.id
-          })
-        })
-      })
-    },
-    getCheckBook(){
-      this.needProps.checkBooks=[]
-      new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
-        data: {
-          items: 'id,f_check_book_name,f_check_book_type',
-          tablename: 't_check_book',
-          condition: `f_orgid = '${this.$login.f.orgid}'`,
-          orderitem: 'id desc'
-        }
-      }, {resolveMsg: null, rejectMsg: null}).then(res => {
-        this.needProps.checkBooks.push({label: '全部', value: ''})
-        this.needProps.checkBooks.push({label: '未在片区内', value: '111111'})
-        res.data.forEach(ress => {
-          this.needProps.checkBooks.push({
-            label: ress.f_check_book_name,
-            value: `${ress.id}-${ress.f_check_book_type}`
-          })
-        })
-      })
-    },
-    loadpage(){
-      this.select_search()
-      this.Mreadibook()
-      this.getSliceArea()
-    },
-    select_search(text, type){
-      //tag
-      let pcdText=text?`   and f_residential_area like '%${text}%'`:''
-      if (type == 'pqId'){
-        if(text.length==0){
-          pcdText=text?`   and 1=1`:''
-        }else {
-          pcdText =text?`and f_check_book_id in (${text})`:''
-        }
-
-      }
-      new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.$login.f.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
-        //tag)
-        this.needProps.areaList=[]
-        this.needProps.areaList.push({label:"全部",value:""})
-        res.data.forEach((result)=>{
-          this.needProps.areaList.push({label:result.f_residential_area,value:result.f_residential_area})
-          //console.log('this.areaList=', JSON.stringify(this.areaList))
-        })
-        //tag)
-      })
-
-
-    },
-    //获取抄表册
-    async Mreadibook(){
-      this.needProps.cbc=[]
-      this.needProps.sliceArea=[]
-      let http = new HttpResetClass()
-      let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
-        {data: {f_orgid: "('"+this.$login.f.orgid+"')"}},
-        {resolveMsg: null, rejectMsg: '获取失败！！！'})
-      this.needProps.cbc = [{label: '全部', value: ''}]
-      //tag
-      //tag)
-      //tag
-      this.needProps.meterbooks=[]
-      this.needProps.meterbooks=getMeterReadingBooks.data.meterbooks
-      this.needProps.meterbooks.forEach((res) => {
-        this.needProps.cbc.push({label: res.f_book_name, value: res.id})
-        /*if(res.f_book_slice_area){
-          if(this.sliceArea.indexOf(res.f_book_slice_area)<0){
-            this.sliceArea.push(res.f_book_slice_area)
-          }
-        }*/
-      })
-
-    },
-    //片区获取
-    async getSliceArea()  {
-      let http = new HttpResetClass()
-      let getAllArea = await http.load('POST', '/rs/search', {
-        source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-        userid: this.$login.f.id
-      }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-      this.needProps.sliceArea = [{label: '全部', value: ''}]
-      //tag
-      //tag
-      //tag
-      getAllArea.data.forEach((res) => {
-        if(res.parentid==this.$login.f.orgid){
-          this.needProps.sliceArea.push({label:res.name,value:res.name})
-        }
-      })
-      //tag
-    },
-    setConList(){
-      this.needProps.entry_status=this.$appdata.getParam('安检状态') ? [{
-        label: '全部',
-        value: ''
-      }, ...this.$appdata.getParam('安检状态')] : [{label: '全部', value: ''}]
-
-      this.needProps.userTypes=this.$appdata.getParam('用户类型') ? [{
-        label: '全部',
-        value: ''
-      }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
-      this.needProps.userStates=this.$appdata.getParam('安检用户状态') ? [{
-        label: '全部',
-        value: ''
-      }, ...this.$appdata.getParam('安检用户状态')] : [{label: '全部', value: ''}]
-      this.needProps.gasproperties=this.$appdata.getParam('用气性质') ? [{
-        label: '全部',
-        value: ''
-      }, ...this.$appdata.getParam('用气性质')] : [{label: '全部', value: ''}]
-      // this.meter_classifys=this.$appdata.getParam('气表类型') ? [{
-      //   label: '全部',
-      //   value: ''
-      // }, ...this.$appdata.getParam('气表类型')] : [{label: '全部', value: ''}]
-    },
-    show () {
-      this.showItem = this.showItem ? false : true
-    },
-    showdetails (row) {
-      console.log('showdetails',row)
-      this.rowData = row
-      this.showItem = false
-      this.showItemUser = true
-    },
-    showusercompany(row){
-      console.log('showuser',row)
-      this.rowData = row
-      this.showItem = false
-      this.rowData.f_check_book_type='用户'
-      this.rowData.f_check_book_type1='单位'
-      this.showItemUser = true
-    },
-    showuser(row){
-      console.log('showuser',row)
-      this.rowData = row
-      this.showItem = false
-      this.rowData.f_check_book_type='用户'
-      this.rowData.f_check_book_type1='小区'
-      this.showItemUser = true
-    },
-    addbook(){
-      this.rowData= {
-        f_is_auto:'否',
-        f_check_book_type:"用户",
-      }
-      this.showItem = true
-    },
-    selected (row) {
-      this.showItem = true
-      this.barwidth = '50%'
-      //tag
-      this.rowData = row.val
-      this.hidden = false
-      //tag
-    },
-
-    close () {
-      this.showItem = false
-      this.barwidth = '100%'
-      this.hidden = true
-    }
-  },
-  computed:{
-    showItemAll(){
-      return this.showItem && this.showItemUser
-    }
-  },
-  watch: {
-    'showItemUser' (val) {
-      //tag
-      console.log("showItemUser",val)
-      if(val){
-        this.showItem = false
-      }
-      if (val || this.showItem) {
-        this.style = 'col-sm-3 form-group'
-        this.style2 = 'col-sm-6 form-group'
-
-      } else {
-        this.style = 'col-sm-2 form-group'
-        this.style2 = 'col-sm-4 form-group'
-      }
-    },
-    'showItem' (val) {
-      console.log("showItem",val)
-      if(val){
-        this.showItemUser = false
-      }
-      if (val || this.showItemUser) {
-        this.style = 'col-sm-3 form-group'
-        this.style2 = 'col-sm-6 form-group'
-
-      } else {
-        this.style = 'col-sm-2 form-group'
-        this.style2 = 'col-sm-4 form-group'
-      }
-    }
-  }
-}
-
-</script>
-

package/src/filiale/fugou/pc/CheckBookAll.vue

@@ -1,67 +0,0 @@
-<template>
-  <tab-button v-ref:list :active="-1">
-    <tabs header="居民用户台账">
-      <check-book v-if="show.includes('居民用户台账')" @deal-msg="dealMsg" v-ref:papermain :showtype="'民用'"></check-book>
-    </tabs>
-    <tabs header="非居民用户台账">
-      <check-book v-if="show.includes('非居民用户台账')" @deal-msg="dealMsg" v-ref:paperfeimain :showtype="'非民用'"></check-book>
-    </tabs>
-<!--    <tabs header="用户管理">-->
-<!--        <check-book-manage v-if="show.includes('用户管理')" @deal-msg="dealMsg"></check-book-manage>-->
-<!--    </tabs>-->
-  </tab-button>
-
-</template>
-
-<script>
-import TabButton from '../../../components/safecheck/common/TabButton'
-import Tabs from '../../../components/safecheck/common/Tabs'
-// import { HttpResetClass } from 'vue-client'
-
-export default {
-  name: 'checkBookAll',
-  title: '用户台账管理',
-  data() {
-    return {// 页面开关
-      residentialArea: [],
-      f_start_date: '',
-      f_end_date: '',
-      listpage: true,
-      width: {
-        left: '100%',
-        right: '0%'
-      },
-      rowData: {},
-      show: []
-    }
-  },
-  components: {Tabs, TabButton},
-  ready() {
-    //tag
-    //tag
-    //tag
-    this.$refs.list.handleTabListClick(0,this.$refs.list.renderData[0])
-  },
-  methods: {
-    // permission(name) {
-    //     if (!this.$login.r.find(value => value == name)) {
-    //       return true
-    //   }
-    //   return true
-    // },
-    cancel(obj) {
-      this.listpage = true
-    },
-    dealMsg(obj) {
-      this.rowData = obj
-      this.listpage = false
-      this.f_start_date = obj.model.startDate
-      this.f_end_date = obj.model.endDate
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>