safecheck-client 3.0.32-3 → 3.0.32-33

package/src/filiale/shexian/pc.js

@@ -1,16 +1,16 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
-  'safe-defect-paper-new': (resolve) => { require(['./pc/DefectPaperNew'], resolve) },
-  'safe-defect-list-new': (resolve) => { require(['./pc/DefectListNew'], resolve) },
-  'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
-  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
+  'safe-defect-paper-new': (resolve) => { require(['./pc/DefectPaperNew'], resolve) },
+  'safe-defect-list-new': (resolve) => { require(['./pc/DefectListNew'], resolve) },
+  'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], 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/CheckSearchUser.vue

@@ -49,15 +49,15 @@
           </div>
           <div class="row" v-show="!$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">用户类型</label>
+              <label class="font_normal_body">用气类型</label>
               <v-select id="f_usertype"
-                        placeholder='用户类型'
+                        placeholder='用气类型'
                         class="select select_list"
-                        :value.sync="model.f_usertype"
+                        :value.sync="model.f_gasproperties"
                         :value-single="true"
-                        :options='$parent.$parent.usertypes'
-                        v-model="model.f_usertype"
-                        condition="f_user_type = '{}'"
+                        :options='$parent.$parent.gasproperties'
+                        v-model="model.f_gasproperties"
+                        condition="f_gasproperties = '{}'"
                         close-on-select clear-button></v-select>
             </div>
             <!--            <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow && !$parent.$parent.$parent.showItem"></div>-->
@@ -183,25 +183,25 @@
                         :value-single="true">
               </v-select>
             </div>
+<!--            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">-->
+<!--              <label class="font_normal_body">用户性质</label>-->
+<!--              <v-select class="select_list select"-->
+<!--                        placeholder='用户性质' style="width: 60%"-->
+<!--                        :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"-->
+<!--                        :options='$parent.$parent.gasproperties'-->
+<!--                        close-on-select clear-button-->
+<!--                        condition="f_gasproperties = '{}'"-->
+<!--                        :value-single="true">-->
+<!--              </v-select>-->
+<!--            </div>-->
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">用户性质</label>
-              <v-select class="select_list select"
-                        placeholder='用户性质' style="width: 60%"
-                        :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
-                        :options='$parent.$parent.gasproperties'
-                        close-on-select clear-button
-                        condition="f_gasproperties = '{}'"
-                        :value-single="true">
-              </v-select>
-            </div>
-            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">片区</label>
+              <label class="font_normal_body">开户网点</label>
               <v-select class="select_list select"
-                        placeholder='片区' style="width: 60%"
+                        placeholder='开户网点' style="width: 60%"
                         :value.sync="model.f_outlets" v-model="model.f_outlets"
                         :options='$parent.$parent.userareas'
                         close-on-select clear-button
-                        condition="f_outlets = '{}'"
+                        condition=" f_khwd = '{}'"
                         :value-single="true">
               </v-select>
             </div>
@@ -251,16 +251,16 @@
                      placeholder="地址" condition="f_address like '%{}%'">
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">用户类型</label>
+              <label class="font_normal_body">用气类型</label>
               <v-select
-                placeholder='用户类型'
+                placeholder='用气类型'
                 class="select select_list"
 
-                :value.sync="model.f_usertype"
+                :value.sync="model.f_gasproperties"
                 :value-single="true"
-                :options='$parent.$parent.usertypes'
-                v-model="model.f_usertype"
-                condition="f_user_type = '{}'"
+                :options='$parent.$parent.gasproperties'
+                v-model="model.f_gasproperties"
+                condition="f_gasproperties = '{}'"
                 close-on-select clear-button></v-select>
             </div>
             <!--            <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow && !$parent.$parent.$parent.showItem"></div>-->
@@ -362,7 +362,10 @@
 <!--              <nobr>气表品牌</nobr>-->
 <!--            </th>-->
             <th>
-              <nobr>用户类型</nobr>
+              <nobr>用气类型</nobr>
+            </th>
+            <th>
+              <nobr>f_khwd</nobr>
             </th>
 <!--            <th>-->
 <!--              <nobr>壁挂炉</nobr>-->
