safecheck-client 3.0.34-47 → 3.0.34-49

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.34-47",
+  "version": "3.0.34-49",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",
@@ -103,13 +103,13 @@
     "sketch-vue3": "^1.0.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.3.2",
+    "system-clients": "3.2.86",
     "system-phone": "1.2.100",
     "telephone-clients": "1.1.27",
     "terser-webpack-plugin-legacy": "^1.2.5",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.25.8",
+    "vue-client": "1.24.117",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

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

@@ -133,6 +133,18 @@
                       v-model="model.f_check_end">
                     </datepicker>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">入户截止:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      :disabled-days-of-week="[]"
+                      style="width:60%;text-align: center"
+                      :format="'yyyy-MM-dd 23:59:59'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_ruhu_end"
+                      v-model="model.f_ruhu_end">
+                    </datepicker>
+                  </div>
 
                 </div>
               </div>
@@ -419,12 +431,15 @@ export default {
       this.excelUserCondtion=true
     },
     selfSearch (args) {
-      if(args.model.f_last_check_state.length > 0) {
+      if(args.model.f_last_check_state.length == 1 && args.model.f_last_check_state[0] == '入户' && args.model.f_ruhu_end) {
+        args.condition += `and DATEADD(YEAR, 2, CAST(ruhuend.f_offsite_time AS datetime)) < '${args.model.f_ruhu_end}'`
+      }
+      if(args.model.f_last_check_state.length > 0 && Util.isEmpty(args.model.f_ruhu_end) && (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end))) {
+        this.$showMessage("选择安检状态时，需要选择安检时间区间！")
+        return
+      }
+      if(args.model.f_last_check_state.length > 0 && Util.isEmpty(args.model.f_ruhu_end)) {
         let zzcon = ''
-        if (Util.isEmpty(args.model.f_check_start) || Util.isEmpty(args.model.f_check_end)) {
-          this.$showMessage("选择安检状态时，需要选择安检时间区间！")
-          return
-        }
         this.model.SafeCheckSX = ` f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         for (let i = 0; i < args.model.f_last_check_state.length; i++) {
           if (args.model.f_last_check_state[i] == '未检') {