Merge remote-tracking branch 'origin/dev-nx' into dev-nx

This commit is contained in:
liang.chao 2024-07-15 15:38:56 +08:00
commit 390419ede2
11 changed files with 451 additions and 346 deletions

View File

@ -206,6 +206,7 @@
align="center"
prop="createTimes"
show-overflow-tooltip
sortable
/>
<el-table-column
label="任务状态"

View File

@ -201,6 +201,7 @@
align="center"
prop="createTimes"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="任务状态"

View File

@ -24,6 +24,7 @@
placeholder="请选择单位名称"
clearable
filterable
@change="unitChange"
>
<el-option
v-for="item in unitList"
@ -265,6 +266,13 @@
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="工程"
align="center"
:show-overflow-tooltip="true"
>
{{ detailsProName }}
</el-table-column>
<el-table-column
label="待出库数量"
align="center"
@ -766,6 +774,8 @@ export default {
outerVisible: false,
center: true,
},
//
detailsProName: '',
}
},
@ -790,10 +800,9 @@ export default {
})
},
//
getProList() {
getProData().then((response) => {
this.proList = response.data
})
async getProList(id) {
const { data: res } = await getProData({ id })
this.proList = res
},
getTypeList() {
getTypeList({ level: '3' }).then((response) => {
@ -838,6 +847,7 @@ export default {
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
this.getProList()
},
/** 查询列表 */
getList() {
@ -850,11 +860,12 @@ export default {
},
//
handleView(row) {
this.detailsProName = row.proName
this.openLeaseDevices = true
this.isView = true
this.dialogQuery.id = row.id
this.resetDialogQuery()
// this.getDialogList();
this.getDialogList()
},
/** 查询列表 */
getDialogList() {
@ -874,6 +885,7 @@ export default {
},
/** 出库按钮操作 */
handleOut(row) {
this.detailsProName = row.proName
this.openLeaseDevices = true
this.isView = false
this.dialogQuery.id = row.id
@ -1071,6 +1083,11 @@ export default {
handlePrinting() {
this.$refs.remarksPrintRef.print()
},
//
unitChange(val) {
this.getProList(val)
},
},
}
</script>

View File

@ -159,13 +159,13 @@
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料数量"
label="出库数量"
align="center"
prop="preNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料人"
label="申请人"
align="center"
prop="leasePerson"
:show-overflow-tooltip="true"
@ -187,6 +187,7 @@
align="center"
prop="createTime"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="领料单位"

View File

@ -213,6 +213,7 @@
align="center"
prop="backTime"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="协议号"

View File

@ -212,6 +212,7 @@
label="申请时间"
align="center"
prop="backTime"
sortable
:show-overflow-tooltip="true"
/>
<el-table-column
@ -226,7 +227,7 @@
prop="dictName"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<template>
<div>
<!-- 暂时全部未否 -->

View File

@ -179,6 +179,7 @@
align="center"
prop="createTime"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="退料单位"

View File

@ -857,10 +857,8 @@ export default {
// 1退 2
const { taskId } = this.sendParams
const { data: res } = await getScrapReturnOverQueryApi({ taskId })
console.log(res, '查询结果=======')
if (res == 0) {
console.log('存在未退料数据')
this.$message.error(
'当前存在未退料机具,请处理之后再点击完成退料!',
)
@ -871,17 +869,14 @@ export default {
this.dialogConfigReturn.outerTitle = '选择审批部门'
this.dialogConfigReturn.outerWidth = '50%'
this.dialogConfigReturn.outerVisible = true
console.log('存在报废数据')
}
if (res == 2) {
console.log('不存在报废数据')
let endBackParams = {
createBy: sessionStorage.getItem('userId'),
taskId: this.sendTbParams.taskId,
}
const res = await getScrapReturnCompleteApi(endBackParams)
console.log(res, '退料结果')
}
},

View File

@ -16,6 +16,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
>
</el-date-picker>
</el-form-item>
@ -24,7 +25,7 @@
v-model="queryParams.unitId"
filterable
clearable
@change="GetProData"
@change="unitChange"
style="width: 240px"
placeholder="请选择"
>
@ -42,7 +43,6 @@
v-model="queryParams.proId"
filterable
clearable
@change="GetUnitData"
style="width: 240px"
placeholder="请选择"
>
@ -290,13 +290,9 @@ export default {
console.log('GetUnitData ======================', res)
},
//
async getProList() {
const params = {
id: this.queryParams.unitId,
}
const res = await getProData(params)
this.proList = res.data
console.log('GetProData ======================', res)
async getProList(id) {
const { data: res } = await getProData({ id })
this.proList = res
},
//
@ -317,6 +313,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.getProList()
this.queryParams.time = []
this.queryParams.unitId = ''
this.queryParams.proId = ''
@ -334,6 +331,10 @@ export default {
`综合查询_退料记录_${new Date().getTime()}.xlsx`,
)
},
//
unitChange(val) {
this.getProList(val)
},
},
}
</script>

View File

@ -1,16 +1,23 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入字典名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="字典类型" prop="dictType">
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="字典名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入字典名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="字典类型" prop="dictType">
<el-input
v-model="queryParams.dictType"
placeholder="请输入字典类型"
@ -19,328 +26,407 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="字典状态"
clearable filterable
style="width: 240px"
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="字典状态"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:dict:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dict:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dict:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>导出</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-refresh"
size="mini"
@click="handleRefreshCache"
v-hasPermi="['system:dict:remove']"
>刷新缓存</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="typeList"
@selection-change="handleSelectionChange"
>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编号" align="center" prop="id" />
<!-- <el-table-column label="字典名称" align="center" prop="name" :show-overflow-tooltip="true" /> -->
<el-table-column
label="字典名称"
align="center"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<router-link
:to="'/system/dict-data/index/' + scope.row.id"
class="link-type"
>
<span>{{ scope.row.name }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_normal_disable"
:value="scope.row.status"
/>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:dict:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dict:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-refresh"
size="mini"
@click="handleRefreshCache"
v-hasPermi="['system:dict:remove']"
>刷新缓存</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编号" align="center" prop="id" />
<!-- <el-table-column label="字典名称" align="center" prop="name" :show-overflow-tooltip="true" /> -->
<el-table-column label="字典名称" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type">
<span>{{ scope.row.name }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="name">
<el-input v-model="form.name" placeholder="请输入字典名称" />
</el-form-item>
<!-- <el-form-item label="字典类型" prop="dictType">
<!-- 添加或修改参数配置对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="500px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="name">
<el-input
v-model="form.name"
placeholder="请输入字典名称"
/>
</el-form-item>
<!-- <el-form-item label="字典类型" prop="dictType">
<el-input v-model="form.dictType" placeholder="请输入字典类型" />
</el-form-item> -->
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listType, refreshCache } from "@/api/system/dict/type";
import { addDictData,updateDictData,delDictData} from "@/api/system/dict/data";
import { listType, refreshCache } from '@/api/system/dict/type'
import {
addDictData,
updateDictData,
delDictData,
} from '@/api/system/dict/data'
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
typeList: [],
//
title: "",
//
open: false,
//
dateRange: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
id:'0',
name: undefined,
dictType: undefined,
status: undefined
},
//
form: {},
//
rules: {
name: [
{ required: true, message: "字典名称不能为空", trigger: "blur" }
],
dictType: [
{ required: true, message: "字典类型不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
},
methods: {
/** 查询字典类型列表 */
getList() {
this.loading = true;
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.typeList = response.rows;
this.total = response.total;
this.loading = false;
name: 'Dict',
dicts: ['sys_normal_disable'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
typeList: [],
//
title: '',
//
open: false,
//
dateRange: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
id: '0',
name: undefined,
dictType: undefined,
status: undefined,
},
//
form: {},
//
rules: {
name: [
{
required: true,
message: '字典名称不能为空',
trigger: 'blur',
},
],
dictType: [
{
required: true,
message: '字典类型不能为空',
trigger: 'blur',
},
],
},
}
);
},
//
cancel() {
this.open = false;
this.reset();
created() {
this.getList()
},
//
reset() {
this.form = {
pId: '0',
name: undefined,
dictType: undefined,
status: "0",
remark: undefined
};
this.resetForm("form");
methods: {
/** 查询字典类型列表 */
getList() {
this.loading = true
listType(this.addDateRange(this.queryParams, this.dateRange)).then(
(response) => {
this.typeList = response.rows
this.total = response.total
this.loading = false
},
)
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.form = {
pId: '0',
name: undefined,
dictType: undefined,
status: '0',
remark: undefined,
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加字典类型'
},
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.pId)
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
let formData = row
this.form = formData
this.open = true
this.title = '修改字典类型'
},
/** 提交按钮 */
submitForm: function () {
this.$refs['form'].validate((valid) => {
if (valid) {
if (this.title === '修改字典类型') {
updateDictData(this.form).then((response) => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addDictData(this.form).then((response) => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const dictIds = row.pId || this.ids
this.$modal
.confirm('是否确认删除所选择的数据项?')
.then(function () {
return delDictData(dictIds)
})
.then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
this.download(
'system/dict/type/export',
{
...this.queryParams,
},
`type_${new Date().getTime()}.xlsx`,
)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {
refreshCache().then(() => {
this.$modal.msgSuccess('刷新成功')
this.$store.dispatch('dict/cleanDict')
})
},
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加字典类型";
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.pId)
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
let formData = row
this.form = formData;
this.open = true;
this.title = "修改字典类型";
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.pId != undefined) {
updateDictData(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addDictData(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const dictIds = row.pId || this.ids;
this.$modal.confirm('是否确认删除所选择的数据项?').then(function() {
return delDictData(dictIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {
refreshCache().then(() => {
this.$modal.msgSuccess("刷新成功");
this.$store.dispatch('dict/cleanDict');
});
}
}
};
}
</script>

View File

@ -43,7 +43,7 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,
target: `http://192.168.2.122:28080`, //超
target: `http://192.168.2.167:28080`, //超
// target: `http://10.40.92.81:28080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/
// target: `http://192.168.2.248:28080`, //帅