From 0a047acb1b0f1a93266d1e54e7fda43339b4c00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 8 Aug 2023 15:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AE=A1=E5=88=92=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeviceInspectPlanAuditModify.vue          | 28 +++------------
 .../inventory/DeviceInspectPlanModify.vue     | 34 ++++++++++++-------
 src/views/inventory/DeviceInspectPlanNew.vue  | 22 +++++++-----
 src/views/inventory/DeviceProjectSelect.vue   | 32 ++++++++---------
 4 files changed, 55 insertions(+), 61 deletions(-)

diff --git a/src/views/inventory/DeviceInspectPlanAuditModify.vue b/src/views/inventory/DeviceInspectPlanAuditModify.vue
index dfbf83cd..10a5daab 100644
--- a/src/views/inventory/DeviceInspectPlanAuditModify.vue
+++ b/src/views/inventory/DeviceInspectPlanAuditModify.vue
@@ -122,33 +122,13 @@
 
         <el-row>
           <el-col :span="10">
-            <el-form-item label="巡检人:" prop="inspectUser">
-              <el-select v-model="inspectPlan.inspectUser" placeholder="委托验收人" clearable style="width: 90%">
-                <el-option
-                    v-for="item in userList"
-                    :key="item.userid"
-                    :label="item.employeeName"
-                    :value="item.userid">
-                  <span style="float: left">{{ item.employeeName }}</span>
-                </el-option>
-
+            <el-form-item label="计划状态:" prop="planStatus">
+              <el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
+                <el-option label="不启用" :value=1></el-option>
+                <el-option label="启用" :value=2></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="预期结束时间:" prop="expectedTime">
-              <el-date-picker
-                  v-model="inspectPlan.expectedTime"
-                  type="datetime"
-                  placeholder="选择任务预期结束时间"
-                  style="width: 90%"
-                  :picker-options="pickerOptionsExpected"
-                  :clearable="false"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
         </el-row>
 
       </el-form>
diff --git a/src/views/inventory/DeviceInspectPlanModify.vue b/src/views/inventory/DeviceInspectPlanModify.vue
index c18f13b5..050b5309 100644
--- a/src/views/inventory/DeviceInspectPlanModify.vue
+++ b/src/views/inventory/DeviceInspectPlanModify.vue
@@ -20,7 +20,7 @@
           <el-col :span="10">
             <el-form-item class="query-form-item" label="部门:" prop="deptCode">
               <el-select v-model="inspectPlan.deptCode" placeholder="请选择部门" clearable="true"
-                         :disabled="inspectPlan.id !== null" @change="deptChange" style="width: 90%">
+                         :disabled="inspectPlan.code != null" @change="deptChange" style="width: 90%">
                 <el-option
                     v-for="item in deptList"
                     :key="item.name"
@@ -34,7 +34,7 @@
 
           <el-col :span="10">
             <el-form-item class="query-form-item" label="仓库:" prop="invCode">
-              <el-select v-model="inspectPlan.invCode" :disabled="inspectPlan.id !== null" placeholder="请选择仓库"
+              <el-select v-model="inspectPlan.invCode" :disabled="inspectPlan.code != null" placeholder="请选择仓库"
                          clearable="true" style="width: 90%">
                 <el-option
                     v-for="item in invList"
@@ -124,16 +124,16 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="计划状态:" prop="planStatus">
-              <el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>
-                <el-option label="不启用" :value=1></el-option>
-                <el-option label="启用" :value=2></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="10">-->
+<!--            <el-form-item label="计划状态:" prop="planStatus">-->
+<!--              <el-select v-model="inspectPlan.planStatus" style="width: 90%" placeholder="请选择计划级别" clearable>-->
+<!--                <el-option label="不启用" :value=1></el-option>-->
+<!--                <el-option label="启用" :value=2></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
       </el-form>
     </el-card>
 
@@ -248,6 +248,7 @@
     >
       <deviceProjectSelect
           :inputQuery="inputQuery"
+          type="1"
           :closeDialog="inspectPlanSetCloseDialog"
       ></deviceProjectSelect>
     </el-dialog>
