safecheck-client 4.0.0-81 → 4.0.0-83

package/src/filiale/meihekou/android/AreaPlan.vue

@@ -340,7 +340,9 @@
                 </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_last_check_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font"  v-if="row.f_last_check_state=='入户'" style="color: orange">{{ row.f_last_check_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font"  v-if="row.f_last_check_state=='拒检'" style="color:red">{{ row.f_last_check_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font"  v-if="row.f_last_check_state=='到访不遇'" style="color:lightpink">{{ row.f_last_check_state }}</p>
                 </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font"><b>上传状态:</b></p>

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

@@ -317,7 +317,9 @@
                 <!--                </div>-->
                 <div class="row">
                   <p class="panel-title col-xs-4 text-left font"><b>上次安检状态:</b></p>
-                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_last_check_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font"  v-if="row.f_last_check_state=='入户'" style="color: orange">{{ row.f_last_check_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font"  v-if="row.f_last_check_state=='拒检'" style="color:red">{{ row.f_last_check_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font"  v-if="row.f_last_check_state=='到访不遇'" style="color:lightpink">{{ row.f_last_check_state }}</p>
                 </div>
                 <div class="col-xs-6">
                   <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>

package/src/filiale/meihekou/android/PhoneUpUserinfo.vue

@@ -29,6 +29,10 @@
           <label class="righttxt">用户电话:</label><input type="text" class="form-control rightipt"
                                                           v-model="userinfo.baseinfo.base.f_user_phone"/>
         </div>
+        <div class="row auto" style="margin: 5px 0">
+          <label class="righttxt">备用电话:</label><input type="text" class="form-control rightipt"
+                                                          v-model="userinfo.baseinfo.base.f_rent_phone"/>
+        </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">租户姓名:</label><input type="text" class="form-control rightipt"
                                                           v-model="userinfo.baseinfo.base.f_rent_name"/>
@@ -371,6 +375,26 @@
                       :options="buy_types"
                       close-on-select value-single></v-select>
           </div>
+          <div class="row auto" style="margin: 5px 0">
+            <label class="righttxt">安装方式:</label>
+            <v-select class="rightipt" :value.sync="row.f_install_type"
+                      v-model="row.f_install_type"
+                      placeholder='请选择'
+                      :width='wid'
+                      readonly
+                      :options="installType"
+                      close-on-select value-single></v-select>
+          </div>
+          <div class="row auto" style="margin: 5px 0">
+            <label class="righttxt">年检时间:</label>
+            <datepicker class="rightipt"
+                        :value.sync="row.f_nianjian"
+                        v-model="row.f_nianjian"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd'"
+                        :show-reset-button="reset"  readonly="readonly">
+            </datepicker>
+          </div>
           <div style="display: flex;justify-content: center;margin-bottom: 3px"
                v-if="$index>this.userinfo_old.devicesinfo.length-1 || this.userinfo_old.devicesinfo.length==0">
             <button class="btn btn-warning" @click="delDevices($index)">删除设备</button>
@@ -413,6 +437,7 @@ export default {
       cityTypes: [{label: '市区', value: '市区'}, {label: '城镇', value: '城镇'}],
       buy_types: [{label: '本公司购买', value: '本公司购买'}, {label: '非本公司购买', value: '非本公司购买'}],
       bqf_states: [{label: '开阀', value: '开阀'}, {label: '关阀', value: '关阀'}],
+      installType: [{label: '本公司安装', value: '本公司安装'}, {label: '非本公司安装', value: '非本公司安装'}],
       pcds: [],
       streets: [],
       update: false,
@@ -642,6 +667,7 @@ export default {
           let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
           // userinfoms.f_user_name=row.f_user_name
           userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+          userinfoms.f_rent_phone=this.userinfo.baseinfo.base.f_rent_phone
           userinfoms.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
           userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
           userinfoms.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
@@ -716,6 +742,7 @@ export default {
           let userinfoms = Object.assign({}, this.userinfo_old.baseinfo.base)
           //userinfoms.f_user_name=row.f_user_name
           userinfoms.f_user_phone = this.userinfo.baseinfo.base.f_user_phone
+          userinfoms.f_rent_phone=this.userinfo.baseinfo.base.f_rent_phone
           userinfoms.f_idnumber = this.userinfo.baseinfo.base.f_idnumber
           userinfoms.f_rent_name = this.userinfo.baseinfo.base.f_rent_name
           userinfoms.f_zuhu_phone = this.userinfo.baseinfo.base.f_zuhu_phone
@@ -978,7 +1005,10 @@ export default {
         "f_brand": null,
         "f_devices_model": null,
         "f_devices_no": null,
-        "img": {"content": null, "filename": null}
+        "img": {"content": null, "filename": null},
+        "f_install_type": null,
+        "f_nianjian": null,
+
       }
       this.model.push(obj)
     },

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

@@ -266,7 +266,7 @@ export default {
             "基表编号":{"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":4,"type":"string","readonly":true},
             "初始表底":{"index":5,"type":"number","isshow":false,"readonly":true},
             "上期表读数":{"index":6,"type":"number","readonly":true,isshow:false},
             "累购气量":{"index":7,"type":"number","readonly":true},
@@ -1406,6 +1406,8 @@ export default {
                   })
                 }
               })
+            }{
+              this.$dispatch('tijiao')
             }
           }
         }else if(res.code == 309){
@@ -1717,7 +1719,7 @@ export default {
                       f_defect_level: null,
                       f_device_id: "",
                       f_is_defect: "",
-                      f_item_name: "进气方向",
+                      f_item_name: "表向",
                       f_item_value: this.item.f_plan_meters[i].f_flow_direction,
                       f_path: "",
                       type: "string"
@@ -1778,7 +1780,7 @@ export default {
                       f_defect_level: null,
                       f_device_id: "",
                       f_is_defect: "",
-                      f_item_name: "进气方向",
+                      f_item_name: "表向",
                       f_item_value: this.item.f_plan_meters[i].f_flow_direction,
                       f_path: "",
                       type: "string"

package/src/filiale/meihekou/android/SafecheckUserInfo.vue

@@ -198,10 +198,10 @@
           </div>
           <div class="row">
             <p class="panel-title col-xs-4 text-left font">上次安检状态</p>
-            <p class="panel-title col-xs-8 text-left input-font"
-               v-if="last_check_date != null && last_check_date != ''">{{ last_check_state }}</p>
-            <p class="panel-title col-xs-8 text-left input-font"
-               v-if="last_check_date == null || last_check_date == ''">未安检</p>
+            <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date != null && last_check_date != '' && last_check_state=='入户'" style="color: orange">{{ last_check_state }}</p>
+            <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date != null && last_check_date != '' && last_check_state=='拒检'" style="color:red">{{ last_check_state }}</p>
+            <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date != null && last_check_date != '' && last_check_state=='到访不遇'" style="color:lightpink">{{ last_check_state }}</p>
+            <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date == null || last_check_date == ''">未安检</p>
           </div>
           <div class="row" v-if="last_check_date != null && last_check_date != ''">
             <p class="panel-title col-xs-4 text-left font">上次安检结果</p>