@@ -403,7 +406,8 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{ row.f_user_phone }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meternumber}}</td>
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center;">{{row.f_meter_brand}}</td>-->
-          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_user_type }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gasproperties }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_khwd }}</td>
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_hasfurnace }}</td>-->
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_haskitchen }}</td>-->
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_residential_area }}</td>
@@ -583,13 +587,14 @@ export default {
         f_defect_content: "CASE WHEN CHARINDEX( '\"result\":\"正常\"', tp.f_defect_content ) > 0 THEN '正常' ELSE replace(replace(replace( replace( RIGHT ( tp.f_defect_content, len( tp.f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
       },
       excelHeaders: {
-        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
+        //用户编号	用户名称	用户电话	安检次数	用气类型	小区名称	地址	安检日期	安检状态	安检结果
 
         'f_userinfo_code': '用户编号',
         'f_user_name': '用户名称',
         'f_user_phone': '用户电话',
         'f_meternumber': '用户表号',
-        'f_user_type': '用户类型',
+        'f_gasproperties': '用气类型',
+        'f_khwd': '开户网点',
         'f_checker_name': '安检员',
         'f_residential_area': '小区名称',
         'f_address': '地址',
@@ -606,7 +611,7 @@ export default {
       orgstrs: [{label: '全部', value: ''}],
       checkersid: [],
       gasproperties:[],
-      userareas:[],
+      userareas:[{label: '全部', value: ''}, ...this.$appdata.getParam('开户网点')],
       SafeCheckXZ: '',
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
@@ -684,7 +689,7 @@ export default {
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
     this.getAllGasproperties()
-    this.getAllOutlets()
+    // this.getAllOutlets()
   },
   methods: {
     async blacklist(){
@@ -920,10 +925,10 @@ export default {
       }, ...this.$appdata.getParam('安检状态')] : [{label: '全部', value: ''}]
     },
     usertypes() {
-      return this.$appdata.getParam('用户类型') ? [{
+      return this.$appdata.getParam('用气类型') ? [{
         label: '全部',
         value: ''
-      }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
+      }, ...this.$appdata.getParam('用气类型')] : [{label: '全部', value: ''}]
     },
     userstates() {
       return this.$appdata.getParam('用户状态') ? [{
@@ -1082,25 +1087,25 @@ export default {
           })
         })
     },
-    getAllOutlets(){
-      this.userareas=[{
-        label:'全部',
-        value:''
-      }]
-      new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_GroupBy`, {data: {
-          items: 'f_outlets',
-          tablename: 't_user_address',
-          condition: `1=1`,
-          groupitem: 'f_outlets'
-        }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        res.data.forEach(ress=>{
-          this.userareas.push({
-            label:ress.f_outlets,
-            value:ress.f_outlets
-          })
-        })
-      })
-    },
+    // getAllOutlets(){
+    //   this.userareas=[{
+    //     label:'全部',
+    //     value:''
+    //   }]
+    //   new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_GroupBy`, {data: {
+    //       items: 'f_outlets',
+    //       tablename: 't_user_address',
+    //       condition: `1=1`,
+    //       groupitem: 'f_outlets'
+    //     }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    //     res.data.forEach(ress=>{
+    //       this.userareas.push({
+    //         label:ress.f_outlets,
+    //         value:ress.f_outlets
+    //       })
+    //     })
+    //   })
+    // },
     getAllMeterBook(val){
       ////tag
       ////tag

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

@@ -101,9 +101,9 @@
               </v-select>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">起始时间</label>
+              <label class="font_normal_body">安检起始时间</label>
               <datepicker
-                placeholder='起始时间' style="width:60%"
+                placeholder='安检起始时间' style="width:60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -113,9 +113,9 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">结束时间</label>
+              <label class="font_normal_body">安检结束时间</label>
               <datepicker
-                placeholder='结束时间' style="width:60%"
+                placeholder='安检结束时间' style="width:60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -300,9 +300,9 @@
               </v-select>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">起始时间</label>
+              <label class="font_normal_body">安检起始时间</label>
               <datepicker
-                placeholder='起始时间' style="width:60%"
+                placeholder='安检起始时间' style="width:60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"
@@ -312,9 +312,9 @@
               </datepicker>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">结束时间</label>
+              <label class="font_normal_body">安检结束时间</label>
               <datepicker
-                placeholder='结束时间' style="width:60%"
+                placeholder='安检结束时间' style="width:60%"
                 :disabled-days-of-week="[]"
                 :format="'yyyy-MM-dd'"
                 :show-rest-button="reset"

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

@@ -120,9 +120,9 @@ import {HttpResetClass} from 'vue-client'
         this.allUsers.forEach(user => {
           // if (resids.indexOf(user.orgid) != -1) {
           //   if (typeof user.name == "string"){
-          if(user.state == '在职'){
+
             this.users.push({label: user.name, value: user.name})
-          }
+
 
           //   }
           // }

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

@@ -408,7 +408,11 @@
               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){
               args.condition += ` and ua.f_last_check_date >='${args.model.f_start_time} 00:00:00' `

package/src/filiale/yangchunboneng/android/SafecheckOrderV.vue

@@ -684,9 +684,9 @@ export default {
       hasError = this.verifyDevices()
       if (hasError)
         return hasError
-      hasError = this.verifyFeedback()
-      if (hasError)
-        return hasError
+      // hasError = this.verifyFeedback()
+      // if (hasError)
+      //   return hasError
     },
     verifyState() {
       if (Vue.android && this.data.f_entry_status == '未使用天然气' && this.data.f_nongasuser_path == Vue.nopic)

package/src/filiale/yongzhou/pc/safeStatistics.vue

@@ -80,6 +80,7 @@
               {{{ model.data.substring(26,model.data.length-8) }}}
             </th>
           </tr>
+          <tr style="height: 100px"></tr>
         </table>
       </div>
     </criteria-paged>

package/src/filiale/yongzhou/pc/safeStatisticsYear.vue

@@ -72,6 +72,7 @@
               {{{ model.data.substring(26,model.data.length-8) }}}
             </th>
           </tr>
+          <tr style="height: 100px"></tr>
         </table>
       </div>
     </criteria-paged>

package/src/filiale/zhongyi/pc/DefectListNew.vue

@@ -494,7 +494,7 @@ export default {
       if (this.model.rows.length > 0) {
         let tempRow = this.model.rows
         for (let i = 0; i < tempRow.length; i++) {
-          if (tempRow[i].f_repaire_type == '未处理') {
+          if (tempRow[i].f_repaire_type == '未处理' ||  !tempRow[i].f_repaire_type ) {
             this.needRepair = true
             return
           }

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(process.env.SAFE_CHECK);
- safecheck('shexian')
-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(process.env.SAFE_CHECK);
+// 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 }
+})