xins
/
HwMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.4.3

Browse Source 
1、在采购订单和销售订单中增加已绑定信息的查看
2、在物料信息、项目信息、供应商信息、销售订单信息和采购订单信息增加同步功能，点击可从ERP立即同步
3、原材料条码和生产任务选择信息时增加radiobox
4、删除导出按钮和right-toolbar
master
xs 3 weeks ago
parent be79405985
commit 3dac744226
76 changed files with 1079 additions and 535 deletions
Show Stats Download Patch File Download Diff File

5
hw-common/hw-common-core/src/main/java/com/hw/common/core/enums/WmsLocationStatus.java
Unescape Escape View File

@ -11,9 +11,10 @@ import java.util.stream.Collectors;
*/ */
public enum WmsLocationStatus public enum WmsLocationStatus
{ {
NORMAL("1", "正常"), AUTOLOCK("2", "自动锁定"), MANUALLOCK("3", "人工锁定"), NORMAL("1", "正常"), AUTOLOCK("2", "自动锁定(入库锁定)"), MANUALLOCK("3", "人工锁定"),
MOVELOCK("4", "移库锁定"), MERGELOCK("5", "合库锁定"), MOVELOCK("4", "移库锁定"), MERGELOCK("5", "合库锁定"),
OUTLOCK("6", "出库锁定"),OUTSIDELOCATIONABNORMAL("8", "因浅库位异常导致深库位不可用"),ABNORMAL("9", "异常"); OUTLOCK("6", "出库锁定"),RETURN_OUTLOCK("7", "退货出库锁定"),
OUTSIDELOCATIONABNORMAL("8", "因浅库位异常导致深库位不可用"),ABNORMAL("9", "异常");
private final String code; private final String code;
private final String info; private final String info;

1
hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMobileController.java
Unescape Escape View File

@ -44,6 +44,7 @@ public class MesMobileController extends BaseController {
@GetMapping("/getMesPalletInfos") @GetMapping("/getMesPalletInfos")
public TableDataInfo getMesPalletInfos(MesBasePalletInfo mesBasePalletInfo) { public TableDataInfo getMesPalletInfos(MesBasePalletInfo mesBasePalletInfo) {
startPage(); startPage();
mesBasePalletInfo.setBindFlag("1");
List<MesBasePalletInfo> list = mesBasePalletInfoService.selectMesBasePalletInfoList(mesBasePalletInfo); List<MesBasePalletInfo> list = mesBasePalletInfoService.selectMesBasePalletInfoList(mesBasePalletInfo);
return getDataTable(list); return getDataTable(list);
} }

16
hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesSaleOrderController.java
Unescape Escape View File

@ -6,8 +6,10 @@ import javax.servlet.http.HttpServletResponse;
import com.hw.common.core.domain.R; import com.hw.common.core.domain.R;
import com.hw.common.security.annotation.InnerAuth; import com.hw.common.security.annotation.InnerAuth;
import com.hw.mes.api.domain.MesBaseBarcodeInfo; import com.hw.mes.api.domain.MesBaseBarcodeInfo;
import com.hw.mes.api.domain.MesOrderBind;
import com.hw.mes.api.domain.MesSaleOrderRelate; import com.hw.mes.api.domain.MesSaleOrderRelate;
import com.hw.mes.api.domain.vo.MesSaleOrderTransferVo; import com.hw.mes.api.domain.vo.MesSaleOrderTransferVo;
import com.hw.mes.service.IMesOrderBindService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -38,7 +40,8 @@ import com.hw.common.core.web.page.TableDataInfo;
public class MesSaleOrderController extends BaseController { public class MesSaleOrderController extends BaseController {
@Autowired @Autowired
private IMesSaleOrderService mesSaleOrderService; private IMesSaleOrderService mesSaleOrderService;
@Autowired
private IMesOrderBindService mesOrderBindService;
/** /**
* 查询销售订单信息列表 * 查询销售订单信息列表
@ -103,6 +106,17 @@ public class MesSaleOrderController extends BaseController {
} }
@GetMapping("/listOrderBinds")
public TableDataInfo listOrderBinds(MesOrderBind mesOrderBind) {
startPage();
List<MesOrderBind> list = mesOrderBindService.selectMesOrderBindJoinList(mesOrderBind);
return getDataTable(list);
}
/** /**
* 库存转销售订单 * 库存转销售订单
*/ */

11
hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java
Unescape Escape View File

@ -43,6 +43,9 @@ public class MesBasePalletInfo extends BaseEntity
@Excel(name = "绑定数量") @Excel(name = "绑定数量")
private BigDecimal bindAmount; private BigDecimal bindAmount;
private String bindFlag;
public void setPalletInfoId(Long palletInfoId) public void setPalletInfoId(Long palletInfoId)
{ {
this.palletInfoId = palletInfoId; this.palletInfoId = palletInfoId;
@ -107,6 +110,14 @@ public class MesBasePalletInfo extends BaseEntity
return bindAmount; return bindAmount;
} }
public String getBindFlag() {
return bindFlag;
}
public void setBindFlag(String bindFlag) {
this.bindFlag = bindFlag;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

1
hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java
Unescape Escape View File

@ -191,6 +191,7 @@ public class MesBasePalletInfoServiceImpl implements IMesBasePalletInfoService {
mesBasePalletInfo.setMaterialBarcode(materialBarcode); mesBasePalletInfo.setMaterialBarcode(materialBarcode);
mesBasePalletInfo.setMaterialId(mesBaseBarcodeInfo.getMaterialId()); mesBasePalletInfo.setMaterialId(mesBaseBarcodeInfo.getMaterialId());
mesBasePalletInfo.setMaterialCode(mesBasePalletInfo.getMaterialCode());
mesBasePalletInfo.setMaterialName(mesBaseBarcodeInfo.getMaterialName()); mesBasePalletInfo.setMaterialName(mesBaseBarcodeInfo.getMaterialName());
mesBasePalletInfo.setUpdateBy(userName); mesBasePalletInfo.setUpdateBy(userName);
mesBasePalletInfo.setUpdateTime(currentDate); mesBasePalletInfo.setUpdateTime(currentDate);

2
hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml
Unescape Escape View File

@ -28,7 +28,9 @@
<where> <where>
<if test="palletInfoCode != null and palletInfoCode != ''">and pallet_info_code = #{palletInfoCode}</if> <if test="palletInfoCode != null and palletInfoCode != ''">and pallet_info_code = #{palletInfoCode}</if>
<if test="materialBarcode != null and materialBarcode != ''">and material_barcode = #{materialBarcode}</if> <if test="materialBarcode != null and materialBarcode != ''">and material_barcode = #{materialBarcode}</if>
<if test="bindFlag != null and bindFlag != ''">and material_barcode is not null</if>
</where> </where>
order by update_time desc
</select> </select>
<select id="selectMesBasePalletInfoByPalletInfoId" parameterType="Long" resultMap="MesBasePalletInfoResult"> <select id="selectMesBasePalletInfoByPalletInfoId" parameterType="Long" resultMap="MesBasePalletInfoResult">

2
hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml
Unescape Escape View File

@ -153,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="mergeFlag != null and mergeFlag != ''"> and mob.bind_amount=1 and mob.barcode_amount=0 and mso.order_amount=1</if> <if test="mergeFlag != null and mergeFlag != ''"> and mob.bind_amount=1 and mob.barcode_amount=0 and mso.order_amount=1</if>
<if test="singleFlag != null and singleFlag != ''"> and mob.bind_amount &gt; mob.barcode_amount</if> <if test="singleFlag != null and singleFlag != ''"> and mob.bind_amount &gt; mob.barcode_amount</if>
<if test="safeFlag != null and safeFlag != ''"> and mob.safe_flag = #{safeFlag}</if> <if test="safeFlag != null and safeFlag != ''"> and mob.safe_flag = #{safeFlag}</if>
<if test="saleOrderId != null"> and mob.sale_order_id = #{saleOrderId}</if>
<if test="purchaseOrderId != null"> and mob.purchase_order_id = #{purchaseOrderId}</if>
<if test="saleOrderCode != null and saleOrderCode != ''"> and mob.sale_order_code like concat('%', #{saleOrderCode}, '%')</if> <if test="saleOrderCode != null and saleOrderCode != ''"> and mob.sale_order_code like concat('%', #{saleOrderCode}, '%')</if>
<if test="productCode != null and productCode != ''"> and pbmi.product_code like concat('%', #{productCode}, '%')</if> <if test="productCode != null and productCode != ''"> and pbmi.product_code like concat('%', #{productCode}, '%')</if>
<if test="productName != null and productName != ''"> and pbmi.product_name like concat('%', #{productName}, '%')</if> <if test="productName != null and productName != ''"> and pbmi.product_name like concat('%', #{productName}, '%')</if>

16
hw-modules/hw-system/src/main/java/com/hw/system/controller/SysMenuController.java
Unescape Escape View File

@ -159,7 +159,7 @@ public class SysMenuController extends BaseController
/** /**
* 获取路由信息 * 获取PDA路由信息
* *
* @return 路由信息 * @return 路由信息
*/ */
@ -170,4 +170,18 @@ public class SysMenuController extends BaseController
List<SysMenu> menus = menuService.selectPdaMenuTreeByUserId(userId); List<SysMenu> menus = menuService.selectPdaMenuTreeByUserId(userId);
return success(menus); return success(menus);
} }
/**
* 获取WCS路由信息
*
* @return 路由信息
*/
@GetMapping("getWcsRouters")
public AjaxResult getWcsRouters()
{
Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = menuService.selectWcsMenuTreeByUserId(userId);
return success(menus);
}
} }

16
hw-modules/hw-system/src/main/java/com/hw/system/mapper/SysMenuMapper.java
Unescape Escape View File

@ -147,4 +147,20 @@ public interface SysMenuMapper
public List<SysMenu> selectPdaMenuTreeByUserId(Long userId); public List<SysMenu> selectPdaMenuTreeByUserId(Long userId);
/**
* 根据用户ID查询WCS菜单
*
* @return 菜单列表
*/
public List<SysMenu> selectWcsMenuTreeAll();
/**
* 根据用户ID查询WCS菜单
*
* @param userId 用户ID
* @return 菜单列表
*/
public List<SysMenu> selectWcsMenuTreeByUserId(Long userId);
} }

8
hw-modules/hw-system/src/main/java/com/hw/system/service/ISysMenuService.java
Unescape Escape View File

@ -150,4 +150,12 @@ public interface ISysMenuService
* @return 菜单列表 * @return 菜单列表
*/ */
public List<SysMenu> selectPdaMenuTreeByUserId(Long userId); public List<SysMenu> selectPdaMenuTreeByUserId(Long userId);
/**
* 根据用户ID查询调度菜单
*
* @param userId 用户名称
* @return 菜单列表
*/
public List<SysMenu> selectWcsMenuTreeByUserId(Long userId);
} }

24
hw-modules/hw-system/src/main/java/com/hw/system/service/impl/SysMenuServiceImpl.java
Unescape Escape View File

@ -557,4 +557,28 @@ public class SysMenuServiceImpl implements ISysMenuService
} }
return getChildPerms(menus, pdaParentId); return getChildPerms(menus, pdaParentId);
} }
/**
* 根据用户ID查询调度菜单
*
* @param userId 用户名称
* @return 菜单列表
*/
@Override
public List<SysMenu> selectWcsMenuTreeByUserId(Long userId)
{
int pdaParentId = 2900;
List<SysMenu> menus = null;
if (SecurityUtils.isAdmin(userId))
{
menus = menuMapper.selectWcsMenuTreeAll();
}
else
{
menus = menuMapper.selectWcsMenuTreeByUserId(userId);
}
return getChildPerms(menus, pdaParentId);
}
} }

