zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
shijing 2025-12-24 16:03:24 +08:00
parent aad1383334 824931b48c
commit ccadd4d37e
6 changed files with 136 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/model/asm.js
View File

@ -27,6 +27,13 @@ export default {
data); data);
} }
}, },
update: {
req: async function(id, data){
return await http.put(
`${config.API_URL}/asm/assetcate/${id}/`,
data);
}
},
delete: { delete: {
name: "删除", name: "删除",
req: async function(id){ req: async function(id){
@ -77,6 +84,13 @@ export default {
data); data);
} }
}, },
update: {
req: async function(id, data){
return await http.put(
`${config.API_URL}/asm/assetlog/${id}/`,
data);
}
},
delete: { delete: {
name: "删除", name: "删除",
req: async function(id){ req: async function(id){

3
src/components/xtSelect/index.vue
View File

@ -89,7 +89,7 @@ const props = defineProps({
options: { type: Array, default: null }, options: { type: Array, default: null },
}); });
const emit = defineEmits(["update:modelValue", "update:obj", "change"]); const emit = defineEmits(["update:modelValue", "update:obj", "change", "update::label"]);
const selectable = (row) => row.count_canhandover?row.count_canhandover>0:true; const selectable = (row) => row.count_canhandover?row.count_canhandover>0:true;
// 控制 popover 显示与隐藏的状态 // 控制 popover 显示与隐藏的状态
const showPopover = ref(false); const showPopover = ref(false);
@ -170,6 +170,7 @@ const selectValue = computed({
}, },
set(val) { set(val) {
emit("update:modelValue", val); emit("update:modelValue", val);
emit("update:label", selectLabel.value);
}, },
}); });

102
src/views/asm/assetlogin_form.vue
View File

