safecheck-client 3.0.33-3 → 3.0.33-31

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

@@ -115,6 +115,47 @@
         <button type="button" name="button" class="col-sm-3 btn btn-primary" @click="cancel1">取消</button>
       </div>
     </modal>
+    <modal :show.sync="showModal3" :backdrop="false" style="font-size: 15px">
+      <div slot="modal-header" class="modal-header upuserinfo_sel">
+        <h4 class="modal-title">
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div class="row" v-for="row in rowCodata.f_devices">
+          <div class="row" v-for="(idxs,item) in row.f_items">
+            <div v-if="item.f_is_defect" style="padding: 5px;border: 1px solid black;border-radius: 10px;margin-top: 10px">
+              <div
+                class="form-group"
+                style="display: flex;flex-wrap: wrap">
+                <label class="fivelabel">{{item.f_item_name}}:{{item.f_item_lists[0].f_item_value}}</label>
+              </div>
+              <div
+                class="form-group"
+                style="display: flex;flex-wrap: wrap">
+                <label class="fivelabel">处理方式</label>
+                <v-select :options="deals"
+                          :value.sync="item.f_deal_dispose"
+                          v-model="item.f_deal_dispose"
+                          :value-single="true"
+                          clear-button
+                          close-on-select></v-select>
+              </div>
+              <div v-if="item.f_deal_dispose == '自行处理' || item.f_deal_dispose == '限时整改'" style="display: flex;flex-wrap: wrap">
+                <label class="fivelabel">处理时效</label>
+                <div class="form-group" style="float: left;width:60%">
+                  <input v-model="item.f_lose_efficacy" class="form-control" maxlength="100" placeholder="单位:天" :value.sync="item.f_lose_efficacy"
+                         type="text">
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button type="button" name="button" class="col-sm-3 btn btn-primary" style="float: left" @click="quotaSave('即时生效')">即时限购上传</button>
+        <button type="button" name="button" class="col-sm-3 btn btn-primary" style="float: right" @click="quotaSave('延期生效')">延期限购上传</button>
+      </div>
+    </modal>
   </div>
 </template>
 