19
hw-modules/hw-system/src/main/resources/mapper/system/SysMenuMapper.xml
Unescape Escape View File

@ -227,4 +227,23 @@
</select> </select>
<select id="selectWcsMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m where m.menu_type = 'W' and m.parent_id!=0 and m.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectWcsMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
left join sys_user u on ur.user_id = u.user_id
where u.user_id = #{userId} and m.parent_id!=0 and m.menu_type ='W' and m.status = 0 AND ro.status = 0
order by m.parent_id, m.order_num
</select>
</mapper> </mapper>

1
hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml
Unescape Escape View File

@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="beginTime != null "> and begin_time = #{beginTime}</if> <if test="beginTime != null "> and begin_time = #{beginTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if> <if test="endTime != null "> and end_time = #{endTime}</if>
</where> </where>
order by apply_date desc
</select> </select>
<select id="selectWmsRawOutstockByRawOutstockId" parameterType="Long" resultMap="WmsRawOutstockResult"> <select id="selectWmsRawOutstockByRawOutstockId" parameterType="Long" resultMap="WmsRawOutstockResult">

10
hw-ui/src/api/mes/saleOrder.js
Unescape Escape View File

@ -42,3 +42,13 @@ export function delSaleOrder(saleOrderId) {
method: 'delete' method: 'delete'
}) })
} }
// 查询销售订单绑定采购订单信息列表
export function listOrderBinds(query) {
return request({
url: '/mes/saleOrder/listOrderBinds',
method: 'get',
params: query
})
}

2
hw-ui/src/views/dms/bom/index.vue
Unescape Escape View File

@ -102,7 +102,7 @@
@click="toggleExpandAll" @click="toggleExpandAll"
>展开/折叠</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 <el-table

20
hw-ui/src/views/dms/checkplan/index.vue
Unescape Escape View File

@ -111,16 +111,16 @@
v-hasPermi="['dms:checkplan:remove']" v-hasPermi="['dms:checkplan:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:checkplan:export']" <!-- v-hasPermi="['dms:checkplan:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/debugging/index.vue
Unescape Escape View File

@ -115,16 +115,16 @@
v-hasPermi="['dms:debugging:remove']" v-hasPermi="['dms:debugging:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:debugging:export']" <!-- v-hasPermi="['dms:debugging:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="debuggingList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="debuggingList" @selection-change="handleSelectionChange">

23
hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue
Unescape Escape View File

@ -99,18 +99,17 @@
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsBaseAlarmRule:export']" <!-- v-hasPermi="['dms:dmsBaseAlarmRule:export']"-->
>导出 <!-- >导出-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsBaseAlarmRuleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsBaseAlarmRuleList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsBaseInspectProject/index.vue
Unescape Escape View File

@ -104,16 +104,16 @@
v-hasPermi="['dms:dmsBaseInspectProject:remove']" v-hasPermi="['dms:dmsBaseInspectProject:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsBaseInspectProject:export']" <!-- v-hasPermi="['dms:dmsBaseInspectProject:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsBaseInspectProjectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsBaseInspectProjectList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue
Unescape Escape View File

@ -95,16 +95,16 @@
v-hasPermi="['dms:dmsBaseInspectRoute:remove']" v-hasPermi="['dms:dmsBaseInspectRoute:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsBaseInspectRoute:export']" <!-- v-hasPermi="['dms:dmsBaseInspectRoute:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsBaseInspectRouteList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsBaseInspectRouteList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue
Unescape Escape View File

@ -88,16 +88,16 @@
v-hasPermi="['dms:dmsBaseInspectStandard:remove']" v-hasPermi="['dms:dmsBaseInspectStandard:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsBaseInspectStandard:export']" <!-- v-hasPermi="['dms:dmsBaseInspectStandard:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsBaseInspectStandardList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsBaseInspectStandardList" @selection-change="handleSelectionChange">