@@ -387,6 +388,9 @@ export default {
       this.$refs["formRef"].validate((valid) => {
         if (valid) {
           let formName = isBlank(this.inspectPlan.id) ? "add" : "edit";
+          if(formName == "add"){
+            this.inspectPlan.planStatus = 1;
+          }
           saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => {
             if (res.code === 20000) {
               this.$message.success("添加成功");
@@ -500,6 +504,9 @@ export default {
         this.$refs["formRef"].validate((valid) => {
           if (valid) {
             let formName = isBlank(this.inspectPlan.id) ? "add" : "edit";
+            if(formName == "add"){
+              this.inspectPlan.planStatus = 1;
+            }
             saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => {
               if (res.code === 20000) {
                 this.inspectPlan.id = res.data.id;
@@ -532,6 +539,9 @@ export default {
       this.$refs["formRef"].validate((valid) => {
         if (valid) {
           let formName = isBlank(this.inspectPlan.id) ? "add" : "edit";
+          if(formName == "add"){
+            this.inspectPlan.planStatus = 1;
+          }
           saveDeviceInspectPlan(this.inspectPlan, formName).then((res) => {
             if (res.code === 20000) {
               this.inspectPlan.id = res.data.id;
diff --git a/src/views/inventory/DeviceInspectPlanNew.vue b/src/views/inventory/DeviceInspectPlanNew.vue
index cfef6bab..7716a15e 100644
--- a/src/views/inventory/DeviceInspectPlanNew.vue
+++ b/src/views/inventory/DeviceInspectPlanNew.vue
@@ -145,7 +145,7 @@
         </el-table-column>
         <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
-            <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
+            <el-tag :type="statusFilterType(scope.row.status)">{{ statusMap[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作">
@@ -160,7 +160,6 @@
             <el-button
               type="text"
               size="small"
-              :disabled = "scope.row.planStatus != 2"
               @click.native.stop="submitAudit(scope.row)"
             >提交审核
             </el-button
@@ -229,7 +228,7 @@
     >
       <DeviceInspectPlanProjectSet
           :detailQuery="detailQuery"
-          :closeDialog="closeDialog"
+          :closeDialog="detailCloseDialogc"
       >
       </DeviceInspectPlanProjectSet>
     </el-dialog>
@@ -255,7 +254,7 @@ export default {
         deptCode: this.$store.getters.locDeptCode,
         invCode: null,
         code: null,
-        status: 0,
+        statusList: [0,3],
         page: 1,
         limit: 20,
       },
@@ -270,7 +269,8 @@ export default {
       statusMap: {
         0: "草稿",
         1: "未审核",
-        2: "已审核"
+        2: "已审核",
+        3: "已拒绝"
       },
       levelMap: {
         1: "低级",
@@ -397,7 +397,7 @@ export default {
         deptCode: this.$store.getters.locDeptCode,
         invCode: null,
         code: null,
-        status: 0,
+        statusList: [0,3],
         page: 1,
         limit: 20,
       };
@@ -481,9 +481,6 @@ export default {
       this.deviceInspectPlan = row;
     },
     submitAudit(row) {
-      if(row.planStatus != 2){
-        return this.$message.error("该计划没有启用");
-      }
       let params = {orderId: row.orderId};
       submitAudit(params).then((res) => {
         if (res.code === 20000) {
@@ -521,6 +518,13 @@ export default {
       this.formVisible = false;
       this.deviceProjectSelectVisible = false
       this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds})
+      this.getList()
+    },
+    detailCloseDialogc() {
+      this.formVisible = false;
+      this.deviceProjectSelectVisible = false
+      this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds})
+      this.getList()
     },
     addInspectPlan() {
       this.formVisible = true;
diff --git a/src/views/inventory/DeviceProjectSelect.vue b/src/views/inventory/DeviceProjectSelect.vue
index 8a62472b..e2352e2b 100644
--- a/src/views/inventory/DeviceProjectSelect.vue
+++ b/src/views/inventory/DeviceProjectSelect.vue
@@ -16,21 +16,15 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="query-form-item" label="项目类型:">
-              <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择项目类型" clearable="true"
-              >
-                <el-option label="巡检" :value="1"></el-option>
-                <el-option label="养护" :value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-
-        </el-row>
-
-        <el-row>
-
+<!--          <el-col :span="8">-->
+<!--            <el-form-item class="query-form-item" label="项目类型:">-->
+<!--              <el-select v-model="filterQuery.type" style="width: 90%" placeholder="请选择项目类型" clearable="true"-->
+<!--              >-->
+<!--                <el-option label="巡检" :value="1"></el-option>-->
+<!--                <el-option label="养护" :value="2"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item class="query-form-item" label="创建时间:">
               <el-date-picker
@@ -49,6 +43,8 @@
           </el-col>
 
         </el-row>
+
+
       </el-form>
       <div class="top-right-btn">
         <el-button-group style="margin-left: 10px;display:flex;">
@@ -108,6 +104,10 @@ export default {
       type: Object,
       required: true
     },
+    type: {
+      type: Object,
+      required: true
+    },
     closeDialog: {
       type: Function,
       required: true
@@ -207,7 +207,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.filterQuery.type = 1
+      this.filterQuery.type = this.type
       getprojectSetList(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {