隐患排查1

src/views/meihuajing/yinhuanpaicha/yinhuanformy.vue

@@ -233,14 +233,19 @@
             type="textarea"
             placeholder="请输入信息"
           />
-          <van-field
-            v-model="message10"
-            rows="1"
-            autosize
-            label="验收日期"
-            type="textarea"
-            placeholder="请输入信息"
-          />
+          <div>
+            <van-cell
+              title="验收日期"
+              :value="dates"
+              @click="showtime = true"
+              :placeholder="'请选择' + label"
+            />
+            <van-calendar
+              v-model="showtime"
+              @confirm="onConfirm"
+              placeholder="请选择"
+            />
+          </div>
           <van-field
             v-model="message11"
             rows="1"
@@ -258,13 +263,21 @@
             placeholder="请输入信息"
           />
           <van-field
-            v-model="message13"
-            rows="1"
-            autosize
+            readonly
+            clickable
             label="验收结果"
-            type="textarea"
-            placeholder="请输入信息"
+            :value="message13"
+            placeholder="请选择"
+            @click="showPicker13 = true"
           />
+          <van-popup v-model="showPicker13" round position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="columns13"
+              @cancel="showPicker13 = false"
+              @confirm="onConfirm13"
+            />
+          </van-popup>
         </van-cell-group>
       </div>
     </div>