21
hw-ui/src/views/dms/dmsBaseMaintProject/index.vue
Unescape Escape View File

@ -48,17 +48,16 @@
v-hasPermi="['dms:dmsBaseMaintProject:remove']" v-hasPermi="['dms:dmsBaseMaintProject:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsBaseMaintProject:export']" <!-- v-hasPermi="['dms:dmsBaseMaintProject:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsBaseMaintProjectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsBaseMaintProjectList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsBillsLubeDetail/index.vue
Unescape Escape View File

@ -88,16 +88,16 @@
v-hasPermi="['dms:billslubedetail:remove']" v-hasPermi="['dms:billslubedetail:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:billslubedetail:export']" <!-- v-hasPermi="['dms:billslubedetail:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="billslubedetailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="billslubedetailList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsBillsMaintDetail/index.vue
Unescape Escape View File

@ -88,16 +88,16 @@
v-hasPermi="['dms:billsmaintdetail:remove']" v-hasPermi="['dms:billsmaintdetail:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:billsmaintdetail:export']" <!-- v-hasPermi="['dms:billsmaintdetail:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="billsmaintdetailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="billsmaintdetailList" @selection-change="handleSelectionChange">

21
hw-ui/src/views/dms/dmsFiles/index.vue
Unescape Escape View File

@ -88,17 +88,16 @@
v-hasPermi="['dms:dmsFiles:remove']" v-hasPermi="['dms:dmsFiles:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsFiles:export']" <!-- v-hasPermi="['dms:dmsFiles:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsFilesList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsFilesList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsInfo/index.vue
Unescape Escape View File

@ -103,16 +103,16 @@
v-hasPermi="['dms:dmsInfo:remove']" v-hasPermi="['dms:dmsInfo:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsInfo:export']" <!-- v-hasPermi="['dms:dmsInfo:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsInfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsInfoList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsPlanInspect/index.vue
Unescape Escape View File

@ -120,16 +120,16 @@
v-hasPermi="['dms:dmsPlanInspect:remove']" v-hasPermi="['dms:dmsPlanInspect:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsPlanInspect:export']" <!-- v-hasPermi="['dms:dmsPlanInspect:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsPlanInspectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsPlanInspectList" @selection-change="handleSelectionChange">

23
hw-ui/src/views/dms/dmsRecordAlarmInfo/index.vue
Unescape Escape View File

@ -134,18 +134,17 @@
>删除 >删除
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsRecordAlarmInfo:export']" <!-- v-hasPermi="['dms:dmsRecordAlarmInfo:export']"-->
>导出 <!-- >导出-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsRecordAlarmInfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsRecordAlarmInfoList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsRecordInspect/index.vue
Unescape Escape View File

@ -131,16 +131,16 @@
v-hasPermi="['dms:dmsRecordInspect:remove']" v-hasPermi="['dms:dmsRecordInspect:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsRecordInspect:export']" <!-- v-hasPermi="['dms:dmsRecordInspect:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsRecordInspectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsRecordInspectList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsRecordLube/index.vue
Unescape Escape View File

@ -164,16 +164,16 @@
v-hasPermi="['dms:dmsRecordLube:remove']" v-hasPermi="['dms:dmsRecordLube:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsRecordLube:export']" <!-- v-hasPermi="['dms:dmsRecordLube:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsRecordLubeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsRecordLubeList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/dmsRepair/index.vue
Unescape Escape View File

@ -113,16 +113,16 @@
v-hasPermi="['dms:dmsRepair:remove']" v-hasPermi="['dms:dmsRepair:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:dmsRepair:export']" <!-- v-hasPermi="['dms:dmsRepair:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="dmsRepairList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dmsRepairList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/info/index.vue
Unescape Escape View File

@ -118,16 +118,16 @@
disabled disabled
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:info:export']" <!-- v-hasPermi="['dms:info:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/install/index.vue
Unescape Escape View File

@ -101,16 +101,16 @@
disabled disabled
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:install:export']" <!-- v-hasPermi="['dms:install:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="installList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="installList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/knowledgeLube/index.vue
Unescape Escape View File

@ -70,16 +70,16 @@
v-hasPermi="['dms:knowledgeLube:remove']" v-hasPermi="['dms:knowledgeLube:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:knowledgeLube:export']" <!-- v-hasPermi="['dms:knowledgeLube:export']"-->
>导出</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>

20
hw-ui/src/views/dms/knowledgeRepair/index.vue
Unescape Escape View File

@ -66,16 +66,16 @@
v-hasPermi="['dms:knowledgeRepair:remove']" v-hasPermi="['dms:knowledgeRepair:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:knowledgeRepair:export']" <!-- v-hasPermi="['dms:knowledgeRepair:export']"-->
>导出</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>

20
hw-ui/src/views/dms/konwledgeMaint/index.vue
Unescape Escape View File

@ -68,16 +68,16 @@
v-hasPermi="['dms:konwledgeMaint:remove']" v-hasPermi="['dms:konwledgeMaint:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:konwledgeMaint:export']" <!-- v-hasPermi="['dms:konwledgeMaint:export']"-->
>导出</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>

20
hw-ui/src/views/dms/ledger/index.vue
Unescape Escape View File

@ -156,16 +156,16 @@
v-hasPermi="['dms:ledger:remove']" v-hasPermi="['dms:ledger:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:ledger:export']" <!-- v-hasPermi="['dms:ledger:export']"-->
>导出</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>

2
hw-ui/src/views/dms/lubeDetail/index.vue
Unescape Escape View File

@ -22,7 +22,7 @@
v-hasPermi="['dms:lubeDetail:add']" v-hasPermi="['dms:lubeDetail:add']"
>新增</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="lubeDetailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="lubeDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />

20
hw-ui/src/views/dms/lubeStandard/index.vue
Unescape Escape View File

@ -80,16 +80,16 @@
v-hasPermi="['dms:lubeStandard:remove']" v-hasPermi="['dms:lubeStandard:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:lubeStandard:export']" <!-- v-hasPermi="['dms:lubeStandard:export']"-->
>导出</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>

22
hw-ui/src/views/dms/lubeStation/index.vue
Unescape Escape View File

@ -105,17 +105,17 @@
v-hasPermi="['dms:lubeStation:remove']" v-hasPermi="['dms:lubeStation:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:lubeStation:export']" <!-- v-hasPermi="['dms:lubeStation:export']"-->
>导出</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="lubeStationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="lubeStationList" @selection-change="handleSelectionChange">

21
hw-ui/src/views/dms/operate/devicedepreciation/index.vue
Unescape Escape View File

@ -116,17 +116,16 @@
v-hasPermi="['dms:devicedepreciation:remove']" v-hasPermi="['dms:devicedepreciation:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:devicedepreciation:export']" <!-- v-hasPermi="['dms:devicedepreciation:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="devicedepreciationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="devicedepreciationList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/param/index.vue
Unescape Escape View File

@ -104,16 +104,16 @@
v-hasPermi="['dms:param:remove']" v-hasPermi="['dms:param:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:param:export']" <!-- v-hasPermi="['dms:param:export']"-->
>导出</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>

22
hw-ui/src/views/dms/purchase/index.vue
Unescape Escape View File

@ -107,17 +107,17 @@
v-hasPermi="['dms:purchase:remove']" v-hasPermi="['dms:purchase:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:purchase:export']" <!-- v-hasPermi="['dms:purchase:export']"-->
>导出</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="purchaseList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="purchaseList" @selection-change="handleSelectionChange">

21
hw-ui/src/views/dms/shutReason/index.vue
Unescape Escape View File

