Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
This commit is contained in:
commit
4b9da28d5d
|
|
@ -3,9 +3,41 @@ import http from "@/utils/request"
|
|||
|
||||
export default {
|
||||
// 固定资产
|
||||
assetcate: {
|
||||
list: {
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/asm/assetcate/`,
|
||||
data
|
||||
);
|
||||
}
|
||||
},
|
||||
item: {
|
||||
req: async function(id){
|
||||
return await http.get(
|
||||
`${config.API_URL}/asm/assetcate/${id}/`,
|
||||
);
|
||||
}
|
||||
},
|
||||
create: {
|
||||
name: "新增",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/asm/assetcate/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
delete: {
|
||||
name: "删除",
|
||||
req: async function(id){
|
||||
return await http.delete(
|
||||
`${config.API_URL}/asm/assetcate/${id}/`
|
||||
);
|
||||
}
|
||||
},
|
||||
},
|
||||
asset: {
|
||||
list: {
|
||||
name: "供应商审核",
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/asm/asset/`,
|
||||
|
|
@ -16,7 +48,24 @@ export default {
|
|||
item: {
|
||||
req: async function(id){
|
||||
return await http.get(
|
||||
`${config.API_URL}asm/asset/${id}/`,
|
||||
`${config.API_URL}/asm/asset/${id}/`,
|
||||
);
|
||||
}
|
||||
},
|
||||
},
|
||||
assetlog: {
|
||||
list: {
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/asm/assetlog/`,
|
||||
data
|
||||
);
|
||||
}
|
||||
},
|
||||
item: {
|
||||
req: async function(id){
|
||||
return await http.get(
|
||||
`${config.API_URL}/asm/assetlog/${id}/`,
|
||||
);
|
||||
}
|
||||
},
|
||||
|
|
@ -24,7 +73,7 @@ export default {
|
|||
name: "新增",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/asm/asset/`,
|
||||
`${config.API_URL}/asm/assetlog/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
|
|
@ -32,9 +81,9 @@ export default {
|
|||
name: "删除",
|
||||
req: async function(id){
|
||||
return await http.delete(
|
||||
`${config.API_URL}/asm/asset/${id}/`
|
||||
`${config.API_URL}/asm/assetlog/${id}/`
|
||||
);
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<!-- <el-button type="primary" @click="handleAdd">新增</el-button> -->
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="关键词"
|
||||
clearable
|
||||
@keyup.enter="$refs.table.refresh()"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="API.asm.asset.list"
|
||||
row-key="id"
|
||||
stripe
|
||||
:query="query"
|
||||
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
|
||||
>
|
||||
<el-table-column label="卡片编号" prop="card_number" width="200" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="固定资产名称" prop="name" width="200" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="规格型号" prop="specification" width="200" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="资产类别" prop="cate_name" width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="使用状态" prop="state" width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="数量" prop="quantity" width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="计量单位" prop="unit" width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="启用日期" prop="start_date" width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="保管部门" prop="keep_dept_name" width="120" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="保管人" prop="keeper_name" width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="存放地点" prop="location" show-overflow-tooltip></el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<!-- <el-drawer title="固定资产分类" v-model="drawerVisible" :size="'80%'" destroy-on-close>
|
||||
<assetcate-form :mode="mode" :t_id="t_id" @success="drawerVisible=false;$refs.table.refresh()"></assetcate-form>
|
||||
</el-drawer> -->
|
||||
</template>
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import API from '@/api'
|
||||
// import assetcateForm from './assetcate_form.vue'
|
||||
import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
|
||||
const query = ref({});
|
||||
const drawerVisible = ref(false);
|
||||
const mode = ref('add');
|
||||
const t_id = ref(null);
|
||||
const handleAdd = () => {
|
||||
mode.value = 'add';
|
||||
drawerVisible.value = true;
|
||||
}
|
||||
</script>
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-button type="primary" @click="handleAdd">新增</el-button>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="关键词"
|
||||
clearable
|
||||
@keyup.enter="$refs.table.refresh()"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="API.asm.assetcate.list"
|
||||
row-key="id"
|
||||
stripe
|
||||
:query="query"
|
||||
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
|
||||
>
|
||||
<el-table-column label="类别名称" prop="name" show-overflow-tooltip></el-table-column>`
|
||||
<el-table-column label="类别编码" prop="code" width="200" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="默认单位" prop="default_unit" width="200" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="创建时间" prop="create_time" width="220" show-overflow-tooltip></el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<el-drawer title="固定资产分类" v-model="drawerVisible" :size="'80%'" destroy-on-close>
|
||||
<assetcate-form :mode="mode" :t_id="t_id" @success="drawerVisible=false;$refs.table.refresh()"></assetcate-form>
|
||||
</el-drawer>
|
||||
</template>
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import API from '@/api'
|
||||
import assetcateForm from './assetcate_form.vue'
|
||||
import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
|
||||
const query = ref({});
|
||||
const drawerVisible = ref(false);
|
||||
const mode = ref('add');
|
||||
const t_id = ref(null);
|
||||
const handleAdd = () => {
|
||||
mode.value = 'add';
|
||||
drawerVisible.value = true;
|
||||
}
|
||||
</script>
|
||||
|
|
@ -0,0 +1,113 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-main class="nopadding">
|
||||
<el-form label-width="80px" :model="formData" style="padding: 20px;">
|
||||
<el-form-item label="类别名称" required>
|
||||
<el-input
|
||||
v-model="formData.name"
|
||||
:readonly="localMode === 'show'"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="类别编码" required>
|
||||
<el-input
|
||||
v-model="formData.code"
|
||||
:readonly="localMode === 'show'"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="默认单位" required>
|
||||
<el-input
|
||||
v-model="formData.default_unit"
|
||||
:readonly="localMode === 'show'"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-footer>
|
||||
<el-button type="danger"
|
||||
v-if="localMode=='edit'"
|
||||
style="margin-right: 4px;"
|
||||
@click="handleDel"
|
||||
:loading="saveLoading"
|
||||
>删除</el-button>
|
||||
<el-button
|
||||
v-else
|
||||
type="primary"
|
||||
style="margin-right: 4px;"
|
||||
@click="handleSave"
|
||||
:loading="saveLoading"
|
||||
>保存</el-button>
|
||||
</el-footer>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
export default {
|
||||
name: 'AssetcateForm',
|
||||
components: {
|
||||
},
|
||||
props: {
|
||||
mode: {
|
||||
type: String,
|
||||
default: 'show'
|
||||
},
|
||||
t_id: {
|
||||
type: String,
|
||||
default: ""
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
formData: {
|
||||
},
|
||||
localMode: this.mode,
|
||||
saveLoading: false
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
if (this.t_id) {
|
||||
this.getTid();
|
||||
} else {
|
||||
this.initFormData();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
async initFormData() {
|
||||
|
||||
},
|
||||
async getTid() {
|
||||
try {
|
||||
let res = await this.$API.asm.assetcate.item.req(this.t_id);
|
||||
this.formData = res;
|
||||
} catch (error) {
|
||||
console.error('获取数据失败:', error);
|
||||
}
|
||||
},
|
||||
handleDel() {
|
||||
this.$confirm(`确定删除吗？`, "提示", {
|
||||
type: "warning",
|
||||
})
|
||||
.then(()=>{
|
||||
this.$API.asm.assetcate.delete.req(this.formData.id).then(res=>{
|
||||
this.$message.success("删除成功");
|
||||
this.$emit('success');
|
||||
})
|
||||
})
|
||||
},
|
||||
async handleSave() {
|
||||
if (this.localMode == "add") {
|
||||
try {
|
||||
let res = await this.$API.asm.assetcate.create.req(this.formData);
|
||||
this.$message.success("提交成功");
|
||||
this.$emit('success', this.localMode);
|
||||
} catch (error) {
|
||||
console.error('提交失败:', error);
|
||||
throw error;
|
||||
}
|
||||
} else if (this.localMode == "edit") {
|
||||
this.$message.error("不支持编辑");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel"></div>
|
||||
<div class="right-panel">
|
||||
<!-- <el-button type="primary" @click="handleAdd">新增</el-button> -->
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="设备信息等"
|
||||
clearable
|
||||
@keyup.enter="$refs.table.refresh()"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="API.em.repair.list"
|
||||
row-key="id"
|
||||
stripe
|
||||
:query="query"
|
||||
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
|
||||
>
|
||||
<el-table-column label="设备" prop="equipment_fullname" width="300" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="流程状态" width="300" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
|
||||
{{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
|
||||
</el-tag>
|
||||
<el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>`
|
||||
<el-table-column label="故障类别" prop="fault_cate" width="100" show-overflow-tooltip></el-table-column>`
|
||||
<el-table-column label="故障描述" prop="fault_description" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="维修人" prop="repair_user_name" width="100" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="维修开始时间" prop="repair_start_time" width="200" show-overflow-tooltip></el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import API from '@/api'
|
||||
import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
|
||||
const query = ref({});
|
||||
const drawerVisible = ref(false);
|
||||
const mode = ref('add');
|
||||
const t_id = ref(null);
|
||||
const handleAdd = () => {
|
||||
mode.value = 'add';
|
||||
drawerVisible.value = true;
|
||||
}
|
||||
</script>
|
||||
|
|
@ -0,0 +1,189 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-main class="nopadding">
|
||||
<el-form label-width="110px" :model="formData" style="padding: 20px;">
|
||||
<el-form-item label="创建时间" v-if="localMode !== 'add'">
|
||||
{{ formData.create_time }}
|
||||
</el-form-item>
|
||||
<el-form-item label="保管部门" required>
|
||||
<xtSelect
|
||||
v-model="formData.keep_dept"
|
||||
style="width: 100%;"
|
||||
:apiObj = "$API.system.dept.list"
|
||||
v-model:label="formData.keep_dept_name"
|
||||
:edit="localMode === 'add'"
|
||||
>
|
||||
<el-table-column prop="name" label="部门名称"></el-table-column>
|
||||
</xtSelect>
|
||||
</el-form-item>
|
||||
<el-form-item label="启用日期" required>
|
||||
<el-date-picker
|
||||
v-model="formData.start_date"
|
||||
type="date"
|
||||
placeholder="请选择启用日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
:disabled="localMode !== 'add'"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="入库明细" required>
|
||||
<sc-form-table
|
||||
v-model="formData.items"
|
||||
:addTemplate="addTemplate"
|
||||
placeholder="暂无数据"
|
||||
>
|
||||
<el-table-column prop="name" label="资产类别" width="180">
|
||||
<template #default="scope">
|
||||
<xtSelect :apiObj="$API.asm.assetcate.list" v-model="scope.row.cate">
|
||||
<el-table-column prop="name"></el-table-column>
|
||||
</xtSelect>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="name" label="资产名称" width="180">
|
||||
<template #default="scope">
|
||||
<el-input v-model="scope.row.name"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="specification" label="规格型号" width="180">
|
||||
<template #default="scope">
|
||||
<el-input v-model="scope.row.specification"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="quantity" label="数量" width="180">
|
||||
<template #default="scope">
|
||||
<el-input-number v-model="scope.row.quantity" :min="1" :precision="0" controls-position="right"></el-input-number>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="canuse_year" label="可用年限" width="180">
|
||||
<template #default="scope">
|
||||
<el-input-number v-model="scope.row.canuse_year" :min="1" :precision="0" controls-position="right"></el-input-number>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="original_value" label="资产原值" width="180">
|
||||
<template #default="scope">
|
||||
<el-input-number v-model="scope.row.original_value" :min="1" :precision="2" controls-position="right"></el-input-number>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="supplier" label="供应商" width="180">
|
||||
<template #default="scope">
|
||||
<el-input v-model="scope.row.supplier"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="location" label="存放地点">
|
||||
<template #default="scope">
|
||||
<el-input v-model="scope.row.location"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</sc-form-table>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-footer>
|
||||
<el-button type="danger"
|
||||
v-if="localMode=='edit'"
|
||||
style="margin-right: 4px;"
|
||||
@click="handleDel"
|
||||
:loading="saveLoading"
|
||||
>删除</el-button>
|
||||
<ticketd_b
|
||||
v-if = "formData.ticket_"
|
||||
:t_id="formData.id"
|
||||
:ticket_="formData.ticket_"
|
||||
:ticket_data="ticket_data"
|
||||
@success="$emit('success', localMode)"
|
||||
ref="ticketd_b"
|
||||
></ticketd_b>
|
||||
<el-button
|
||||
v-else
|
||||
type="primary"
|
||||
style="margin-right: 4px;"
|
||||
@click="handleSave"
|
||||
:loading="saveLoading"
|
||||
>提交审批</el-button>
|
||||
</el-footer>
|
||||
</el-main>
|
||||
<el-aside width="20%" v-if="formData.ticket_">
|
||||
<ticketd :ticket_="formData.ticket_" @success="$emit('success')"></ticketd>
|
||||
</el-aside>
|
||||
</el-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ticketd_b from "@/views/wf/ticketd_b.vue";
|
||||
import ticketd from '@/views/wf/ticketd.vue'
|
||||
|
||||
export default {
|
||||
name: 'repair_form',
|
||||
components: {
|
||||
ticketd_b,
|
||||
ticketd
|
||||
},
|
||||
props: {
|
||||
mode: {
|
||||
type: String,
|
||||
default: 'show'
|
||||
},
|
||||
t_id: {
|
||||
type: String,
|
||||
default: ""
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
formData: {
|
||||
type: "入库",
|
||||
items: [],
|
||||
},
|
||||
ticket_data: {},
|
||||
localMode: this.mode,
|
||||
saveLoading: false,
|
||||
addTemplate: {
|
||||
name: null,
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
if (this.t_id) {
|
||||
this.getTid();
|
||||
} else {
|
||||
this.localMode = "add";
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
async getTid() {
|
||||
try {
|
||||
let res = await this.$API.em.repair.item.req(this.t_id);
|
||||
this.formData = res;
|
||||
if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
|
||||
this.localMode = "edit";
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取数据失败:', error);
|
||||
}
|
||||
},
|
||||
handleDel() {
|
||||
this.$confirm(`确定删除吗？`, "提示", {
|
||||
type: "warning",
|
||||
})
|
||||
.then(()=>{
|
||||
this.$API.em.repair.delete.req(this.formData.id).then(res=>{
|
||||
this.$message.success("删除成功");
|
||||
this.$emit('success');
|
||||
})
|
||||
})
|
||||
},
|
||||
async handleSave() {
|
||||
if (this.localMode == "add") {
|
||||
try {
|
||||
let res = await this.$API.em.repair.create.req(this.formData);
|
||||
this.$message.success("提交成功");
|
||||
this.$emit('success', this.localMode);
|
||||
} catch (error) {
|
||||
console.error('提交失败:', error);
|
||||
throw error;
|
||||
}
|
||||
} else if (this.localMode == "edit") {
|
||||
this.$message.error("不支持编辑");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
Loading…
Reference in New Issue