safecheck-client 3.0.33-8 → 3.0.33-81

package/src/filiale/rongchuang/pc.js

@@ -5,6 +5,7 @@ import Vue from "vue";
 let specialComp = {
   // 计划管理用户
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
 }
 exports.specialComp = specialComp

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

@@ -344,8 +344,8 @@
         },
         props:["selectplan","userlogin"],
         ready(){
-          this.$refs.paged.$refs.criteria.model.f_user_state='正常'
-          this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
+          // this.$refs.paged.$refs.criteria.model.f_user_state='正常'
+          // this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
           //this.$refs.paged.$refs.criteria.model.f_hasHousehold='未入户'
           this.setConList()
           this.loadpage()

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

@@ -103,14 +103,14 @@
       <label>请输入超期原因:</label><br/>
       <textarea style="width: 100%;" v-model="paper.f_exceed_reason"></textarea>
     </div>
-    <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__">
-      <div class="col-xs-6 col-sm-6">
-        <input type="checkbox" v-model="backlistisselect" :readonly="enabled"/><label class="text-left font" >限制该用户购气</label>
-      </div>
-      <div class="col-xs-6 col-sm-6">
-        <input type="checkbox" v-model="deletebacklistisselect" :readonly="deleteenabled"/><label class="text-left font" >取消该用户限制</label>
-      </div>
-    </div>
+<!--    <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__">-->
+<!--      <div class="col-xs-6 col-sm-6">-->
+<!--        <input type="checkbox" v-model="backlistisselect" :readonly="enabled"/><label class="text-left font" >限制该用户购气</label>-->
+<!--      </div>-->
+<!--      <div class="col-xs-6 col-sm-6">-->
+<!--        <input type="checkbox" v-model="deletebacklistisselect" :readonly="deleteenabled"/><label class="text-left font" >取消该用户限制</label>-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="form-group col-md-12 col-sm-12 col-xs-12" :class="style__" v-if="Vue.$appdata.getParam('安检天然气安全使用须知检查')=='是'">
       <div class="col-xs-12 col-sm-12">
         <input type="checkbox" v-model="paper.f_gas_guidelines" /><label class="text-left font" >天然气安全使用须知</label>

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

@@ -160,7 +160,7 @@
                             close-on-select
                             @change="changdeal" @click="transelation(idxs)"></v-select>
                 </div>
-                <div v-if="row.f_deal_dispose == '自行处理' || row.f_deal_dispose == '限时整改'" style="display: flex;flex-wrap: wrap">
+                <div v-if="(row.f_deal_dispose == '自行处理' || row.f_deal_dispose == '限时整改') && row.f_is_defect != '' " style="display: flex;flex-wrap: wrap">
                   <label class="fivelabel">处理时效:</label>
                   <!--                  <datepicker-->
                   <!--                    :value.sync="row.f_handle_date"-->

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,32 @@ export default {
     }
   },
   methods: {
+    quotaSave(type){
+      if (type == '取消'){
+        this.showModal3 = false
+        return
+      }
+      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 +1397,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 +1654,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) {