@ -100,17 +100,16 @@
v-hasPermi="['dms:shutReason:remove']" v-hasPermi="['dms:shutReason:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:shutReason:export']" <!-- v-hasPermi="['dms:shutReason:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="shutReasonList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="shutReasonList" @selection-change="handleSelectionChange">

21
hw-ui/src/views/dms/shutType/index.vue
Unescape Escape View File

@ -65,17 +65,16 @@
v-hasPermi="['dms:shutType:remove']" v-hasPermi="['dms:shutType:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:shutType:export']" <!-- v-hasPermi="['dms:shutType:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="shutTypeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="shutTypeList" @selection-change="handleSelectionChange">

20
hw-ui/src/views/dms/specialDeviceParam/index.vue
Unescape Escape View File

@ -96,16 +96,16 @@
v-hasPermi="['dms:specialDeviceParam:remove']" v-hasPermi="['dms:specialDeviceParam:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:specialDeviceParam:export']" <!-- v-hasPermi="['dms:specialDeviceParam:export']"-->
>导出</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>

20
hw-ui/src/views/dms/standard/index.vue
Unescape Escape View File

@ -88,16 +88,16 @@
v-hasPermi="['dms:standard:remove']" v-hasPermi="['dms:standard:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:standard:export']" <!-- v-hasPermi="['dms:standard:export']"-->
>导出</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>

20
hw-ui/src/views/dms/station/index.vue
Unescape Escape View File

@ -81,16 +81,16 @@
v-hasPermi="['dms:station:remove']" v-hasPermi="['dms:station:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:station:export']" <!-- v-hasPermi="['dms:station:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="stationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="stationList" @selection-change="handleSelectionChange">

21
hw-ui/src/views/dms/suplier/index.vue
Unescape Escape View File

@ -89,17 +89,16 @@
v-hasPermi="['dms:suplier:remove']" v-hasPermi="['dms:suplier:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['dms:suplier:export']" <!-- v-hasPermi="['dms:suplier:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="suplierList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="suplierList" @selection-change="handleSelectionChange">

10
hw-ui/src/views/ems/base/Energystatistics/index.vue
Unescape Escape View File

@ -102,11 +102,11 @@
kW·h kW·h
</div> </div>
</div> </div>
<right-toolbar <!-- <right-toolbar-->
:showSearch.sync="showSearch" <!-- :showSearch.sync="showSearch"-->
@queryTable="getList" <!-- @queryTable="getList"-->
:columns="columns" <!-- :columns="columns"-->
></right-toolbar> <!-- ></right-toolbar>-->
</el-row> </el-row>
<!-- 用户表格 --> <!-- 用户表格 -->
<el-table <el-table

2
hw-ui/src/views/ems/base/HistoryElectricity/index.vue
Unescape Escape View File

@ -102,7 +102,7 @@
@click="handleExport" @click="handleExport"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
</el-row> </el-row>
<!-- 用户表格 --> <!-- 用户表格 -->
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

2
hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
Unescape Escape View File

@ -90,7 +90,7 @@
>导出 >导出
</el-button> </el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="baseCollectDeviceInfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="baseCollectDeviceInfoList" @selection-change="handleSelectionChange">

2
hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
Unescape Escape View File

@ -48,7 +48,7 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button> <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
</el-row> </el-row>
<el-table v-if="refreshTable" v-loading="loading" :data="baseMonitorInfoList" row-key="objId" <el-table v-if="refreshTable" v-loading="loading" :data="baseMonitorInfoList" row-key="objId"

24
hw-ui/src/views/ems/base/basepublicuser/index.vue
Unescape Escape View File

@ -71,18 +71,18 @@
</el-button </el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
v-hasPermi="['base:basepublicuser:export']" <!-- v-hasPermi="['base:basepublicuser:export']"-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
plain <!-- plain-->
size="mini" <!-- size="mini"-->
type="warning" <!-- type="warning"-->
@click="handleExport" <!-- @click="handleExport"-->
>导出 <!-- >导出-->
</el-button <!-- </el-button-->
> <!-- >-->
</el-col> <!-- </el-col>-->
<!-- <right-toolbar--> <!-- <right-toolbar-->
<!-- :showSearch.sync="showSearch"--> <!-- :showSearch.sync="showSearch"-->
<!-- @queryTable="getList"--> <!-- @queryTable="getList"-->

2
hw-ui/src/views/ems/base/businessType/index.vue
Unescape Escape View File

@ -80,7 +80,7 @@
<el-col :span="1.5"> <el-col :span="1.5">
共{{list.length}}条 共{{list.length}}条
</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 <el-table

20
hw-ui/src/views/ems/base/dnbThreshold/index.vue
Unescape Escape View File

@ -55,16 +55,16 @@
v-hasPermi="['energy:dnbThreshold:remove']" v-hasPermi="['energy:dnbThreshold:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['energy:dnbThreshold:export']" <!-- v-hasPermi="['energy:dnbThreshold:export']"-->
>导出</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>

20
hw-ui/src/views/ems/base/exception/data/index.vue
Unescape Escape View File

@ -38,16 +38,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['energy:data:export']" <!-- v-hasPermi="['energy:data:export']"-->
>导出</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>

20
hw-ui/src/views/ems/base/info/index.vue
Unescape Escape View File

@ -70,16 +70,16 @@
v-hasPermi="['energy:info:remove']" v-hasPermi="['energy:info:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['energy:info:export']" <!-- v-hasPermi="['energy:info:export']"-->
>导出</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>

20
hw-ui/src/views/ems/base/lineMonitor/index.vue
Unescape Escape View File

@ -66,16 +66,16 @@
>展开/折叠</el-button >展开/折叠</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['base:lineMonitor:export']" <!-- v-hasPermi="['base:lineMonitor:export']"-->
>导出</el-button> <!-- >导出</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
共{{list.length}}条 共{{list.length}}条
</el-col> </el-col>

22
hw-ui/src/views/ems/base/loss/index.vue
Unescape Escape View File

@ -89,17 +89,17 @@
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['energy:loss:export']" <!-- v-hasPermi="['energy:loss:export']"-->
>导出</el-button <!-- >导出</el-button-->
> <!-- >-->
</el-col> <!-- </el-col>-->
<!-- <right-toolbar--> <!-- <right-toolbar-->
<!-- :showSearch.sync="showSearch"--> <!-- :showSearch.sync="showSearch"-->
<!-- @queryTable="getList"--> <!-- @queryTable="getList"-->

20
hw-ui/src/views/ems/base/threshold/index.vue
Unescape Escape View File

@ -55,16 +55,16 @@
v-hasPermi="['energy:threshold:remove']" v-hasPermi="['energy:threshold:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['energy:threshold:export']" <!-- v-hasPermi="['energy:threshold:export']"-->
>导出</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>

40
hw-ui/src/views/ems/base/type/index.vue
Unescape Escape View File

@ -24,16 +24,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="primary"--> type="primary"
<!-- plain--> plain
<!-- icon="el-icon-plus"--> icon="el-icon-plus"
<!-- size="mini"--> size="mini"
<!-- @click="handleAdd"--> @click="handleAdd"
<!-- v-hasPermi="['energy:type:add']"--> v-hasPermi="['energy:type:add']"
<!-- >新增</el-button>--> >新增</el-button>
<!-- </el-col>--> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -56,16 +56,16 @@
<!-- v-hasPermi="['energy:type:remove']"--> <!-- v-hasPermi="['energy:type:remove']"-->
<!-- >删除</el-button>--> <!-- >删除</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['energy:type:export']" <!-- v-hasPermi="['energy:type:export']"-->
>导出</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>

20
hw-ui/src/views/ems/base/typeRelation/index.vue
Unescape Escape View File

