PY-2022.1 <Faith@DESKTOP-FQ04LTL Merge branch 'master'

src/api/pt.js

@@ -62,4 +62,12 @@ export function getNone(query) {
     method: 'get',
     params: query
   })
+}
+// 获取预警功能
+export function noReminder(query) {
+  return request({
+    url: '/system/menu/noReminder',
+    method: 'get',
+    params: query
+  })
 }

src/views/PrintsManage/manage/index.vue

@@ -1131,6 +1131,15 @@ export default {
         isReturn: [
           { required: true, message: "是否归还需要选择", trigger: "change" },
         ],
+        printName : [
+          { required: true, message: "打印文件不能为空", trigger: "change" },
+        ],
+        printNumber : [
+          { required: true, message: "打印份数不能为空", trigger: "change" },
+        ],
+        printfileName :[
+          { required: true, message: "打印人不能为空", trigger: "change" }
+        ]
       },
       //级别
       levelMs: [],

src/views/barracksManagement/flat/index.vue

@@ -7,24 +7,25 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="number">
+      <el-form-item prop="xingMing">
         <el-input
-          v-model="queryParams.number"
+          v-model.number="queryParams.xingMing"
           clearable
           size="small"
-          placeholder="请输入坐落号"
+          placeholder="请输入姓名"
           @input="handleQuery"
         />
       </el-form-item>
-      <el-form-item prop="number1">
+      <!-- <el-form-item prop="roomNumber">
         <el-input
-          v-model="queryParams.number1"
+          v-model="queryParams.roomNumber"
+          oninput="value=value.replace(/[^\d]/g,'')"
           clearable
           size="small"
-          placeholder="请输入分栋号"
+          placeholder="请输入房间号"
           @input="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="分栋名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -173,13 +174,24 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50"> </el-table-column>
-      <el-table-column label="坐落号" align="center" prop="number" />
-      <el-table-column label="分栋号" align="center" prop="number1" />
-      <el-table-column label="分栋名称" align="center" prop="name" />
-      <el-table-column label="营房用途" align="center" prop="behoof" />
-      <el-table-column label="利用现状" align="center" prop="statusQuo" />
-      <el-table-column label="建筑年代" align="center" prop="period" />
+      <el-table-column label="姓名" align="center" prop="xingMing" />
+      <el-table-column label="房间号" align="center" prop="roomNumber" />
       <el-table-column label="建筑面积" align="center" prop="area" />
+      <el-table-column
+        label="物业费标准"
+        align="center"
+        prop="propertyFeeStandard"
+      />
+      <el-table-column label="房租标准" align="center" prop="rentStandard" />
+      <el-table-column label="月水费" align="center" prop="waterBil" />
+      <el-table-column label="月房租" align="center" prop="monthlyRent" />
+      <el-table-column
+        label="月物业费"
+        align="center"
+        prop="monthlyPropertyFee"
+      />
+      <el-table-column label="总金额" align="center" prop="totalAmount" />
+
       <el-table-column
         label="备注"
         align="center"
@@ -200,9 +212,8 @@
           <!-- rTime -->
         </template>
       </el-table-column>
-      <el-table-column label="楼房层数" align="center" prop="tier" />
-      <el-table-column label="房间号" align="center" prop="roomNumber" />
-      <el-table-column label="单元号" align="center" prop="element" />
+      <!-- <el-table-column label="楼房层数" align="center" prop="tier" />
+      <el-table-column label="单元号" align="center" prop="element" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -251,39 +262,66 @@
         label-width="90px"
         :inline="true"
       >
-        <el-form-item label="坐落号" prop="number">
-          <el-input v-model="form.number"  oninput="value=value.replace(/[^\d]/g,'')"/>
+        <el-form-item label="姓名" prop="xingMing">
+          <el-input v-model="form.xingMing" />
         </el-form-item>
-        <el-form-item label="分栋号" prop="number1">
-          <el-input v-model="form.number1"  oninput="value=value.replace(/[^\d]/g,'')"/>
+        <el-form-item label="房间号" prop="roomNumber">
+          <el-input
+            v-model.number="form.roomNumber"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
-        <el-form-item label="分栋名称" prop="name">
-          <el-input v-model="form.name" />
+        <el-form-item label="建筑面积" prop="area">
+          <el-input
+            v-model.number="form.area"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
-        <el-form-item label="营房用途" prop="behoof">
-          <el-input v-model="form.behoof" />
+        <el-form-item label="使用面积" prop="usageArea">
+          <el-input
+            v-model.number="form.usageArea"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
-        <el-form-item label="利用现状" prop="statusQuo">
-          <el-input v-model="form.statusQuo" />
+        <el-form-item label="物业标准" prop="propertyFeeStandard">
+          <el-input
+            v-model.number="form.propertyFeeStandard"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
-        <el-form-item label="建筑年代" prop="period">
-          <el-input v-model="form.period" />
+        <el-form-item label="房租标准" prop="rentStandard">
+          <el-input
+            v-model.number="form.rentStandard"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
-        <el-form-item label="建筑面积" prop="area">
-          <el-input v-model="form.area" />
+        <el-form-item label="水电费" prop="waterBil">
+          <el-input
+            v-model.number="form.waterBil"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
-        <el-form-item label="楼房层数" prop="tier">
-          <el-input v-model="form.tier" />
+        <el-form-item label="月房租" prop="monthlyRent">
+          <el-input
+            v-model.number="form.monthlyRent"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
-        <el-form-item label="房间号" prop="roomNumber">
-          <el-input v-model="form.roomNumber" />
+        <el-form-item label="月物业费" prop="monthlyPropertyFee">
+          <el-input
+            v-model.number="form.monthlyPropertyFee"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
-        <el-form-item label="单元号" prop="element">
-          <el-input v-model="form.element" />
+
+        <el-form-item label="总金额" prop="totalAmount">
+          <el-input
+            v-model.number="form.totalAmount"
+            oninput="value=value.replace(/[^\d]/g,'')"
+          />
         </el-form-item>
         <div class="jibens">备注</div>
         <el-form-item prop="remark">
-          
           <el-input
             v-model="form.remark"
             type="textarea"
@@ -314,7 +352,6 @@ export default {
   name: "Flat",
   data() {
     return {
-      
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -356,35 +393,35 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        number: [
-          { required: true,  message: "坐落号不能为空", trigger: "blur" },
+        xingMing: [
+          { required: true, message: "姓名不能为空", trigger: "blur" },
         ],
-        number1: [
-          { required: true, message: "分栋号不能为空", trigger: "blur" },
+        area: [
+          { required: true, message: "建筑面积不能为空", trigger: "blur" },
         ],
-        name: [
-          { required: true, message: "分栋名称不能为空", trigger: "blur" },
+        usageArea: [
+          { required: true, message: "使用面积不能为空", trigger: "blur" },
         ],
-        behoof: [
-          { required: true, message: "营房用途不能为空", trigger: "blur" },
+        propertyFeeStandard: [
+          { required: true, message: "物业标准不能为空", trigger: "blur" },
         ],
-        statusQuo: [
-          { required: true, message: "利用现状不能为空", trigger: "blur" },
+        rentStandard: [
+          { required: true, message: "房租标准不能为空", trigger: "blur" },
         ],
-        roomNumber: [
-          { required: true, message: "房间号不能为空", trigger: "blur" },
+        waterBil: [
+          { required: true, message: "水电费不能为空", trigger: "blur" },
         ],
-        element: [
-          { required: true, message: "单元号不能为空", trigger: "blur" },
+        monthlyRent: [
+          { required: true, message: "月房租不能为空", trigger: "blur" },
         ],
-        period: [
-          { required: true, message: "建筑年代不能为空", trigger: "blur" },
+        monthlyPropertyFee: [
+          { required: true, message: "月物业费不能为空", trigger: "blur" },
         ],
-        area: [
-          { required: true, message: "建筑面积不能为空", trigger: "blur" },
+        totalAmounnt: [
+          { required: true, message: "总金额不能为空", trigger: "blur" },
         ],
-        tier: [
-          { required: true, message: "楼房层数不能为空", trigger: "blur" },
+        roomNumber: [
+          { required: true, message: "房间号不能为空", trigger: "blur" },
         ],
       },
     };
@@ -606,5 +643,4 @@ export default {
 ::v-deep .el-textarea__inner {
   min-height: 120px !important;
 }
-
 </style>

src/views/bdglregular/regularcountinfo/index.vue

@@ -152,6 +152,9 @@ export default {
           this.peopleList.forEach((item) => {
             return (item.subscore = item.subscore.split(".")[0]);
           });
+          this.peopleList.forEach((item) => {
+            return (item.addscore = item.addscore.split(".")[0]);
+          });
         }
       });
     },

src/views/bdglregular/regularinfo/index.vue

@@ -254,7 +254,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column
-        label="受检单位"
+        :label="queryParams.caoZuoType == 0?'受检单位':'单位'"
         align="center"
         key="inspectedUnit"
         prop="inspectedUnit"
@@ -278,6 +278,7 @@
         prop="unitCheck"
         width="150"
         key="unitCheck"
+        v-if="queryParams.caoZuoType == 0"
       />
       <el-table-column
         label="检查时间"
@@ -425,7 +426,7 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="检查单位" prop="unitCheck">
+        <el-form-item label="检查单位" prop="unitCheck" v-if="queryParams.caoZuoType == 0"> 
           <el-select
             v-model="form.unitCheck"
             @change="unitCheckIdfun"
@@ -441,12 +442,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="受检单位" prop="inspectedUnit">
+        <el-form-item :label="queryParams.caoZuoType == 0?'受检单位':'单位'" prop="inspectedUnit">
           <el-select
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-            placeholder="请选择受检单位"
+            :placeholder="queryParams.caoZuoType == 0?'请选择受检单位':'请选择单位'"
             :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           >
             <el-option
@@ -472,7 +473,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查时间" prop="inspectionTime">
+        <el-form-item label="检查时间" prop="inspectionTime" >
           <el-date-picker
             clearable
             size="small"
@@ -618,7 +619,7 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="检查单位" prop="unitCheck">
+        <el-form-item label="检查单位" prop="unitCheck" v-if="queryParams.caoZuoType == 0">
           <el-select
             v-model="form.unitCheck"
             @change="unitCheckIdfun"
@@ -634,12 +635,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="受检单位" prop="inspectedUnit">
+        <el-form-item :label="queryParams.caoZuoType == 0?'受检单位':'单位'" prop="inspectedUnit">
           <el-select
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-            placeholder="请选择受检单位"
+             :placeholder="queryParams.caoZuoType == 0?'请选择受检单位':'请选择单位'"
             :disabled="disabled"
           >
             <el-option
@@ -665,7 +666,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查时间" prop="inspectionTime">
+        <el-form-item label="检查时间" prop="inspectionTime" >
           <el-date-picker
             clearable
             size="small"
@@ -739,7 +740,7 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="检查单位" prop="unitCheck">
+        <el-form-item label="检查单位" prop="unitCheck" v-if="queryParams.caoZuoType == 0">
           <el-select
             v-model="form.unitCheck"
             @change="unitCheckIdfun"
@@ -755,12 +756,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="受检单位" prop="inspectedUnit">
+        <el-form-item :label="queryParams.caoZuoType == 0?'受检单位':'单位'" prop="inspectedUnit">
           <el-select
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-            placeholder="请选择受检单位"
+             :placeholder="queryParams.caoZuoType == 0?'请选择受检单位':'请选择单位'"
             :disabled="disabled"
           >
             <el-option
@@ -786,7 +787,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="检查时间" prop="inspectionTime">
+        <el-form-item label="检查时间" prop="inspectionTime" >
           <el-date-picker
             clearable
             size="small"
@@ -1226,6 +1227,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      console.log(this.queryParams.caoZuoType)
       this.reset();
       this.open = true;
       this.title = "经常性检查";

src/views/bdglregular/specialcountinfo/index.vue

@@ -139,6 +139,15 @@ export default {
       unitrank().then(res => {
         if (res.code == 200) {
           this.peopleList = res.data;
+          this.peopleList.forEach((item) => {
+            return (item.addscore = item.addscore.split(".")[0]);
+          });
+          this.peopleList.forEach((item) => {
+            return (item.zongfen = item.zongfen.split(".")[0]);
+          });
+          this.peopleList.forEach((item) => {
+            return (item.subscore = item.subscore.split(".")[0]);
+          });
         }
       });
     },

src/views/bdglregular/specialinfo/index.vue

@@ -222,7 +222,15 @@
       <el-table-column label="序号" align="center" key="index" type="index" />
       <!-- <el-table-column label="受检单位_id" align="center" prop="inspectedUnitId" /> -->
       <el-table-column
-        label="受检单位"
+        label="检查单位"
+        align="center"
+        prop="unitCheckName"
+        width="150"
+        key="unitCheck"
+        v-if="queryParams.caoZuoType == 0"
+      />
+      <el-table-column
+        :label="queryParams.caoZuoType == 0 ? '受检单位' : '单位'"
         align="center"
         key="inspectedUnit"
         prop="inspectedUnit"
@@ -244,12 +252,33 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column
+        label="类型"
+        align="center"
+        key="inspectionType"
+        prop="inspectionType"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.inspectionType"
+            :value="scope.row.inspectionType"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="检查时间"
         align="center"
         key="inspectionTime"
         prop="inspectionTime"
       />
+      <el-table-column
+        width="250"
+        show-overflow-tooltip
+        label="检查地点"
+        align="center"
+        prop="inspectionSite"
+        key="inspectionSite"
+      />
       <el-table-column
         label="事由"
         align="center"
@@ -372,12 +401,31 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="受检单位" prop="inspectedUnit">
+        <el-form-item label="检查单位" prop="unitCheckName" v-if="queryParams.caoZuoType == 0"> 
+          <el-select
+            v-model="form.unitCheckName"
+            @change="unitCheckIdfun"
+            clearable
+            placeholder="请选择检查单位"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+          >
+            <el-option
+              v-for="dict in unitId"
+              :key="dict.deptId"
+              :label="dict.deptName"
+              :value="dict"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          :label="queryParams.caoZuoType == 0 ? '受检单位' : '单位'"
+          prop="inspectedUnit"
+        >
           <el-select
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-            placeholder="请选择受检单位"
+            :placeholder="queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'"
             :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           >
             <el-option
@@ -388,6 +436,21 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="类型" prop="inspectionType">
+          <el-select
+            v-model="form.inspectionType"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+            clearable
+            placeholder="请选择类型"
+          >
+            <el-option
+              v-for="dict in inspectionType"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="检查时间" prop="inspectionTime">
           <el-date-picker
             clearable
@@ -399,6 +462,13 @@
             :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
           ></el-date-picker>
         </el-form-item>
+        <el-form-item label="检查地点" prop="inspectionSite">
+          <el-input
+            v-model="form.inspectionSite"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+            placeholder="请输入检查地点"
+          />
+        </el-form-item>
         <el-form-item label="分值" prop="score" v-if="jiannum == 0">
           <el-input-number
             v-model="form.score"
@@ -407,7 +477,11 @@
             :disabled="disabled"
           ></el-input-number>
         </el-form-item>
-        <el-form-item label="整改时间" prop="rectificationTime">
+        <el-form-item
+          label="整改时间"
+          v-if="queryParams.caoZuoType == 0"
+          prop="rectificationTime"
+        >
           <el-date-picker
             clearable
             size="small"
@@ -524,12 +598,31 @@
         label-width="120px"
       >
         <div class="jiben">基本信息</div>
-        <el-form-item label="受检单位" prop="inspectedUnit">
+        <el-form-item label="检查单位" prop="unitCheck" v-if="queryParams.caoZuoType == 0"> 
+          <el-select
+            v-model="form.unitCheckName"
+            @change="unitCheckIdfun"
+            clearable
+            placeholder="请选择检查单位"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+          >
+            <el-option
+              v-for="dict in unitId"
+              :key="dict.deptId"
+              :label="dict.deptName"
+              :value="dict"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          :label="queryParams.caoZuoType == 0 ? '受检单位' : '单位'"
+          prop="inspectedUnit"
+        >
           <el-select
             v-model="form.inspectedUnit"
             @change="inspectedUnitfun"
             clearable
-            placeholder="请选择受检单位"
+            :placeholder="queryParams.caoZuoType == 0 ? '请选择受检单位' : '请选择单位'"
             :disabled="disabled"
           >
             <el-option
@@ -540,6 +633,66 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="类型" prop="inspectionType">
+          <el-select
+            v-model="form.inspectionType"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+            clearable
+            placeholder="请选择类型"
+          >
+            <el-option
+              v-for="dict in inspectionType"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型" prop="inspectionType">
+          <el-select
+            v-model="form.inspectionType"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+            clearable
+            placeholder="请选择类型"
+          >
+            <el-option
+              v-for="dict in inspectionType"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型" prop="inspectionType">
+          <el-select
+            v-model="form.inspectionType"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+            clearable
+            placeholder="请选择类型"
+          >
+            <el-option
+              v-for="dict in inspectionType"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类型" prop="inspectionType">
+          <el-select
+            v-model="form.inspectionType"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+            clearable
+            placeholder="请选择类型"
+          >
+            <el-option
+              v-for="dict in inspectionType"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="检查时间" prop="inspectionTime">
           <el-date-picker
             clearable
@@ -551,6 +704,13 @@
             :disabled="disabled"
           ></el-date-picker>
         </el-form-item>
+        <el-form-item label="检查地点" prop="inspectionSite">
+          <el-input
+            v-model="form.inspectionSite"
+            :disabled="disabled && btnnum != 0 && btnnum != 1 && zg == 3"
+            placeholder="请输入检查地点"
+          />
+        </el-form-item>
         <el-form-item label="分值" prop="score" v-if="jiannum == 0">
           <el-input-number
             v-model="form.score"
@@ -559,7 +719,11 @@
             :disabled="disabled"
           ></el-input-number>
         </el-form-item>
-        <el-form-item label="整改时间" prop="rectificationTime">
+        <el-form-item
+          label="整改时间"
+          v-if="queryParams.caoZuoType == 0"
+          prop="rectificationTime"
+        >
           <el-date-picker
             clearable
             size="small"
@@ -697,6 +861,7 @@ import {
 
 export default {
   name: "Specialinfo",
+  dicts: ["inspectionType"],
   data() {
     return {
       // 遮罩层
@@ -726,6 +891,9 @@ export default {
         inspectedUnitId: null,
         inspectedUnit: null,
         inspectionTime: null,
+        unitCheckId: null,
+        unitCheck: null,
+        inspectionSite: null,
         score: null,
         rectificationTime: null,
         currentState: null,
@@ -739,19 +907,29 @@ export default {
         createUser: null,
         caoZuoType: 0,
       },
+      inspectionType: [],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        unitCheckName: [
+          { required: true, message: "检查单位不能为空", trigger: "change" },
+        ],
         inspectedUnit: [
           { required: true, message: "受检单位不能为空", trigger: "change" },
         ],
+        inspectionType: [
+          { required: true, message: "类型不能为空", trigger: "change" },
+        ],
         inspectionTime: [
           { required: true, message: "检查时间不能为空", trigger: "change" },
         ],
         rectificationTime: [
           { required: true, message: "整改时间为空", trigger: "change" },
         ],
+        inspectionSite: [
+          { required: true, message: "检查地点不能为空", trigger: "blur" },
+        ],
         chargePeople: [
           { required: true, message: "整改负责人不能为空", trigger: "change" },
         ],
@@ -800,6 +978,10 @@ export default {
         this.unitId = res.data;
       }
     });
+    //检查类型
+    this.getDicts("inspectionType").then((response) => {
+      this.inspectionType = response.data;
+    });
     //调动人员对象
     listPeople().then((res) => {
       if (res.code == 200) {
@@ -872,6 +1054,7 @@ export default {
       this.loading = true;
       listSpecialinfo(this.queryParams).then((response) => {
         this.specialinfoList = response.rows;
+        console.log(this.specialinfoList)
         this.total = response.total;
         this.loading = false;
       });
@@ -1053,6 +1236,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form)
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.documentProof) {
@@ -1115,7 +1299,7 @@ export default {
     //检查单位
     unitCheckIdfun(val) {
       this.form.unitCheckId = val.deptId;
-      this.form.unitCheck = val.deptName;
+      this.form.unitCheckName= val.deptName;
     },
     //受检单位
     inspectedUnitfun(val) {

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -894,11 +894,37 @@ export default {
               new Date(this.gongZuoTiem) <= new Date(this.form.endTime)
             ) {
               this.form.bdglWeekworkRegisterList = this.tomList;
-              updateBdglweekwork(this.form).then((response) => {
-                this.$modal.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
+              var num = 0;
+              var num1 = this.form.bdglWeekworkRegisterList.length;
+              for (
+                let index = 0;
+                index < this.form.bdglWeekworkRegisterList.length;
+                index++
+              ) {
+                if (
+                  this.form.bdglWeekworkRegisterList[index].peopleIds == "" ||
+                  this.form.bdglWeekworkRegisterList[index].peopleIds == null ||
+                  this.form.bdglWeekworkRegisterList[index].address == "" ||
+                  this.form.bdglWeekworkRegisterList[index].address == null ||
+                  this.form.bdglWeekworkRegisterList[index].contents == "" ||
+                  this.form.bdglWeekworkRegisterList[index].contents == null ||
+                  this.form.bdglWeekworkRegisterList[index].organizer == "" ||
+                  this.form.bdglWeekworkRegisterList[index].organizer == null
+                ) {
+                  return this.$modal.msgWarning(
+                    "请填写工作登记内容，组织人，参加人，地点"
+                  );
+                } else {
+                  num += 1;
+                }
+              }
+              if (num1 === num) {
+                pdateBdglweekwork(this.form).then((response) => {
+                  this.$modal.msgSuccess("修改成功");
+                  this.open = false;
+                  this.getList();
+                });
+              }
             } else {
               this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");
             }
@@ -909,13 +935,42 @@ export default {
             ) {
               this.form.bdglWeekworkRegisterList = this.tomList;
               if (this.code != 200) {
-                if (this.form.unitId) {
+                var num2 = 0;
+                var num3 = this.form.bdglWeekworkRegisterList.length;
+                for (
+                  let index = 0;
+                  index < this.form.bdglWeekworkRegisterList.length;
+                  index++
+                ) {
+                  if (
+                    this.form.bdglWeekworkRegisterList[index].peopleIds == "" ||
+                    this.form.bdglWeekworkRegisterList[index].peopleIds ==
+                      null ||
+                    this.form.bdglWeekworkRegisterList[index].address == "" ||
+                    this.form.bdglWeekworkRegisterList[index].address == null ||
+                    this.form.bdglWeekworkRegisterList[index].contents == "" ||
+                    this.form.bdglWeekworkRegisterList[index].contents ==
+                      null ||
+                    this.form.bdglWeekworkRegisterList[index].organizer == "" ||
+                    this.form.bdglWeekworkRegisterList[index].organizer == null
+                  ) {
+                    return this.$modal.msgWarning(
+                      "请填写工作登记内容，组织人，参加人，地点"
+                    );
+                  } else {
+                    num2 += 1;
+                  }
+                }
+                if (num2 === num3) {
+                  console.log(1);
                   addBdglweekwork(this.form).then((response) => {
                     this.$modal.msgSuccess("新增成功");
                     this.open = false;
                     this.getList();
                   });
                 }
+                // if (this.form.unitId) {
+                // }
               }
             } else {
               this.$modal.msgWarning("请选择开始时间与结束时间区级内的日期");

src/views/materialManagement/archives/index.vue

@@ -319,17 +319,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="物品规格" prop="materialSpecification">
+        <el-form-item label="营具规格" prop="materialSpecification">
           <el-input
             v-model="form.materialSpecification"
-            placeholder="请输入物品规格"
+            placeholder="请输入营具规格"
           />
         </el-form-item>
-        <el-form-item label="物品型号" prop="materialXh">
-          <el-input v-model="form.materialXh" placeholder="请输入物品型号" />
+        <el-form-item label="营具型号" prop="materialXh">
+          <el-input v-model="form.materialXh" placeholder="请输入营具型号" />
         </el-form-item>
-        <el-form-item label="营具类型" prop="yingJuType">
-          <el-select v-model="form.yingJuType" placeholder="请选择营具类型">
+        <el-form-item label="物品类型" prop="yingJuType">
+          <el-select v-model="form.yingJuType" placeholder="请选择物品类型">
             <el-option
               v-for="dict in dict.type.camp_equipment"
               :key="dict.value"
@@ -463,7 +463,12 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        name: [{ required: true, message: "请填写物品名称", trigger: "blur" }],
+        yingJuType: [
+          { required: true, message: "请选择物品类型", trigger: "blur" },
+        ],
+      },
       // 树形单位
       deptOptions: [],
       // 人员列表

src/views/materialManagement/distribution/index.vue

@@ -668,7 +668,13 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        name: [{ required: true, message: "请选择物品名称", trigger: "blur" }],
+        yingJuType: [
+          { required: true, message: "请选择营具类型", trigger: "blur" },
+        ],
+        warehouse: [{ required: true, message: "请选择库房", trigger: "blur" }],
+      },
       // 获取物品名称列表
       itemlist: [],
       // 树形单位

src/views/materialManagement/materialRegistration/index.vue

@@ -557,7 +557,13 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        name: [{ required: true, message: "请选择物品名称", trigger: "blur" }],
+        wuPinType: [
+          { required: true, message: "请选择物品类型", trigger: "blur" },
+        ],
+        warehouse: [{ required: true, message: "请选择库房", trigger: "blur" }],
+      },
       // 获取物品名称列表
       itemlist: [],
       // 外面的人员

src/views/pt.vue

@@ -47,6 +47,7 @@
               <div class="demo-box">
                 <div class="demo active" v-on:click="doThis">
                   <img src="../images/dj.png" alt />
+                  <span class="tanhao" v-show="yuJing[0] != '0'"></span>
                 </div>
               </div>
               <div class="demo-a">
@@ -77,6 +78,7 @@
                 >
                   <img src="../images/gz.png" alt />
                 </div>
+                <span class="tanhao" v-show="yuJing[1] != '0'"></span>
               </div>
               <div class="demo-a">
                 <a href="#" class="a">工 作 安 排</a>
@@ -177,6 +179,7 @@
                 >
                   <img src="../images/jc.png" alt />
                 </div>
+                <span class="tanhao" v-show="yuJing[2] != '0'"></span>
               </div>
               <div class="demo-a">
                 <a href="#" class="a">检查督导</a>
@@ -305,7 +308,7 @@
                 <a href="#" class="a">人力资源</a>
               </div>
             </li>
-            <!-- <li>
+            <li v-if="str.includes('admin') || str.includes('系统工具')">
               <div class="demo-box">
                 <div
                   class="demo active"
@@ -319,7 +322,7 @@
               <div class="demo-a">
                 <a href="#" class="a">系统工具</a>
               </div>
-            </li> -->
+            </li>
             <img
               src="../assets/images/椭圆 513 (2).png"
               class="li-img"
@@ -723,6 +726,7 @@ import {
   updateNotice,
   getWorkTask,
   getNone,
+  noReminder,
 } from "@/api/pt";
 import { getUserProfile } from "@/api/system/user";
 import Cookies from "js-cookie";
@@ -764,6 +768,8 @@ export default {
       danWie: "",
       yongHu: "",
       str: "",
+      // 获取预警列表
+      yuJing: [],
     };
   },
   created() {
@@ -776,6 +782,10 @@ export default {
     getNone().then((res) => {
       this.str = res.msg;
     });
+    noReminder().then((res) => {
+      console.log(res);
+      this.yuJing = res.data;
+    });
   },
   mounted() {
     if (this.$route.params.name) {
@@ -1236,6 +1246,7 @@ li {
   display: flex;
   justify-content: center;
   align-items: center;
+  position: relative;
 }
 .demo-a {
   width: 100%;
@@ -1796,4 +1807,12 @@ hr {
 #xitong img {
   margin-top: 44px !important;
 }
+.tanhao {
+  position: absolute;
+  right: 22%;
+  background: url(/static/img/感叹号圆.a6dba5cb.gif) no-repeat;
+  width: 30px;
+  height: 30px;
+  top: 16%;
+}
 </style>

src/views/taishi/index.vue

@@ -873,7 +873,7 @@
           <img src="../../assets/images/左上角.png" alt class="left1-jlt" />
           <img src="../../assets/images/左下角.png" alt class="left1-jlb" />
           <div class="left1-head">
-            <span>防疫物资储备情况</span>
+            <span>物资储备情况</span>
           </div>
           <!-- <div class="right2-main">
             <dv-scroll-board
@@ -886,8 +886,8 @@
             <div class="right2-main-title">
               <p>
                 <span>序号</span>
-                <span>防疫名称</span>
-                <span>防疫数量</span>
+                <span>名称</span>
+                <span>数量</span>
               </p>
             </div>
             <vueSeamlessScroll

src/views/taishi/tanshi1.vue

@@ -850,7 +850,7 @@
           <img src="../../assets/images/左上角.png" alt class="left1-jlt" />
           <img src="../../assets/images/左下角.png" alt class="left1-jlb" />
           <div class="left1-head">
-            <span>防疫物资储备情况</span>
+            <span>物资储备情况</span>
           </div>
           <!-- <div class="right2-main">
             <dv-scroll-board
@@ -863,8 +863,8 @@
             <div class="right2-main-title">
               <p>
                 <span>序号</span>
-                <span>防疫名称</span>
-                <span>防疫数量</span>
+                <span>名称</span>
+                <span>数量</span>
               </p>
             </div>
             <vueSeamlessScroll

src/views/workingArrangements/planTask/index.vue

@@ -53,6 +53,18 @@
           >新增</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['workingArrangements:planTask:export']"
+          >导出</el-button
+        >
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="success"
@@ -700,6 +712,90 @@
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 导出弹框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open5"
+      width="450px"
+      append-to-body
+      class="el-dialog__header jinduchakan"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="queryParamsTime"
+        :model="queryParamsTime"
+        :rules="queryParamsRules"
+        label-width="100px"
+        :inline="true"
+      >
+        <div>
+          <el-form-item label="请选择类型">
+            <el-select
+              v-model="category"
+              placeholder="请选择类型"
+              @change="leixingchange"
+              id="leixing"
+            >
+              <el-option value="时间">时间</el-option>
+              <el-option value="年">年</el-option>
+              <el-option value="月">月</el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <el-form-item label="开始时间" prop="startTime" v-if="shijian">
+          <el-date-picker
+            placeholder="请选择开始时间"
+            clearable
+            size="small"
+            v-model="queryParamsTime.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            style="width: 200px"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="结束时间"
+          label-width="100px"
+          prop="endTime"
+          v-if="shijian"
+        >
+          <el-date-picker
+            placeholder="请选择结束时间"
+            clearable
+            size="small"
+            v-model="queryParamsTime.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="年份" prop="createtime" v-if="nian">
+          <el-date-picker
+            placeholder="请选择年份"
+            clearable
+            size="small"
+            v-model="queryParamsTime.createtime"
+            type="year"
+            value-format="yyyy"
+            style="width: 200px"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="月份" label-width="100px" prop="yue" v-if="yue">
+          <el-date-picker
+            placeholder="请选择月份"
+            clearable
+            size="small"
+            v-model="queryParamsTime.yue"
+            type="month"
+            value-format="yyyy-MM"
+          ></el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm4">导 出</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -863,6 +959,36 @@ export default {
       jinduTable: [],
       partsp: null,
       comstatus: 0,
+      // 导出弹出层的显示与隐藏
+      open5: false,
+      shijian: true,
+      nian: false,
+      yue: false,
+      category: "时间",
+      queryParamsRules: {
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" },
+        ],
+        endTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" },
+        ],
+        createtime: {
+          required: true,
+          message: "年份不能为空",
+          trigger: "blur",
+        },
+        yue: {
+          required: true,
+          message: "月份不能为空",
+          trigger: "blur",
+        },
+      },
+      queryParamsTime: {
+        startTime: null,
+        endTime: null,
+        createtime: null,
+        yue: null,
+      },
     };
   },
   created() {
@@ -886,6 +1012,36 @@ export default {
     });
   },
   methods: {
+    // 导出重置
+    resets() {
+      this.queryParamsTime = {
+        startTime: null,
+        endTime: null,
+        createtime: null,
+        yue: null,
+      };
+      this.resetForm("queryParamsTime");
+    },
+    // 点击类型触发
+    leixingchange(value) {
+      console.log(value);
+      if (value == "时间") {
+        this.resets();
+        this.shijian = true;
+        this.nian = false;
+        this.yue = false;
+      } else if (value == "年") {
+        this.resets();
+        this.shijian = false;
+        this.nian = true;
+        this.yue = false;
+      } else {
+        this.resets();
+        this.shijian = false;
+        this.nian = false;
+        this.yue = true;
+      }
+    },
     comPlan() {
       if (this.Progress.comPlan > 100) {
         this.Progress.comPlan = 0;
@@ -954,6 +1110,7 @@ export default {
       this.open1 = false;
       this.open2 = false;
       this.open3 = false;
+      this.open5 = false;
     },
     // 表单重置
     reset() {
@@ -1254,18 +1411,31 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal
-        .confirm("是否确认导出所有工作计划数据项？")
-        .then(() => {
-          this.exportLoading = true;
-          return exportPlanTask(queryParams);
-        })
-        .then((response) => {
-          this.$download.name(response.msg);
-          this.exportLoading = false;
-        })
-        .catch(() => {});
+      this.open5 = true;
+      this.title = "导出工作数据";
+      this.resets();
+    },
+    //导出
+    submitForm4() {
+      this.$refs["queryParamsTime"].validate((valid) => {
+        if (valid) {
+          if (this.category == "月") {
+            this.queryParamsTime.createtime = this.queryParamsTime.yue;
+          }
+          this.$modal
+            .confirm("是否确认导出数据项？")
+            .then(() => {
+              this.exportLoading = true;
+              return exportPlanTask(this.queryParamsTime);
+            })
+            .then((response) => {
+              this.$download.name(response.msg);
+              this.exportLoading = false;
+              this.open5 = false;
+            })
+            .catch(() => {});
+        }
+      });
     },
     // 发布单位接口
     getdept() {

src/views/workingArrangements/workTask/index.vue

@@ -105,6 +105,18 @@
           >新增</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['workingArrangements:workTask:export']"
+          >导出</el-button
+        >
+      </el-col>
       <!-- <el-col :span="1.5">
         <el-button
           type="success"
@@ -863,6 +875,93 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 导出弹框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open5"
+      width="450px"
+      append-to-body
+      class="el-dialog__header jinduchakan"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="queryParamsTime"
+        :model="queryParamsTime"
+        :rules="queryParamsRules"
+        label-width="100px"
+        :inline="true"
+      >
+        <div>
+          <el-form-item label="请选择类型">
+            <el-select
+              v-model="category"
+              placeholder="请选择类型"
+              @change="leixingchange"
+              id="leixing"
+            >
+              <el-option value="时间">时间</el-option>
+              <el-option value="年">年</el-option>
+              <el-option value="月">月</el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <el-form-item label="开始时间" prop="startTime" v-if="shijian">
+          <el-date-picker
+            placeholder="请选择开始时间"
+            clearable
+            size="small"
+            v-model="queryParamsTime.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            style="width: 200px"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="结束时间"
+          label-width="100px"
+          prop="endTime"
+          v-if="shijian"
+        >
+          <el-date-picker
+            placeholder="请选择结束时间"
+            clearable
+            size="small"
+            v-model="queryParamsTime.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="年份" prop="createtime" v-if="nian">
+          <el-date-picker
+            placeholder="请选择年份"
+            clearable
+            size="small"
+            v-model="queryParamsTime.createtime"
+            type="year"
+            value-format="yyyy"
+            style="width: 200px"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="月份" label-width="100px" prop="yue" v-if="yue">
+          <el-date-picker
+            placeholder="请选择月份"
+            clearable
+            size="small"
+            v-model="queryParamsTime.yue"
+            type="month"
+            value-format="yyyy-MM"
+          ></el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm4" :href="daoChu"
+          >导 出</el-button
+        >
+        <el-button @click="cancel">取 消</el-button>
+        <a v-show="false" id="dianji">111</a>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1018,13 +1117,41 @@ export default {
       defaultTime: null,
       daoruobj: {},
       open4: null,
+      // 导出弹出层的显示与隐藏
+      open5: false,
+      shijian: true,
+      nian: false,
+      yue: false,
+      category: "时间",
+      queryParamsRules: {
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" },
+        ],
+        endTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" },
+        ],
+        createtime: {
+          required: true,
+          message: "年份不能为空",
+          trigger: "blur",
+        },
+        yue: {
+          required: true,
+          message: "月份不能为空",
+          trigger: "blur",
+        },
+      },
+      queryParamsTime: {
+        startTime: null,
+        endTime: null,
+        createtime: null,
+        yue: null,
+      },
+      // 导出文件的路径
+      daoChu: "",
     };
   },
   created() {
-    // if (Cookies.get("shuaxin") != "true") {
-    //   window.location.reload();
-    // }
-    // Cookies.set("shuaxin", "true");
     this.getList();
     this.getdept();
     allUser().then((res) => {
@@ -1035,15 +1162,41 @@ export default {
     });
     this.getdict();
     this.chooseplan();
-    // this.selectPeo3();
-    // this.defaultTime(){
-    // }
-    // this.startTime();
     getDept2().then((res) => {
       this.users = res.data;
     });
   },
   methods: {
+    // 导出重置
+    resets() {
+      this.queryParamsTime = {
+        startTime: null,
+        endTime: null,
+        createtime: null,
+        yue: null,
+      };
+      this.resetForm("queryParamsTime");
+    },
+    // 点击类型触发
+    leixingchange(value) {
+      console.log(value);
+      if (value == "时间") {
+        this.resets();
+        this.shijian = true;
+        this.nian = false;
+        this.yue = false;
+      } else if (value == "年") {
+        this.resets();
+        this.shijian = false;
+        this.nian = true;
+        this.yue = false;
+      } else {
+        this.resets();
+        this.shijian = false;
+        this.nian = false;
+        this.yue = true;
+      }
+    },
     // startTime() {
     //   this.timer = setInterval(() => {
     //     var today = new Date();
@@ -1147,6 +1300,7 @@ export default {
       this.open2 = false;
       this.open3 = false;
       this.open4 = false;
+      this.open5 = false;
     },
     // 表单重置
     reset() {
@@ -1434,35 +1588,44 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
-      this.open4 = true;
+      this.open5 = true;
       this.title = "导出工作数据";
-      // this.$modal
-      //   .confirm("是否确认导出所有工作任务数据项？")
-      //   .then(() => {
-      //     this.exportLoading = true;
-      //     return exportWorkTask(queryParams);
-      //   })
-      //   .then((response) => {
-      //     this.$download.name(response.msg);
-      //     this.exportLoading = false;
-      //   })
-      //   .catch(() => {});
+      this.resets();
     },
     //导出
     submitForm4() {
-      this.$modal
-        .confirm("是否确认导出所有工作任务数据项？")
-        .then(() => {
-          this.exportLoading = true;
-          return exportWorkTask(this.daoruobj);
-        })
-        .then((response) => {
-          this.$download.name(response.msg);
-          this.exportLoading = false;
-          this.open4 = false;
-        })
-        .catch(() => {});
+      this.$refs["queryParamsTime"].validate((valid) => {
+        if (valid) {
+          if (this.category == "月") {
+            this.queryParamsTime.createtime = this.queryParamsTime.yue;
+          }
+          this.$modal
+            .confirm("是否确认导出数据项？")
+            .then(() => {
+              this.exportLoading = true;
+              return exportWorkTask(this.queryParamsTime);
+            })
+            .then((response) => {
+              this.$download.name(response.msg);
+              this.exportLoading = false;
+              this.open5 = false;
+            })
+            .catch(() => {});
+        }
+      });
+
+      // this.$modal;
+      // .confirm("是否确认导出所有工作任务数据项？")
+      // .then(() => {
+      //   this.exportLoading = true;
+      //   return exportWorkTask(this.daoruobj);
+      // })
+      // .then((response) => {
+      //   this.$download.name(response.msg);
+      //   this.exportLoading = false;
+      //   this.open4 = false;
+      // })
+      // .catch(() => {});
     },
     // 发布单位接口
     getdept() {
@@ -1787,4 +1950,7 @@ export default {
 .el-date-picker__time-header {
   border-bottom: none;
 }
+#leixing {
+  width: 200px !important;
+}
 </style>