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" align="center"
prop="createTimes" prop="createTimes"
show-overflow-tooltip show-overflow-tooltip
sortable
/> />
<el-table-column <el-table-column
label="任务状态" label="任务状态"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,13 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="字典名称" prop="name"> <el-form-item label="字典名称" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.name"
@ -23,7 +30,8 @@
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="字典状态" placeholder="字典状态"
clearable filterable clearable
filterable
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -46,8 +54,19 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-item>
</el-form> </el-form>
@ -60,7 +79,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dict:add']" v-hasPermi="['system:dict:add']"
>新增</el-button> >新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -71,7 +91,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -82,7 +103,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -92,7 +114,8 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dict:export']" v-hasPermi="['system:dict:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -102,34 +125,61 @@
size="mini" size="mini"
@click="handleRefreshCache" @click="handleRefreshCache"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>刷新缓存</el-button> >刷新缓存</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="typeList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编号" align="center" prop="id" /> <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" prop="name" :show-overflow-tooltip="true" /> -->
<el-table-column label="字典名称" align="center" :show-overflow-tooltip="true"> <el-table-column
label="字典名称"
align="center"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type"> <router-link
:to="'/system/dict-data/index/' + scope.row.id"
class="link-type"
>
<span>{{ scope.row.name }}</span> <span>{{ scope.row.name }}</span>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> <dict-tag
:options="dict.type.sys_normal_disable"
:value="scope.row.status"
/>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -137,20 +187,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@ -158,10 +210,18 @@
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="name"> <el-form-item label="字典名称" prop="name">
<el-input v-model="form.name" placeholder="请输入字典名称" /> <el-input
v-model="form.name"
placeholder="请输入字典名称"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="字典类型" prop="dictType"> <!-- <el-form-item label="字典类型" prop="dictType">
<el-input v-model="form.dictType" placeholder="请输入字典类型" /> <el-input v-model="form.dictType" placeholder="请输入字典类型" />
@ -172,11 +232,16 @@
v-for="dict in dict.type.sys_normal_disable" v-for="dict in dict.type.sys_normal_disable"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="dict.value"
>{{dict.label}}</el-radio> >{{ dict.label }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> <el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -188,10 +253,14 @@
</template> </template>
<script> <script>
import { listType, refreshCache } from "@/api/system/dict/type"; import { listType, refreshCache } from '@/api/system/dict/type'
import { addDictData,updateDictData,delDictData} from "@/api/system/dict/data"; import {
addDictData,
updateDictData,
delDictData,
} from '@/api/system/dict/data'
export default { export default {
name: "Dict", name: 'Dict',
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { return {
@ -210,7 +279,7 @@ export default {
// //
typeList: [], typeList: [],
// //
title: "", title: '',
// //
open: false, open: false,
// //
@ -219,42 +288,51 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
id:'0', id: '0',
name: undefined, name: undefined,
dictType: undefined, dictType: undefined,
status: undefined status: undefined,
}, },
// //
form: {}, form: {},
// //
rules: { rules: {
name: [ name: [
{ required: true, message: "字典名称不能为空", trigger: "blur" } {
required: true,
message: '字典名称不能为空',
trigger: 'blur',
},
], ],
dictType: [ dictType: [
{ required: true, message: "字典类型不能为空", trigger: "blur" } {
] required: true,
message: '字典类型不能为空',
trigger: 'blur',
},
],
},
} }
};
}, },
created() { created() {
this.getList(); this.getList()
}, },
methods: { methods: {
/** 查询字典类型列表 */ /** 查询字典类型列表 */
getList() { getList() {
this.loading = true; this.loading = true
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listType(this.addDateRange(this.queryParams, this.dateRange)).then(
this.typeList = response.rows; (response) => {
this.total = response.total; this.typeList = response.rows
this.loading = false; this.total = response.total
} this.loading = false
); },
)
}, },
// //
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// //
reset() { reset() {
@ -262,85 +340,93 @@ export default {
pId: '0', pId: '0',
name: undefined, name: undefined,
dictType: undefined, dictType: undefined,
status: "0", status: '0',
remark: undefined remark: undefined,
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = []; this.dateRange = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset()
this.open = true; this.open = true
this.title = "添加字典类型"; this.title = '添加字典类型'
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.pId) this.ids = selection.map((item) => item.pId)
this.single = selection.length!=1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
let formData = row let formData = row
this.form = formData; this.form = formData
this.open = true; this.open = true
this.title = "修改字典类型"; this.title = '修改字典类型'
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if (this.form.pId != undefined) { if (this.title === '修改字典类型') {
updateDictData(this.form).then(response => { updateDictData(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addDictData(this.form).then(response => { addDictData(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const dictIds = row.pId || this.ids; const dictIds = row.pId || this.ids
this.$modal.confirm('是否确认删除所选择的数据项?').then(function() { this.$modal
return delDictData(dictIds); .confirm('是否确认删除所选择的数据项?')
}).then(() => { .then(function () {
this.getList(); return delDictData(dictIds)
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('system/dict/type/export', { this.download(
...this.queryParams 'system/dict/type/export',
}, `type_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`type_${new Date().getTime()}.xlsx`,
)
}, },
/** 刷新缓存按钮操作 */ /** 刷新缓存按钮操作 */
handleRefreshCache() { handleRefreshCache() {
refreshCache().then(() => { refreshCache().then(() => {
this.$modal.msgSuccess("刷新成功"); this.$modal.msgSuccess('刷新成功')
this.$store.dispatch('dict/cleanDict'); this.$store.dispatch('dict/cleanDict')
}); })
} },
} },
}; }
</script> </script>

View File

@ -43,7 +43,7 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // 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.81:28080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
// target: `http://192.168.2.248:28080`, //帅 // target: `http://192.168.2.248:28080`, //帅