@@ -284,9 +297,9 @@ export default {
       value2: "", //隐患等级
       message1: "", //存在问题或隐患
       message2: "", //整改措施
-      value3: "", //风险点 
-      value4: "", //风险类型 
-      value5: "", //风险等级 
+      value3: "", //风险点
+      value4: "", //风险类型
+      value5: "", //风险等级
       value6: "", //事故类型
       message3: "", //风险描述
       message4: "", //后果及影响
@@ -294,16 +307,20 @@ export default {
       message6: "", //整改责任单位
       message7: "", //整改责任人
       value7: "", //督办部门
-      value8: "", //督办责任人 
-      value9: "", //整改期限  
+      value8: "", //督办责任人
+      value9: "", //整改期限
       message8: "", //整改意见
       message9: "", //验收意见
       message10: "", //验收日期
       message11: "", //验收部门
       message12: "", //验收责任人
       message13: "", //验收结果
+      showPicker13: false,
+      columns13: ["好", "很好", "非常好"],
       fileList: [],
       infos: [],
+      dates: "请选择" ? "请选择" : "",
+      showtime: false,
     };
   },
   methods: {
@@ -318,6 +335,19 @@ export default {
     afterRead(file) {
       console.log(file);
     },
+    formatDate(date) {
+      return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+    },
+    onConfirm(date) {
+      this.showtime = false;
+      this.dates = this.formatDate(date);
+      console.log(this.dates);
+    },
+    onConfirm13(value) {
+      console.log(value);
+      this.message13 = value;
+      this.showPicker13 = false;
+    },
   },
   mounted() {
     document.body.style.backgroundColor = "#f0f0f0"; //背景色
@@ -341,6 +371,15 @@ export default {
 [class*="van-hairline"]:after {
   border: none;
 }
+>>> .van-cell__title,
+.van-cell__value {
+  -webkit-box-flex: 1;
+  -webkit-flex: none;
+  flex: none;
+}
+>>> .van-cell__value > span {
+  padding-left: 42px;
+}
 .headers {
   width: 100%;
   background: #fff;

src/views/meihuajing/yinhuanpaicha/yinhuanformz.vue

@@ -250,24 +250,6 @@ export default {
       value9: "", //整改期限  
       message8: "", //整改意见
       fileList: [],
-      tableData: [
-        {
-          date: "风险描述1",
-          name: "后果及影响1",
-          address: "管控措施1",
-        },
-        {
-          date: "风险描述2",
-          name: "后果及影响2",
-          address: "管控措施2",
-        },
-        {
-          date: "风险描述3",
-          name: "后果及影响3",
-          address: "管控措施3",
-        },
-      ],
-      multipleSelection: [],
       infos: [],
     };
   },

src/views/meihuajing/yinhuanpaicha/yinhuaninfo.vue

@@ -73,7 +73,10 @@
             <div class="footed_box_one">
               <p class="footed_box_one_p1">张三</p>
               <p class="footed_box_one_p2">2021-10-12</p>
-              <p class="footed_box_one_p3">已验收</p>
+              <p class="footed_box_one_p6" v-if="colors==0">未整改</p>
+              <p class="footed_box_one_p3" v-else-if="colors==2">已验收</p>
+              <p class="footed_box_one_p4" v-else-if="colors==1">未验收</p>  
+              <p class="footed_box_one_p5" v-else>逾期</p>
             </div>
             <div class="footed_box_two">
               <div class="footed_box_two_div">
@@ -89,7 +92,7 @@
                 <span>综掘进三队</span>
               </div>
             </div>
-            <div class="footed_box_three">
+            <div class="footed_box_three" @click="dianji">
               <img src="../../../assets/images/meihuajing/信息.png" alt="" />
             </div>
           </div>
@@ -99,7 +102,10 @@
             <div class="footed_box_one">
               <p class="footed_box_one_p1">李四</p>
               <p class="footed_box_one_p2">2021-10-13</p>
-              <p class="footed_box_one_p6">未整改</p>
+              <p class="footed_box_one_p6" v-if="colors==0">未整改</p>
+              <p class="footed_box_one_p3" v-else-if="colors==2">已验收</p>
+              <p class="footed_box_one_p4" v-else-if="colors==1">未验收</p>  
+              <p class="footed_box_one_p5" v-else>逾期</p>
             </div>
             <div class="footed_box_two">
               <div class="footed_box_two_div">
@@ -125,7 +131,10 @@
             <div class="footed_box_one">
               <p class="footed_box_one_p1">王五</p>
               <p class="footed_box_one_p2">2021-10-14</p>
-              <p class="footed_box_one_p5">逾期</p>
+              <p class="footed_box_one_p6" v-if="colors==0">未整改</p>
+              <p class="footed_box_one_p3" v-else-if="colors==2">已验收</p>
+              <p class="footed_box_one_p4" v-else-if="colors==1">未验收</p>  
+              <p class="footed_box_one_p5" v-else>逾期</p>
             </div>
             <div class="footed_box_two">
               <div class="footed_box_two_div">
@@ -145,81 +154,6 @@
               <img src="../../../assets/images/meihuajing/信息.png" alt="" />
             </div>
           </div>
-
-          <div class="footed_box">
-            <div class="footed_box_one">
-              <p class="footed_box_one_p1">李四</p>
-              <p class="footed_box_one_p2">2021-10-13</p>
-              <p class="footed_box_one_p4">未验收</p>
-            </div>
-            <div class="footed_box_two">
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">风险点</span>
-                <span>111001运输港</span>
-              </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">检查单位</span>
-                <span>掘进专业</span>
-              </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">责任但闻</span>
-                <span>综掘进三队</span>
-              </div>
-            </div>
-            <div class="footed_box_three" @click="dianji1">
-              <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-            </div>
-          </div>
-
-          <div class="footed_box">
-            <div class="footed_box_one">
-              <p class="footed_box_one_p1">张三</p>
-              <p class="footed_box_one_p2">2021-10-12</p>
-              <p class="footed_box_one_p6">未整改</p>
-            </div>
-            <div class="footed_box_two">
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">风险点</span>
-                <span>111001运输港</span>
-              </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">检查单位</span>
-                <span>掘进专业</span>
-              </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">责任但闻</span>
-                <span>综掘进三队</span>
-              </div>
-            </div>
-            <div class="footed_box_three" @click="dianji">
-              <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-            </div>
-          </div>
-
-          <div class="footed_box">
-            <div class="footed_box_one">
-              <p class="footed_box_one_p1">赵六</p>
-              <p class="footed_box_one_p2">2021-10-12</p>
-              <p class="footed_box_one_p3">已验收</p>
-            </div>
-            <div class="footed_box_two">
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">风险点</span>
-                <span>111001运输港</span>
-              </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">检查单位</span>
-                <span>掘进专业</span>
-              </div>
-              <div class="footed_box_two_div">
-                <span class="footed_box_span1">责任但闻</span>
-                <span>综掘进三队</span>
-              </div>
-            </div>
-            <div class="footed_box_three" @click="dianji2">
-              <img src="../../../assets/images/meihuajing/信息.png" alt="" />
-            </div>
-          </div>
         </van-tab>
       </van-tabs>
     </div>
@@ -231,16 +165,17 @@ export default {
   data() {
     return {
       shows: true, //tabber是否显示
-      active: 2,
-      value1: "",
-      value2: "",
-      value3: "",
+      active: 0,//选择当前在我的发布，我的整改，全部
+      value1: "",//责任单位
+      value2: "",//整改负责人
+      value3: "",//检查专业
       showPicker1: false,
       showPicker2: false,
       showPicker3: false,
       columns1: ["综掘进一队", "综掘进二队", "综掘进三队"],
       columns2: ["张三", "李四", "王五"],
       columns3: ["掘进专业", "钻头专业", "打井专业"],
+      colors:0,
     };
   },
   methods: {
@@ -252,39 +187,50 @@ export default {
     onClickRight(){
       this.$router.push("/meihuajing/yinhuanpaicha/yinhuanform");
     },
+    //责任单位
     onConfirm1(value) {
       //   console.log("1");
       console.log(value);
       this.value1 = value;
       this.showPicker1 = false;
     },
+    //整改负责人
     onConfirm2(value) {
       //   console.log("2");
       console.log(value);
       this.value2 = value;
       this.showPicker2 = false;
     },
+    //检查专业
     onConfirm3(value) {
       //   console.log("3");
       console.log(value);
       this.value3 = value;
       this.showPicker3 = false;
     },
+    //点击查询
     buttons() {
       console.log(this.value1, this.value2, this.value3);
     },
     onClick(name, title) {
       console.log(name, title);
     },
-    dianji(){
-      this.$router.push("/meihuajing/yinhuanpaicha/yinhuanformz");
-    },
-    dianji1(){
-      this.$router.push("/meihuajing/yinhuanpaicha/yinhuanformy");
+    
+    //需要判断当前状态，是未整改，未验收，已验收，逾期，跳转不同页面
+    //点击时需要传参
+    dianji(forms){
+      if(forms==0){
+        //跳转至未整改页面
+        this.$router.push("/meihuajing/yinhuanpaicha/yinhuanformz");
+      }else if(forms==1){
+        //跳转至未验收页面
+        this.$router.push("/meihuajing/yinhuanpaicha/yinhuanformy");
+      }else{
+        //跳转至已验收页面
+        this.$router.push("/meihuajing/yinhuanpaicha/yinhuanformok");
+      }
+      
     },
-    dianji2(){
-      this.$router.push("/meihuajing/yinhuanpaicha/yinhuanformok");
-    }
   },
   mounted() {
     document.body.style.backgroundColor = "#f0f0f0"; //背景色