safecheck-client 3.0.34-2 → 3.0.34-21

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

@@ -147,6 +147,15 @@
                          type="text">
                 </div>
               </div>
+              <div v-if="item.f_deal_dispose == '自行处理' || item.f_deal_dispose == '限时整改'" class="form-group" style="display: flex;flex-wrap: wrap">
+                <label class="fivelabel">是否拉黑</label>
+                  <v-select :options="lives"
+                            :value.sync="item.f_is_black"
+                            v-model="item.f_is_black"
+                            :value-single="true"
+                            clear-button
+                            close-on-select></v-select>
+              </div>
             </div>
           </div>
         </div>
@@ -197,6 +206,7 @@ export default {
         value: '报修'
       }, {label: '限时整改', value: '限时整改'}, {label: '跟踪处置', value: '跟踪处置'}],
       showModal3:false,
+      lives: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       data: {
         f_devices: [],
         f_defect_content: '',
@@ -1082,7 +1092,7 @@ export default {
         let msg = ''
         for (let a = 0; a < checkResults.data.length; a++) {
           for (let datumKey in checkResults.data[a]) {
-            msg += datumKey + ':' + checkResults.data[a][datumKey] + ';'
+            msg += datumKey + ','
           }
         }
         this.data.f_defect_text = msg

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

@@ -175,6 +175,18 @@
                         :multiple="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">是否限购</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :options='$parent.$parent.isOrNo'
+                        v-model='model.f_is_black'
+                        :value.sync="model.f_is_black"
+                        placeholder='是否限购'
+                        condition="f_is_black = '{}'"
+                        :multiple="false">
+              </v-select>
+            </div>
           </div>
           <div class="row" v-show="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style">
@@ -329,6 +341,18 @@
                         placeholder='隐患类型'
                         :multiple="true">
               </v-select>
+            </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">是否限购</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :options='$parent.$parent.isOrNo'
+                        v-model='model.f_is_black'
+                        :value.sync="model.f_is_black"
+                        placeholder='是否限购'
+                        condition="f_is_black = '{}'"
+                        :multiple="false">
+              </v-select>
             </div>
              <div :class="$parent.$parent.style">
                           <label class="font_normal_body">维&ensp;修&ensp;员</label>
@@ -371,6 +395,7 @@
             <th><nobr>完成情况</nobr></th>
             <th><nobr>维修情况</nobr></th>
             <th><nobr>维修员</nobr></th>
+            <th><nobr>限购状态</nobr></th>
             <th><nobr>隐患明细</nobr></th>
           </tr>
         </template>
@@ -392,6 +417,7 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_is_repair}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_repaired}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_repairman}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_is_black}}</td>
           <td style="text-align: center;white-space:nowrap;">{{ $parent.$parent.$parent.trouble(row.f_defect_content)}}</td>
         </template>
       </data-grid>
@@ -522,7 +548,9 @@ export default {
       checker_name:'',
       defectType:[],
       defectLeave:'',
+      is_black:'',
       defectLeaveList:[{label:'全部',value:''},{label:'重大',value:'重大'},{label:'一般',value:'一般'}],
+      isOrNo:[{label:'全部',value:''},{label:'是',value:'是'},{label:'否',value:'否'}],
       repaired:[{label: '全部', value: ''},{label: '未完成', value: '未完成'}, {label: '已完成', value: '已完成'}],
       deals:[{label: '全部', value: ''},{label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'}],
       f: this.$login.f,
@@ -990,6 +1018,9 @@ export default {
           }
         }
         args.condition += ` )`
+      }
+      if (this.is_black){
+
       }
       this.model.search(args.condition, args.model)
       console.log('zzz',args.condition)

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

@@ -1375,8 +1375,10 @@ export default {
         if(HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
+          if (!this.data.f_onsite_time){
+            HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
+          }
           //tag
-          HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
           HostApp.__this__.tick()
         }
       }
@@ -2235,3 +2237,4 @@ export default {
   padding: 13px 16px;
 }
 </style>
+

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

@@ -240,9 +240,6 @@ export default {
         }
       }
     }
