From 5218032b30db4a1e19ac6bb243b71900a600da28 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 19 三月 2024 10:37:57 +0800
Subject: [PATCH] 设备保养计划修改
---
jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue | 17 +++++++++++++----
jcdm-ui/src/views/main/em/inspectionPlan/index.vue | 34 +++++++++++++++++++++++++++-------
jcdm-ui/src/views/main/em/inspectionPlan/subject.vue | 2 +-
3 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue
index 6ff1b90..b4b7d6c 100644
--- a/jcdm-ui/src/views/main/em/inspectionPlan/index.vue
+++ b/jcdm-ui/src/views/main/em/inspectionPlan/index.vue
@@ -94,23 +94,32 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table border v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange" @inSelected="inMachineryAdd">
+ <el-table border v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange" >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="璁″垝鍚嶇О" align="center" prop="planName">
</el-table-column>
<el-table-column label="璁″垝缂栧彿" align="center" prop="planCode">
</el-table-column>
<el-table-column label="璁″垝绫诲瀷" align="center" prop="planType">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.plan_type" :value="scope.row.planType"/>
+ </template>
</el-table-column>
<el-table-column label="棰戠巼" align="center" prop="frequency">
</el-table-column>
<el-table-column label="缁村害" align="center" prop="dimension">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dimension" :value="scope.row.dimension"/>
+ </template>
</el-table-column>
<el-table-column label="寮�濮嬫椂闂�" align="center" prop="startTime">
</el-table-column>
<el-table-column label="缁撴潫鏃堕棿" align="center" prop="endTime">
</el-table-column>
<el-table-column label="鐘舵��" align="center" prop="state">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.plan_status" :value="scope.row.state"/>
+ </template>
</el-table-column>
<el-table-column label="涓婃鐢熸垚鏃堕棿" align="center" prop="lastGenerationTime">
</el-table-column>
@@ -151,7 +160,6 @@
<el-form-item label="鐘舵��" prop="state">
<el-radio-group style="width: 450px" v-model="form.status">
<el-radio
-
v-for="dict in dict.type.plan_status"
:key="dict.value"
:label="dict.value"
@@ -206,7 +214,7 @@
</el-form>
<el-tabs type="border-card" >
<el-tab-pane label="璁惧娓呭崟" >
- <Checkmachinery ref="machinerylist" ></Checkmachinery>
+ <Checkmachinery ref="machinerylist" @inSelected="onMachineryAdd"></Checkmachinery>
</el-tab-pane>
<el-tab-pane label="鐐规椤圭洰">
<Checksubject ref="subjectlist"></Checksubject>
@@ -215,13 +223,14 @@
<el-divider></el-divider>
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="cs">娴� 璇�</el-button>
+ <el-button @click="checkMachineryAdd">娴嬭瘯</el-button>
</el-dialog>
</div>
</template>
<script>
import { listInspectionPlan, getInspectionPlan, delInspectionPlan, addInspectionPlan, updateInspectionPlan } from "@/api/main/em/inspectionPlan/inspectionPlan";
+import { listInspectionPlanArchives, delInspectionPlanArchives, addInspectionPlanArchives} from "@/api/main/em/inspectionPlanArchives/inspectionPlanArchives";
import Checkmachinery from "./machinery.vue"
import Checksubject from "./subject.vue"
@@ -247,6 +256,7 @@
total: 0,
// 鐐规淇濆吇璁″垝琛ㄦ牸鏁版嵁
inspectionPlanList: [],
+ machineryList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -375,9 +385,11 @@
};
this.resetForm("form");
},
- /** 娴嬭瘯鎸夐挳 */
- cs(){
- this.$emit('inSelected',this.planCode);
+
+ onMachineryAdd(checkmachineryList){
+ if(checkmachineryList !=null && checkmachineryList.length >0){
+ this.machineryList = checkmachineryList
+ }
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -411,6 +423,14 @@
this.titleName = "淇敼鐐规淇濆吇璁″垝";
});
},
+ /** 璁惧娓呭崟鏂板 */
+ checkMachineryAdd(){
+ for (let i = 0; i < this.machineryList.length; i++) {
+ this.machineryList[i].planCode = this.form.planCode
+ addInspectionPlanArchives(this.machineryList[i]).then(response =>{
+ });
+ }
+ },
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue b/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue
index c082ea4..b3634e6 100644
--- a/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue
+++ b/jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue
@@ -25,12 +25,21 @@
</el-row>
<MachinerySelect ref="machinerySelect" @onSelected="onMachineryAdd" ></MachinerySelect>
<el-table v-loading="loading" :data="checkmachineryList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
<el-table-column label="璁惧缂栫爜" align="center" prop="equipmentCode" />
<el-table-column label="璁惧鍚嶇О" align="center" prop="equipmentName" />
<el-table-column label="鍝佺墝" align="center" prop="equipmentBrand" />
<el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="equipmentSpec" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
+ <el-table-column label="鎿嶄綔" align="center" >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="danger"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@@ -97,7 +106,7 @@
getList() {
this.loading = true;
listInspectionPlanArchives(this.queryParams).then(response => {
- this.checkmachineryList = response.rows;
+ // this.checkmachineryList = response.rows;
this.total = response.total;
this.loading = false;
});
@@ -126,10 +135,10 @@
// },
onMachineryAdd(selectedRows){
if(selectedRows !=null && selectedRows.length >0){
- this.checkmachineryList.spareField1 = this.planCode
this.checkmachineryList = selectedRows
- console.log(this.checkmachineryList)
}
+ this.$emit('inSelected',this.checkmachineryList);
+ console.log(this.checkmachineryList)
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
diff --git a/jcdm-ui/src/views/main/em/inspectionPlan/subject.vue b/jcdm-ui/src/views/main/em/inspectionPlan/subject.vue
index 3e4baa9..ed0aebc 100644
--- a/jcdm-ui/src/views/main/em/inspectionPlan/subject.vue
+++ b/jcdm-ui/src/views/main/em/inspectionPlan/subject.vue
@@ -105,7 +105,7 @@
this.checksubjectList = response.rows;
this.total = response.total;
this.loading = false;
- console.log(response.rows)
+ // console.log(response.rows)
});
},
// 澶氶�夋閫変腑鏁版嵁
--
Gitblit v1.9.3