检查督导

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/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) {