-    for (let i in this.userinfo) {
-      //tag + '：' + JSON.stringify(this.userinfo[i]))
-    }
     this.safecheckStateReady()
   },
   methods: {
@@ -409,7 +406,9 @@ export default {
     start() {
       this.$parent.$parent.isStrat = true
       this.$set('action', !this.action)
-      this.$set('f_onsite_time', Util.toStandardTimeString())
+      if (!this.f_onsite_time){
+        this.$set('f_onsite_time', Util.toStandardTimeString())
+      }
     },
     safecheckStateReady() {
       //tag
@@ -441,7 +440,9 @@ export default {
       //tag
       if (this.f_onsite_time) {
         this.$parent.$parent.isStrat = true
-        this.$parent.$parent.data.f_onsite_time = Util.toStandardTimeString()
+        if (!this.$parent.$parent.data.f_onsite_time){
+          this.$parent.$parent.data.f_onsite_time = this.f_onsite_time
+        }
       }
       if (this.$parent.$parent.role == 'repair') {
         this.$set('style__', 'divmask')

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

@@ -662,15 +662,7 @@
           {label: '未检', value: '未检'},
           {label: '已检', value: '已检'},
         ],
-        last_check_states: [
-          {label: '请选择', value: ''},
-          {label: '入户', value: '入户'},
-          {label: '拒检', value: '拒检'},
-          {label: '到访不遇', value: '到访不遇'},
-          {label: '拆除', value: '拆除'},
-          {label: '停用', value: '停用'},
-          {label: '未通气', value: '未通气'}
-        ],
+        last_check_states: Vue.$appdata.getParam('安检状态'),
         upload_states: [
           {label: '请选择上传状态', value: ''},
           {label: '未传', value: '未传'},
@@ -1009,8 +1001,13 @@
           condition += ` and (ti.f_user_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_zuhu_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_rent_phone like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%' or f_user_phone2 like '%${this.$refs.paged.$refs.cri.model.f_user_phone}%')`
         }
 
-        if(this.$refs.paged.$refs.cri.model.f_last_check_state !=''){
-          condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_check_state+"'"
+        if(this.$refs.paged.$refs.cri.model.f_last_check_state.length > 0){
+          let last_check_state = ''
+          this.$refs.paged.$refs.cri.model.f_last_check_state.forEach((item) => {
+            last_check_state = last_check_state + `'${item}',`
+          })
+          last_check_state = last_check_state.slice(0, -1)
+          condition += " and ti.f_last_check_state in ("+last_check_state+")"
         }
         if(this.$refs.paged.$refs.cri.model.userinfo){
           condition += ` and (f_userinfo_code like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_name like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_meter_no like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_address like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_zuhu_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_rent_phone like '%${this.$refs.paged.$refs.cri.model.userinfo}%' or f_user_phone2 like '%${this.$refs.paged.$refs.cri.model.userinfo}%')`

package/src/filiale/yangchunboneng/android/DailyworkloadQuery.vue

@@ -302,15 +302,7 @@ export default {
         {label: '左表', value: '左表'},
         {label: '右表', value: '右表'}
       ],
-      check_states: [
-        {label: '请选择安检状态', value: ''},
-        {label: '入户', value: '入户'},
-        {label: '到访不遇', value: '到访不遇'},
-        {label: '拒检', value: '拒检'},
-        {label: '停用', value: '停用'},
-        {label: '未通气', value: '未通气'},
-        {label: '拆除', value: '拆除'}
-      ],
+      check_states: Vue.$appdata.getParam('安检状态'),
       last_check_states: [
         {label: '请选择上次安检状态', value: ''},
         {label: '入户', value: '入户'},
@@ -436,10 +428,13 @@ export default {
           condition += " and f_offsite_time < '"+this.$refs.paged.$refs.cri.model.f_end_date +"'"
         }
       }
-      if(this.$refs.paged.$refs.cri.model.f_state){
-        if(this.$refs.paged.$refs.cri.model.f_state.toString().trim()){
-          condition += " and f_entry_status = '"+this.$refs.paged.$refs.cri.model.f_state +"'"
-        }
+      if(this.$refs.paged.$refs.cri.model.f_state.length > 0){
+        let last_check_state = ''
+        this.$refs.paged.$refs.cri.model.f_state.forEach((item) => {
+          last_check_state = last_check_state + `'${item}',`
+        })
+        last_check_state = last_check_state.slice(0, -1)
+        condition += " and f_entry_status in ("+last_check_state+")"
       }
       if(this.$refs.paged.$refs.cri.model.f_user_type){
         if(this.$refs.paged.$refs.cri.model.f_user_type.toString().trim()){