From f7c31d8f871fb7d83fc9dbea2aa1cddce89cfa4b Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 08 五月 2024 23:22:11 +0800
Subject: [PATCH] 物料信息
---
src/utils/request.js | 7 +
src/views/console/basic-data/material-warehousing-data/material-info.vue | 27 +++
src/views/tpm/MachineTab.vue | 4
src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue | 291 +++++++++++++++++++++++++++++++++++++++++
src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue | 38 +++++
5 files changed, 361 insertions(+), 6 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 8c820d1..cadc101 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -34,6 +34,13 @@
// HTTP response 鎷︽埅鍣�
axios.interceptors.response.use(
(response) => {
+ if (response.data.code && response.data.code !== 200) {
+ ElNotification.error({
+ title: '璇锋眰閿欒',
+ message: response.data.msg
+ });
+ return Promise.reject(response);
+ }
return response;
},
(error) => {
diff --git a/src/views/console/basic-data/material-warehousing-data/material-info.vue b/src/views/console/basic-data/material-warehousing-data/material-info.vue
index 8c4e8ff..53dd963 100644
--- a/src/views/console/basic-data/material-warehousing-data/material-info.vue
+++ b/src/views/console/basic-data/material-warehousing-data/material-info.vue
@@ -1,12 +1,31 @@
<template>
- <div>
- 鐗╂枡淇℃伅
- </div>
+ <el-main style="height: 100%;">
+ <el-card shadow="never" style="height: 100%;" body-style="height: 100%">
+ <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+ <el-tab-pane label="鐗╂枡淇℃伅" name="1">
+ <materialInfoComp1 />
+ </el-tab-pane>
+ <el-tab-pane label="鐗╂枡绫诲瀷" name="2">
+ <materialInfoComp2 />
+ </el-tab-pane>
+ </el-tabs>
+ </el-card>
+ </el-main>
</template>
<script>
+import materialInfoComp1 from './material-infoComp1.vue';
+import materialInfoComp2 from './material-infoComp2.vue';
export default {
-
+ components: {
+ materialInfoComp1,
+ materialInfoComp2
+ },
+ data() {
+ return {
+ activeName: '1'
+ }
+ },
}
</script>
diff --git a/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue b/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
new file mode 100644
index 0000000..b604416
--- /dev/null
+++ b/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
@@ -0,0 +1,291 @@
+<!--
+ * @Date: 2024-05-08 21:29:53
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-05-08 23:20:45
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
+-->
+<template>
+ <el-containter>
+ <el-header>
+ <el-button @click="table_add" type="primary" icon="el-icon-plus"></el-button>
+ <el-button type="primary">瀵煎叆</el-button>
+ <el-button type="primary">瀵煎嚭</el-button>
+ <el-popconfirm width="220" cancel-button-text="鍋滅敤" confirm-button-text="鍒犻櫎"
+ title="鍒犻櫎鏁版嵁浼氬奖鍝嶅凡鍏宠仈鐨勪笟鍔� ,鑻ユ偍鎯冲湪宸插叧鑱旂殑涓氬姟涓緷鐒舵樉绀鸿繖浜涙暟鎹�, 鎮ㄥ彲浠ラ�夋嫨 鍋滅敤 鎿嶄綔銆傚仠鐢ㄥ悗姝ゆ暟鎹皢涓嶈兘鍐嶈鏂颁笟鍔′娇鐢ㄣ��"
+ @confirm="table_del(selection, '0')" @cancel="table_del(selection, '1')">
+ <template #reference>
+ <el-button :disabled="selection.length == 0" type="danger" plain icon="el-icon-delete"
+ @click="batchDel"></el-button>
+ </template>
+ </el-popconfirm>
+
+ <el-select v-model="params.status" style="width: 240px;margin-left: auto;" :prefix-icon="Search">
+ <template #prefix>
+ 鐘舵��
+ </template>
+ <el-option v-for="item in options.status" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ <el-select v-model="params.typeId" style="width: 240px;margin-left: 8px;">
+ <template #prefix>
+ 鐗╂枡绫诲瀷
+ </template>
+ <el-option v-for="item in options.typeId" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ <el-select v-model="params.property" style="width: 240px;margin-left: 8px;">
+ <template #prefix>
+ 鐗╂枡灞炴��
+ </template>
+ <el-option v-for="item in options.property" :key="item.value" :label="item.label" :value="item.value" />
+ </el-select>
+ <el-input style="width: 240px;margin-left: 8px;" v-model="params.keyWord" placeholder="璇疯緭鍏ユ绱㈠唴瀹�"></el-input>
+ <el-button @click="search" style="margin-left: 8px;" type="primary" icon="el-icon-search"></el-button>
+ </el-header>
+ <el-main>
+ <scTable ref="table" @selection-change="handleSelectionChange" row-key="id" border :params="params"
+ :apiObj="apiObj" stripe @dataChange="dataChange">
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="code" label="鐗╂枡缂栧彿" />
+ <el-table-column prop="name" label="鐗╂枡鍚嶇О" />
+ <el-table-column prop="standardModel" label="瑙勬牸" />
+ <el-table-column prop="unit" label="璁￠噺鍗曚綅" />
+ <el-table-column prop="typeName" label="鐗╂枡绫诲瀷" />
+ <el-table-column prop="stuff" label="鏉愯川" />
+ <el-table-column prop="property" label="鐗╂枡灞炴��">
+ <template #default="scope">
+ {{ this.options.property.find(v => v.value == scope.row.property).label }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="isMustCheckName" label="鏄惁蹇呮">
+ <template #default="scope">
+ {{ scope.row.isMustCheck == 1 ? '鏄�' : '鍚�' }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="lowerLimit" label="棰濆畾搴撳瓨" />
+ <el-table-column prop="upperLimit" label="瀹夊叏搴撳瓨" />
+
+ <el-table-column label="鎿嶄綔" fixed="right" align="left" width="160">
+ <template #default="scope">
+ <el-button-group>
+ <el-button text type="primary" size="small"
+ @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ <el-popconfirm width="220" cancel-button-text="鍋滅敤" confirm-button-text="鍒犻櫎"
+ title="鍒犻櫎鏁版嵁浼氬奖鍝嶅凡鍏宠仈鐨勪笟鍔� ,鑻ユ偍鎯冲湪宸插叧鑱旂殑涓氬姟涓緷鐒舵樉绀鸿繖浜涙暟鎹�, 鎮ㄥ彲浠ラ�夋嫨 鍋滅敤 鎿嶄綔銆傚仠鐢ㄥ悗姝ゆ暟鎹皢涓嶈兘鍐嶈鏂颁笟鍔′娇鐢ㄣ��"
+ @confirm="table_del([scope.row], '0')" @cancel="table_del([scope.row], '1')">
+ <template #reference>
+ <el-button text type="primary" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ </el-button-group>
+ </template>
+ </el-table-column>
+ </scTable>
+ </el-main>
+ <el-drawer v-model="drawer" title="鐗╂枡淇℃伅">
+ <el-form :model="form" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鐗╂枡缂栧彿" prop="code">
+ <el-input style="width: 240px" disabled v-model="form.code"
+ placeholder="淇濆瓨鏃剁郴缁熻嚜鍔ㄧ敓鎴�"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鐗╂枡鍚嶇О" prop="name">
+ <el-input style="width: 240px" v-model="form.name" placeholder="" clearable></el-input>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="24">
+ <el-form-item label="鐗╂枡绫诲瀷" prop="typeId">
+ <el-select v-model="form.typeId" style="width: 240px;" clearable>
+ <el-option v-for="item in options.typeId" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="瑙勬牸" prop="standardModel">
+ <el-input style="width: 240px" v-model="form.standardModel" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="璁￠噺鍗曚綅" prop="unit">
+ <el-input style="width: 240px" v-model="form.unit" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鐗╂枡灞炴��" prop="property">
+ <el-select v-model="form.property" style="width: 240px;">
+ <el-option v-for="item in options.property" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鏉愯川" prop="stuff">
+ <el-input style="width: 240px" v-model="form.stuff" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鏄惁蹇呮" prop="isMustCheck">
+ <el-radio-group v-model="form.isMustCheck" class="ml-4">
+ <el-radio :label="1" size="large">鏄�</el-radio>
+ <el-radio :label="0" size="large">鍚�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="棰濆畾搴撳瓨" prop="lowerLimit">
+ <el-input-number v-model="form.upperLimit" :precision="2" :step="0.01" :max="10" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="瀹夊叏搴撳瓨" prop="upperLimit">
+ <el-input-number v-model="form.upperLimit" :precision="2" :step="0.01" :max="10" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鐘舵��" prop="code">
+ <el-select v-model="form.status" style="width: 240px;">
+ <el-option v-for="item in options.status" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <el-button type="primary" @click="save">淇濆瓨</el-button>
+ </template>
+ </el-drawer>
+ </el-containter>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ activeName: '1',
+ options: {
+ status: [
+ {
+ label: '鍚敤',
+ value: 1
+ },
+ {
+ label: '鍋滅敤',
+ value: 0
+ },
+ ],
+ typeId: [],
+ property: []
+ },
+ params: {
+ keyWord: '',
+ typeId: '',
+ property: '',
+ status: 1
+ },
+ apiObj: {
+ get: async (data) => {
+ let params = {
+ ...data
+ }
+ return await this.$HTTP.get(`/api/blade-cps/material/page`, params).then(res => {
+ return res
+ })
+ }
+ },
+ selection: [],
+ drawer: false,
+ form: {
+
+ },
+ rules: {
+ name: [
+ { required: true, message: '蹇呭～' }
+ ],
+ typeId: [
+ { required: true, message: '蹇呭～' }
+ ],
+ property: [
+ { required: true, message: '蹇呭～' }
+ ],
+ },
+ }
+ },
+ created() {
+ this.init()
+ },
+ methods: {
+ init() {
+ this.$HTTP.get(`/api/blade-cps/material-type/list`).then(res => {
+ this.options.typeId = res.data.map(item => ({
+ label: item.name,
+ value: item.id
+ }))
+ })
+ this.$HTTP.get(`/api/blade-system/dict/dictionary?code=material_property`).then(res => {
+ this.options.property = res.data.map(item => ({
+ label: item.dictValue,
+ value: item.dictKey - 0
+ }))
+ })
+ },
+ search() {
+ this.$refs.table.reload(this.params)
+ },
+ handleSelectionChange(selection) {
+ this.selection = selection
+ },
+ table_add() {
+ this.drawer = true
+ this.form = {}
+ },
+ table_edit(row) {
+ this.drawer = true
+ this.form = {
+ ...row
+ }
+ },
+ batchDel() {
+
+ },
+ dataChange() {
+
+ },
+ table_del(rowArr, type) {
+ this.$HTTP.delete(`/api/blade-cps/material/delete-material?ids=${rowArr.map(v => v.id).toString()}&type=${type}`).then(res => {
+ if (res.code === 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.$refs.table.reload(this.params)
+ }
+ })
+ },
+ save() {
+ this.$refs.dialogForm.validate(async (valid) => {
+ if (valid) {
+ if (this.form.id) {
+ this.$HTTP.put(`/api/blade-cps/material/update-material`, {
+ ...this.form
+ }).then(res => {
+ this.drawer = false
+ this.$refs.table.reload(this.params)
+ })
+ } else {
+ this.$HTTP.post(`/api/blade-cps/material/create-material`, {
+ ...this.form
+ }).then(res => {
+ this.drawer = false
+ this.$refs.table.reload(this.params)
+ })
+ }
+ }
+ })
+
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue b/src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue
new file mode 100644
index 0000000..6c68bf6
--- /dev/null
+++ b/src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue
@@ -0,0 +1,38 @@
+<!--
+ * @Date: 2024-05-08 21:29:54
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-05-08 21:29:59
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/material-info copy 2.vue
+-->
+<!--
+ * @Date: 2024-05-08 21:29:54
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-05-08 21:29:58
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/material-warehousing-data/material-info copy 2.vue
+-->
+<template>
+ <el-main style="height: 100%;">
+ <el-card shadow="never" style="height: 100%;" body-style="height: 100%">
+ <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+ <el-tab-pane label="鐗╂枡淇℃伅" name="1">
+
+ </el-tab-pane>
+ <el-tab-pane label="鐗╂枡绫诲瀷" name="2">
+
+ </el-tab-pane>
+ </el-tabs>
+ </el-card>
+ </el-main>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ activeName: '1'
+ }
+ },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/tpm/MachineTab.vue b/src/views/tpm/MachineTab.vue
index 6c02bcb..7760cd4 100644
--- a/src/views/tpm/MachineTab.vue
+++ b/src/views/tpm/MachineTab.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-27 20:04:34
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-07 22:40:21
+ * @LastEditTime: 2024-05-08 23:13:10
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/tpm/MachineTab.vue
-->
<template>
@@ -58,7 +58,7 @@
<el-button-group>
<el-button text type="primary" size="small"
@click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
- <el-popconfirm cancel-button-text="鍋滅敤" confirm-button-text="鍒犻櫎"
+ <el-popconfirm width="220" cancel-button-text="鍋滅敤" confirm-button-text="鍒犻櫎"
title="鍒犻櫎鏁版嵁浼氬奖鍝嶅凡鍏宠仈鐨勪笟鍔� ,鑻ユ偍鎯冲湪宸插叧鑱旂殑涓氬姟涓緷鐒舵樉绀鸿繖浜涙暟鎹�, 鎮ㄥ彲浠ラ�夋嫨 鍋滅敤 鎿嶄綔銆傚仠鐢ㄥ悗姝ゆ暟鎹皢涓嶈兘鍐嶈鏂颁笟鍔′娇鐢ㄣ��"
@confirm="table_del(scope.row, scope.$index, '0')"
@cancel="table_del(scope.row, scope.$index, '1')">
--
Gitblit v1.9.3