@ -63,16 +63,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
v-hasPermi="['base:typeRelation:export']" <!-- v-hasPermi="['base:typeRelation:export']"-->
>导出</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>

25
hw-ui/src/views/mes/materialinfo/index.vue
Unescape Escape View File

@ -149,15 +149,26 @@
<!-- v-hasPermi="['mes:materialinfo:remove']"--> <!-- v-hasPermi="['mes:materialinfo:remove']"-->
<!-- >删除</el-button>--> <!-- >删除</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['mes:materialinfo:export']"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="syncMaterialInfos"
v-hasPermi="['mes:materialinfo:export']" >同步
>导出
</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>
@ -421,6 +432,7 @@ import {
import {listBaseMaterialType} from "@//api/mes/baseMaterialType"; import {listBaseMaterialType} from "@//api/mes/baseMaterialType";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {runJob} from "@/api/monitor/job";
export default { export default {
name: "Materialinfo", name: "Materialinfo",
@ -669,6 +681,13 @@ export default {
}, },
syncMaterialInfos(){
this.$modal.confirm('确认要立即同步物料信息么？').then(function() {
return runJob(161, 'DEFAULT');
}).then(() => {
this.$modal.msgSuccess("执行成功");
}).catch(() => {});
}
} }
}; };
</script> </script>

24
hw-ui/src/views/mes/materialinfo/selectMaterial.vue
Unescape Escape View File

@ -51,9 +51,18 @@
<el-table v-loading="loading" :data="materialinfoList" @selection-change="handleSelectionChange" <el-table v-loading="loading" :data="materialinfoList"
@row-click="handleRowClick" :highlight-current-row="true"
highlight-current-row> @selection-change="handleSelectionChange"
:current-row-key="selectedRowId"
ref="selectMaterialRef">
<el-table-column label="选择" width="50">
<template slot-scope="scope">
<el-radio v-model="selectedRowId" :label="scope.row.materialId" @change="handleSelect(scope.row)">
{{scope.row.i}}
</el-radio>
</template>
</el-table-column>
<el-table-column type="selection" width="55" align="center" v-if="false" /> <el-table-column type="selection" width="55" align="center" v-if="false" />
<el-table-column label="物料ID" align="center" prop="materialId" v-if="false"/> <el-table-column label="物料ID" align="center" prop="materialId" v-if="false"/>
<el-table-column label="物料编码" align="center" prop="materialCode"/> <el-table-column label="物料编码" align="center" prop="materialCode"/>
@ -110,6 +119,7 @@ export default {
baseMaterialTypeOptions: [], baseMaterialTypeOptions: [],
// 物料信息表格数据 // 物料信息表格数据
materialinfoList: [], materialinfoList: [],
selectedRowId:null,
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -184,6 +194,14 @@ export default {
handleRowClick(row) { handleRowClick(row) {
this.selectedRow = row this.selectedRow = row
}, },
handleSelect(row){
this.selectedRow = row;
this.selectedRowId = row.materialId;
// 滚动到选中行
this.$nextTick(() => {
this.$refs.selectMaterialRef.setCurrentRow(row);
});
},
} }
}; };

29
hw-ui/src/views/mes/productOrder/addSaleOrder.vue
Unescape Escape View File

@ -98,11 +98,21 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>--> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="saleOrderList" @selection-change="handleSelectionChange" <el-table v-loading="loading" :data="saleOrderList"
@row-click="handleRowClick" :highlight-current-row="true"
highlight-current-row @selection-change="handleSelectionChange"
:current-row-key="selectedRowId"
ref="selectSaleOrderRef"
> >
<el-table-column type="selection" width="55" align="center" v-if="false"/>
<el-table-column label="选择" width="50">
<template slot-scope="scope">
<el-radio v-model="selectedRowId" :label="scope.row.saleOrderId" @change="handleSelect(scope.row)">
{{scope.row.i}}
</el-radio>
</template>
</el-table-column>
<el-table-column label="主键标识" align="center" prop="saleOrderId" v-if="columns[0].visible"/> <el-table-column label="主键标识" align="center" prop="saleOrderId" v-if="columns[0].visible"/>
<el-table-column label="ERP主键" align="center" prop="erpId" v-if="columns[1].visible"/> <el-table-column label="ERP主键" align="center" prop="erpId" v-if="columns[1].visible"/>
<el-table-column label="ERP订单明细ID" align="center" prop="fentryId" v-if="columns[2].visible"/> <el-table-column label="ERP订单明细ID" align="center" prop="fentryId" v-if="columns[2].visible"/>
@ -344,7 +354,7 @@ export default {
total: 0, total: 0,
// 销售订单信息表格数据 // 销售订单信息表格数据
saleOrderList: [], saleOrderList: [],
selectedRowId:null,
relateTotal:0, relateTotal:0,
//关联的销售订单数据 //关联的销售订单数据
relateSaleOrderList:[], relateSaleOrderList:[],
@ -573,6 +583,15 @@ export default {
}); });
}, },
handleSelect(row){
this.selectedRow = row;
this.selectedRowId = row.saleOrderId;
// 滚动到选中行
this.$nextTick(() => {
this.$refs.selectSaleOrderRef.setCurrentRow(row);
});
},
} }
}; };
</script> </script>

14
hw-ui/src/views/mes/productOrder/index.vue
Unescape Escape View File

