bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-cq-bug' into dev

This commit is contained in:
15856 2024-04-30 10:26:55 +08:00
parent 763c003c34 88ac035ed7
commit bbf5d988f3
11 changed files with 56 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaintenanceGangMapper.xml
View File

@ -22,11 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<select id="getMaintenanceGangInfoAll" resultType="com.bonus.sgzb.base.domain.MaintenanceGang">
SELECT mt.type_id as modelId ,mt.type_name as modelName,
mt2.type_id, mt2.type_name as typeName,
mt3.type_id as typeId,mt3.type_name,
mt3.type_id as kindId,mt4.type_name as kindName,
su.user_id as userId, su.nick_name as userName
SELECT mt.type_id as modelId ,
mt.type_name as modelName,
mt2.type_id,
mt2.type_name as typeName,
mt3.type_id as typeId,
mt3.type_id as kindId,
mt4.type_name as kindName,
su.user_id as userId,
su.nick_name as userName
FROM ma_type mt
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
@ -35,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_user su ON su.user_id = mtk.user_id
WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
<if test="typeName != null and typeName != ''">
AND mt3.type_name like concat('%', #{typeName}, '%')
AND mt2.type_name like concat('%', #{typeName}, '%')
</if>
ORDER BY mt.type_id DESC
</select>

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/AgreementInfoMapper.xml
View File

@ -109,7 +109,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
where bai.status = '1'
<if test="keyWord != null and keyWord != ''">
and bai.contract_code like concat('%', #{keyWord}, '%')
and (bai.contract_code like concat('%', #{keyWord}, '%') or
auth_person like concat('%', #{keyWord}, '%') or
phone like concat('%', #{keyWord}, '%'))
</if>
<if test="agreementCode != null and agreementCode != ''">

9
sgzb-ui/src/api/store/newBuy.js
View File

@ -363,3 +363,12 @@ export function getWholeSetDetails(query) {
params: query,
})
}
// 查看绑定编码详情
export function getBindCodeDetails(query) {
return request({
url: '/material/purchaseMacode/details',
method: 'get',
params: query,
})
}

10
sgzb-ui/src/views/base/assetAttributeManagement/index.vue
View File

@ -81,12 +81,6 @@
<el-input v-model="form.propName" placeholder="请输入资产类型名称" maxlength="60" />
</el-form-item>
<el-form-item label="所属上级" prop="deptId">
<<<<<<< HEAD
<treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属上级" @select="select" />
</el-form-item>
<el-form-item label="资产编码" prop="code">
<el-input v-model="form.code" placeholder="请输入资产编码" maxlength="60" />
=======
<treeselect
v-model="form.deptId"
:options="deptOptions"
@ -96,7 +90,9 @@
placeholder="请选择所属上级"
@select="select"
/>
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
</el-form-item>
<el-form-item label="资产编码" prop="code">
<el-input v-model="form.code" placeholder="请输入资产编码" maxlength="60" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

14
sgzb-ui/src/views/base/section/index.vue
View File

@ -30,15 +30,6 @@
<el-table v-loading="loading" :data="projectLot" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<<<<<<< HEAD
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="标段工程名称" align="center" prop="lotName" :show-overflow-tooltip="true" />
<el-table-column label="工程类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="所属工程项目" align="center" prop="ownPro" :show-overflow-tooltip="true" />
<el-table-column label="所属上级" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="联系人" align="center" prop="linkMan" :show-overflow-tooltip="true" />
<el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" />
=======
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
@ -50,7 +41,6 @@
<el-table-column label="所属上级" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="联系人" align="center" prop="linkMan" :show-overflow-tooltip="true" />
<el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" />
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
<el-table-column label="状态" align="center" prop="status" width="180">
<template slot-scope="scope">
<el-switch
@ -117,9 +107,6 @@
</el-select>
</el-form-item>
<el-form-item label="所属上级" prop="deptId">
<<<<<<< HEAD
<treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属上级" @select="select" />
=======
<treeselect
v-model="form.deptId"
:options="deptOptions"
@ -129,7 +116,6 @@
placeholder="请选择所属上级"
@select="select"
/>
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
</el-form-item>
<el-form-item label="联系人" prop="linkMan">
<el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20" />

5
sgzb-ui/src/views/base/unit/index.vue
View File

@ -31,17 +31,12 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<<<<<<< HEAD
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="单位类型" align="center" prop="name" :show-overflow-tooltip="true" />
=======
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="单位类型" align="center" prop="name" :show-overflow-tooltip="true" />
>>>>>>> 0e681358a987a27cf0ca5da93cd80f30abbe2c0c
<el-table-column label="状态" align="center" prop="status" width="180">
<template slot-scope="scope">
<el-switch

32
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
View File

@ -65,6 +65,14 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
icon="el-icon-view"
:disabled="scope.row.bindNum == 0"
@click="handleBindDetails(scope.row)"
>
查看
</el-button>
<el-button
size="mini"
type="primary"
@ -88,7 +96,7 @@
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-row :gutter="24" class="mb8">
<el-form ref="form" :model="form" :rules="rules" label-width="78px">
<el-form ref="form" :model="form" :rules="rules" label-width="78px" v-if="!isDetail">
<el-input v-model="form.typeId" disabled v-show="false" />
<el-col :span="7">
<el-form-item label="编码前缀" prop="exCode">
@ -145,18 +153,21 @@
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input
v-if="!isDetail"
v-model="scope.row.maCode"
:disabled="scope.row.statusFlag == 0"
οninput="value=value.replace(/[^0-9.]/g,'')"
></el-input>
<span v-else>{{ scope.row.maCode }}</span>
</template>
</el-table-column>
<el-table-column label="固定资产编码" align="center" prop="assetsCode">
<template slot-scope="scope">
<el-input v-model="scope.row.assetsCode" v-show="form.fixCode == '0'" maxlength="50"></el-input>
<el-input v-model="scope.row.assetsCode" v-if="!isDetail" v-show="form.fixCode == '0'" maxlength="50"></el-input>
<span v-else>{{ scope.row.assetsCode }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" v-if="!isDetail">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="delCode(scope.row)">删除</el-button>
</template>
@ -164,7 +175,7 @@
</el-table>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="submitForm" v-if="!isDetail">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -187,6 +198,7 @@ import {
makeEquipmentNumber,
editPurchaseMacode,
delMacodeList,
getBindCodeDetails
} from '@/api/store/newBuy'
import { getTypeList } from '@/api/store/warehousing'
@ -250,6 +262,7 @@ export default {
// { required: true, message: "设备编号不能为空", trigger: "blur" }
// ],
},
isDetail: false,
}
},
mounted() {
@ -338,6 +351,7 @@ export default {
this.codeList = []
this.open = true
this.title = '生成编码'
this.isDetail = false
// let param = {
// taskId:this.taskId,
// typeId:row.typeId,
@ -484,6 +498,16 @@ export default {
const obj = { path: '/store/newBuy/newDevicesList' }
this.$tab.closeOpenPage(obj)
},
async handleBindDetails(row) {
console.log('🚀 ~ handleBindDetails ~ row:', row.taskId);
this.open = true
this.isDetail = true
this.title = '编码绑定详情'
this.codeList = []
const res = await getBindCodeDetails({taskId: row.taskId})
console.log('🚀 ~ handleBindDetails ~ res:', res);
this.codeList = res.data
}
},
}
</script>

2
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
View File

@ -629,6 +629,8 @@
this.$tab.closeOpenPage({
path: '/store/newBuy/newDevicesCode',
query,
}).then(() => {
this.$tab.refreshPage()
})
},

2
sgzb-ui/src/views/store/shelves/shelvesList.vue
View File

@ -87,7 +87,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="上级组织" prop="parentId">
<el-form-item label="上级组织" prop="parentId" v-if="form.parentId != 0">
<treeselect v-model="form.parentId" :options="deptOptions" noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" :normalizer="normalizer" placeholder="选择上级部门" />
</el-form-item>
</el-col>

32
sgzb-ui/src/views/store/tools/keeper.vue
View File

@ -134,38 +134,6 @@
v-if="columns[4].visible"
width="200"
/>
<el-table-column
label="种类名称"
align="center"
key="kindName"
prop="kindName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="类型名称"
align="center"
key="typeName"
prop="typeName"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
key="modelName"
prop="modelName"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="库管员"
align="center"
key="userName"
prop="userName"
v-if="columns[4].visible"
width="200"
/>
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<!-- <el-button-->

32
sgzb-ui/src/views/store/tools/repair.vue
View File

@ -153,38 +153,6 @@
v-if="columns[4].visible"
width="200"
/>
<el-table-column
label="种类名称"
align="center"
key="kindName"
prop="kindName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="类型名称"
align="center"
key="typeName"
prop="typeName"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
key="modelName"
prop="modelName"
v-if="columns[3].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="维修班"
align="center"
key="userName"
prop="userName"
v-if="columns[4].visible"
width="200"
/>
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<!-- <el-button-->