lcw

2026-01-20 17:06:37 +08:00
parent 10853312f2
commit 96283c3a0e
35 changed files with 4306 additions and 419 deletions
--- a/src/components/ChooseList/ChooseZdr/addPeo.vue
+++ b/src/components/ChooseList/ChooseZdr/addPeo.vue
@ -33,9 +33,9 @@ const chooseMarksVisible = ref(false)
 const emit = defineEmits(['change'])
 const listQuery = ref({})
 const formData = ref([
+      { label: "身份证号", prop: "rySfzh", type: "input" ,width:'45%'},
    { label: "人员姓名", prop: "ryXm", type: "input" ,width:'45%'},
    { label: "性别", prop: "ryXb", type: "select" ,width:'45%',options:D_BZ_XB},
-    { label: "身份证号", prop: "rySfzh", type: "input" ,width:'45%'},
    { label: "手机号码", prop: "ryLxdh", type: "input",width:'45%' },
  { label: "户籍地址", prop: "hjdXz", type: "input", width: '100%' },
  { label: "户籍地派出所", prop: "hjdpcsdm", depMc: 'hjdpcs', type: "department", width: '48%' },
@ -49,11 +49,13 @@ const formData = ref([
 ])
 const rules = reactive({
  // fjZp: [{ required: true, message: "请上传人员照片", trigger: "blur" }],
-    ryXm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
-    rySfzh: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
-  ryXb: [{ required: true, message: "请选择性别", trigger: "change" }],
-  yjdj: [{ required: true, message: "请选择预警等级", trigger: "change" }],
-  ssbmdm:[{ required: true, message: "请选择所属部门", trigger: "change" }]
+  rySfzh: [{ required: true, message: "请输入身份证号", trigger: "blur" }],
+    fjZp: [{ required: true, message: "人员照片", trigger: "blur" }],
+    // ryXm: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+
+  // ryXb: [{ required: true, message: "请选择性别", trigger: "change" }],
+  // yjdj: [{ required: true, message: "请选择预警等级", trigger: "change" }],
+  // ssbmdm:[{ required: true, message: "请选择所属部门", trigger: "change" }]
    // ryLxdh: [{ required: true, message: "请输入手机号码", trigger: "blur" }],
    // hjdXz: [{ required: true, message: "请输入户籍地", trigger: "blur" }],
    // xzdXz: [{ required: true, message: "请输入现居住地址", trigger: "blur" }],
--- a/src/components/aboutTable/Search.vue
+++ b/src/components/aboutTable/Search.vue
@ -1,75 +1,37 @@
 <template>
-  <div v-loading="loadingPage" class="pageSearch searchBox" :style="`margin-bottom: ${marginBottom}px;background-color: ${backgroundColor}`">
+  <div style="padding: 0" v-loading="loadingPage" class="pageSearch searchBox"
+    :style="`margin-bottom: ${marginBottom}px;background-color: ${backgroundColor}`">
+      <div class="filter-title">
+        <span class="filter-label"><el-icon><Filter /></el-icon>筛选条件</span>
+      </div>
    <div class="box">
      <div v-for="(item, index) in getArr" :key="index" class="item">
        <div class="label" v-if="item.label">{{ item.label }}</div>
        <!-- select -->
-        <el-select
-          v-if="item.showType === 'select'"
-          v-model="searchObj[item.prop]"
-          :multiple="item.multiple"
-          :clearable="item.clearable"
-          :filterable="item.filterable"
-          :placeholder="item.placeholder"
-          collapse-tags
-          collapse-tags-tooltip
-        >
-          <el-option
-            v-for="obj in getOptions[item.prop]"
-            :key="obj.value"
-            :label="obj.label || obj.lable"
-            :value="obj.value"
-          />
+        <el-select v-if="item.showType === 'select'" v-model="searchObj[item.prop]" :multiple="item.multiple"
+          :clearable="item.clearable" :filterable="item.filterable" :placeholder="item.placeholder" collapse-tags
+          collapse-tags-tooltip>
+          <el-option v-for="obj in getOptions[item.prop]" :key="obj.value" :label="obj.label || obj.lable"
+            :value="obj.value" />
        </el-select>
        <!-- input -->
-        <el-input
-          v-else-if="item.showType === 'input'"
-          class="input"
-          v-model="searchObj[item.prop]"
-          :clearable="item.clearable"
-          :placeholder="item.placeholder"
-        />
+        <el-input v-else-if="item.showType === 'input'" class="input" v-model="searchObj[item.prop]"
+          :clearable="item.clearable" :placeholder="item.placeholder" />
        <!-- 日期段选择器 -->
-        <el-date-picker
-          v-else-if="item.showType === 'daterange'"
-          v-model="searchObj[item.prop]"
-          type="daterange"
-          unlink-panels
-          :range-separator="item.rangeSeparator"
-          :start-placeholder="item.startPlaceholder"
-          :end-placeholder="item.endPlaceholder"
-          :shortcuts="item.shortcuts"
-          :disabledDate="disabledDate"
-          value-format="YYYY-MM-DD"
-        />
-        <el-date-picker
-          v-else-if="item.showType === 'datetimerange'"
-          v-model="searchObj[item.prop]"
-          type="datetimerange"
-          unlink-panels
-          :range-separator="item.rangeSeparator || '至'"
-          :start-placeholder="item.startPlaceholder || '开始日期'"
-          :end-placeholder="item.endPlaceholder || '结束日期'"
-          :shortcuts="item.shortcuts"
-          value-format="YYYY-MM-DD HH:mm:ss"
-        />
-        <el-date-picker
-          v-else-if="item.showType === 'date'"
-          v-model="searchObj[item.prop]"
-          type="date"
-          :placeholder="item.placeholder"
-          :disabled-date="disabledDate"
-          :shortcuts="item.shortcuts"
-          value-format="YYYY-MM-DD"
-        >
+        <el-date-picker v-else-if="item.showType === 'daterange'" v-model="searchObj[item.prop]" type="daterange"
+          unlink-panels :range-separator="item.rangeSeparator" :start-placeholder="item.startPlaceholder"
+          :end-placeholder="item.endPlaceholder" :shortcuts="item.shortcuts" :disabledDate="disabledDate"
+          value-format="YYYY-MM-DD" />
+        <el-date-picker v-else-if="item.showType === 'datetimerange'" v-model="searchObj[item.prop]"
+          type="datetimerange" unlink-panels :range-separator="item.rangeSeparator || '至'"
+          :start-placeholder="item.startPlaceholder || '开始日期'" :end-placeholder="item.endPlaceholder || '结束日期'"
+          :shortcuts="item.shortcuts" value-format="YYYY-MM-DD HH:mm:ss" />
+        <el-date-picker v-else-if="item.showType === 'date'" v-model="searchObj[item.prop]" type="date"
+          :placeholder="item.placeholder" :disabled-date="disabledDate" :shortcuts="item.shortcuts"
+          value-format="YYYY-MM-DD">
        </el-date-picker>
-        <el-date-picker
-          v-else-if="item.showType === 'datetime'"
-          v-model="searchObj[item.prop]"
-          type="datetime"
-          :placeholder="item.placeholder"
-          value-format="YYYY-MM-DD HH:mm:ss"
-        >
+        <el-date-picker v-else-if="item.showType === 'datetime'" v-model="searchObj[item.prop]" type="datetime"
+          :placeholder="item.placeholder" value-format="YYYY-MM-DD HH:mm:ss">
        </el-date-picker>

        <!-- checkbox -->
@ -78,60 +40,31 @@
        </template>
        <!-- checkbox -->
        <template v-else-if="item.showType === 'checkbox'">
-          <el-checkbox
-            v-if="item.showSelectAll"
-            v-model="item.checkAll"
-            :indeterminate="item.isIndeterminate"
-            @change="
-              (val) => {
-                handleCheckAllChange(val, item);
-              }
-            "
-            >全选</el-checkbox
-          >
-          <el-checkbox-group
-            v-model="searchObj[item.prop]"
-            @change="
-              (val) => {
-                handleCheckedCitiesChange(val, item);
-              }
-            "
-          >
-            <el-checkbox
-              v-for="obj in item.options"
-              :key="obj.value"
-              :label="obj.value"
-              >{{ obj.label }}</el-checkbox
-            >
+          <el-checkbox v-if="item.showSelectAll" v-model="item.checkAll" :indeterminate="item.isIndeterminate" @change="
+            (val) => {
+              handleCheckAllChange(val, item);
+            }
+          ">全选</el-checkbox>
+          <el-checkbox-group v-model="searchObj[item.prop]" @change="
+            (val) => {
+              handleCheckedCitiesChange(val, item);
+            }
+          ">
+            <el-checkbox v-for="obj in item.options" :key="obj.value" :label="obj.value">{{ obj.label }}</el-checkbox>
          </el-checkbox-group>
        </template>
        <!-- radio -->
-        <el-radio-group
-          v-else-if="item.showType === 'radio'"
-          v-model="searchObj[item.prop]"
-          @change="
-            (val) => {
-              handleRadioChange(val, item);
-            }
-          "
-        >
-          <el-radio
-            v-for="obj in item.options"
-            :key="obj.value"
-            :label="obj.value"
-            >{{ obj.label }}</el-radio
-          >
+        <el-radio-group v-else-if="item.showType === 'radio'" v-model="searchObj[item.prop]" @change="
+          (val) => {
+            handleRadioChange(val, item);
+          }
+        ">
+          <el-radio v-for="obj in item.options" :key="obj.value" :label="obj.value">{{ obj.label }}</el-radio>
        </el-radio-group>
        <!-- 级联选择 -->
-        <el-cascader
-          v-else-if="item.showType === 'cascader'"
-          v-model="searchObj[item.prop]"
-          :props="item.props"
-          :show-all-levels="item.showAllLevels"
-          :clearable="item.clearable"
-          :options="getOptions[item.prop]"
-          :placeholder="item.placeholder"
-        />
+        <el-cascader v-else-if="item.showType === 'cascader'" v-model="searchObj[item.prop]" :props="item.props"
+          :show-all-levels="item.showAllLevels" :clearable="item.clearable" :options="getOptions[item.prop]"
+          :placeholder="item.placeholder" />
        <div v-if="item.showType === 'Slot'">
          <slot :name="item.prop"></slot>
        </div>
@ -242,6 +175,10 @@ const props = defineProps({
    type: String,
    default: "rgb(255, 255, 255, 1)"
  },
+  bool: {
+    type: Boolean,
+    default: true
+  }
 });
 let loadingPage = ref(false);
 const emit = defineEmits(["submit", "reset"]);
@ -488,12 +425,12 @@ watchEffect(() => {
        item.options = reactive(item.options);
        getOptions[item.prop] = item.options;
        break;
-        case "input":
-          item = { ...inputDefault, ...item };
+      case "input":
+        item = { ...inputDefault, ...item };
        break;
      case "daterange":
        item = { ...daterangeDefault, ...item };
-        if (item.defaultShortcuts)  item.shortcuts = shortcuts;
+        if (item.defaultShortcuts) item.shortcuts = shortcuts;
        break;
      case "date":
        item = { ...defaultDate, ...item };
@ -532,14 +469,41 @@ watchEffect(() => {

 <style lang="scss" scoped>
 .pageSearch {
+
+  .filter-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+    width: 100%;
+background: linear-gradient(to right,  #9ed7ff, #e6f0f8);
+padding: 5px 15px;
+    .filter-label {
+    display: flex;
+    align-items: center;
+      font-weight: bold;
+      color: #000;
+      margin-right: 10px;
+      white-space: nowrap;
+    }
+
+    .filter-line {
+      flex: 1;
+      height: 1px;
+      background-color: #ccc;
+    }
+  }
+
  .box {
+    padding: 0 15px;
    display: flex;
    flex-wrap: wrap;
+
    .item {
      display: flex;
      margin-right: 12px;
      margin-bottom: 15px;
    }
+
    .label {
      margin: auto;
      margin-right: 5px;
@ -549,7 +513,7 @@ watchEffect(() => {
  }
 }

- ::v-deep .el-date-editor .el-range-separator{
+::v-deep .el-date-editor .el-range-separator {
  color: #333;
 }
 </style>
--- a/src/components/flowPath/SelectingPeople.vue
+++ b/src/components/flowPath/SelectingPeople.vue
@ -590,6 +590,11 @@ const sendMessage = (gzlid) => {
      qcckPost(promes, '/mosty-gsxt/ypbg/sjzl/updateBkgzl').then(res => {
        console.log(res);
      })
+      break;
+          case 'BQBK':
+      qcckPost(promes, '/mosty-gsxt/gsxt/bqbk/sendFqzl ').then(res => {
+        console.log(res);
+      })
      break;
  }
 }