@ -20,10 +20,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="销售订单编号" prop="saleorderCode"> <el-form-item label="销售订单号" prop="saleorderCode">
<el-input <el-input
v-model="queryParams.saleorderCode" v-model="queryParams.saleorderCode"
placeholder="请输入销售订单编号" placeholder="请输入销售订单号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -160,7 +160,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售订单ID" align="center" prop="saleOrderId" v-if="columns[2].visible" width="100"/> <el-table-column label="销售订单ID" align="center" prop="saleOrderId" v-if="columns[2].visible" width="100"/>
<el-table-column label="销售订单编号" align="center" prop="saleorderCode" v-if="columns[3].visible" width="100"/> <el-table-column label="销售订单号" align="center" prop="saleorderCode" v-if="columns[3].visible" width="100"/>
<el-table-column label="项目编号" align="center" prop="projectNo" v-if="columns[5].visible"/> <el-table-column label="项目编号" align="center" prop="projectNo" v-if="columns[5].visible"/>
<el-table-column label="成品编号" align="center" prop="materialCode" v-if="columns[27].visible" width="100"/> <el-table-column label="成品编号" align="center" prop="materialCode" v-if="columns[27].visible" width="100"/>
<el-table-column label="成品名称" align="center" prop="materialName" v-if="columns[6].visible" width="100"/> <el-table-column label="成品名称" align="center" prop="materialName" v-if="columns[6].visible" width="100"/>
@ -346,8 +346,8 @@
<!-- <el-form-item label="销售订单ID" prop="saleOrderId">--> <!-- <el-form-item label="销售订单ID" prop="saleOrderId">-->
<!-- <el-input v-model="form.saleOrderId" placeholder="请输入销售订单ID" />--> <!-- <el-input v-model="form.saleOrderId" placeholder="请输入销售订单ID" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="销售订单编号" prop="saleorderCode" v-if="form.saleType !== MES_SALE_TYPE.MES_SALE_TYPE_PACKING"> <el-form-item label="销售订单号" prop="saleorderCode" v-if="form.saleType !== MES_SALE_TYPE.MES_SALE_TYPE_PACKING">
<el-input v-model="form.saleorderCode" placeholder="请点击右侧检索销售订单编号" :disabled="saleOrderDisabled" <el-input v-model="form.saleorderCode" placeholder="请点击右侧检索销售订单号" :disabled="saleOrderDisabled"
readonly> readonly>
<el-button slot="append" icon="el-icon-search" @click="handleSaleOrderAdd"></el-button> <el-button slot="append" icon="el-icon-search" @click="handleSaleOrderAdd"></el-button>
</el-input> </el-input>
@ -726,7 +726,7 @@ export default {
{required: true, message: "销售类型不能为空", trigger: "blur"} {required: true, message: "销售类型不能为空", trigger: "blur"}
], ],
saleorderCode: [ saleorderCode: [
{required: true, message: "销售订单编号不能为空", trigger: "blur"} {required: true, message: "销售订单号不能为空", trigger: "blur"}
], ],
materialName: [ materialName: [
{required: true, message: "请选择成品", trigger: "blur"} {required: true, message: "请选择成品", trigger: "blur"}
@ -831,7 +831,7 @@ export default {
{key: 0, label: `主键标识`, visible: false}, {key: 0, label: `主键标识`, visible: false},
{key: 1, label: `任务编号`, visible: true}, {key: 1, label: `任务编号`, visible: true},
{key: 2, label: `销售订单ID`, visible: false}, {key: 2, label: `销售订单ID`, visible: false},
{key: 3, label: `销售订单编号`, visible: true}, {key: 3, label: `销售订单号`, visible: true},
{key: 4, label: `销售订单行号`, visible: false}, {key: 4, label: `销售订单行号`, visible: false},
{key: 5, label: `项目编号`, visible: false}, {key: 5, label: `项目编号`, visible: false},
{key: 6, label: `物料名称`, visible: true}, {key: 6, label: `物料名称`, visible: true},

27
hw-ui/src/views/mes/projectinfo/index.vue
Unescape Escape View File

@ -104,6 +104,17 @@
<!-- v-hasPermi="['mes:projectinfo:remove']"--> <!-- v-hasPermi="['mes:projectinfo:remove']"-->
<!-- >删除--> <!-- >删除-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['mes:projectinfo:export']"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -111,11 +122,11 @@
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="syncProjectInfos"
v-hasPermi="['mes:projectinfo:export']" >同步
>导出
</el-button> </el-button>
</el-col> </el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>--> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
</el-row> </el-row>
@ -313,6 +324,7 @@ import {
addProjectinfo, addProjectinfo,
updateProjectinfo updateProjectinfo
} from "@/api/mes/projectinfo"; } from "@/api/mes/projectinfo";
import {runJob} from "@/api/monitor/job";
export default { export default {
name: "Projectinfo", name: "Projectinfo",
@ -494,6 +506,15 @@ export default {
this.download('mes/projectinfo/export', { this.download('mes/projectinfo/export', {
...this.queryParams ...this.queryParams
}, `projectinfo_${new Date().getTime()}.xlsx`) }, `projectinfo_${new Date().getTime()}.xlsx`)
},
syncProjectInfos(){
this.$modal.confirm('确认要立即同步项目信息么？').then(function() {
return runJob(162, 'DEFAULT');
}).then(() => {
this.$modal.msgSuccess("执行成功");
}).catch(() => {});
} }
} }
}; };

20
hw-ui/src/views/mes/purchaseOrder/bindOrder.vue
Unescape Escape View File

@ -150,6 +150,11 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 销售订单绑定采购订单信息对话框 -->
<el-dialog title="采购订单绑定销售订单信息" :visible.sync="orderBindDialogVisible" append-to-body>
<order-binds ref="orderBindsRef" :defineData="orderBindsData"
v-if="orderBindDialogVisible"></order-binds>
</el-dialog>
</div> </div>
</template> </template>
@ -158,12 +163,14 @@
import {getPurchaseOrder, bindOrder, deleteOrderBind} from "@/api/mes/purchaseOrder"; import {getPurchaseOrder, bindOrder, deleteOrderBind} from "@/api/mes/purchaseOrder";
import selectSaleOrder from '@//views/mes/purchaseOrder/selectSaleOrder.vue'; import selectSaleOrder from '@//views/mes/purchaseOrder/selectSaleOrder.vue';
import orderBinds from "@/views/mes/saleOrder/orderBinds.vue";
export default { export default {
name: "PurchaseOrder", name: "PurchaseOrder",
components: { components: {
'select-saleOrder': selectSaleOrder, 'select-saleOrder': selectSaleOrder,
'order-binds': orderBinds,
}, },
dicts: ['active_flag', 'mes_purchase_order_status', 'document_status', 'mes_safe_flag'], dicts: ['active_flag', 'mes_purchase_order_status', 'document_status', 'mes_safe_flag'],
data() { data() {
@ -240,7 +247,9 @@ export default {
SAFE_FLAG: { SAFE_FLAG: {
YES: '1', YES: '1',
NO: '0' NO: '0'
} },
orderBindDialogVisible: false,
orderBindsData: {},
}; };
}, },
@ -425,6 +434,15 @@ export default {
const obj = {path: "/mes/plan/purchaseOrder", query: {t: Date.now(), pageNum: this.$route.query.pageNum}}; const obj = {path: "/mes/plan/purchaseOrder", query: {t: Date.now(), pageNum: this.$route.query.pageNum}};
this.$tab.closeOpenPage(obj); this.$tab.closeOpenPage(obj);
}, },
// 采购订单绑定销售订单信息页面
handleOrderBinds() {
this.orderBindDialogVisible = true
this.orderBindsData = {
purchaseOrderId: this.form.purchaseOrderId,
}
},
} }
}; };
</script> </script>

97
hw-ui/src/views/mes/purchaseOrder/index.vue
Unescape Escape View File

@ -74,6 +74,53 @@
</el-form-item> </el-form-item>
</el-form> </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="['mes:supplierInfo: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="['mes:supplierInfo: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="['mes:supplierInfo:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="syncPurchaseOrderInfos"
>同步
</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="purchaseOrderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="purchaseOrderList" @selection-change="handleSelectionChange">
<el-table-column label="采购订单ID" align="center" prop="purchaseOrderId"/> <el-table-column label="采购订单ID" align="center" prop="purchaseOrderId"/>
@ -137,6 +184,14 @@
v-if="scope.row.orderStatus === ORDER_STATUS.TO_PURCHASE || scope.row.orderStatus === ORDER_STATUS.PURCHASEING" v-if="scope.row.orderStatus === ORDER_STATUS.TO_PURCHASE || scope.row.orderStatus === ORDER_STATUS.PURCHASEING"
>绑定 >绑定
</el-button> </el-button>
<el-button
type="text"
icon="el-icon-info"
size="mini"
@click="handleOrderBinds(scope.row)"
v-hasPermi="['mes:purchaseOrder:bind']"
>已绑定
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -177,6 +232,13 @@
<el-button @click="upload.open = false">取 消</el-button> <el-button @click="upload.open = false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 销售订单绑定采购订单信息对话框 -->
<el-dialog title="采购订单绑定销售订单信息" :visible.sync="orderBindDialogVisible" append-to-body>
<order-binds ref="orderBindsRef" :defineData="orderBindsData"
v-if="orderBindDialogVisible"></order-binds>
</el-dialog>
</div> </div>
</template> </template>
@ -188,12 +250,22 @@ import {
addPurchaseOrder, addPurchaseOrder,
updatePurchaseOrder updatePurchaseOrder
} from "@/api/mes/purchaseOrder"; } from "@/api/mes/purchaseOrder";
import router from "@/router";
import {getToken} from "@/utils/auth"; import {getToken} from "@/utils/auth";
import orderBinds from "@/views/mes/saleOrder/orderBinds.vue";
import {runJob} from "@/api/monitor/job";
export default { export default {
name: "PurchaseOrder", name: "PurchaseOrder",
dicts: ['active_flag', 'mes_purchase_order_status', 'document_status', 'mes_safe_flag','mes_material_bind_flag'], dicts: ['active_flag', 'mes_purchase_order_status', 'document_status', 'mes_safe_flag','mes_material_bind_flag'],
components: {
'order-binds': orderBinds,
},
provide() {
return {
closeDialog: this.closeDialog,
}
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -287,7 +359,9 @@ export default {
ORDER_STATUS: { ORDER_STATUS: {
TO_PURCHASE: "1",//代采购 TO_PURCHASE: "1",//代采购
PURCHASEING: "2"//采购中 PURCHASEING: "2"//采购中
} },
orderBindDialogVisible: false,
orderBindsData: {},
}; };
}, },
@ -476,8 +550,25 @@ export default {
handleSaleOrderAdd() { handleSaleOrderAdd() {
} },
// 采购订单绑定销售订单信息页面
handleOrderBinds(row) {
this.orderBindDialogVisible = true
this.orderBindsData = {
purchaseOrderId: row.purchaseOrderId,
}
},
syncPurchaseOrderInfos(){
this.$modal.confirm('确认要立即同步采购订单信息么？').then(function() {
return runJob(164, 'DEFAULT');
}).then(() => {
this.$modal.msgSuccess("执行成功");
}).catch(() => {});
}
} }
}; };
</script> </script>