@@ -151,6 +192,11 @@ export default {
       //   "f_user_equipment_remarks":null,"f_plan_id":"0819ea6707ad4d9dad217c06a87f4227","f_user_name":"用户二",
       //   "f_plan_meters":[{"f_weizhi":null,"f_flow_direction":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2119035714","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":3,"f_maker":null,"f_metergasnums":0,"f_total_fee":100,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663},{"f_weizhi":null,"f_flow_direction":"右表","f_metertitles":"","f_prior_reading":0,"f_meter_no":"2118999901","f_collection_type":"按金额","f_aliasname":"先锋系统结算物联网表","f_meter_type":"物联网表","version":1,"f_maker":null,"f_metergasnums":0,"f_total_fee":0,"f_diaphgram_size":"G2.5","f_total_gas":0,"id":18663}]
       // },
+      deals: [{label: '现场整改', value: '现场整改'}, {label: '自行处理', value: '自行处理'}, {
+        label: '报修',
+        value: '报修'
+      }, {label: '限时整改', value: '限时整改'}, {label: '跟踪处置', value: '跟踪处置'}],
+      showModal3:false,
       data: {
         f_devices: [],
         f_defect_content: '',
@@ -313,6 +359,7 @@ export default {
       faultshow: {
         number: 8
       },     // 控制 故障汇总 在 菜单里显示与否,
+      selectindex: null,
       deletebacklist_status: true
     }
   },
@@ -324,6 +371,28 @@ export default {
     }
   },
   methods: {
+    quotaSave(type){
+      this.saveNoclick()
+      this.rowCodata.f_immediately_black = type
+      let param = {
+        f_qlchazhi: this.f_qlchazhi,
+        f_check_item_id: this.data.f_check_item_id,
+        f_checker_id: this.data.f_checker_id,
+        row: this.rowCodata
+      }
+      this.showModal3 = false
+      let paramStr = JSON.stringify(param)
+      let subLength = 800
+      for (let i = 0; i < paramStr.length; i += subLength) {
+        HostApp.param_cache(paramStr.substr(i, subLength))
+      }
+      HostApp.__this__ = this
+      HostApp.syncLogic({
+        'logic': '上传安检信息',
+        'callback': 'javascript:HostApp.__this__.uploadCallBack()',
+        'backresult': 1
+      })
+    },
     showmod() {
       this.saveNoclick()
       let errString = this.errorVerify()
@@ -1324,7 +1393,6 @@ export default {
         }
       }
 
-
       if (Vue.android) {
         if (this.item.f_no_checkplan == '无计划安检' && this.item.f_no_checkplan != '打回') {
           if(this.data.f_safecheck_type=='复检') {
@@ -1582,31 +1650,8 @@ export default {
             if(this.data.f_safecheck_type=='复检') {
               codata.f_is_fujian = '已复检'
             }
-            let param = {
-              f_qlchazhi: this.f_qlchazhi,
-              f_check_item_id: this.data.f_check_item_id,
-              f_checker_id: this.data.f_checker_id,
-              // row: codata
-              row: this.rowCodata
-            }
-            //tag)
-            let paramStr = JSON.stringify(param)
-            // 多长截断一次
-            let subLength = 800
-            for (let i = 0; i < paramStr.length; i += subLength) {
-              HostApp.param_cache(paramStr.substr(i, subLength))
-            }
-            HostApp.__this__ = this
-            HostApp.syncLogic({
-              // logic别名，key必须为logic
-              'logic': '上传安检信息',
-              // 回调执行方法名，key必须为callback
-              'callback': 'javascript:HostApp.__this__.uploadCallBack()',
-              // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
-              // 执行回调方法传入key为backresult
-              // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
-              'backresult': 1
-            })
+            this.showModal3 = true
+            $("#savebut").removeClass("noclickbut");
           } else {
             this.$showMessage('保存成功！')
             if (this.clickBack) {

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

@@ -689,6 +689,8 @@ export default {
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
     this.getAllGasproperties()
+    this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
     // this.getAllOutlets()
   },
   methods: {

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

@@ -564,7 +564,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 {
       repaired: [{label: '全部', value: ''}, {label: '未完成', value: '未完成'}, {label: '已完成', value: '已完成'}],
-      deals: [{label: '全部', value: ''}, {label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'},{label: '处理中', value: '处理中'}],
+      deals: [{label: '全部', value: ''}, {label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'}],
       hasDefectOptions: [{label: '全部', value: ''}, {label: '有隐患', value: '有隐患'}, {
         label: '无隐患',
         value: '无隐患'

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

@@ -246,8 +246,8 @@
                     >
                     </v-select>
                   </div>
-                  <!--<div class="form-group col-sm-4" >
-                    <label class="font_normal_body">入户情况:</label>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检筛选:</label>
                     <v-select
                       class="select select_list"
                       :value.sync="model.f_hasHousehold"
@@ -259,7 +259,7 @@
                       value-single
                     >
                     </v-select>
-                  </div>-->
+                  </div>
 
                 </div>
               </div>
@@ -358,7 +358,7 @@
             gasproperties:[],//用气性质
             meter_classifys:[],//气表类型
             entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
-            hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
+            hasHousehold:[{label:"全部",value:""},{label:"入户",value:"入户"},{label:"未入户",value:"未入户"}],
             yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
             sliceArea:[],
             meterbooks:[],
@@ -399,11 +399,11 @@
           selfSearch (args) {
             //tag)
             args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
-            /*if(args.model.f_hasHousehold=='已入户'){
-              args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
+            if(args.model.f_hasHousehold=='入户'){
+              args.condition +=` and ua.F_LAST_CHECK_STATE='入户'`
             }else if(args.model.f_hasHousehold=='未入户'){
-              args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
-            }*/
+              args.condition +=` and (ua.F_LAST_CHECK_STATE !='入户' or ua.F_LAST_CHECK_STATE is null)`
+            }
             if(this.uploadCodeCondition){
               args.condition +=` and ${this.uploadCodeCondition}`
             }

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

@@ -63,7 +63,7 @@
           <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_ht_date }}</p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
-          <p class="panel-title col-xs-5 text-left font" style="width: 36%;float: left"><b>上期保费截至日期:</b></p>
+          <p class="panel-title col-xs-5 text-left font" style="width: 36%;float: left"><b>保费截至日期:</b></p>
           <p class="panel-title text-left input-font" style="width: 100%">{{ userinfo.f_ins_stop_date }}</p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">