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

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

# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
This commit is contained in:
csyue 2024-05-28 18:36:05 +08:00
parent ac4ee525d2 6b89c6f089
commit 84d718b9bc
20 changed files with 435 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
View File

@ -58,8 +58,9 @@ public class TokenController {
//web端登录 //web端登录
@PostMapping("login") @PostMapping("login")
public R<?> login(@RequestBody LoginBody form) throws Exception { public R<?> login(@RequestBody LoginBody form) throws Exception {
//String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), privateKey);
// 用户登录 // 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData);
String uuid = form.getUuid(); String uuid = form.getUuid();
String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString();
if (StringUtils.isBlank(captcha)) { if (StringUtils.isBlank(captcha)) {

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java
View File

@ -50,4 +50,17 @@ public class InventoryAndWarehousingController extends BaseController {
return inventoryAndWarehousingService.savePutInfo(dto); return inventoryAndWarehousingService.savePutInfo(dto);
} }
/**
* 根据入库单号查看详情
* @param bean
* @return
*/
@ApiOperation(value = "根据入库单号查看详情")
@GetMapping("/getDetail")
public TableDataInfo getDetail(PutInStorageBean bean) {
startPage();
List<PutInStorageBean> list = inventoryAndWarehousingService.getDetails(bean);
return getDataTable(list);
}
} }

9
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java
View File

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
/** /**
* @description 入库盘点 * @description 入库盘点
@ -44,6 +43,10 @@ public class PutInStorageBean extends BaseEntity {
@ApiModelProperty(value = "盘点入库单号") @ApiModelProperty(value = "盘点入库单号")
private String kindName; private String kindName;
/** 设备编号 */
@ApiModelProperty(value = "设备编号")
private String maCode;
/** 单位ID */ /** 单位ID */
@ApiModelProperty(value = "单位ID") @ApiModelProperty(value = "单位ID")
private String unitId; private String unitId;
@ -85,6 +88,10 @@ public class PutInStorageBean extends BaseEntity {
@ApiModelProperty(value = "设备工器具类型名称") @ApiModelProperty(value = "设备工器具类型名称")
private String typeName; private String typeName;
/** 规格型号 */
@ApiModelProperty(value = "规格型号")
private String typeModelName;
/** 设备主键 */ /** 设备主键 */
@ApiModelProperty(value = "设备主键") @ApiModelProperty(value = "设备主键")
private Integer machine; private Integer machine;

7
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
View File

@ -74,4 +74,11 @@ public interface InventoryAndWarehousingMapper {
int selectTaskNumByMonth(@Param("date") Date nowDate); int selectTaskNumByMonth(@Param("date") Date nowDate);
int selectByCode(String code); int selectByCode(String code);
/**
* 根据入库单号查看详情
* @param bean
* @return
*/
List<PutInStorageBean> getDetails(PutInStorageBean bean);
} }

7
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java
View File

@ -27,4 +27,11 @@ public interface InventoryAndWarehousingService {
* @return * @return
*/ */
AjaxResult savePutInfo(SavePutInfoDto dto); AjaxResult savePutInfo(SavePutInfoDto dto);
/**
* 根据入库单号查看详情
* @param bean
* @return
*/
List<PutInStorageBean> getDetails(PutInStorageBean bean);
} }

10
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
View File

@ -119,6 +119,16 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
return AjaxResult.success(res); return AjaxResult.success(res);
} }
/**
* 根据入库单号查看详情
* @param bean
* @return
*/
@Override
public List<PutInStorageBean> getDetails(PutInStorageBean bean) {
return inventoryAndWarehousingMapper.getDetails(bean);
}
/** /**
* 根据code从ma_machine表查询是否有数据，去重 * 根据code从ma_machine表查询是否有数据，去重
* @param code * @param code

98
sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
View File

@ -198,35 +198,50 @@
</update> </update>
<select id="getList" resultType="com.bonus.sgzb.material.domain.PutInStorageBean"> <select id="getList" resultType="com.bonus.sgzb.material.domain.PutInStorageBean">
SELECT pisi.PUT_IN_TYPE as putInType, SELECT
lot.lot_name as projectName, sub.putInType,
bui.unit_name as unitName, sub.projectName,
pisi.`CODE` as kindName, sub.unitName,
mt2.type_name as typeName, sub.kindName,
su.user_name as modelName, sub.typeName,
pisi.CREATE_DATE as createDate, sub.modelName,
pisi.REMARKS as remark sub.createDate,
FROM ma_type_put_in_storage_info pisi sub.remark
LEFT JOIN ma_type_put_in_storage_details pisd on pisi.id = pisd.INFO FROM (
LEFT JOIN bm_project_lot lot on lot.lot_id = pisi.PROJECT_ID SELECT
LEFT JOIN bm_unit_info bui on bui.unit_id = pisi.UNIT_ID pisi.PUT_IN_TYPE AS putInType,
LEFT JOIN ma_type mt on mt.type_id = pisd.TYPE lot.lot_name AS projectName,
LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id bui.unit_name AS unitName,
LEFT JOIN sys_user su on su.user_id = pisi.CREATOR pisi.`CODE` AS kindName,
where mt2.type_name AS typeName,
su.user_name AS modelName,
pisi.CREATE_DATE AS createDate,
pisi.REMARKS AS remark,
ROW_NUMBER() OVER (PARTITION BY pisi.`CODE` ORDER BY pisi.CREATE_DATE DESC) AS row_num
FROM
ma_type_put_in_storage_info pisi
LEFT JOIN ma_type_put_in_storage_details pisd ON pisi.id = pisd.INFO
LEFT JOIN bm_project_lot lot ON lot.lot_id = pisi.PROJECT_ID
LEFT JOIN bm_unit_info bui ON bui.unit_id = pisi.UNIT_ID
LEFT JOIN ma_type mt ON mt.type_id = pisd.TYPE
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN sys_user su ON su.user_id = pisi.CREATOR
WHERE
1 = 1 1 = 1
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and ( AND (
pisi.`CODE` like concat('%',#{keyWord},'%') or pisi.`CODE` LIKE CONCAT('%',#{keyWord},'%') OR
pisi.PUT_IN_TYPE like concat('%',#{keyWord},'%') or pisi.PUT_IN_TYPE LIKE CONCAT('%',#{keyWord},'%') OR
lot.lot_name like concat('%',#{keyWord},'%') or lot.lot_name LIKE CONCAT('%',#{keyWord},'%') OR
bui.unit_name like concat('%',#{keyWord},'%') or bui.unit_name LIKE CONCAT('%',#{keyWord},'%') OR
mt2.type_name like concat('%',#{keyWord},'%') or mt2.type_name LIKE CONCAT('%',#{keyWord},'%') OR
su.user_name like concat('%',#{keyWord},'%') or su.user_name LIKE CONCAT('%',#{keyWord},'%') OR
pisi.REMARKS like concat('%',#{keyWord},'%') pisi.REMARKS LIKE CONCAT('%',#{keyWord},'%')
) )
</if> </if>
order by pisi.CREATE_DATE desc ) AS sub
WHERE sub.row_num = 1
ORDER BY createDate DESC
</select> </select>
<select id="selectTaskNumByMonth" resultType="java.lang.Integer"> <select id="selectTaskNumByMonth" resultType="java.lang.Integer">
select count(*) from ma_type_put_in_storage_info where DATE_FORMAT(CREATE_DATE,'%y%m') = DATE_FORMAT(#{date},'%y%m') select count(*) from ma_type_put_in_storage_info where DATE_FORMAT(CREATE_DATE,'%y%m') = DATE_FORMAT(#{date},'%y%m')
@ -238,4 +253,37 @@
<if test="code != null ">and qr_code = #{code}</if> <if test="code != null ">and qr_code = #{code}</if>
</where> </where>
</select> </select>
<select id="getDetails" resultType="com.bonus.sgzb.material.domain.PutInStorageBean">
SELECT
pisi.`CODE` as kindName,
pisi.PUT_IN_TYPE as putInType,
pisd.MACODE as maCode,
pisd.NUM as num,
mt2.type_name as typeName,
mt.type_name as typeModelName,
su.user_name as modelName,
pisi.CREATE_DATE as createDate
FROM ma_type_put_in_storage_info pisi
LEFT JOIN ma_type_put_in_storage_details pisd on pisi.id = pisd.INFO
LEFT JOIN bm_project_lot lot on lot.lot_id = pisi.PROJECT_ID
LEFT JOIN bm_unit_info bui on bui.unit_id = pisi.UNIT_ID
LEFT JOIN ma_type mt on mt.type_id = pisd.TYPE
LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id
LEFT JOIN sys_user su on su.user_id = pisi.CREATOR
where
1 = 1
<if test="kindName != null and kindName != ''">
and pisi.`CODE` = #{kindName}
</if>
<if test="keyWord != null and keyWord != ''">
and (
pisi.PUT_IN_TYPE like concat('%',#{keyWord},'%') or
mt2.type_name like concat('%',#{keyWord},'%') or
su.user_name like concat('%',#{keyWord},'%') or
mt.type_name like concat('%',#{keyWord},'%') or
pisd.MACODE like concat('%',#{keyWord},'%')
)
</if>
order by pisi.CREATE_DATE desc
</select>
</mapper> </mapper>

21
sgzb-ui/src/api/store/putInStore.js
View File

@ -7,7 +7,7 @@ export function getReturnOfMaterialsInfoAll(query) {
method: 'get', method: 'get',
params: query params: query
}) })
} }
//机具退料入库--机具类型，规格型号下拉数据 //机具退料入库--机具类型，规格型号下拉数据
@ -17,7 +17,7 @@ export function getTypeList(query) {
method: 'get', method: 'get',
params: query params: query
}) })
} }
//修试后入库--列表 //修试后入库--列表
@ -27,7 +27,7 @@ export function getRepairedList(data) {
method: 'get', method: 'get',
params: data params: data
}) })
} }
//修试后入库--详情 //修试后入库--详情
export function getRepairedDetailList(data) { export function getRepairedDetailList(data) {
@ -36,18 +36,18 @@ export function getRepairedDetailList(data) {
method: 'get', method: 'get',
params: data params: data
}) })
} }
//修试后入库--审核 //修试后入库--审核
export function inputByType(data) { export function inputByType(data) {
return request({ return request({
url: '/material/RepairTestInput/inputByType', url: '/material/RepairTestInput/inputByType',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 获取 设备树 // 获取 设备树
export function getDeviceTypeTree(params = {}){ export function getDeviceTypeTree(params = {}) {
return request({ return request({
url: '/system/select/getDeviceTypeTree', url: '/system/select/getDeviceTypeTree',
method: 'post', method: 'post',
@ -64,6 +64,13 @@ export function inputByCode(data) {
}) })
} }
// 查看盘点入库详情接口
export const getInventoryWarehousingApi = (data) => {
return request.get(`/material/inventoryAndWarehousing/getDetail`, {
params: data
})
}

13
sgzb-ui/src/components/TableModel/index.vue
View File

@ -32,6 +32,14 @@
:selectable="selectable" :selectable="selectable"
v-if="config.isSelShow" v-if="config.isSelShow"
/> />
<el-table-column
align="center"
label="序号"
type="index"
:index="
indexContinuation(pageParams.pageNum, pageParams.pageSize)
"
/>
<el-table-column <el-table-column
v-for="(item, v) in tableColumCheckProps" v-for="(item, v) in tableColumCheckProps"
:key="v" :key="v"
@ -47,6 +55,9 @@
<slot :data="scope.row" :name="item.t_slot"></slot> <slot :data="scope.row" :name="item.t_slot"></slot>
</template> </template>
<template v-else> <template v-else>
{{ scope.row[item.t_props] || '-' }}
</template>
<!-- <template v-else>
{{ {{
v === 0 v === 0
? indexContinuation( ? indexContinuation(
@ -55,7 +66,7 @@
) )
: scope.row[item.t_props] || '-' : scope.row[item.t_props] || '-'
}} }}
</template> </template> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

4
sgzb-ui/src/views/claimAndRefund/returnScrap/config.js
View File

@ -31,7 +31,7 @@ export const config = {
{ f_label: '创建时间', f_model: 'time', f_type: 'date' }, { f_label: '创建时间', f_model: 'time', f_type: 'date' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_props: 'scrapNum', t_label: '预报废单号' }, { t_props: 'scrapNum', t_label: '预报废单号' },
{ t_props: 'scrapNum', t_label: '退料单号' }, { t_props: 'scrapNum', t_label: '退料单号' },
{ t_props: 'repairNum', t_label: '单位名称' }, { t_props: 'repairNum', t_label: '单位名称' },
@ -61,7 +61,7 @@ export const dialogConfig = {
{ f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' }, { f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
{ t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
{ t_width: '', t_props: 'maCode', t_label: '设备编码' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' },

4
sgzb-ui/src/views/repairTest/repairScrap/config.js
View File

@ -31,7 +31,7 @@ export const config = {
{ f_label: '创建时间', f_model: 'time', f_type: 'date' }, { f_label: '创建时间', f_model: 'time', f_type: 'date' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_props: 'scrapNum', t_label: '预报废单号' }, { t_props: 'scrapNum', t_label: '预报废单号' },
{ t_props: 'scrapNum', t_label: '维修单号' }, { t_props: 'scrapNum', t_label: '维修单号' },
{ t_props: 'repairNum', t_label: '单位名称' }, { t_props: 'repairNum', t_label: '单位名称' },
@ -61,7 +61,7 @@ export const dialogConfig = {
{ f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' }, { f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
{ t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
{ t_width: '', t_props: 'maCode', t_label: '设备编码' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' },

2
sgzb-ui/src/views/scrapManage/Inventory/config.js
View File

@ -15,7 +15,7 @@ export const config = {
{ f_label: '创建时间', f_model: 'time', f_type: 'date' }, { f_label: '创建时间', f_model: 'time', f_type: 'date' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_props: '', t_label: '预报废单号' }, { t_props: '', t_label: '预报废单号' },
{ t_props: '', t_label: '机具类型' }, { t_props: '', t_label: '机具类型' },
{ t_props: '', t_label: '任务创建人' }, { t_props: '', t_label: '任务创建人' },

4
sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
View File

@ -39,7 +39,7 @@ export const config = {
{ f_label: '创建时间', f_model: 'time', f_type: 'date' }, { f_label: '创建时间', f_model: 'time', f_type: 'date' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'scrapNum', t_label: '预报废单号', }, { t_width: '', t_props: 'scrapNum', t_label: '预报废单号', },
{ t_width: '', t_props: '', t_label: '报废来源', t_slot: 'source', }, { t_width: '', t_props: '', t_label: '报废来源', t_slot: 'source', },
{ t_width: '', t_props: 'repairNum', t_label: '单号', t_slot: 'code', }, { t_width: '', t_props: 'repairNum', t_label: '单号', t_slot: 'code', },
@ -74,7 +74,7 @@ export const dialogConfig = {
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
{ t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
{ t_width: '', t_props: 'maCode', t_label: '设备编码' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' },

18
sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
View File

@ -160,16 +160,16 @@
</template> </template>
<script> <script>
import TableModel from '@/components/TableModel' import TableModel from '@/components/TableModel'
import DialogModel from '@/components/DialogModel' import DialogModel from '@/components/DialogModel'
import ScrapSource from '../../component/scrapSource.vue' import ScrapSource from '../../component/scrapSource.vue'
import { config, dialogConfig, getSelList, getTypeListSel } from './config' import { config, dialogConfig, getSelList, getTypeListSel } from './config'
import { import {
getForecastWasteListApi, getForecastWasteListApi,
getDialogListApi, getDialogListApi,
auditingPreScrapApi, auditingPreScrapApi,
} from '@/api/scrap/forecastWaste.js' } from '@/api/scrap/forecastWaste.js'
export default { export default {
name: 'Inventory', name: 'Inventory',
components: { components: {
TableModel, TableModel,
@ -340,5 +340,5 @@
deep: true, deep: true,
}, },
}, },
} }
</script> </>

4
sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js
View File

@ -12,7 +12,7 @@ export const config = {
{ f_label: '规格型号', f_model: 'backPro', f_type: 'sel', f_selList: [] }, { f_label: '规格型号', f_model: 'backPro', f_type: 'sel', f_selList: [] },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'demo', t_label: '类型名称' }, { t_width: '', t_props: 'demo', t_label: '类型名称' },
{ t_width: '', t_props: '', t_label: '规格型号' }, { t_width: '', t_props: '', t_label: '规格型号' },
{ t_width: '', t_props: '', t_label: '数量' }, { t_width: '', t_props: '', t_label: '数量' },
@ -44,7 +44,7 @@ export const dialogConfig = {
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'demo', t_label: '设备类型' }, { t_width: '', t_props: 'demo', t_label: '设备类型' },
{ t_width: '', t_props: '', t_label: '规格型号' }, { t_width: '', t_props: '', t_label: '规格型号' },
{ t_width: '', t_props: '', t_label: '设备编码' }, { t_width: '', t_props: '', t_label: '设备编码' },

4
sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
View File

@ -41,7 +41,7 @@ export const config = {
}, },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'scrapNum', t_label: '报废单号' }, { t_width: '', t_props: 'scrapNum', t_label: '报废单号' },
{ t_width: '', t_props: '', t_label: '报废来源', t_slot: 'source' }, { t_width: '', t_props: '', t_label: '报废来源', t_slot: 'source' },
{ t_width: '', t_props: 'repairNum', t_label: '预报废单号' }, { t_width: '', t_props: 'repairNum', t_label: '预报废单号' },
@ -75,7 +75,7 @@ export const dialogConfig = {
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
{ t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
{ t_width: '', t_props: 'maCode', t_label: '设备编码' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' },

4
sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
View File

@ -30,7 +30,7 @@ export const config = {
{ f_label: '创建时间', f_model: 'time', f_type: 'date' }, { f_label: '创建时间', f_model: 'time', f_type: 'date' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_props: 'scrapNum', t_label: '报废单号' }, { t_props: 'scrapNum', t_label: '报废单号' },
{ t_props: '', t_label: '报废来源', t_slot: 'source' }, { t_props: '', t_label: '报废来源', t_slot: 'source' },
{ t_props: 'repairNum', t_label: '预报废单号' }, { t_props: 'repairNum', t_label: '预报废单号' },
@ -59,7 +59,7 @@ export const dialogConfig = {
{ f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' }, { f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
{ t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
{ t_width: '', t_props: 'maCode', t_label: '设备编码' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' },

4
sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
View File

@ -38,7 +38,7 @@ export const config = {
{ f_label: '创建时间', f_model: 'time', f_type: 'date' }, { f_label: '创建时间', f_model: 'time', f_type: 'date' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_props: 'scrapNum', t_label: '报废单号' }, { t_props: 'scrapNum', t_label: '报废单号' },
{ t_props: 'scrapSource', t_label: '报废来源', t_slot: 'source' }, { t_props: 'scrapSource', t_label: '报废来源', t_slot: 'source' },
{ t_props: 'repairNum', t_label: '预报废单号' }, { t_props: 'repairNum', t_label: '预报废单号' },
@ -67,7 +67,7 @@ export const dialogConfig = {
{ f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' }, { f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' },
], ],
columnsList: [ columnsList: [
{ t_width: '55px', t_props: '', t_label: '序号' }, // { t_width: '55px', t_props: '', t_label: '序号' },
{ t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' },
{ t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' },
{ t_width: '', t_props: 'maCode', t_label: '设备编码' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' },

24
sgzb-ui/src/views/store/warehousing/config.js Normal file
View File

@ -0,0 +1,24 @@
export const dialogConfig = {
outerWidth: '70%',
outerTitle: '查看',
outerVisible: false,
handleColShow: false, // 是否显示操作列
pageShow: true, // 是否显示分页组件
isSelShow: false,// 表格是否需要复选框
isFormShow: true, // 是否显示表单查询组件
formLabel: [
{ f_label: '关键字', f_model: 'keyWord', f_type: 'ipt', },
],
columnsList: [
{ t_width: '', t_props: 'putInType', t_label: '入库来源' },
{ t_width: '', t_props: 'typeName', t_label: '设备类型' },
{ t_width: '', t_props: 'typeModelName', t_label: '规格型号' },
{ t_width: '', t_props: 'maCode', t_label: '设备编码' },
{ t_width: '', t_props: 'modelName', t_label: '入库人' },
{ t_width: '', t_props: 'createDate', t_label: '入库日期' },
],
}

65
sgzb-ui/src/views/store/warehousing/putInStore.vue
View File

@ -55,6 +55,7 @@
v-loading="loading" v-loading="loading"
:data="returnList" :data="returnList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
border
> >
<el-table-column <el-table-column
align="center" align="center"
@ -107,17 +108,16 @@
prop="remark" prop="remark"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="{ row }">
<el-button <el-button
size="mini"
type="text" type="text"
icon="el-icon-edit" size="mini"
@click="handleUpdate(scope.row)" @click="queryDetails(row)"
v-hasPermi="['system:dict:edit']" >查看详情</el-button
>审核</el-button> >
</template> </template>
</el-table-column> --> </el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -757,6 +757,21 @@
<el-button @click="cancelCode">取 消</el-button> <el-button @click="cancelCode">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 查看时详情弹框 -->
<DialogModel
:dialogConfig="dialogConfig"
@closeDialogOuter="closeDialogOuter"
>
<template slot="outerContent">
<el-table data="detailsList">
<el-table-column></el-table-column>
<el-table-column></el-table-column>
<el-table-column></el-table-column>
<el-table-column></el-table-column>
</el-table>
</template>
</DialogModel>
</div> </div>
</template> </template>
@ -774,14 +789,23 @@ import {
getTypeList, getTypeList,
getDeviceTypeTree, getDeviceTypeTree,
inputByCode, inputByCode,
getInventoryWarehousingApi,
} from '@/api/store/putInStore' } from '@/api/store/putInStore'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import { supplierInfoList } from '@/api/store/tools' import { supplierInfoList } from '@/api/store/tools'
import { getUnitData, getProData } from '@/api/claimAndRefund/receive' import { getUnitData, getProData } from '@/api/claimAndRefund/receive'
import DialogModel from '@/components/DialogModel'
import TableMode from '@/components/TableModel'
import { dialogConfig } from './config'
export default { export default {
name: 'DevicesWarehousing', name: 'DevicesWarehousing',
// dicts: ['sys_normal_disable'], // dicts: ['sys_normal_disable'],
components: {
DialogModel,
TableMode,
},
data() { data() {
return { return {
// 用户信息 // 用户信息
@ -919,6 +943,12 @@ export default {
}, },
], ],
}, },
// 详情弹框配置
dialogConfig,
getInventoryWarehousingApi,
sendParams: {},
detailsList: [],
} }
}, },
created() { created() {
@ -1447,6 +1477,25 @@ export default {
this.codeForm.proId = val this.codeForm.proId = val
// console.log('🚀 ~ changeProList ~ this.codeForm:', this.codeForm.proId); // console.log('🚀 ~ changeProList ~ this.codeForm:', this.codeForm.proId);
}, },
/**
* -----------------------------------------------------------------------------------------------------------------------------
*/
/* 查看详情 */
async queryDetails(row) {
this.sendParams.kindName = row.kindName
const { data: res } = await getInventoryWarehousingApi(
this.sendParams,
)
this.detailsList = res.rows
console.log(res, '详情--')
// this.dialogConfig.outerVisible = true
},
/* 外层弹框关闭 */
closeDialogOuter() {
this.dialogConfig.outerVisible = false
},
}, },
} }
</script> </script>