44
hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue
Unescape Escape View File

@ -42,7 +42,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="常备物料" v-if="!queryParams.mergeFlag" clearable prop="alwaysFlag"> <el-form-item label="常备物料" v-if="queryParams.mergeFlag===null" clearable prop="alwaysFlag">
<el-select v-model="queryParams.alwaysFlag" placeholder="请选择常备物料标识" clearable> <el-select v-model="queryParams.alwaysFlag" placeholder="请选择常备物料标识" clearable>
<el-option <el-option
v-for="dict in dict.type.mes_material_bind_flag" v-for="dict in dict.type.mes_material_bind_flag"
@ -53,7 +53,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="可用标识" v-if="queryParams.mergeFlag" prop="mergeFlag"> <el-form-item label="可用标识" v-if="queryParams.mergeFlag!==null" prop="mergeFlag">
<el-radio-group v-model="queryParams.mergeFlag"> <el-radio-group v-model="queryParams.mergeFlag">
<el-radio label="1" value="1" > <el-radio label="1" value="1" >
是 是
@ -64,7 +64,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="可用标识" v-if="!queryParams.mergeFlag" prop="singleFlag"> <el-form-item label="可用标识" v-if="queryParams.mergeFlag===null" prop="singleFlag">
<el-radio-group v-model="queryParams.singleFlag"> <el-radio-group v-model="queryParams.singleFlag">
<el-radio label="1" value="1" > <el-radio label="1" value="1" >
是 是
@ -89,11 +89,24 @@
<el-table v-loading="loading" <el-table v-loading="loading"
:data="orderBindList" :data="orderBindList"
:highlight-current-row="true"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="handleRowClick" :current-row-key="selectedRowId"
highlight-current-row ref="purchaseOrderRef"
> >
<el-table-column type="selection" align="center" v-if="selectionVisible"/> <el-table-column label="选择" width="50" v-if="isSingleSelect">
<template slot-scope="scope">
<el-radio v-model="selectedRowId" :label="scope.row.purchaseOrderId" @change="handleSelect(scope.row)">
{{scope.row.i}}
</el-radio>
</template>
</el-table-column>
<el-table-column
type="selection"
width="55"
:reserve-selection="true"
v-if="!isSingleSelect"
></el-table-column>
<el-table-column label="采购订单ID" align="center" prop="purchaseOrderId" /> <el-table-column label="采购订单ID" align="center" prop="purchaseOrderId" />
<el-table-column label="采购订单" align="center" prop="poNo" /> <el-table-column label="采购订单" align="center" prop="poNo" />
<el-table-column label="物料编码" align="center" prop="materialCode" /> <el-table-column label="物料编码" align="center" prop="materialCode" />
@ -229,6 +242,9 @@ export default {
{key: 22, label: `更新时间`, visible: false}, {key: 22, label: `更新时间`, visible: false},
], ],
selectedRows:[], selectedRows:[],
selectedRow:null,
selectedRowId:null,
isSingleSelect:true,
ALWAYS_FLAG:{ ALWAYS_FLAG:{
YES:"1", YES:"1",
NO:"0" NO:"0"
@ -245,10 +261,12 @@ export default {
this.selectionVisible = true; this.selectionVisible = true;
this.queryParams.mergeFlag = "1"; this.queryParams.mergeFlag = "1";
this.queryParams.singleFlag = null; this.queryParams.singleFlag = null;
this.isSingleSelect = false;
}else{ }else{
this.selectionVisible = false; this.selectionVisible = false;
this.queryParams.singleFlag ="1"; this.queryParams.singleFlag ="1";
this.queryParams.mergeFlag = null; this.queryParams.mergeFlag = null;
this.isSingleSelect = true;
} }
}, },
@ -315,10 +333,22 @@ export default {
}, },
//选中列赋值 //选中列赋值
handleRowClick(row) { handleRowClick(row) {
this.selectedRow = row this.selectedRow = row
this.selectedRowId = row.purchaseOrderId;
//alert(this.selectedRowId);
}, },
handleSelect(row){
this.selectedRow = row;
this.selectedRowId = row.purchaseOrderId;
// 滚动到选中行
this.$nextTick(() => {
this.$refs.purchaseOrderRef.setCurrentRow(row);
});
},
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
alert(JSON.stringify(selection))
this.ids = selection.map(item => item.purchaseOrderId) this.ids = selection.map(item => item.purchaseOrderId)
this.selectedRows = selection.map(item => item) this.selectedRows = selection.map(item => item)
this.single = selection.length !== 1 this.single = selection.length !== 1

46
hw-ui/src/views/mes/saleOrder/bindingPurchase.vue
Unescape Escape View File

@ -172,15 +172,15 @@
v-hasPermi="['mes:saleOrder:bind']" v-hasPermi="['mes:saleOrder:bind']"
>保存 >保存
</el-button> </el-button>
<!--el-button <el-button
type="danger" type="info"
plain plain
icon="el-icon-delete" icon="el-icon-info"
size="mini" size="mini"
@click="handleUnallocateBarCodes" @click="handleOrderBinds"
v-hasPermi="['mes:saleOrder:bind']" v-hasPermi="['mes:saleOrder:bind']"
>删除 >已绑定
</el-button--> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -225,6 +225,13 @@
<!-- </el-col>--> <!-- </el-col>-->
</el-row> </el-row>
<!-- 销售订单绑定采购订单信息对话框 -->
<el-dialog title="销售订单绑定采购订单信息" :visible.sync="dialogVisible" append-to-body>
<order-binds ref="orderBindsRef" :defineData="orderBindsData"
v-if="dialogVisible"></order-binds>
</el-dialog>
</div> </div>
</template> </template>
@ -236,9 +243,14 @@ import {
unbindPurchaseOrderList unbindPurchaseOrderList
} from "@/api/mes/purchaseOrder"; } from "@/api/mes/purchaseOrder";
import orderBinds from '@//views/mes/saleOrder/orderBinds.vue';
export default { export default {
name: "BindingPurchase", name: "BindingPurchase",
dicts: ['mes_material_bind_flag'], dicts: ['mes_material_bind_flag'],
components: {
'order-binds': orderBinds,
},
data() { data() {
return { return {
// 已选采购订单遮罩层 // 已选采购订单遮罩层
@ -299,6 +311,9 @@ export default {
alwaysFlag: null, alwaysFlag: null,
poNo: null poNo: null
}, },
dialogVisible: false,
orderBindsData: {},
}; };
}, },
created() { created() {
@ -458,6 +473,25 @@ export default {
}); });
}, },
// 销售订单绑定采购订单信息页面
handleOrderBinds() {
this.dialogVisible = true
this.orderBindsData = {
saleOrderId: this.saleOrderForm.saleOrderId,
}
},
closeDialog() {
this.dialogVisible = false;
},
} }
}; };
</script> </script>

