safecheck-client 3.0.32-6 → 3.0.32-8

package/package.json

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

package/src/filiale/dexin/android/WebMeterOpen.vue

@@ -330,14 +330,14 @@ export default {
   width: 35px;
   height: 35px;
   background-size: 100%;
-  background-image: url("./../../../../static/stretch_top.png")
+  background-image: url("../../../../static/stretch_top.png")
 }
 
 .button_shrink_bottom {
   width: 35px;
   height: 35px;
   background-size: 100%;
-  background-image: url("./../../../../static/stretch_bottom.png")
+  background-image: url("../../../../static/stretch_bottom.png")
 }
 
 .sort-caret {

package/src/filiale/dexin/android/WebMeterOpenEdit.vue

@@ -2,7 +2,7 @@
   <div class="auto clearfix">
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
       <div class="col-xs-4 col-sm-4 col-md-4">
-        <img src="../../assets/户编号.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <img src="../../../assets/户编号.png" style="width: 20px;margin-bottom: 5px" alt="">
         <span class="text-left font">客户编号</span>
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">
@@ -11,7 +11,7 @@
     </div>
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
       <div class="col-xs-4 col-sm-4 col-md-4">
-        <img src="../../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <img src="../../../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
         <span class="text-left font">客户姓名</span>
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">
@@ -20,7 +20,7 @@
     </div>
     <div class="row app-row col-xs-12 col-sm-12 col-md-12">
       <div class="col-xs-4 col-sm-2 col-md-2">
-        <img src="../../assets/地址.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <img src="../../../assets/地址.png" style="width: 20px;margin-bottom: 5px" alt="">
         <span class="text-left font">客户地址</span>
       </div>
       <div class="col-xs-8 col-sm-10 col-md-10">
@@ -29,7 +29,7 @@
     </div>
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
       <div class="col-xs-4 col-sm-4 col-md-4">
-        <img src="../../assets/表类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <img src="../../../assets/表类型.png" style="width: 20px;margin-bottom: 5px" alt="">
         <span class="text-left font">气表类型</span>
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">
@@ -38,7 +38,7 @@
     </div>
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
       <div class="col-xs-4 col-sm-4 col-md-4">
-        <img src="../../assets/表类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <img src="../../../assets/表类型.png" style="width: 20px;margin-bottom: 5px" alt="">
         <span class="text-left font">气表品牌</span>
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">
@@ -47,7 +47,7 @@
     </div>
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
       <div class="col-xs-4 col-sm-4 col-md-4">
-        <img src="../../assets/表号.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <img src="../../../assets/表号.png" style="width: 20px;margin-bottom: 5px" alt="">
         <span class="text-left font">表号</span>
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">
@@ -57,7 +57,7 @@
 
     <div class="row app-row col-xs-12 col-sm-6 col-md-6">
       <div class="col-xs-4 col-sm-4 col-md-4">
-        <img src="../../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+        <img src="../../../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
         <span class="text-left font">通气人</span>
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">
@@ -66,7 +66,7 @@
     </div>
     <div class="row app-row col-xs-12">
       <div class="col-xs-4 col-sm-4 col-md-4">
-        <img src="../../assets/底数.png" style="width: 20px;" alt="">
+        <img src="../../../assets/底数.png" style="width: 20px;" alt="">
         <span class="text-left font">备注</span>
       </div>
       <div class="col-xs-8 col-sm-8 col-md-8">

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

@@ -211,7 +211,19 @@
                           :value-single="true">
                 </v-select>
               </div>
-
+              <div class="form-group col-sm-2"  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'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_gasproperties = '{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
 
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal>
@@ -286,6 +298,9 @@
               <th>
                 <nobr>接收人</nobr>
               </th>
+              <th>
+                <nobr>用气性质</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -307,6 +322,7 @@
             <td style="text-align: center">{{row.f_service_id}}</td>
             <td style="text-align: center">{{row.f_handlingtype}}</td>
             <td style="text-align: center">{{row.f_order_man}}</td>
+            <td style="text-align: center">{{row.f_gasproperties}}</td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -464,6 +480,7 @@
           'f_deal_dispose': '处理方式',
           'f_is_repaired': '隐患状态',
           'f_repairman':'处理人',
+          'f_gasproperties':'用气性质',
           'f_repair_date':'处理时间'
         },
         fun: this.$login.f,
@@ -483,6 +500,10 @@
         sliceArea: [],
         cbc:[],
         DefectConfig:'' ,
+        gasproperties:this.$appdata.getParam('用气性质') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用气性质')] : [{label: '全部', value: ''}],
         DefectConfigs:[{label:'全部',value:''},{label: '金额异常差值', value: '金额异常差值'},{label: '气量异常差值', value: '气量异常差值'}],
         device_types:[{label:'全部',value:''}],
         f_check_type:[{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],