From 607b9d4be0b23701a936a5153a35a54fb8e3e46c Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 15 Nov 2023 17:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=B7=A1=E6=A3=80=E4=BF=9D?=
 =?UTF-8?q?=E5=85=BB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/deviceOrder/index.vue        |  4 +-
 src/views/device/inspectionPlan/index.vue     |  2 +-
 src/views/device/spotCheckPlan/index.vue      | 59 ++++++++++++-------
 .../device/spotInspectionOrder/index.vue      | 19 ++++++
 src/views/device/upkeepOrder/index.vue        |  6 +-
 5 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 432d910..3c024a3 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -386,8 +386,8 @@
                     </el-col>
                     <el-col :span="9">
                       <el-form-item label="是否达标:">
-                        <el-radio v-model="standard.detailReach" label="0">达标</el-radio>
-                        <el-radio v-model="standard.detailReach" label="1">未达标</el-radio>
+                        <el-radio v-model="standard.detailReach" label="0">未达标</el-radio>
+                        <el-radio v-model="standard.detailReach" label="1">达标</el-radio>
                       </el-form-item>
                     </el-col>
                   </el-row>
diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index 7a72553..59e44e4 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -374,7 +374,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span=12 :offset="1">
-                <el-form-item label-width="100px" label="巡检执行时间">
+                <el-form-item label-width="100px" label="循环时间范围">
                   <el-date-picker
                     @change="changeArray"
                     v-model="form.planTimeArray"
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index 76ad8bb..32783fd 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -69,14 +69,6 @@
 					/>
 				</el-select>
 			</el-form-item>
-			<el-form-item v-if="false" label="循环执行时间开始" prop="planLoopStart">
-				<el-date-picker clearable
-					v-model="queryParams.planLoopStart"
-					type="date"
-					value-format="yyyy-MM-dd"
-					placeholder="请选择循环执行时间开始">
-				</el-date-picker>
-			</el-form-item>
 			<el-form-item v-if="false" label="循环执行时间结束" prop="planLoopEnd">
 				<el-date-picker clearable
 					v-model="queryParams.planLoopEnd"
@@ -104,12 +96,14 @@
 				</el-select>
 			</el-form-item>
 			<el-form-item label-width="90px" label="是否可生产" prop="planRestrict">
-				<el-input
-					v-model="queryParams.planRestrict"
-					placeholder="请输入是否可生产"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
+        <el-select v-model="queryParams.planRestrict" placeholder="请选择计划状态" clearable>
+          <el-option
+            v-for="dict in dict.type.device_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
 			</el-form-item>
 			<el-form-item v-if="false" label="是否委外" prop="planOutsource">
 				<el-input
@@ -191,7 +185,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-      <el-form-item label="创建人" prop="createBy">
+      <el-form-item v-if="false" label="创建人" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
           placeholder="请输入创建人"
@@ -199,7 +193,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
+      <el-form-item v-if="false" label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTimeArray"
           type="daterange"
@@ -212,7 +206,20 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="更新人" prop="updateBy">
+      <el-form-item label-width="100px" label="循环开始时间" prop="planLoopStart">
+        <el-date-picker
+          v-model="queryParams.loopStartArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item v-if="false" label="更新人" prop="updateBy">
         <el-input
           v-model="queryParams.updateBy"
           placeholder="请输入更新人"
@@ -220,7 +227,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
+      <el-form-item v-if="false" label="更新时间" prop="updateTime">
         <el-date-picker
           v-model="queryParams.updateTimeArray"
           type="daterange"
@@ -302,12 +309,12 @@
 					<dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
 				</template>
 			</el-table-column>
-			<el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180">
+			<el-table-column label="循环开始时间" align="center" prop="planLoopStart" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="循环执行时间结束" align="center" prop="planLoopEnd" width="180">
+			<el-table-column v-if="false" label="循环执行时间结束" align="center" prop="planLoopEnd" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
 				</template>
@@ -423,9 +430,15 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span=12 :offset="1">
+              <el-col :span="9" :offset="2">
                 <el-form-item label-width="100px" label="点检开始时间">
                   <el-date-picker
+                    v-model="form.planLoopStart"
+                    type="date"
+                    placeholder="开始时间">
+                  </el-date-picker>
+                  <el-date-picker
+                    v-if="false"
                     @change="changeArray"
                     v-model="form.planTimeArray"
                     type="datetimerange"
@@ -780,6 +793,7 @@ export default {
 				updateTime: null,
         createTimeArray: [],
         updateTimeArray: [],
+        loopStartArray: [],
 			},
 			// 表单参数
 			form: {
@@ -793,6 +807,7 @@ export default {
         personList: [],
         planWorkshop: null,
         planType: "spotInspection",
+        planLoopStart: null,
       },
 			// 表单校验
 			rules: {}
@@ -1123,6 +1138,7 @@ export default {
         planTimeArray: [],
         equipmentItem: [],
         personList: [],
+        loopStartArray: [],
 			};
 			this.resetForm("form");
 		},
@@ -1137,6 +1153,7 @@ export default {
       // 重置日期范围
       this.queryParams.createTimeArray = [];
       this.queryParams.updateTimeArray = [];
+      this.queryParams.loopStartArray = [];
 			this.handleQuery();
 		},
 		// 多选框选中数据
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index ccf1f43..ed9cd56 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -394,6 +394,9 @@
                         <el-radio v-model="standard.detailReach" label="1">达标</el-radio>
                       </el-form-item>
                     </el-col>
+                    <el-col :span="2">
+                      <el-button type="primary" icon="el-icon-picture" circle @click="imgDialog = true"></el-button>
+                    </el-col>
                   </el-row>
                 </div>
                 <div v-else>
@@ -477,6 +480,11 @@ export default {
   dicts: ['device_order_status', 'device_loop_type'],
 	data() {
 		return {
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+      // 上传图片弹出层
+      imgDialog: false,
       // 工作中心
       workCenterList:[],
 			// 遮罩层
@@ -544,6 +552,17 @@ export default {
     this.setWorkCenter();
 	},
 	methods: {
+    // test
+    handleRemove(file) {
+      console.log(file);
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    handleDownload(file) {
+      console.log(file);
+    },
     // 获取工作中心
     setWorkCenter() {
       getWorkCenter().then(response => {
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index aa1427f..f31a06d 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -772,8 +772,8 @@
                     </el-col>
                     <el-col :span="9">
                       <el-form-item label="是否达标:">
-                        <el-radio v-model="standard.detailReach" label="0">达标</el-radio>
-                        <el-radio v-model="standard.detailReach" label="1">未达标</el-radio>
+                        <el-radio v-model="standard.detailReach" label="0">未达标</el-radio>
+                        <el-radio v-model="standard.detailReach" label="1">达标</el-radio>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1088,7 +1088,7 @@ export default {
       this.form.personList = this.selectPersonList;
       addUpkeepOrder(this.form).then(response => {
         this.$modal.msgSuccess("新增成功");
-        this.open = false;
+        this.orderDialog = false;
         this.getList();
       });
     },