safecheck-client 3.0.34-6 → 3.0.34-61

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

@@ -1,63 +1,63 @@
-<template>
-  <div id="unit" class="flex-row" :class="{'binary':showItem}">
-    <div :class="{'basic-main':!showItem,'binary-left':showItem}">
-      <defect-paper-new @select-changed="selected" :style="style" :style2="style2" v-ref:check></defect-paper-new>
-    </div>
-    <div class="binary-right" v-show="showItem">
-      <div class="flex">
-        <defect-list-new v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'
-                     v-ref:detail></defect-list-new>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import DefectPaperNew from './DefectPaperNew'
-import DefectListNew from './DefectListNew'
-
-export default {
-  title: '隐患查看',
-  props: ['f'],
-  components: {DefectPaperNew, DefectListNew},
-  data() {
-    return {
-      showItem: false,
-      style: 'col-sm-2 form-group',
-      style2: 'col-sm-4 form-group'
-    }
-  },
-  methods: {
-    selected(row) {
-      this.showItem = true
-    }
-  },
-  watch: {
-    'showItem'(val) {
-      //tag
-      //tag
-      if (val) {
-        this.style = 'col-sm-3 form-group'
-        this.style2 = 'col-sm-6 form-group'
-      } else {
-        this.style = 'col-sm-2 form-group'
-        this.style2 = 'col-sm-4 form-group'
-      }
-    }
-  }
-}
-</script>
-<style>
-.form-input-group label {
-  text-align: right;
-  width: auto;
-}
-
-.datapanel {
-  color: #333;
-  background-color: white;
-  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
-  padding: 5px 7px 5px 7px;
-  border-radius: 10px;
-}
-</style>
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+    <div :class="{'basic-main':!showItem,'binary-left':showItem}">
+      <defect-paper-new @select-changed="selected" :style="style" :style2="style2" v-ref:check></defect-paper-new>
+    </div>
+    <div class="binary-right" v-show="showItem">
+      <div class="flex">
+        <defect-list-new v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'
+                     v-ref:detail></defect-list-new>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import DefectPaperNew from './DefectPaperNew'
+import DefectListNew from './DefectListNew'
+
+export default {
+  title: '隐患查看',
+  props: ['f'],
+  components: {DefectPaperNew, DefectListNew},
+  data() {
+    return {
+      showItem: false,
+      style: 'col-sm-2 form-group',
+      style2: 'col-sm-4 form-group'
+    }
+  },
+  methods: {
+    selected(row) {
+      this.showItem = true
+    }
+  },
+  watch: {
+    'showItem'(val) {
+      //tag
+      //tag
+      if (val) {
+        this.style = 'col-sm-3 form-group'
+        this.style2 = 'col-sm-6 form-group'
+      } else {
+        this.style = 'col-sm-2 form-group'
+        this.style2 = 'col-sm-4 form-group'
+      }
+    }
+  }
+}
+</script>
+<style>
+.form-input-group label {
+  text-align: right;
+  width: auto;
+}
+
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+  padding: 5px 7px 5px 7px;
+  border-radius: 10px;
+}
+</style>

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)