safecheck-client 3.0.34-3 → 3.0.34-30

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)