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

Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

This commit is contained in:
zzyuan 2024-04-24 14:10:21 +08:00
parent 580e3a851a 37d0365868
commit 4af501532f
20 changed files with 172 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
View File

@ -278,7 +278,7 @@ public class BackReceiveController extends BaseController {
@PostMapping("backReceiveRecordWeb")
public AjaxResult backReceiveRecordWeb(@RequestBody BackApplyInfo record) {
try {
List<BackApplyInfo> list = backReceiveService.backReceiveRecord(record);
List<BackApplyInfo> list = backReceiveService.backReceiveRecordWeb(record);
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex,pageSize, list));

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
View File

@ -21,6 +21,7 @@ public class BackApplyInfo {
*/
private String userName;
private String badId;
private String[] typeIds;
@Excel(name = "退料状态",sort = 9)
private String taskName;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java
View File

@ -198,4 +198,6 @@ public interface BackReceiveMapper {
int selectNumByTypeId(@Param("parentId")Integer parentId,@Param("typeId") String typeId);
int selectTaskStatus(int taskId);
BackApplyInfo backReceiveRecordWeb(BackApplyInfo record);
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java
View File

@ -99,4 +99,6 @@ public interface LeaseOutDetailsMapper {
MachinePart getMachineParts(TmTask typeId);
int updateMaTypeStockNumCt(TmTask record);
int getmaChineByCt(LeaseOutDetails record);
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java
View File

@ -95,4 +95,6 @@ public interface BackReceiveService {
List<TmTask> getRecord(TmTask task);
int revoke(BackApplyInfo record);
List<BackApplyInfo> backReceiveRecordWeb(BackApplyInfo record);
}

32
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
View File

@ -83,10 +83,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
if (res == 0) {
throw new RuntimeException("插入back_check_details异常");
}
/* int insSltInfoNum = insSltInfo(lTask.getAgreementId().toString(), leaseOutDetail);
if (insSltInfoNum < 1) {
return res;
}*/
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
}
@ -115,7 +111,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
break;
}
//根据maId和taskId查询是否已接收
re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId());
re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId());
if (re > 0) {
res = -1;
break;
@ -325,6 +321,21 @@ public class BackReceiveServiceImpl implements BackReceiveService {
return res;
}
@Override
public List<BackApplyInfo> backReceiveRecordWeb(BackApplyInfo record) {
String typeId = record.getTypeId();
String[] split = typeId.split(",");
List<BackApplyInfo> backApplyInfoList = new ArrayList<>();
for (String s : split) {
record.setTypeId(s);
BackApplyInfo backApplyInfo = backReceiveMapper.backReceiveRecordWeb(record);
if (backApplyInfo != null) {
backApplyInfoList.add(backApplyInfo);
}
}
return backApplyInfoList;
}
private int insertRad(int taskId, List<BackApplyInfo> wxList) {
int result = 0;
if (wxList != null) {
@ -452,8 +463,17 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//机具状态变为在用
backReceiveMapper.updateMaStatus(s, "16");
}
res = backReceiveMapper.deleteCheckDetails(record);
} else if ("2".equals(manageType)) {
String[] split = record.getTypeIds();
for (String s : split) {
record.setTypeId(s);
res = backReceiveMapper.deleteCheckDetails(record);
}
} else {
res = backReceiveMapper.deleteCheckDetails(record);
}
res = backReceiveMapper.deleteCheckDetails(record);
}
return res;