@ -8,10 +8,19 @@
<el-form-item label="保管部门" required> <el-form-item label="保管部门" required>
<xtSelect <xtSelect
v-model="formData.keep_dept" v-model="formData.keep_dept"
style="width: 100%;"
:apiObj = "$API.system.dept.list" :apiObj = "$API.system.dept.list"
v-model:label="formData.keep_dept_name" v-model:label="formData.keep_dept_name"
:edit="localMode === 'add'" :edit="localMode == 'add'"
>
<el-table-column prop="name" label="部门名称"></el-table-column>
</xtSelect>
</el-form-item>
<el-form-item label="保管人" required>
<xtSelect
v-model="formData.keeper"
:apiObj = "$API.system.user.list"
:edit="localMode != 'show'"
v-model:label="formData.keeper_name"
> >
<el-table-column prop="name" label="部门名称"></el-table-column> <el-table-column prop="name" label="部门名称"></el-table-column>
</xtSelect> </xtSelect>
@ -31,41 +40,71 @@
:addTemplate="addTemplate" :addTemplate="addTemplate"
placeholder="暂无数据" placeholder="暂无数据"
> >
<el-table-column prop="name" label="资产类别" width="180"> <el-table-column prop="name" width="160">
<template #header>
<span style="color: red">*</span>
<span>资产类别</span>
</template>
<template #default="scope"> <template #default="scope">
<xtSelect :apiObj="$API.asm.assetcate.list" v-model="scope.row.cate"> <xtSelect :apiObj="$API.asm.assetcate.list" v-model="scope.row.cate" v-model:label="scope.row.cate_name">
<el-table-column prop="name"></el-table-column> <el-table-column prop="name"></el-table-column>
</xtSelect> </xtSelect>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="资产名称" width="180"> <el-table-column prop="name" label="资产名称" width="160">
<template #header>
<span style="color: red">*</span>
<span>资产名称</span>
</template>
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.name"></el-input> <el-input v-model="scope.row.name"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="specification" label="规格型号" width="180"> <el-table-column prop="specification" label="规格型号" width="160">
<template #header>
<span style="color: red">*</span>
<span>规格型号</span>
</template>
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.specification"></el-input> <el-input v-model="scope.row.specification"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="quantity" label="数量" width="180"> <el-table-column prop="quantity" label="数量" width="180">
<template #header>
<span style="color: red">*</span>
<span>数量</span>
</template>
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.quantity" :min="1" :precision="0" controls-position="right"></el-input-number> <el-input-number v-model="scope.row.quantity" :min="1" :precision="0" controls-position="right"></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="canuse_year" label="可用年限" width="180"> <el-table-column prop="canuse_year" label="可用年限" width="180">
<template #header>
<span style="color: red">*</span>
<span>可用年限</span>
</template>
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.canuse_year" :min="1" :precision="0" controls-position="right"></el-input-number> <el-input-number v-model="scope.row.canuse_year" :min="1" :precision="0" controls-position="right"></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="original_value" label="资产原值" width="180"> <el-table-column prop="original_value" label="资产原值" width="180">
<template #header>
<span style="color: red">*</span>
<span>资产原值</span>
</template>
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.original_value" :min="1" :precision="2" controls-position="right"></el-input-number> <el-input-number v-model="scope.row.original_value" :min="1" :precision="2" controls-position="right"></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="supplier" label="供应商" width="180"> <el-table-column prop="supplier" label="供应商" width="160">
<template #header>
<span style="color: red">*</span>
<span>供应商</span>
</template>
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.supplier"></el-input> <xtSelect :apiObj="$API.pum.supplier.list" v-model="scope.row.supplier" v-model:label="scope.row.supplier_name">
<el-table-column prop="name"></el-table-column>
</xtSelect>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="location" label="存放地点"> <el-table-column prop="location" label="存放地点">
@ -83,21 +122,21 @@
@click="handleDel" @click="handleDel"
:loading="saveLoading" :loading="saveLoading"
>删除</el-button> >删除</el-button>
<el-button
v-if="localMode!='show'"
type="primary"
style="margin-right: 4px;"
@click="handleSave"
:loading="saveLoading"
>提交审批</el-button>
<ticketd_b <ticketd_b
v-if = "formData.ticket_" v-if = "formData.ticket_ && localMode=='show'"
:t_id="formData.id" :t_id="formData.id"
:ticket_="formData.ticket_" :ticket_="formData.ticket_"
:ticket_data="ticket_data" :ticket_data="ticket_data"
@success="$emit('success', localMode)" @success="$emit('success', localMode)"
ref="ticketd_b" ref="ticketd_b"
></ticketd_b> ></ticketd_b>
<el-button
v-else
type="primary"
style="margin-right: 4px;"
@click="handleSave"
:loading="saveLoading"
>提交审批</el-button>
</el-footer> </el-footer>
</el-main> </el-main>
<el-aside width="20%" v-if="formData.ticket_"> <el-aside width="20%" v-if="formData.ticket_">
@ -136,7 +175,8 @@ export default {
localMode: this.mode, localMode: this.mode,
saveLoading: false, saveLoading: false,
addTemplate: { addTemplate: {
name: null, quantity: 1,
canuse_year: 1
} }
} }
}, },
@ -150,7 +190,7 @@ export default {
methods: { methods: {
async getTid() { async getTid() {
try { try {
let res = await this.$API.em.repair.item.req(this.t_id); let res = await this.$API.asm.assetlog.item.req(this.t_id);
this.formData = res; this.formData = res;
if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) { if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
this.localMode = "edit"; this.localMode = "edit";
@ -164,7 +204,7 @@ export default {
type: "warning", type: "warning",
}) })
.then(()=>{ .then(()=>{
this.$API.em.repair.delete.req(this.formData.id).then(res=>{ this.$API.asm.assetlog.delete.req(this.formData.id).then(res=>{
this.$message.success("删除成功"); this.$message.success("删除成功");
this.$emit('success'); this.$emit('success');
}) })
@ -173,7 +213,7 @@ export default {
async handleSave() { async handleSave() {
if (this.localMode == "add") { if (this.localMode == "add") {
try { try {
let res = await this.$API.em.repair.create.req(this.formData); let res = await this.$API.asm.assetlog.create.req(this.formData);
this.$message.success("提交成功"); this.$message.success("提交成功");
this.$emit('success', this.localMode); this.$emit('success', this.localMode);
} catch (error) { } catch (error) {
@ -181,7 +221,15 @@ export default {
throw error; throw error;
} }
} else if (this.localMode == "edit") { } else if (this.localMode == "edit") {
this.$message.error("不支持编辑"); try{
let res = await this.$API.asm.assetlog.update.req(this.formData.id, this.formData);
this.$message.success("提交成功");
this.$emit('success', this.localMode);
}catch (error){
throw error;
}
} }
} }
} }

30
src/views/em/repair_form.vue
View File

@ -80,21 +80,21 @@
@click="handleDel" @click="handleDel"
:loading="saveLoading" :loading="saveLoading"
>删除</el-button> >删除</el-button>
<ticketd_b <el-button
v-if = "formData.ticket_" v-if="localMode!='show'"
:t_id="formData.id" type="primary"
:ticket_="formData.ticket_" style="margin-right: 4px;"
:ticket_data="ticket_data" @click="handleSave"
@success="$emit('success', localMode)" :loading="saveLoading"
ref="ticketd_b" >提交审批</el-button>
></ticketd_b> <ticketd_b
<el-button v-if = "formData.ticket_ && localMode=='show'"
v-else :t_id="formData.id"
type="primary" :ticket_="formData.ticket_"
style="margin-right: 4px;" :ticket_data="ticket_data"
@click="handleSave" @success="$emit('success', localMode)"
:loading="saveLoading" ref="ticketd_b"
>提交审批</el-button> ></ticketd_b>
</el-footer> </el-footer>
</el-main> </el-main>
<el-aside width="20%" v-if="formData.ticket_"> <el-aside width="20%" v-if="formData.ticket_">

29
src/views/hrm/resignation_form.vue
View File

@ -42,20 +42,21 @@
@click="handleDel" @click="handleDel"
:loading="saveLoading" :loading="saveLoading"
>删除</el-button> >删除</el-button>
<ticketd_b <el-button
v-if = "formData.ticket_" v-if="localMode!='show'"
:t_id="formData.id" type="primary"
:ticket_="formData.ticket_" style="margin-right: 4px;"
@success="$emit('success', localMode)" @click="handleSave"
ref="ticketd_b" :loading="saveLoading"
></ticketd_b> >提交审批</el-button>
<el-button <ticketd_b
v-else v-if = "formData.ticket_ && localMode=='show'"
type="primary" :t_id="formData.id"
style="margin-right: 4px;" :ticket_="formData.ticket_"
@click="handleSave" :ticket_data="ticket_data"
:loading="saveLoading" @success="$emit('success', localMode)"
>提交审批</el-button> ref="ticketd_b"
></ticketd_b>
</el-footer> </el-footer>
</el-main> </el-main>
<el-aside width="20%" v-if="formData.ticket_"> <el-aside width="20%" v-if="formData.ticket_">

29
src/views/pum/supplieraudit_form.vue
View File

@ -51,20 +51,21 @@
style="margin-right: 4px;" style="margin-right: 4px;"
@click="handleDel" @click="handleDel"
>删除</el-button> >删除</el-button>
<ticketd_b <el-button
v-if ="formData.ticket_" v-if="localMode!='show'"
:t_id="formData.id" type="primary"
:ticket_="formData.ticket_" style="margin-right: 4px;"
@success="$emit('success', localMode)" @click="handleSave"
ref="ticketd_b" :loading="saveLoading"
></ticketd_b> >提交审批</el-button>
<el-button <ticketd_b
v-else v-if = "formData.ticket_ && localMode=='show'"
type="primary" :t_id="formData.id"
style="margin-right: 4px;" :ticket_="formData.ticket_"
@click="handleSave" :ticket_data="ticket_data"
:loading="saveLoading" @success="$emit('success', localMode)"
>提交审批</el-button> ref="ticketd_b"
></ticketd_b>
</el-footer> </el-footer>
</el-main> </el-main>
<el-aside width="20%" v-if="formData.ticket_"> <el-aside width="20%" v-if="formData.ticket_">