52
hw-ui/src/views/mes/saleOrder/index.vue
Unescape Escape View File

@ -116,7 +116,18 @@
v-hasPermi="['mes:saleOrder:export']" v-hasPermi="['mes:saleOrder:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar--> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="syncSaleOrderInfos"
>同步</el-button>
</el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="saleOrderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="saleOrderList" @selection-change="handleSelectionChange">
@ -201,6 +212,15 @@
v-hasPermi="['mes:saleOrder:list']" v-hasPermi="['mes:saleOrder:list']"
v-if="scope.row.saleOrderClassfication==='2'" v-if="scope.row.saleOrderClassfication==='2'"
>详情</el-button> >详情</el-button>
<el-button
type="text"
icon="el-icon-info"
size="mini"
@click="handleOrderBinds(scope.row)"
v-hasPermi="['mes:saleOrder:bind']"
v-if="scope.row.saleOrderClassfication==='1'"
>已绑定
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -345,17 +365,26 @@
v-if="dialogVisible"></sale-order-relates> v-if="dialogVisible"></sale-order-relates>
</el-dialog> </el-dialog>
<!-- 销售订单绑定采购订单信息对话框 -->
<el-dialog title="销售订单绑定采购订单信息" :visible.sync="orderBindDialogVisible" append-to-body>
<order-binds ref="orderBindsRef" :defineData="orderBindsData"
v-if="orderBindDialogVisible"></order-binds>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listSaleOrder, getSaleOrder, delSaleOrder, addSaleOrder, updateSaleOrder } from "@/api/mes/saleOrder"; import { listSaleOrder, getSaleOrder, delSaleOrder, addSaleOrder, updateSaleOrder } from "@/api/mes/saleOrder";
import saleOrderRelates from "@/views/mes/saleOrder/saleOrderRelates.vue"; import saleOrderRelates from "@/views/mes/saleOrder/saleOrderRelates.vue";
import orderBinds from "@/views/mes/saleOrder/orderBinds.vue";
import {runJob} from "@/api/monitor/job";
export default { export default {
name: "SaleOrder", name: "SaleOrder",
components: { components: {
'sale-order-relates': saleOrderRelates, 'sale-order-relates': saleOrderRelates,
'order-binds': orderBinds,
}, },
provide() { provide() {
return { return {
@ -451,6 +480,9 @@ export default {
], ],
dialogVisible: false, dialogVisible: false,
saleOrderRelatesData: {}, saleOrderRelatesData: {},
orderBindDialogVisible: false,
orderBindsData: {},
}; };
}, },
created() { created() {
@ -591,7 +623,27 @@ export default {
} }
this.dialogVisible = true this.dialogVisible = true
},
// 销售订单绑定采购订单信息页面
handleOrderBinds(row) {
this.orderBindDialogVisible = true
this.orderBindsData = {
saleOrderId: row.saleOrderId,
}
},
syncSaleOrderInfos(){
this.$modal.confirm('确认要立即同步销售订单信息么？').then(function() {
return runJob(163, 'DEFAULT');
}).then(() => {
this.$modal.msgSuccess("执行成功");
}).catch(() => {});
} }
} }
}; };
</script> </script>

105
hw-ui/src/views/mes/saleOrder/orderBinds.vue
Unescape Escape View File

@ -0,0 +1,105 @@
<template>
<div class="app-container">
<el-table v-loading="loading" :data="orderBindList">
<el-table-column label="采购订单号" align="center" prop="poNo" v-if="purchaseVisible"/>
<el-table-column label="物料ID" align="center" prop="materialId" v-if="false"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="purchaseVisible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="purchaseVisible"/>
<el-table-column label="物料规格" align="center" prop="materialSpec" v-if="purchaseVisible"/>
<el-table-column label="安全库存" align="center" prop="safeFlag" v-if="saleVisible">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_safe_flag" :value="scope.row.safeFlag"/>
</template>
</el-table-column>
<el-table-column label="销售订单号" align="center" prop="saleOrderCode" v-if="saleVisible"/>
<el-table-column label="成品ID" align="center" prop="productId" v-if="false"/>
<el-table-column label="成品编码" align="center" prop="productCode" v-if="saleVisible"/>
<el-table-column label="成品名称" align="center" prop="productName" v-if="saleVisible"/>
<el-table-column label="成品规格" align="center" prop="productSpec" v-if="saleVisible"/>
<el-table-column label="绑定数量" align="center" prop="bindAmount"/>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { listOrderBinds } from "@/api/mes/saleOrder";
export default {
name: "OrderBinds",
props: {
defineData: {
type: Object,
default: {}
}
},
inject: ['closeDialog'],
dicts: [ 'mes_safe_flag'],
data() {
return {
// 遮罩层
loading: true,
// 总条数
total: 0,
orderBindList:[],
purchaseVisible:false,
saleVisible:false,
// 选中数组
queryParams: {
pageNum: 1,
pageSize: 10,
},
};
},
created() {
this.getData();
},
methods: {
getData() {
if (this.defineData.saleOrderId) {
this.queryParams.saleOrderId = this.defineData.saleOrderId;
this.purchaseVisible = true;
this.saleVisible = false;
this.getList();
}else if (this.defineData.purchaseOrderId) {
this.queryParams.purchaseOrderId = this.defineData.purchaseOrderId;
this.purchaseVisible = false;
this.saleVisible = true;
this.getList();
}
},
/** 查询销售订单信息列表 */
getList() {
this.loading = true;
listOrderBinds(this.queryParams).then(response => {
this.orderBindList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
}
};
</script>

93
hw-ui/src/views/mes/supplierInfo/index.vue
Unescape Escape View File

@ -53,49 +53,60 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['mes:supplierInfo:add']" <!-- v-hasPermi="['mes:supplierInfo:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['mes:supplierInfo:edit']" <!-- v-hasPermi="['mes:supplierInfo:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['mes:supplierInfo:remove']" <!-- v-hasPermi="['mes:supplierInfo:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['mes:supplierInfo:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="syncSupplierInfos"
v-hasPermi="['mes:supplierInfo:export']" >同步
>导出</el-button> </el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
<!--right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar-->
</el-row> </el-row>
<el-table v-loading="loading" :data="supplierInfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="supplierInfoList" @selection-change="handleSelectionChange">
@ -198,6 +209,7 @@
<script> <script>
import { listSupplierInfo, getSupplierInfo, delSupplierInfo, addSupplierInfo, updateSupplierInfo } from "@/api/mes/supplierInfo"; import { listSupplierInfo, getSupplierInfo, delSupplierInfo, addSupplierInfo, updateSupplierInfo } from "@/api/mes/supplierInfo";
import {runJob} from "@/api/monitor/job";
export default { export default {
name: "SupplierInfo", name: "SupplierInfo",
@ -372,6 +384,15 @@ export default {
this.download('mes/supplierInfo/export', { this.download('mes/supplierInfo/export', {
...this.queryParams ...this.queryParams
}, `supplierInfo_${new Date().getTime()}.xlsx`) }, `supplierInfo_${new Date().getTime()}.xlsx`)
},
syncSupplierInfos(){
this.$modal.confirm('确认要立即同步供应商信息么？').then(function() {
return runJob(160, 'DEFAULT');
}).then(() => {
this.$modal.msgSuccess("执行成功");
}).catch(() => {});
} }
} }
}; };

2
hw-ui/src/views/wms/info/rawinstock/index.vue
Unescape Escape View File

@ -84,7 +84,7 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<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="rawinstockList"> <el-table v-loading="loading" :data="rawinstockList">

Write Preview
Loading…
Cancel
Save