18
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -158,7 +158,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
if ((record.getManageType() == 1 || record.getManageType() == 2) && record.getInputNum() != null) {
record.setOutNum(record.getInputNum().doubleValue());
}
//2、判断库存是否足够
//2、判断成套机具出库库存是否足够
if (record.getManageType() == 2) {
res = checkStorageNumCt(record);
if (res == 0) {
@ -206,8 +206,10 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
// 插入领料出库明细表（lease_out_details）
res = leaseOutDetailsMapper.insertSelective(record);
if (res > 0) {
if (record.getManageType() == 2){
if (record.getManageType() == 2) {
// 成套机具减少 (ma_type 设备规格表)的库存数量
res = leaseOutDetailsMapper.updateMaTypeStockNum(record);
// 成套机具减少 (ma_type 设备规格表)配件的库存数量
List<TmTask> typeIds = leaseOutDetailsMapper.getMaTypeDetails(record);
typeIds.removeIf(item -> item == null);
for (TmTask typeId : typeIds) {
@ -216,7 +218,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
typeId.setNum(machinePart.getNum() - machinePart.getPartNum());
res = leaseOutDetailsMapper.updateMaTypeStockNumCt(typeId);
}
}else {
} else {
// 普通机具减少 (ma_type 设备规格表)的库存数量
res = leaseOutDetailsMapper.updateMaTypeStockNum(record);
}
@ -268,14 +270,20 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
}
private int checkStorageNumCt(LeaseOutDetails record) {
int res = 0;
double outNum = 0.1;
if (StringUtils.isNull(record)) {
return 0;
return res;
}
if (record.getOutNum() == null || record.getOutNum() < outNum) {
record.setOutNum(0.00);
}
//先判断成套机具的库存是否足够
int num = leaseOutDetailsMapper.getmaChineByCt(record);
if (num < record.getOutNum()) {
return res;
}
//判断(ma_type 设备规格表)中的库存够不够出库的
List<TmTask> typeIds = leaseOutDetailsMapper.getMaTypeDetails(record);
typeIds.removeIf(item -> item == null);
@ -283,7 +291,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
MachinePart machinePart = leaseOutDetailsMapper.getMachineParts(typeId);
machinePart.setPartNum((int) (typeId.getPartNum() * record.getOutNum()));
if (machinePart.getNum() < machinePart.getPartNum()) {
return 0;
return res;
}
}
return 1;

26
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -959,4 +959,30 @@
) res
HAVING backNum > -1
</select>
<select id="backReceiveRecordWeb" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT
mt2.type_name AS typeName,
mt1.type_name AS typeCode,
ifnull(sum( bcd.back_num ), 0) AS backNum,
mm.ma_code as maCode,
bcd.create_time AS backTime,
bcd.type_id as modelId,
bcd.back_status AS backStatus
FROM
back_check_details bcd
LEFT JOIN ma_type mt1 ON mt1.type_id = bcd.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
WHERE
bcd.parent_id = #{parentId}
AND bcd.type_id = #{typeId}
<if test="maCode != null and maCode != ''">
and mm.ma_code like concat('%', #{maCode}, '%')
</if>
GROUP BY
bcd.type_id
ORDER BY
bcd.create_time DESC
</select>
</mapper>

7
sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
View File

@ -303,7 +303,7 @@
UPDATE
ma_type
SET
num = num - #{num} ,update_time = NOW()
num = #{num} ,update_time = NOW()
WHERE
type_id = #{typeId}
</update>
@ -412,7 +412,7 @@
SELECT
mt.type_name AS typeModelName,
mt.unit_name as unitName,
mt.num as num,
ifnull(mt.num , 0) as num,
m2.type_name As typeName
FROM
ma_type mt
@ -420,4 +420,7 @@
WHERE
mt.type_id = #{typeId}
</select>
<select id="getmaChineByCt" resultType="java.lang.Integer">
select num from ma_type WHERE type_id = #{typeId}
</select>
</mapper>

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachinePart.java
View File

@ -12,4 +12,5 @@ public class MachinePart {
private String unitName;
private String typeName;
private Integer partNum;
private Integer typeId;
}

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
View File

@ -7,6 +7,7 @@ import com.bonus.sgzb.base.api.domain.MaMachineLabel;
import com.bonus.sgzb.base.api.domain.MaType;
import com.bonus.sgzb.material.domain.InputApplyDetails;
import com.bonus.sgzb.material.domain.MaInputRecord;
import com.bonus.sgzb.material.domain.MachinePart;
import com.bonus.sgzb.material.domain.PurchaseMacodeInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -277,4 +278,6 @@ public interface PurchaseMacodeInfoMapper {
* @return
*/
int selectPurchaseCheckDetailsStatus(Long taskId);
int updateMaTypeNum(MachinePart wholeSetDetail);
}

15
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.*;
import com.bonus.sgzb.material.mapper.*;
import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.material.vo.EquipmentNumberVO;
@ -39,6 +40,9 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
@Resource
private TaskMapper taskMapper;
@Autowired
private IPurchaseCheckInfoService purchaseCheckInfoService;
@Resource
private BmQrcodeInfoMapper qrcodeInfoMapper;
@ -298,6 +302,17 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
.add(maType.getNum() == null ? new BigDecimal(0) : maType.getNum()));
purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
//判断是否是成套机具，是的话配件库存也要增加
if ("2".equals(maType.getManageType())){
PurchaseCheckInfo purchaseCheckInfo = new PurchaseCheckInfo();
purchaseCheckInfo.setPurchaseNum(maInputRecord.getInputNum().toString());
purchaseCheckInfo.setTypeId(maInputRecord.getTypeId());
List<MachinePart> wholeSetDetails = purchaseCheckInfoService.getWholeSetDetails(purchaseCheckInfo);
for (MachinePart wholeSetDetail : wholeSetDetails) {
purchaseMacodeInfoMapper.updateMaTypeNum(wholeSetDetail);
}
}
BigDecimal inputNum = checkDetailsMapper.selectInputNumByTypeId(taskId, typeId);
PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails();
purchaseCheckDetails.setTaskId(taskId);

5
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -312,6 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getWholeSetDetails" resultType="com.bonus.sgzb.material.domain.MachinePart">
SELECT
mt2.type_name AS typeModelName,
mt2.type_id as typeId,
mt3.type_name AS typeName,
aa.part_num * #{purchaseNum} AS partNum,
mt2.unit_name as unitName
@ -329,8 +330,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_id = #{typeId}
) aa ON aa.type_id = mt2.type_id
<if test="keyWord != null and keyWord != ''">
WHERE mt2.type_name like concat('%', #{keyWord}, '%')
WHERE (mt2.type_name like concat('%', #{keyWord}, '%')
or mt3.type_name like concat('%', #{keyWord}, '%'))
</if>
</select>
</mapper>

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

@ -534,4 +534,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and type_id = #{typeId}
and ma_code = #{maCode}
</update>
<update id="updateMaTypeNum">
UPDATE ma_type
SET num = ifnull( num, 0 ) + #{partNum} WHERE type_id = #{typeId}
</update>
</mapper>

2
sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
View File

@ -416,7 +416,7 @@
resetQuery() {
this.queryParams.time = []
this.queryParams.unitId = ''
this.queryParams.proId = ''
this.queryParams.proId = ''
this.resetForm('queryForm')
this.GetUnitData()
this.GetProData()

2
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
View File

@ -432,7 +432,7 @@
resetQuery() {
this.queryParams.time = []
this.queryParams.unitId = ''
this.queryParams.proId = ''
this.queryParams.proId = ''
this.resetForm('queryForm')
this.GetUnitData()
this.GetProData()

4
sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
View File

@ -126,7 +126,7 @@
size="mini"
type="primary"
@click="handleNumReturn(scope.row)"
v-if="!isView&&(scope.row.manageType=='1'||'2')&&scope.row.num>0"
v-if="!isView&&(scope.row.manageType=='1'||scope.row.manageType=='2')&&scope.row.num>0"
>数量退料</el-button>
<el-button
size="mini"
@ -814,7 +814,7 @@ export default {
let arr = [
{
parentId: this.codeQuery.parentId,
typeId: row.modelId,
typeId: row.typeId,
backNum: 1,
backStatus: type,
manageType: 0,

1
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
View File

@ -227,7 +227,6 @@
:autosize="{ minRows: 4, maxRows: 6}"
placeholder="请输入通知内容"
style="width: 80%;"
disabled
/>
</el-form-item>
</el-form>

280
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -1,37 +1,14 @@
<template>
<div class="app-container" id="newDevicesWarehousing">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="设备类型" prop="typeId">
<el-select
v-model="queryParams.typeId"
placeholder="请选择设备类型"
clearable
filterable
style="width: 240px"
>
<el-option
v-for="typeItem in typesList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
<el-select v-model="queryParams.typeId" placeholder="请选择设备类型" clearable filterable style="width: 240px">
<el-option v-for="typeItem in typesList" :key="typeItem.typeId" :label="typeItem.typeName"
:value="typeItem.typeId" />
</el-select>
</el-form-item>
<el-form-item>
@ -42,14 +19,8 @@
<el-row :gutter="10" class="mb8">
<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-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:dict:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -57,62 +28,15 @@
<el-table v-loading="loading" :data="tableList">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" align="center" type="index" width="55px" />
<el-table-column
label="采购单号"
align="center"
prop="code"
:show-overflow-tooltip="true"
width="160"
/>
<el-table-column
label="采购日期"
align="center"
prop="purchaseTime"
:show-overflow-tooltip="true"
width="100"
/>
<el-table-column
label="到货日期"
align="center"
prop="arrivalTime"
:show-overflow-tooltip="true"
width="100"
/>
<el-table-column
label="采购机具设备"
align="center"
prop="purchasingTypeName"
:show-overflow-tooltip="true"
width="250"
/>
<el-table-column
label="采购员"
align="center"
prop="purchaserName"
:show-overflow-tooltip="true"
width="100"
/>
<el-table-column
label="入库人员"
align="center"
prop="updateBy"
:show-overflow-tooltip="true"
width="100"
/>
<el-table-column
label="入库时间"
align="center"
prop="updateTime"
:show-overflow-tooltip="true"
width="150"
/>
<el-table-column
label="发布时间"
align="center"
prop="createTime"
:show-overflow-tooltip="true"
width="150"
/>
<el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" width="160" />
<el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" width="100" />
<el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" width="100" />
<el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true"
width="250" />
<el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100" />
<el-table-column label="入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100" />
<el-table-column label="入库时间" align="center" prop="updateTime" :show-overflow-tooltip="true" width="150" />
<el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="taskStatus">
<template slot-scope="scope">
@ -127,54 +51,25 @@
<template slot-scope="scope">
<el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
v-if="
scope.row.taskStatus == '26' ||
scope.row.taskStatus == '105'
"
@click="handleUpdate(scope.row)"
>审核</el-button>
<el-button
size="mini"
type="info"
icon="el-icon-edit"
v-if="scope.row.taskStatus == '28'"
@click="handlePrint(scope.row)"
>入库单</el-button>
<el-button size="mini" type="primary" icon="el-icon-edit" v-if="
scope.row.taskStatus == '26' ||
scope.row.taskStatus == '105'
" @click="handleUpdate(scope.row)">审核</el-button>
<el-button size="mini" type="info" icon="el-icon-edit" v-if="scope.row.taskStatus == '28'"
@click="handlePrint(scope.row)">入库单</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"
/>
<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="1000px" append-to-body>
<el-form
:model="query"
ref="query"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关键字" prop="dictName">
<el-input
v-model="query.dictName"
placeholder="请输入关键字"
clearable
maxlength="50"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="query.dictName" placeholder="请输入关键字" clearable maxlength="50" style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
@ -200,97 +95,55 @@
<!-- >导出</el-button>-->
<!-- </el-col>-->
</el-row>
<el-table
v-loading="loading"
:data="detailTableList"
@selection-change="handleSelectionChange"
height="400"
>
<el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
<el-table-column type="selection" width="55" align="center" :selectable="selectable" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column
label="规格型号"
align="center"
prop="specificationType"
:show-overflow-tooltip="true"
/>
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
<el-table-column
label="编号"
align="center"
prop="maCode"
:show-overflow-tooltip="true"
width="200"
/>
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" width="200" />
<el-table-column label="管理模式" align="center" prop="manageType">
<template slot-scope="scope">
<span v-if="scope.row.manageType=='0'">编码管理</span>
<span v-if="scope.row.manageType=='1'">数量管理</span>
<span v-if="scope.row.manageType == '0'">编码管理</span>
<span v-if="scope.row.manageType == '1'">数量管理</span>
</template>
</el-table-column>
<!-- <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status=='0'">未入库</span>
<span v-if="scope.row.status=='1'">已入库</span>
<span v-if="scope.row.status=='2'">已驳回</span>
<span v-if="scope.row.status == '0'">未入库</span>
<span v-if="scope.row.status == '1'">已入库</span>
<span v-if="scope.row.status == '2'">已驳回</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
v-if="showHandle"
width="150"
>
<template
slot-scope="scope"
v-if="
scope.row.manageType == '1' ||
(scope.row.manageType == '0' && scope.row.maCode)
"
>
<el-button
size="mini"
type="text"
v-if="scope.row.status == '0'"
@click="pass(scope.row)"
>通过</el-button>
<el-button
size="mini"
type="text"
v-if="scope.row.status == '0'"
@click="refused(scope.row)"
>不通过</el-button>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle" width="150">
<template slot-scope="scope" v-if="
scope.row.manageType == '1' || scope.row.manageType == '2' ||
(scope.row.manageType == '0' && scope.row.maCode)
">
<el-button size="mini" type="text" v-if="scope.row.status == '0'" @click="pass(scope.row)">通过</el-button>
<el-button size="mini" type="text" v-if="scope.row.status == '0'"
@click="refused(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="dialogTotal > 0"
:total="dialogTotal"
:page.sync="query.pageNum"
:limit.sync="query.pageSize"
@pagination="getDialogTable"
/>
<pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="query.pageNum" :limit.sync="query.pageSize"
@pagination="getDialogTable" />
</el-dialog>
<!-- 入库单弹窗 -->
<el-dialog :visible.sync="openPrint" width="900px" append-to-body>
<div style="height: 600px; overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
class="title"
style="
<div class="title" style="
text-align: center;
font-weight: 600;
font-size: 16px;
"
>入库单</div>
">入库单</div>
<div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
<div
<!-- <div
class="item"
style="
width: 50%;
@ -300,19 +153,16 @@
"
>
<span>工程名称：</span>
</div>
<div
class="item"
style="
</div> -->
<div class="item" style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
">
<span>日期：</span>
</div>
<div
<!-- <div
class="item"
style="
width: 50%;
@ -322,8 +172,8 @@
"
>
<span>领料单号</span>
</div>
<div
</div> -->
<!-- <div
class="item"
style="
width: 50%;
@ -333,18 +183,13 @@
"
>
<span>车辆信息：</span>
</div>
</div> -->
</div>
<el-table
:data="printTableData"
class="table"
style="
<el-table :data="printTableData" class="table" style="
margin-top: 20px;
padding-bottom: 1px;
padding-right: 1px;
"
border
>
" border>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="类型名称" align="center" prop="typeName" />
@ -355,14 +200,11 @@
<!-- <el-table-column label="出库方式" align="center" prop="manageTypeName" /> -->
</el-table>
<div
class="fillIn"
style="
<div class="fillIn" style="
margin-top: 20px;
display: flex;
justify-content: space-between;
"
>
">
<div class="item" style="width: 25%">
<span>审核：</span>
</div>
@ -711,6 +553,7 @@ export default {
font-weight: 600;
font-size: 16px;
}
.info {
margin-top: 10px;
display: flex;
@ -730,6 +573,7 @@ export default {
justify-content: space-between;
}
}
::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important;
margin-bottom: 10px;

4
sgzb-ui/vue.config.js
View File

@ -35,9 +35,9 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://112.29.103.165:21626`,//线上环境-重庆
// target: `http://112.29.103.165:21626`, //线上环境-重庆
// target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
// target: `http://192.168.0.14:21624`,//测试环境
// target: `http://192.168.0.14:21624`, //测试环境
// target: `http://1.12.248.179:23028`,//线上环境-南网
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,