From 2bfe437d8b30fb7d80a38875b00ebf2b222ea05f Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 17 三月 2025 17:54:03 +0800
Subject: [PATCH] 完成车间管理
---
src/views/performance/manHour/workTimeConfig.vue | 154 ++++++++++-----------------------------------------
1 files changed, 30 insertions(+), 124 deletions(-)
diff --git a/src/views/performance/manHour/workTimeConfig.vue b/src/views/performance/manHour/workTimeConfig.vue
index 83dcc11..0ec72f6 100644
--- a/src/views/performance/manHour/workTimeConfig.vue
+++ b/src/views/performance/manHour/workTimeConfig.vue
@@ -4,175 +4,79 @@
<div class="search_thing">
<div class="search_label">缂栧彿锛�</div>
<div class="search_input">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="queryParams.number"
- @keyup.enter.native="refreshTable()"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.number"
+ @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
<div class="search_thing">
<div class="search_label">瀹為獙瀹わ細</div>
- <el-select
- v-model="queryParams.laboratory"
- placeholder="鍏ㄩ儴"
- size="small"
- @change="refreshTable()"
- clearable
- >
- <el-option
- v-for="item in laboratoryList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="queryParams.laboratory" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()" clearable>
+ <el-option v-for="item in laboratoryList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
<div class="search_thing">
<div class="search_label">閮ㄩ棬锛�</div>
<div class="search_input">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="queryParams.department"
- @keyup.enter.native="refreshTable()"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.department"
+ @keyup.enter.native="refreshTable()"></el-input>
</div>
</div>
<div class="search_thing" style="padding-left: 30px">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()"
- >鏌� 璇�</el-button
- >
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
- <el-button
- size="small"
- type="primary"
- style="position: absolute; right: 50px"
- @click="openAdd('鏂板')"
- v-if="checkPermi(['performance:manHour:workTimeConfig:add'])"
- >鏂� 澧�</el-button
- >
+ <el-button size="small" type="primary" style="position: absolute; right: 50px" @click="openAdd('鏂板')"
+ v-if="checkPermi(['performance:manHour:workTimeConfig:add'])">鏂� 澧�</el-button>
</div>
<div class="table">
- <lims-table
- :tableData="tableData"
- :column="column"
- :page="page"
- :tableLoading="tableLoading"
- :height="'calc(100vh - 290px)'"
- @pagination="pagination"
- ></lims-table>
+ <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 290px)'"
+ :page="page" @pagination="pagination"></lims-table>
</div>
<!-- 鏂板/缂栬緫 -->
<el-dialog :title="title" :visible.sync="timeDia" width="500px">
- <el-form
- :model="timeForm"
- ref="timeForm"
- :rules="timeRules"
- label-position="right"
- label-width="120px"
- >
+ <el-form :model="timeForm" ref="timeForm" :rules="timeRules" label-position="right" label-width="120px">
<el-form-item label="缂栧彿" prop="number">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="timeForm.number"
- ></el-input>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="timeForm.number"></el-input>
</el-form-item>
<el-form-item label="杈呭姪椤圭洰鍚嶇О" prop="auxiliaryProject">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="timeForm.auxiliaryProject"
- >
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="timeForm.auxiliaryProject">
</el-input>
</el-form-item>
<el-form-item label="閮ㄩ棬" prop="department">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="timeForm.department"
- >
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="timeForm.department">
</el-input>
</el-form-item>
<el-form-item label="瀹為獙瀹�" prop="laboratory">
- <el-select
- v-model="timeForm.laboratory"
- size="small"
- clearable
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in laboratoryList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="timeForm.laboratory" size="small" clearable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in laboratoryList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曚綅" prop="unit">
- <el-select
- v-model="timeForm.unit"
- size="small"
- clearable
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in unitList"
- :key="item.dictValue"
- :label="item.dictLabel"
- :value="item.dictValue"
- >
+ <el-select v-model="timeForm.unit" size="small" clearable placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in unitList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鏍稿噯宸ユ椂" prop="approvedWorkingHour">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- clearable
- v-model="timeForm.approvedWorkingHour"
- >
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="timeForm.approvedWorkingHour">
</el-input>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input
- size="small"
- placeholder="璇疯緭鍏�"
- type="textarea"
- :rows="2"
- clearable
- v-model="timeForm.remarks"
- >
+ <el-input size="small" placeholder="璇疯緭鍏�" type="textarea" :rows="2" clearable v-model="timeForm.remarks">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="timeDia = false">鍙� 娑�</el-button>
- <el-button
- :loading="uploading"
- type="primary"
- @click="submitProduct('timeForm')"
- >纭� 璁�</el-button
- >
+ <el-button :loading="uploading" type="primary" @click="submitProduct('timeForm')">纭� 璁�</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
import limsTable from "@/components/Table/lims-table.vue";
import {
selectAuxiliaryWorkingHours,
@@ -183,7 +87,6 @@
} from "@/api/performance/manHour";
export default {
components: {
- ValueTable,
limsTable,
},
dicts: ["sys_unit"],
@@ -211,7 +114,6 @@
dataType: "action",
fixed: "right",
label: "鎿嶄綔",
- width: "160px",
operation: [
{
name: "缂栬緫",
@@ -375,12 +277,14 @@
})
.then(() => {
deleteAuxiliaryWorkingHours({ id: row.id }).then((res) => {
- if (res.code == 201) return;
- this.$message.success("鍒犻櫎鎴愬姛");
- this.refresh();
+ console.log('res', res)
+ if (res.code == 200) {
+ this.$message.success("鍒犻櫎鎴愬姛");
+ this.refresh();
+ }
});
})
- .catch(() => {});
+ .catch(() => { });
},
},
};
@@ -390,6 +294,7 @@
.work-time-config {
height: 100%;
}
+
.search {
background-color: #fff;
height: 80px;
@@ -412,6 +317,7 @@
.search_input {
width: calc(100% - 70px);
}
+
.table {
padding: 10px;
padding-top: 0;
--
Gitblit v1.9.3