safecheck-client 3.0.35-43 → 3.0.35-46

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.35-43",
+  "version": "3.0.35-46",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/android/PhoneotherInfo.vue

@@ -90,14 +90,6 @@
       }
     },
     watch: {
-      'user' (val) {
-        if(this.user){
-          if (!(this.user.isNuN)) {
-            this.model= []
-            this.getmodel()
-          }
-        }
-      },
       'f_userinfo_id'(){
         if(this.f_userinfo_id){
           this.model= []
@@ -106,12 +98,6 @@
       }
     },
     ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        this.getmodel()
-      }
-      if(this.f_userinfo_id){
-        this.getmodel()
-      }
     }
   }
 </script>

package/src/components/android/PhoneotherInfov3.vue

@@ -0,0 +1,118 @@
+<template >
+  <div class="panel panel-default auto repair-info-content">
+    <div class="panel-body">
+      <div class="panel panel-default well" v-for="row in model">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收费类型: {{row.f_brand_spec}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  品名规格: {{row.f_typename}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  单价: {{row.f_collection}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  数量: {{row.f_number}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收款: {{row.f_money}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  付款方式: {{row.f_payment}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  状态: {{row.f_state}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收费日期: {{row.f_operate_date}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  服务人员: {{row.f_operator}}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <p v-show="model.length == 0 && noExp ">此用户暂无其他收费记录</p>
+      <p v-show="model.length == 0 && !noExp ">{{expMsg}}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  import Vue from 'vue'
+  export default {
+    title: '查询其他收费记录',
+    data () {
+      return {
+        model: [],
+        show: false,
+        row: Object,
+        noExp: false,
+        expMsg: '查询中......'
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      f_userinfo_id:''
+    },
+    methods: {
+      getmodel () {
+        let userinfoid
+        if(this.f_userinfo_id){
+          userinfoid = this.f_userinfo_id
+        }else{
+          userinfoid = this.user.f_userinfoid
+          console.log(this.user.f_userinfo_id)
+        }
+        console.log(userinfoid)
+        this.noExp = false
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/otherChargeQuery`, {data: {
+            condition: ` f_orgid in ('${Vue.user.orgid}') and f_userinfo_id =  '${userinfoid}' and f_state = '有效'`,
+            orderitem: "f_operate_date desc"
+          }
+        }).then((row) => {
+          this.model = row.data
+          this.noExp = true
+        })
+      },
+      back(){
+
+      }
+    },
+    watch: {
+      'f_userinfo_id'(){
+        if(this.f_userinfo_id){
+          this.model= []
+          this.getmodel()
+        }
+      }
+    },
+    ready () {
+    }
+  }
+</script>
+<style>
+  .app-botton {
+    position:fixed;
+    background: #87b2dd;
+    color: #FFF;
+    padding: 8px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -10px;
+    height: 40px;
+  }
+</style>

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

@@ -231,6 +231,15 @@
                         close-on-select
                         condition="f_check_type = '{}'"></v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患等级</label>
+              <v-select :value.sync="model.f_defect_level" v-model='model.f_defect_level'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.defectlevels' placeholder='隐患等级'
+                        close-on-select
+              ></v-select>
+            </div>
           </div>
 
           <div v-show="$parent.$parent.$parent.showItem" class="row">
@@ -436,7 +445,15 @@
                 style="width:60%">
               </datepicker>
             </div>
-
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患等级</label>
+              <v-select :value.sync="model.f_defect_level" v-model='model.f_defect_level'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.defectlevels' placeholder='隐患等级'
+                        close-on-select
+              ></v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -648,6 +665,7 @@ export default {
     model.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"
     return {
       checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
+      defectlevels: [{label: '全部', value: ''},{label: '一级隐患', value: 'f_fist_count'}, {label: '二级隐患', value: 'f_second_count '}, {label: '三级隐患', value: 'f_third_count'}],
       quyus: [{label: '请选择', value: ''}, ...this.$appdata.getParam('区域')],
       bumens: [{label: '请选择', value: ''}],
       teams: [{label: '请选择', value: ''}],
@@ -1127,6 +1145,9 @@ export default {
       if (this.f_check_plan.f_plan_name) {
         args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
       }
+      if (args.model.f_defect_level){
+        args.condition += ` and ${args.model.f_defect_level} > 0 `
+      }
       this.checkes = []
       this.checkAll = false
       this.model.search(args.condition, args.model)