safecheck-client 3.0.32-4 → 3.0.32-6

package/src/filiale/rongchuang/pc/NewCheckpaper.vue

@@ -57,6 +57,12 @@ div {
       <div @click="back()">
         <img src="../../../assets/back.png" style="margin: 0px"/>
       </div>
+      <div @click="updateSpotCheck('合格')">
+        合格
+      </div>
+      <div @click="NoSpotCheck()">
+        不合格
+      </div>
     </div>
     <work-busy :is-busy="loading"></work-busy>
     <div class="container-fluid" style="overflow: scroll">
@@ -289,7 +295,9 @@ div {
                     </div>
                     <div class="col-md-4" style="text-align: center">
                       <label style="font-weight: normal"
-                             v-if="dev.type!='picture'">{{ getDeviceValue(config.checkname, dev.lname) ? getDeviceValue(config.checkname, dev.lname) : '无' }}</label>
+                             v-if="dev.type!='picture'">{{
+                          getDeviceValue(config.checkname, dev.lname) ? getDeviceValue(config.checkname, dev.lname) : '无'
+                        }}</label>
                       <label style="font-weight: normal" v-if="dev.type=='picture'">
                         <div v-show="getDevicePath(config.checkname,dev.lname)">
                           <button-link style="color: black" type="button" class="btn btn-link"
@@ -358,6 +366,22 @@ div {
       <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
     </footer>
   </modal>
+  <modal :show.sync="showSpotCheckButton" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      安检抽检
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <div class="row">
+          <textarea v-model="spotCheckMessage"></textarea>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success" @click='SpotCheckSuccess'>确认</button>
+      <button type="button" class="btn btn-success" @click='SpotCheckCancel'>取消</button>
+    </footer>
+  </modal>
 </template>
 
 <script>
@@ -463,25 +487,30 @@ export default {
         "燃气表": {
           "checkmust": true,
           "index": 1,
-          "items":{
+          "items": {
             //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
-            "气表表号":{"index":1,"type":"string","readonly":true},
-            "气表型号":{"index":2,"type":"string","readonly":true},
-            "气表品牌":{"index":3,"type":"string","readonly":true},
-            "气表类型":{"index":4,"type":"string","readonly":true},
-            "进气方向":{"index":5,"type":"selector","options":[{"data":"左表","isdefault":false},{"data":"右表","isdefault":false}],"checkmust": true},
-            "初始表底":{"index":6,"type":"number","isshow":false,"readonly":true},
-            "上期表读数":{"index":7,"type":"number","readonly":true,isshow:false},
-            "累购气量":{"index":8,"type":"number","readonly":true},
-            "累购金额":{"index":8,"type":"number","readonly":true},
-            "已用气量":{"index":9,"type":"number","checkmust": false},//基表数
-            "已用金额":{"index":9,"type":"number","checkmust": false},
-            "剩余气量":{"index":10,"type":"number","checkmust": false},//累购-已用
+            "气表表号": {"index": 1, "type": "string", "readonly": true},
+            "气表型号": {"index": 2, "type": "string", "readonly": true},
+            "气表品牌": {"index": 3, "type": "string", "readonly": true},
+            "气表类型": {"index": 4, "type": "string", "readonly": true},
+            "进气方向": {
+              "index": 5,
+              "type": "selector",
+              "options": [{"data": "左表", "isdefault": false}, {"data": "右表", "isdefault": false}],
+              "checkmust": true
+            },
+            "初始表底": {"index": 6, "type": "number", "isshow": false, "readonly": true},
+            "上期表读数": {"index": 7, "type": "number", "readonly": true, isshow: false},
+            "累购气量": {"index": 8, "type": "number", "readonly": true},
+            "累购金额": {"index": 8, "type": "number", "readonly": true},
+            "已用气量": {"index": 9, "type": "number", "checkmust": false},//基表数
+            "已用金额": {"index": 9, "type": "number", "checkmust": false},
+            "剩余气量": {"index": 10, "type": "number", "checkmust": false},//累购-已用
             //显示屏数  --实际剩余气量
-            "剩余金额":{"index":10,"type":"number","checkmust": false},
-            "气量异常差值":{"index":11,"type":"number","readonly": true},
-            "金额异常差值":{"index":11,"type":"number","readonly": true},
-            "表箱号":{"index":12,"type":"string","readonly": true}
+            "剩余金额": {"index": 10, "type": "number", "checkmust": false},
+            "气量异常差值": {"index": 11, "type": "number", "readonly": true},
+            "金额异常差值": {"index": 11, "type": "number", "readonly": true},
+            "表箱号": {"index": 12, "type": "string", "readonly": true}
           }
           // 注意，配置项的index必须与上面的固定配置保持'顺序'
         }
@@ -491,28 +520,35 @@ export default {
         "燃气表": {
           "checkmust": true,
           "index": 1,
-          "items":{
+          "items": {
             //"燃气表照片":{"index":1,"type":"picture","remark":"(拍摄清晰的表具编号、字轮数、剩余气量等)"},
-            "气表表号":{"index":1,"type":"string","readonly":true},
-            "气表型号":{"index":2,"type":"string","readonly":true},
-            "气表品牌":{"index":3,"type":"string","readonly":true},
-            "气表类型":{"index":4,"type":"string","readonly":true},
-            "进气方向":{"index":5,"type":"selector","options":[{"data":"左表","isdefault":false},{"data":"右表","isdefault":false}],"checkmust": true},
-            "初始表底":{"index":6,"type":"number","isshow":false,"readonly":true},
-            "上期表读数":{"index":7,"type":"number","readonly":true,isshow:false},
-            "累购气量":{"index":8,"type":"number","readonly":true},
-            "累购金额":{"index":8,"type":"number","readonly":true},
-            "已用气量":{"index":9,"type":"number","checkmust": false},//基表数
-            "已用金额":{"index":9,"type":"number","checkmust": false},
-            "剩余气量":{"index":10,"type":"number","checkmust": false},//累购-已用
+            "气表表号": {"index": 1, "type": "string", "readonly": true},
+            "气表型号": {"index": 2, "type": "string", "readonly": true},
+            "气表品牌": {"index": 3, "type": "string", "readonly": true},
+            "气表类型": {"index": 4, "type": "string", "readonly": true},
+            "进气方向": {
+              "index": 5,
+              "type": "selector",
+              "options": [{"data": "左表", "isdefault": false}, {"data": "右表", "isdefault": false}],
+              "checkmust": true
+            },
+            "初始表底": {"index": 6, "type": "number", "isshow": false, "readonly": true},
+            "上期表读数": {"index": 7, "type": "number", "readonly": true, isshow: false},
+            "累购气量": {"index": 8, "type": "number", "readonly": true},
+            "累购金额": {"index": 8, "type": "number", "readonly": true},
+            "已用气量": {"index": 9, "type": "number", "checkmust": false},//基表数
+            "已用金额": {"index": 9, "type": "number", "checkmust": false},
+            "剩余气量": {"index": 10, "type": "number", "checkmust": false},//累购-已用
             //显示屏数  --实际剩余气量
-            "剩余金额":{"index":10,"type":"number","checkmust": false},
-            "气量异常差值":{"index":11,"type":"number","readonly": true},
-            "金额异常差值":{"index":11,"type":"number","readonly": true},
-            "表箱号":{"index":12,"type":"string","readonly": true}
+            "剩余金额": {"index": 10, "type": "number", "checkmust": false},
+            "气量异常差值": {"index": 11, "type": "number", "readonly": true},
+            "金额异常差值": {"index": 11, "type": "number", "readonly": true},
+            "表箱号": {"index": 12, "type": "string", "readonly": true}
           }
         }
       },
+      showSpotCheckButton: false,
+      spotCheckMessage:''
     }
   },
   components: {
@@ -520,12 +556,12 @@ export default {
     Radio,
   },
   computed: {
-    isRecodrDownloadBtn(){
+    isRecodrDownloadBtn() {
       // 投诉单下派还是处理
       let res = this.$appdata.getSingleValue('无限制录音');
-      if (res == 'true'){
+      if (res == 'true') {
         return true;
-      }else {
+      } else {
         return false;
       }
     },
@@ -549,6 +585,32 @@ export default {
     }
   },
   methods: {
+    updateSpotCheck(value) {
+      var reqData = {
+        paperId:this.item.id,
+        userName: Vue.user.name,
+        spotCheckState: '已抽检',
+        spotCheckResult: value,
+        spotCheckMessage:this.spotCheckMessage
+      }
+      new HttpResetClass().load('POST', 'rs/logic/updateSpotCheck', reqData).then(res => {
+        if (res.data = 200) {
+          this.$showMessage('安检抽检完成')
+        }
+      })
+    },
+    NoSpotCheck() {
+      this.showSpotCheckButton = true
+    },
+    SpotCheckSuccess() {
+      this.updateSpotCheck('不合格')
+      this.spotCheckMessage = ''
+      this.showSpotCheckButton = false
+    },
+    SpotCheckCancel() {
+      this.spotCheckMessage = ''
+      this.showSpotCheckButton = false
+    },
     devicesCollect() {
       //tag
       //tag)
@@ -602,7 +664,7 @@ export default {
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
                 }
-              } else if (items.type === 'string' && items.f_is_defect  && items.f_item_value[0] ) {
+              } else if (items.type === 'string' && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
@@ -679,10 +741,10 @@ export default {
         if (Vue.config.safecheck.ApproveConfig.livedispose != undefined) {
           this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
         }
-        if(Vue.config.safecheck.ApproveConfig.hiddendanger != undefined) {
+        if (Vue.config.safecheck.ApproveConfig.hiddendanger != undefined) {
           if (parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger) >= 3) {
             this.hiddenDangerImgNumber = 3
-          }else {
+          } else {
             this.hiddenDangerImgNumber = parseInt(Vue.config.safecheck.ApproveConfig.hiddendanger)
           }
         }
@@ -749,9 +811,9 @@ export default {
                   this.showimg2 = this.devicesAll[i][j].f_items[k].f_second_path
                   this.otherDarginShowImgs = []
                   for (let l = 0; l < this.hiddenDangerImgNumber; l++) {
-                    let img = {path:''}
-                    if (this.devicesAll[i][j].f_items[k]['f_p' + (l+1)+'_path']) {
-                      img.path =  this.devicesAll[i][j].f_items[k]['f_p' + (l+1)+'_path'] + '?' + Math.random()
+                    let img = {path: ''}
+                    if (this.devicesAll[i][j].f_items[k]['f_p' + (l + 1) + '_path']) {
+                      img.path = this.devicesAll[i][j].f_items[k]['f_p' + (l + 1) + '_path'] + '?' + Math.random()
                       this.otherDarginShowImgs.push(img)
                     }
                   }
@@ -1225,14 +1287,14 @@ export default {
               //tag)
               if (this.data.f_check_type == '民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                if (typeof this.deviceconfig==='string'){
-                  this.deviceconfig=JSON.parse(this.deviceconfig)
+                if (typeof this.deviceconfig === 'string') {
+                  this.deviceconfig = JSON.parse(this.deviceconfig)
                 }
                 //tag)
               } else if (this.data.f_check_type == '非民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
-                if (typeof this.deviceconfig==='string'){
-                  this.deviceconfig=JSON.parse(this.deviceconfig)
+                if (typeof this.deviceconfig === 'string') {
+                  this.deviceconfig = JSON.parse(this.deviceconfig)
                 }
                 //tag)
               }

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,21 +183,21 @@
                         :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
@@ -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,7 @@
 <!--              <nobr>气表品牌</nobr>-->
 <!--            </th>-->
             <th>
-              <nobr>用户类型</nobr>
+              <nobr>用气类型</nobr>
             </th>
 <!--            <th>-->
 <!--              <nobr>壁挂炉</nobr>-->
@@ -583,13 +583,13 @@ 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_checker_name': '安检员',
         'f_residential_area': '小区名称',
         'f_address': '地址',
@@ -606,7 +606,7 @@ export default {
       orgstrs: [{label: '全部', value: ''}],
       checkersid: [],
       gasproperties:[],
-      userareas:[],
+      userareas:[{label: '全部', value: ''}, ...this.$appdata.getParam('开户网点')],
       SafeCheckXZ: '',
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
@@ -684,7 +684,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 +920,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 +1082,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/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})
-          }
+
 
           //   }
           // }