隐患排查新增检查人，优化筛选

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "demo-demonstration",
+  "name": "-",
   "version": "0.1.0",
   "private": true,
   "scripts": {

src/views/meihuajing/yinhuanpaicha/yinhuanform.vue

@@ -4,6 +4,24 @@
       <van-nav-bar title="风险评级" left-arrow @click-left="onClickLeft" />
     </div> -->
     <div class="headers">
+      <van-field
+        v-model="fieldValue_jianChaRen"
+        is-link
+        readonly
+        label="检查人"
+        placeholder="请选择检查人"
+        @click="show_jianChaRen = true"
+      />
+      <van-popup v-model="show_jianChaRen" round position="bottom">
+        <van-cascader
+          v-model="cascaderValue_jianChaRen"
+          title="请选择检查人"
+          :options="options"
+          @close="show_jianChaRen = false"
+          @finish="onFinish_jianChaRen"
+        />
+      </van-popup>
+
       <div>
         <van-field
           readonly
@@ -496,11 +514,21 @@ export default {
       show_zhengGaiRen: false,
 
       fieldValue_zhengGaiRen: "",
+      cascaderValue_zhengGaiRen: "",
 
       // 筛选督办人
       show_duBanRen: false,
 
       fieldValue_duBanRen: "",
+      cascaderValue_duBanRen: "",
+
+      // 选择检查人
+      show_jianChaRen: false,
+
+      fieldValue_jianChaRen: "",
+      cascaderValue_jianChaRen: "",
+
+      jianChaRen_key:"",
 
       options: [],
     };
@@ -509,124 +537,91 @@ export default {
     //返回按钮
     onClickLeft() {
       window.history.back();
-      // console.log("sss");
     },
     getCurrentRow(row, index) {
       // 获取选中数据
-      console.log(row, index);
       this.RiskRating_id = this.RiskRating[index].id;
     },
     handleClickRow(val) {
-      console.log(val);
       // this.infos = val;
     },
     sc() {
-      // console.log(this.infos);
       // this.zhankai1 = false;
       this.zhankai2 = true;
 
       // 获取筛选数据
       this.getRiskRating();
     },
-    tianjia() {
-      console.log(this.dates);
-    },
+    tianjia() {},
     onConfirm1(value, index) {
-      console.log(value);
-
       this.inspectionSpecialtyArr_key = this.inspectionSpecialtyArr[index].key;
 
       this.value1 = value;
       this.showPicker1 = false;
     },
     onConfirm2(value, index) {
-      console.log(value);
-
       this.hiddenDanger_levelArr_key = this.hiddenDanger_levelArr[index].key;
 
       this.value2 = value;
       this.showPicker2 = false;
     },
     onConfirm3(value, index) {
-      console.log(value, index);
-
       this.riskPointArr_key = this.riskPointArr[index].key;
 
       this.value3 = value;
       this.showPicker3 = false;
     },
     onConfirm4(value, index) {
-      console.log(value);
-
       this.riskTypeArr_key = this.riskTypeArr[index].key;
 
       this.value4 = value;
       this.showPicker4 = false;
     },
     onConfirm5(value, index) {
-      console.log(value);
-
       this.riskLevelArr_key = this.riskLevelArr[index].key;
 
       this.value5 = value;
       this.showPicker5 = false;
     },
     onConfirm6(value, index) {
-      console.log(value);
-
       this.accidentTypeArr_key = this.accidentTypeArr[index].key;
 
       this.value6 = value;
       this.showPicker6 = false;
     },
     onConfirm7(value, index) {
-      console.log(value);
-
       this.sectionArr_id = this.sectionArr[index].id;
 
       this.value7 = value;
       this.showPicker7 = false;
     },
     onConfirm8(value, index) {
-      console.log(value);
-
       this.staffArr_id = this.staffArr[index].id;
 
       this.value8 = value;
       this.showPicker8 = false;
     },
     onConfirm9(value, index) {
-      console.log(value, index);
-
       this.zhengGaiType = index + 1;
-      console.log(this.zhengGaiType);
 
       this.value9 = value;
       this.showPicker9 = false;
     },
 
     onConfirm10(value, index) {
-      console.log(value, index);
-
       this.zhengGaiDanWei_id = this.sectionArr[index].id;
 
       this.value10 = value;
       this.showPicker10 = false;
     },
     onConfirm11(value, index) {
-      console.log(value, index);
-
       this.zhengGaiRen_id = this.staffArr[index].id;
 
-      console.log(this.staffArr[index].id);
-
       this.value11 = value;
       this.showPicker11 = false;
     },
 
     onConfirm12(value, index) {
-      console.log(value, index);
-
       this.inspected_unit_key = this.sectionArr[index].id;
 
       this.value12 = value;
@@ -639,7 +634,6 @@ export default {
     onConfirm(date) {
       this.showtime = false;
       this.dates = this.formatDate(date);
-      console.log(this.dates);
     },
 
     // 获取检查专业等筛选信息
@@ -650,17 +644,23 @@ export default {
           {}
         )
         .then((res) => {
-          console.log(res.data.data);
-
           // 初始化筛选数据
           // 风险点
           this.riskPointArr = res.data.data.riskPointArr;
+          this.riskPointArr.unshift({key:"0",value:"请选择"})
+          console.log(this.riskPointArr)
           // 风险类型
           this.riskTypeArr = res.data.data.riskTypeArr;
+          this.riskTypeArr.unshift({key:"0",value:"请选择"})
+
           // 风险等级
           this.riskLevelArr = res.data.data.riskLevelArr;
+          this.riskLevelArr.unshift({key:"0",value:"请选择"})
+
           // 事故类型
           this.accidentTypeArr = res.data.data.accidentTypeArr;
+          this.accidentTypeArr.unshift({key:"0",value:"请选择"})
+
 
           // 检查专业
           this.inspectionSpecialtyArr = res.data.data.inspectionSpecialtyArr;
@@ -718,7 +718,6 @@ export default {
           this.$toast.clear();
           this.tableData = [];
 
-          console.log(res.data.data);
           this.RiskRating = res.data.data;
 
           // 风险描述 risk_description
@@ -745,8 +744,6 @@ export default {
           {}
         )
         .then((res) => {
-          console.log(res.data);
-
           this.sectionArr = res.data.data.sectionArr;
           this.staffArr = res.data.data.staffArr;
 
@@ -790,14 +787,16 @@ export default {
         this.hiddenDanger_levelArr_key == "" ||
         this.message1 == "" ||
         this.message2 == "" ||
-        this.RiskRating_id == "" ||
+        // 风险评估选填
+        // this.RiskRating_id == "" ||
         this.zhengGaiDanWei_id == "" ||
         this.zhengGaiRen_id == "" ||
         this.sectionArr_id == "" ||
         this.staffArr_id == "" ||
         this.inspected_unit_key == "" ||
         this.inspection_location == "" ||
-        this.zhengGaiType == ""
+        this.zhengGaiType == "" ||
+        this.jianChaRen_key == ""
       ) {
         this.$toast("请填写完整后再提交!");
         return;
@@ -839,10 +838,12 @@ export default {
             inspected_unit: this.inspected_unit_key,
             // 检查地点
             inspection_location: this.inspection_location,
+
+            // 检查人id
+            inspected_person: this.jianChaRen_key
           }
         )
         .then((res) => {
-          console.log(res);
           if (res.data.code == 1) {
             this.$toast("请填写完整后再提交!");
           } else {
@@ -862,8 +863,6 @@ export default {
         .map((option) => option.text)
         .join("--");
 
-      console.log(selectedOptions[1].value);
-
       this.zhengGaiRen_id = selectedOptions[1].value;
     },
 
@@ -875,11 +874,20 @@ export default {
         .map((option) => option.text)
         .join("--");
 
-      console.log(selectedOptions[1].value);
-
       this.staffArr_id = selectedOptions[1].value;
     },
 
+    // 选择检查人
+
+    onFinish_jianChaRen({ selectedOptions }) {
+      this.show_jianChaRen = false;
+      this.fieldValue_jianChaRen = selectedOptions
+        .map((option) => option.text)
+        .join("--");
+
+      this.jianChaRen_key = selectedOptions[1].value;
+    },
+
     // 获取部门、人
     getSectionStaff() {
       this.$http
@@ -888,7 +896,6 @@ export default {
           {}
         )
         .then((res) => {
-          console.log(res.data.data);
           this.options = res.data.data;
         });
     },

src/views/meihuajing/yinhuanpaicha/yinhuanform_my_wys.vue

@@ -6,6 +6,15 @@
     <div class="headers">
       <div>
         <van-field
+          v-model="value12"
+          name="检查人"
+          label="检查人"
+          placeholder="检查人"
+          readonly="false"
+        />
+      </div>
+      <div>
+        <van-field
           v-model="value10"
           name="检查人部门"
           label="检查人部门"
@@ -327,6 +336,8 @@ export default {
       value10: "",
       // 整改类型
       value11: "",
+      // 检查人
+      value12: "",
 
       // 详情id
       id: "",
@@ -428,6 +439,8 @@ export default {
           this.value8 = data.supervision_duty_person;
           this.value11 = data.rectification_type;
           this.value9 = data.rectification_term;
+          this.value12 = data.inspected_person
+
 
           this.message8 = data.rectification_opinion;
 

src/views/meihuajing/yinhuanpaicha/yinhuanform_my_wzg.vue

@@ -4,6 +4,16 @@
       <van-nav-bar title="风险评级" left-arrow @click-left="onClickLeft" />
     </div> -->
     <div class="headers">
+       <div>
+        <van-field
+          v-model="value12"
+          name="检查人"
+          label="检查人"
+          placeholder="检查人"
+          readonly="false"
+        />
+      </div>
+
       <div>
         <van-field
           v-model="value10"
@@ -278,6 +288,8 @@ export default {
       value10: "",
       // 整改类型
       value11: "",
+      // 检查人
+      value12: "",
 
       // 详情id
       id: "",
@@ -388,6 +400,8 @@ export default {
           this.value8 = data.supervision_duty_person;
           this.value11 = data.rectification_type;
           this.value9 = data.rectification_term;
+          this.value12 = data.inspected_person
+
         });
     },
   },

src/views/meihuajing/yinhuanpaicha/yinhuanform_my_yys.vue

@@ -4,6 +4,15 @@
       <van-nav-bar title="风险评级" left-arrow @click-left="onClickLeft" />
     </div> -->
     <div class="headers">
+       <div>
+        <van-field
+          v-model="value12"
+          name="检查人"
+          label="检查人"
+          placeholder="检查人"
+          readonly="false"
+        />
+      </div>
       <div>
         <van-field
           v-model="value10"
@@ -322,6 +331,8 @@ export default {
       value10: "",
       // 整改类型
       value11: "",
+      // 检查人
+      value12: "",
 
       // 详情id
       id: "",
@@ -391,6 +402,8 @@ export default {
           this.value8 = data.supervision_duty_person;
           this.value11 = data.rectification_type;
           this.value9 = data.rectification_term;
+          this.value12 = data.inspected_person
+
 
           this.message8 = data.rectification_opinion;
 

src/views/meihuajing/yinhuanpaicha/yinhuanform_my_yzg.vue

@@ -4,6 +4,16 @@
       <van-nav-bar title="风险评级" left-arrow @click-left="onClickLeft" />
     </div> -->
     <div class="headers">
+       <div>
+        <van-field
+          v-model="value12"
+          name="检查人"
+          label="检查人"
+          placeholder="检查人"
+          readonly="false"
+        />
+      </div>
+
       <div>
         <van-field
           v-model="value10"
@@ -269,6 +279,8 @@ export default {
       value10: "",
       // 整改类型
       value11: "",
+      // 检查人
+      value12: "",
 
       // 详情id
       id: "",
@@ -325,6 +337,8 @@ export default {
           this.value8 = data.supervision_duty_person;
           this.value11 = data.rectification_type;
           this.value9 = data.rectification_term;
+          this.value12 = data.inspected_person
+
 
           this.message8 = data.rectification_opinion;
         });

src/views/meihuajing/yinhuanpaicha/yinhuanform_wzg_wys.vue

@@ -4,6 +4,15 @@
       <van-nav-bar title="风险评级" left-arrow @click-left="onClickLeft" />
     </div> -->
     <div class="headers">
+      <div>
+        <van-field
+          v-model="value12"
+          name="检查人"
+          label="检查人"
+          placeholder="检查人"
+          readonly="false"
+        />
+      </div>
 
       <div>
         <van-field
@@ -262,7 +271,8 @@ export default {
       value10:"",
       // 整改类型
       value11:"",
-
+      // 检查人
+      value12:"",
 
       // 详情id
       id:"",
@@ -318,6 +328,7 @@ export default {
           this.value8 = data.supervision_duty_person
           this.value11 = data.rectification_type
           this.value9 = data.rectification_term
+          this.value12 = data.inspected_person
 
 
         });

src/views/meihuajing/yinhuanpaicha/yinhuanform_yzg_wys.vue

@@ -6,6 +6,16 @@
     <div class="headers">
       <div>
         <van-field
+          v-model="value13"
+          name="检查人"
+          label="检查人"
+          placeholder="检查人"
+          readonly="false"
+        />
+      </div>
+
+      <div>
+        <van-field
           v-model="value10"
           name="检查人部门"
           label="检查人部门"
@@ -321,11 +331,14 @@ export default {
       value10: "",
       // 整改类型
       value11: "",
+      // 验收部门
+      value12: "",
+      // 检查人
+      value13: "",
+
 
       // 验收部门选项
       columns12: [],
-      // 验收责任人选项
-      columns13: [],
 
       // 详情id
       id: "",
@@ -343,6 +356,7 @@ export default {
       show_yanShouRen: false,
 
       fieldValue_yanShouRen: "",
+      cascaderValue_yanShouRen:"",
 
       options: [],
     };
@@ -356,6 +370,12 @@ export default {
     tijiao() {
       console.log(this.sectionArr_id, this.staffArr_id);
 
+      if(this.sectionArr_id == "" || this.staffArr_id == ""){
+        this.$toast("请填写完整后再提交!");
+
+        return
+      }
+
       this.$toast.loading();
 
       this.$http
@@ -418,11 +438,7 @@ export default {
           res.data.data.sectionArr.forEach((item, index) => {
             this.columns12.push(item.title);
           });
-          // 验收责任人
-          this.columns13 = [];
-          res.data.data.staffArr.forEach((item, index) => {
-            this.columns13.push(item.name);
-          });
+         
         });
     },
 
@@ -464,6 +480,8 @@ export default {
           this.value8 = data.supervision_duty_person;
           this.value11 = data.rectification_type;
           this.value9 = data.rectification_term;
+          this.value13 = data.inspected_person
+
 
           this.message8 = data.rectification_opinion;
         });

src/views/meihuajing/yinhuanpaicha/yinhuaninfo.vue

@@ -277,7 +277,7 @@ export default {
       show_zhengGaiRen: false,
 
       fieldValue_zhengGaiRen: "",
-
+      cascaderValue_zhengGaiRen:"",
 
       options: [],
     };
@@ -286,15 +286,12 @@ export default {
     //返回按钮
     onClickLeft() {
       window.history.back();
-      // console.log("sss");
     },
     onClickRight() {
       this.$router.push("/meihuajing/yinhuanpaicha/yinhuanform");
     },
     //责任单位
     onConfirm1(value, index) {
-      //   console.log("1");
-      console.log(value, index);
 
       this.sectionArr_key = this.sectionArr[index].id;
 
@@ -303,8 +300,6 @@ export default {
     },
     //整改负责人
     onConfirm2(value, index) {
-      //   console.log("2");
-      console.log(value, index);
 
       this.staffArr_key = this.staffArr[index].id;
 
@@ -313,8 +308,6 @@ export default {
     },
     //检查专业
     onConfirm3(value, index) {
-      //   console.log("3");
-      console.log(value, index);
 
       this.inspectionSpecialtyArr_key = this.inspectionSpecialtyArr[index].key;
 
@@ -323,14 +316,10 @@ export default {
     },
     //点击查询
     buttons() {
-      console.log(this.value1, this.value2, this.value3);
 
       this.getTroubleshootData();
     },
     onClick(name, title) {
-      console.log(name, title);
-      console.log(name);
-
       this.value1 = "";
       this.value2 = "";
       this.value3 = "";
@@ -356,9 +345,6 @@ export default {
     //需要判断当前状态，是未整改，未验收，已验收，逾期，跳转不同页面
     //点击时需要传参
     dianji(item) {
-      console.log(this.active);
-      console.log(item.rectification_status);
-      console.log(item.status);
 
       if (this.active == 0) {
         // 我的发布
@@ -441,7 +427,6 @@ export default {
           {}
         )
         .then((res) => {
-          console.log(res.data);
 
           this.sectionArr = res.data.data.sectionArr;
           this.staffArr = res.data.data.staffArr;
@@ -467,7 +452,6 @@ export default {
           {}
         )
         .then((res) => {
-          console.log(res.data.data);
 
           // 初始化筛选数据
 
@@ -501,7 +485,6 @@ export default {
         .then((res) => {
           this.$toast.clear();
 
-          console.log(res.data.data.data);
           this.TroubleshootData_list = res.data.data.data;
         });
     },
@@ -514,7 +497,6 @@ export default {
           {}
         )
         .then((res) => {
-          console.log(res.data.data);
           this.options = res.data.data
         });
     },
@@ -528,7 +510,6 @@ export default {
         .map((option) => option.text)
         .join("--");
 
-      console.log(selectedOptions[1].value);
 
       this.staffArr_key = selectedOptions[1].value
     },