root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev
王晓迪 2 months ago
parent
58164fa26d 98413d99ce
commit
3d544f3125
18 changed files with 258 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java
  2. 5
      ruoyi-admin/src/main/java/com/ruoyi/financial/mapper/FinancialAccountsPayableMapper.java
  3. 25
      ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java
  4. 13
      ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrder.java
  5. 5
      ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseOrderService.java
  6. 39
      ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
  7. 7
      ruoyi-admin/src/main/resources/mapper/financial/FinancialAccountsPayableMapper.xml
  8. 7
      ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderMapper.xml
  9. 8
      ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/compantFixedAssets.html
  10. 11
      ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
  11. 50
      ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html
  12. 11
      ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
  13. 19
      ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
  14. 62
      ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/closePurchaseOrder.html
  15. 33
      ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html
  16. 20
      ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
  17. 10
      ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/inventoryCheck.html
  18. 10
      ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html

2
ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java
View File

@ -25,7 +25,7 @@ public class FinancialAccountsPayable extends BaseEntity
@Excel(name = "应付单号", sort = 1) @Excel(name = "应付单号", sort = 1)
private String accountsPayableCode; private String accountsPayableCode;
/** 付款状态 */ /** 付款状态（0待付款、1部分付款、2已结案） */
@Excel(name = "付款状态", sort = 2,dictType = "accounts_payable_status") @Excel(name = "付款状态", sort = 2,dictType = "accounts_payable_status")
private String accountsPayableStatus; private String accountsPayableStatus;

5
ruoyi-admin/src/main/java/com/ruoyi/financial/mapper/FinancialAccountsPayableMapper.java
View File

@ -79,4 +79,9 @@ public interface FinancialAccountsPayableMapper
public List<FinancialAccountsPayable> selectFinancialAccountsPayableByCodes(String[] accountsPayableCodes); public List<FinancialAccountsPayable> selectFinancialAccountsPayableByCodes(String[] accountsPayableCodes);
public int updatePayableClosingStatusById(Long accountsPayableId); public int updatePayableClosingStatusById(Long accountsPayableId);
/**
* 根据关联编号查询财务应付账款
* */
FinancialAccountsPayable selectFinancialAccountsPayableByRelevanceCode(String relevanceCode);
} }

25
ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java
View File

@ -403,4 +403,29 @@ public class PurchaseOrderController extends BaseController
List<SysUser> list = sysUserService.selectRoleToUserList("cgyRole,cgjlRole,cgzgRole"); List<SysUser> list = sysUserService.selectRoleToUserList("cgyRole,cgjlRole,cgzgRole");
return getDataTable(list); return getDataTable(list);
} }
/**
* 加载采购订单结案弹窗
*/
@GetMapping("/closePurchaseOrder/{purchaseOrderId}")
public String closePurchaseOrder(@PathVariable("purchaseOrderId") Long purchaseOrderId,ModelMap mmap){
PurchaseOrder purchaseOrder = purchaseOrderService.selectPurchaseOrderById(purchaseOrderId);
mmap.put("purchaseOrder", purchaseOrder);
return prefix + "/closePurchaseOrder";
}
/**
* 采购订单结案
* */
@RequiresPermissions("purchase:purchaseOrder:close")
@Log(title = "采购订单", businessType = BusinessType.UPDATE)
@PostMapping("/closePurchaseOrder")
@ResponseBody
public AjaxResult closePurchaseOrderSave(PurchaseOrder purchaseOrder){
return toAjax(purchaseOrderService.closePurchaseOrder(purchaseOrder));
}
} }

13
ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrder.java
View File

@ -138,6 +138,10 @@ public class PurchaseOrder extends BaseEntity
/** 申请时间 */ /** 申请时间 */
private Date applyTime; private Date applyTime;
/** 用于应付账款结案的结案原因*/
private String closedReason;
private List<PurchaseOrderChild> purchaseOrderChildList; private List<PurchaseOrderChild> purchaseOrderChildList;
@ -447,6 +451,14 @@ public class PurchaseOrder extends BaseEntity
return applyTime; return applyTime;
} }
public String getClosedReason() {
return closedReason;
}
public void setClosedReason(String closedReason) {
this.closedReason = closedReason;
}
public List<PurchaseOrderChild> getPurchaseOrderChildList() { public List<PurchaseOrderChild> getPurchaseOrderChildList() {
return purchaseOrderChildList; return purchaseOrderChildList;
} }
@ -496,6 +508,7 @@ public class PurchaseOrder extends BaseEntity
.append("applyTitle", getApplyTitle()) .append("applyTitle", getApplyTitle())
.append("applyUser", getApplyUser()) .append("applyUser", getApplyUser())
.append("applyTime", getApplyTime()) .append("applyTime", getApplyTime())
.append("closedReason", getClosedReason())
.append("purchaseOrderChildList", getPurchaseOrderChildList()) .append("purchaseOrderChildList", getPurchaseOrderChildList())
.toString(); .toString();
} }

5
ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseOrderService.java
View File

@ -130,4 +130,9 @@ public interface IPurchaseOrderService
* 通过采购订单号集合查询采购订单集合 * 通过采购订单号集合查询采购订单集合
* */ * */
List<PurchaseOrder> selectPurchaseOrderChildListByPurchaseCodeList(List<String> purchaseCodeList); List<PurchaseOrder> selectPurchaseOrderChildListByPurchaseCodeList(List<String> purchaseCodeList);
/**
* 采购订单结案
* */
int closePurchaseOrder(PurchaseOrder purchaseOrder);
} }

39
ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
View File

@ -1344,7 +1344,8 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
purchaseStorage.setWarehouseDeptType(purchaseOrderChild.getWarehouseDept()); purchaseStorage.setWarehouseDeptType(purchaseOrderChild.getWarehouseDept());
purchaseStorage.setWarehouseQualityStatus("0"); purchaseStorage.setWarehouseQualityStatus("0");
purchaseStorage.setWarehouseOrderType("0"); purchaseStorage.setWarehouseOrderType("0");
purchaseStorage.setCreateBy(ShiroUtils.getLoginName());
purchaseStorage.setCreateTime(DateUtils.getNowDate());
purchaseStorage.setArrivedTime(purchaseOrder.getArrivedTime()); purchaseStorage.setArrivedTime(purchaseOrder.getArrivedTime());
purchaseStorage.setRelatedOrderCode(purchaseOrder.getPurchaseOrderCode()); purchaseStorage.setRelatedOrderCode(purchaseOrder.getPurchaseOrderCode());
@ -1510,6 +1511,42 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
} }
/**
* 采购订单结案
* */
@Transactional(rollbackFor = Exception.class)
@Override
public int closePurchaseOrder(PurchaseOrder purchaseOrder) {
String loginName = ShiroUtils.getLoginName();
String purchaseOrderCode = purchaseOrder.getPurchaseOrderCode();
FinancialAccountsPayable oldAccountsPayable = financialAccountsPayableMapper.selectFinancialAccountsPayableByRelevanceCode(purchaseOrderCode);
if (oldAccountsPayable == null){
throw new BusinessException("未查到关联的应付账款记录，请检查");
}
oldAccountsPayable.setAccountsPayableStatus("2");
oldAccountsPayable.setClosedReason(purchaseOrder.getClosedReason());
oldAccountsPayable.setUpdateBy(loginName);
oldAccountsPayable.setUpdateTime(new Date());
int updateAccountsPayableResult = financialAccountsPayableMapper.updateFinancialAccountsPayable(oldAccountsPayable);
if (updateAccountsPayableResult <= 0){
throw new BusinessException("应付账款结案失败");
}
purchaseOrder.setPaymentStatus("4");
purchaseOrder.setUpdateBy(loginName);
purchaseOrder.setUpdateTime(new Date());
int updateResult = purchaseOrderMapper.updatePurchaseOrder(purchaseOrder);
if (updateResult <= 0){
throw new BusinessException("采购订单结案失败");
}
return updateResult;
}
/** /**
* 提交采购订单详情 * 提交采购订单详情
* */ * */

7
ruoyi-admin/src/main/resources/mapper/financial/FinancialAccountsPayableMapper.xml
View File

@ -74,7 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectFinancialAccountsPayableVo"/> <include refid="selectFinancialAccountsPayableVo"/>
where accounts_payable_id = #{accountsPayableId} where accounts_payable_id = #{accountsPayableId}
</select> </select>
<select id="selectFinancialAccountsPayableByRelevanceCode" parameterType="String" resultMap="FinancialAccountsPayableResult">
<include refid="selectFinancialAccountsPayableVo"/>
where relevance_code = #{relevanceCode}
</select>
<insert id="insertFinancialAccountsPayable" parameterType="FinancialAccountsPayable" useGeneratedKeys="true" keyProperty="accountsPayableId"> <insert id="insertFinancialAccountsPayable" parameterType="FinancialAccountsPayable" useGeneratedKeys="true" keyProperty="accountsPayableId">
insert into financial_accounts_payable insert into financial_accounts_payable
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">

7
ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderMapper.xml
View File

@ -43,10 +43,11 @@
<result property="applyTitle" column="apply_title" /> <result property="applyTitle" column="apply_title" />
<result property="applyUser" column="apply_user" /> <result property="applyUser" column="apply_user" />
<result property="applyTime" column="apply_time" /> <result property="applyTime" column="apply_time" />
<result property="closedReason" column="closed_reason" />
</resultMap> </resultMap>
<sql id="selectPurchaseOrderVo"> <sql id="selectPurchaseOrderVo">
select purchase_order_id, purchase_order_code, purchase_plan_code, warehouse_storage_status, payment_status, supplier_code, supplier_name, material_sum, actual_purchase_sum, shared_inventory_occupancy_sum, refunds_exchanges_sum, storage_sum, notify_has_arrived_sum,noRmb_sum, rmb_sum, eceipt_type, arrived_time, stock_no, stock_name, receive_person, receive_person_phone, receive_address, purchase_buyer, use_status, audit_status, create_by, create_time, update_by, update_time, del_flag, instance_id, instance_type, submit_instance_id, cancel_instance_id, restore_instance_id, apply_title, apply_user, apply_time from purchase_order select purchase_order_id, purchase_order_code, purchase_plan_code, warehouse_storage_status, payment_status, supplier_code, supplier_name, material_sum, actual_purchase_sum, shared_inventory_occupancy_sum, refunds_exchanges_sum, storage_sum, notify_has_arrived_sum,noRmb_sum, rmb_sum, eceipt_type, arrived_time, stock_no, stock_name, receive_person, receive_person_phone, receive_address, purchase_buyer, use_status, audit_status, create_by, create_time, update_by, update_time, del_flag, instance_id, instance_type, submit_instance_id, cancel_instance_id, restore_instance_id, apply_title, apply_user, apply_time, closed_reason from purchase_order
</sql> </sql>
<select id="selectPurchaseOrderList" parameterType="PurchaseOrder" resultMap="PurchaseOrderResult"> <select id="selectPurchaseOrderList" parameterType="PurchaseOrder" resultMap="PurchaseOrderResult">
@ -146,6 +147,7 @@
<if test="applyTitle != null">apply_title,</if> <if test="applyTitle != null">apply_title,</if>
<if test="applyUser != null">apply_user,</if> <if test="applyUser != null">apply_user,</if>
<if test="applyTime != null">apply_time,</if> <if test="applyTime != null">apply_time,</if>
<if test="closedReason != null">closed_reason,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="purchaseOrderCode != null">#{purchaseOrderCode},</if> <if test="purchaseOrderCode != null">#{purchaseOrderCode},</if>
@ -185,6 +187,7 @@
<if test="applyTitle != null">#{applyTitle},</if> <if test="applyTitle != null">#{applyTitle},</if>
<if test="applyUser != null">#{applyUser},</if> <if test="applyUser != null">#{applyUser},</if>
<if test="applyTime != null">#{applyTime},</if> <if test="applyTime != null">#{applyTime},</if>
<if test="closedReason != null">#{closedReason},</if>
</trim> </trim>
</insert> </insert>
@ -228,6 +231,7 @@
<if test="applyTitle != null">apply_title = #{applyTitle},</if> <if test="applyTitle != null">apply_title = #{applyTitle},</if>
<if test="applyUser != null">apply_user = #{applyUser},</if> <if test="applyUser != null">apply_user = #{applyUser},</if>
<if test="applyTime != null">apply_time = #{applyTime},</if> <if test="applyTime != null">apply_time = #{applyTime},</if>
<if test="closedReason != null">closed_reason = #{closedReason},</if>
</trim> </trim>
where purchase_order_id = #{purchaseOrderId} where purchase_order_id = #{purchaseOrderId}
</update> </update>
@ -273,6 +277,7 @@
<if test="applyTitle != null">apply_title = #{applyTitle},</if> <if test="applyTitle != null">apply_title = #{applyTitle},</if>
<if test="applyUser != null">apply_user = #{applyUser},</if> <if test="applyUser != null">apply_user = #{applyUser},</if>
<if test="applyTime != null">apply_time = #{applyTime},</if> <if test="applyTime != null">apply_time = #{applyTime},</if>
<if test="closedReason != null">closed_reason = #{closedReason},</if>
</trim> </trim>
where purchase_order_code = #{purchaseOrderCode} where purchase_order_code = #{purchaseOrderCode}
</update> </update>

8
ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/compantFixedAssets.html
View File

@ -132,10 +132,10 @@
{title: '操作',align: 'center', {title: '操作',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-eye"></i>详情</a> '); actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.compantFixedAssetsId + '\')"><i class="fa fa-eye"></i>详情</a> ');
var actionLinks = actions.join('');
return actions.join(''); return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

11
ruoyi-admin/src/main/resources/templates/financial/companyCost/companyCost.html
View File

@ -19,7 +19,7 @@
<input type="number" name="costYear"/> <input type="number" name="costYear"/>
</li> </li>
<li> <li>
<label for="costMonth">月份：</label> <label>月份：</label>
<select class="form-control" name="costMonth"> <select class="form-control" name="costMonth">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${@dict.getType('sys_month')}" th:text="${item.dictLabel}" th:value="${item.dictValue}"></option> <option th:each="item : ${@dict.getType('sys_month')}" th:text="${item.dictLabel}" th:value="${item.dictValue}"></option>
@ -45,7 +45,7 @@
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="financial:companyCost:export"> <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="financial:companyCost:export">
<i class="fa fa-plus"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
@ -97,10 +97,11 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a> '); actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i>详情</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> '); // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
] ]

50
ruoyi-admin/src/main/resources/templates/financial/companyCost/detail.html
View File

@ -27,7 +27,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">备注：</label> <label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="remark" th:field="*{remark}" class="form-control"></textarea> <textarea name="remark" th:text="*{remark}" class="form-control" readonly></textarea>
</div> </div>
</div> </div>
</div> </div>
@ -35,39 +35,39 @@
<div class="form-group" hidden="hidden"> <div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">经营成本：</label> <label class="col-sm-3 control-label">经营成本：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="operatingCosts" name="operatingCosts" th:field="*{operatingCosts}" class="form-control" type="number"> <input id="operatingCosts" name="operatingCosts" th:field="*{operatingCosts}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="container"> <div class="container">
<h3>经营成本</h3> <h3>经营成本</h3>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">工资费用：</label> <label class="col-sm-3 control-label">工资费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="salaryExpenses" th:field="*{salaryExpenses}" class="form-control" type="number" required> <input name="salaryExpenses" th:field="*{salaryExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">厂租费用：</label> <label class="col-sm-3 control-label">厂租费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="factoryRentalFees" th:field="*{factoryRentalFees}" class="form-control" type="number" required> <input name="factoryRentalFees" th:field="*{factoryRentalFees}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">税金费用：</label> <label class="col-sm-3 control-label">税金费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="taxExpenses" th:field="*{taxExpenses}" class="form-control" type="number" required> <input name="taxExpenses" th:field="*{taxExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">工厂电费：</label> <label class="col-sm-3 control-label">工厂电费：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="factoryElectricityFees" th:field="*{factoryElectricityFees}" class="form-control" type="number" required> <input name="factoryElectricityFees" th:field="*{factoryElectricityFees}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">其他费用：</label> <label class="col-sm-3 control-label">其他费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="ohterExpenses" th:field="*{ohterExpenses}" class="form-control" type="number" requirede> <input name="ohterExpenses" th:field="*{ohterExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
</div> </div>
@ -75,45 +75,45 @@
<div class="form-group" hidden="hidden"> <div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">业务成本：</label> <label class="col-sm-3 control-label">业务成本：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="businessCost" name="businessCost" th:field="*{businessCost}" class="form-control" type="number"> <input id="businessCost" name="businessCost" th:field="*{businessCost}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="container"> <div class="container">
<h3>业务成本</h3> <h3>业务成本</h3>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">运输费用：</label> <label class="col-sm-3 control-label">运输费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="transportationCosts" th:field="*{transportationCosts}" class="form-control" type="number" required> <input name="transportationCosts" th:field="*{transportationCosts}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">推广费用：</label> <label class="col-sm-3 control-label">推广费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="promotionExpenses" th:field="*{promotionExpenses}" class="form-control" type="number" required> <input name="promotionExpenses" th:field="*{promotionExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">包装费用：</label> <label class="col-sm-3 control-label">包装费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="packagingCost" th:field="*{packagingCost}" class="form-control" type="number" required> <input name="packagingCost" th:field="*{packagingCost}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">业务费用：</label> <label class="col-sm-3 control-label">业务费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="businessExpenses" th:field="*{businessExpenses}" class="form-control" type="number" required> <input name="businessExpenses" th:field="*{businessExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">售后费用：</label> <label class="col-sm-3 control-label">售后费用：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="afterSalesExpenses" th:field="*{afterSalesExpenses}" class="form-control" type="number" required> <input name="afterSalesExpenses" th:field="*{afterSalesExpenses}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">业务提成：</label> <label class="col-sm-3 control-label">业务提成：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="businessCommission" th:field="*{businessCommission}" class="form-control" type="number" required> <input name="businessCommission" th:field="*{businessCommission}" class="form-control" type="number" readonly>
</div> </div>
</div> </div>
</div> </div>

11
ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
View File

@ -202,15 +202,16 @@
var todoUserIdList = row.todoUserId.split(","); var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){ if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix1 + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix1 + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
} }
} }
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> '); actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> '); actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
} }
// 详情 // 详情
actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.expenseId + '\')"><i class="fa fa-eye"></i> 详情</a> '); actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.expenseId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
} }
], ],

19
ruoyi-admin/src/main/resources/templates/financial/taxInvoice/taxInvoice.html
View File

@ -87,7 +87,7 @@
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="financial:taxInvoice:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="financial:taxInvoice:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="financial:taxInvoice:export"> <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="financial:taxInvoice:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -265,19 +265,19 @@
//待审核详情 //待审核详情
if (row.taxInvoiceStatus=="0"){ if (row.taxInvoiceStatus=="0"){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="beforeAuditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>'); actions.push('<a href="javascript:void(0)" onclick="beforeAuditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
} }
if (row.taxInvoiceStatus=="0" && row.commonCurrency=="1"){ if (row.taxInvoiceStatus=="0" && row.commonCurrency=="1"){
actions.push('<a class="btn btn-success btn-xs ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>'); actions.push('<a class=" ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>');
} }
if (row.taxInvoiceStatus=="0" && row.commonCurrency=="2"){ if (row.taxInvoiceStatus=="0" && row.commonCurrency=="2"){
actions.push('<a class="btn btn-success btn-xs ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>'); actions.push('<a class=" ' + auditInvoiceFlag + '" href="javascript:void(0)" onclick="auditInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>审核</a>');
} }
//审核详情 //审核详情
if (row.taxInvoiceStatus=="1"){ if (row.taxInvoiceStatus=="1"){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="auditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>'); actions.push('<a href="javascript:void(0)" onclick="auditInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
} }
// if (row.taxInvoiceStatus=="1" ){ // if (row.taxInvoiceStatus=="1" ){
@ -285,17 +285,18 @@
// } // }
if (row.taxInvoiceStatus=="1" && row.commonCurrency=="1"){ if (row.taxInvoiceStatus=="1" && row.commonCurrency=="1"){
actions.push('<a class="btn btn-success btn-xs ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>'); actions.push('<a class=" ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceRmb(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>');
} }
if (row.taxInvoiceStatus=="1" && row.commonCurrency=="2"){ if (row.taxInvoiceStatus=="1" && row.commonCurrency=="2"){
actions.push('<a class="btn btn-success btn-xs ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>'); actions.push('<a class=" ' + uploadInvoiceFlag + '" href="javascript:void(0)" onclick="uploadInvoiceUsd(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>上传发票</a>');
} }
//上传发票详情 //上传发票详情
if (row.taxInvoiceStatus=="2" ){ if (row.taxInvoiceStatus=="2" ){
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="uploadInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>'); actions.push('<a href="javascript:void(0)" onclick="uploadInvoiceDetail(\'' + row.taxInvoiceId + '\')"><i class="fa fa-edit"></i>详情</a>');
} }
return actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks);
} }
}] }]
}; };

62
ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/closePurchaseOrder.html
View File

@ -0,0 +1,62 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('结案')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-purchaseOrder-closePurchaseOrder" th:object="${purchaseOrder}">
<input name="purchaseOrderId" th:field="*{purchaseOrderId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">采购单号：</label>
<div class="col-sm-8">
<input name="purchaseOrderCode" th:field="*{purchaseOrderCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">打款结案状态：</label>
<div class="col-sm-8">
<select name="paymentStatus" class="form-control m-b" th:with="type=${@dict.getType('sys_pay_close')}" disabled>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{paymentStatus}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label ">供应商ID：</label>
<div class="col-sm-8">
<input name="supplierCode" th:field="*{supplierCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">供应商名称：</label>
<div class="col-sm-8">
<input name="supplierName" th:field="*{supplierName}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">结案原因：</label>
<div class="col-sm-8">
<textarea name="closedReason" th:field="*{closedReason}" class="form-control" required></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "purchase/purchaseOrder"
$("#form-purchaseOrder-closePurchaseOrder").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/closePurchaseOrder", $('#form-purchaseOrder-closePurchaseOrder').serialize());
}
}
</script>
</body>
</html>

33
ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html
View File

@ -59,6 +59,9 @@
<a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="purchase:purchaseOrder:export"> <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="purchase:purchaseOrder:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
<a class="btn btn-success" onclick="closePurchaseOrder()" shiro:hasPermission="purchase:purchaseOrder:close">
<i class="fa fa-plus"></i> 结案
</a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
@ -74,6 +77,8 @@
var restoreFlag = [[${@permission.hasPermi('purchase:purchaseOrder:restore')}]]; var restoreFlag = [[${@permission.hasPermi('purchase:purchaseOrder:restore')}]];
var addPurchaseStorageFlag = [[${@permission.hasPermi('purchase:purchaseOrder:addPurchaseStorage')}]]; var addPurchaseStorageFlag = [[${@permission.hasPermi('purchase:purchaseOrder:addPurchaseStorage')}]];
var closeFlag = [[${@permission.hasPermi('purchase:purchaseOrder:close')}]];
var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]]; var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]];
var paymentStatusDatas = [[${@dict.getType('sys_pay_close')}]]; var paymentStatusDatas = [[${@dict.getType('sys_pay_close')}]];
@ -231,20 +236,23 @@
var actions = []; var actions = [];
if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId) { if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId) {
// 作废 // 作废
actions.push('<a class=" ' + cancelFlag + ' " href="javascript:void(0)" onclick="cancel(\'' + row.purchaseOrderId + '\')"><i class="fa fa-remove"></i> 作废</a>'); actions.push('<a class=" ' + cancelFlag + ' " href="javascript:void(0)" onclick="cancel(\'' + row.purchaseOrderId + '\')"><i class="fa fa-remove"></i>作废</a>');
//入库状态(0待暂收、1已暂收、2待入库、3部分入库、4全部入库) //入库状态(0待暂收、1已暂收、2待入库、3部分入库、4全部入库)
if(row.warehouseStorageStatus=="2" || row.warehouseStorageStatus=="3"){ if(row.warehouseStorageStatus=="2" || row.warehouseStorageStatus=="3"){
//入库通知 //入库通知
actions.push('<a class=" ' + addPurchaseStorageFlag + ' " href="javascript:void(0)" onclick="addPurchaseStorage(\'' + row.purchaseOrderId + '\')"><i class="fa fa-edit"></i> 入库通知</a>'); actions.push('<a class=" ' + addPurchaseStorageFlag + ' " href="javascript:void(0)" onclick="addPurchaseStorage(\'' + row.purchaseOrderId + '\')"><i class="fa fa-edit"></i>入库通知</a>');
}
//打款结案状态（0待打款、1部分打款、2全部打款、3部分结案、4已结案）
if(row.paymentStatus != "4"){
//结案
actions.push('<a class=" ' + closeFlag + ' " href="javascript:void(0)" onclick="closePurchaseOrder(\'' + row.purchaseOrderId + '\')"><i class="fa fa-edit"></i>结案</a>');
} }
// 已作废
} }
// 有流程实例id // 有流程实例id
if(row.useStatus=="2" && !row.restoreInstanceId){ if(row.useStatus=="2" && !row.restoreInstanceId){
// 恢复 // 恢复
actions.push('<a class="" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.purchaseOrderId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> '); actions.push('<a class="" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.purchaseOrderId + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
} }
// 有流程实例id // 有流程实例id
@ -258,9 +266,9 @@
} }
} }
// 审批历史 // 审批历史
actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> '); actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i>审批历史</a> ');
// 进度查看 // 进度查看
actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> '); actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i>进度查看</a> ');
} }
actions.push('<a href="javascript:void(0)" onclick="detail(\'' + row.purchaseOrderId + '\')"><i class="fa fa-edit"></i>详情</a> '); actions.push('<a href="javascript:void(0)" onclick="detail(\'' + row.purchaseOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
@ -352,6 +360,17 @@
$.modal.open("详情", url); $.modal.open("详情", url);
} }
//结案
function closePurchaseOrder(purchaseOrderId) {
var url = prefix + "/closePurchaseOrder/" + purchaseOrderId;
$.modal.open("结案", url);
}
// 显示警告消息的通用函数
function showWarning(message) {
$.modal.msgWarning(message);
}
</script> </script>
</body> </body>
</html> </html>

20
ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
View File

@ -77,16 +77,16 @@
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="purchase:purchaseStorage:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="purchase:purchaseStorage:add">-->
<i class="fa fa-plus"></i> 添加 <!-- <i class="fa fa-plus"></i> 添加-->
</a> <!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="purchase:purchaseStorage:edit"> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="purchase:purchaseStorage:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 修改-->
</a> <!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="purchase:purchaseStorage:remove"> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="purchase:purchaseStorage:remove">-->
<i class="fa fa-remove"></i> 删除 <!-- <i class="fa fa-remove"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="purchase:purchaseStorage:export"> <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="purchase:purchaseStorage:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>

10
ruoyi-admin/src/main/resources/templates/warehouse/inventoryCheck/inventoryCheck.html
View File

@ -206,7 +206,7 @@
// 已作废 // 已作废
if(row.useStatus=="2" && !row.restoreInstanceId){ if(row.useStatus=="2" && !row.restoreInstanceId){
// 恢复 // 恢复
actions.push('<a class="btn ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.inventoryCheckId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> '); actions.push('<a class=" ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.inventoryCheckId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
} }
// 有流程实例id // 有流程实例id
@ -216,14 +216,14 @@
var todoUserIdList = row.todoUserId.split(","); var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){ if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
} }
} }
actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> '); actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> '); actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
} }
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.inventoryCheckId + '\')"><i class="fa fa-edit"></i>详情</a> '); actions.push('<a class="' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.inventoryCheckId + '\')"><i class="fa fa-edit"></i>详情</a> ');
var actionLinks = actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks); return $.table.dropdownToggle(actionLinks);
// return actions.join(''); // return actions.join('');

10
ruoyi-admin/src/main/resources/templates/warehouse/inventoryReportDamage/inventoryReportDamage.html
View File

@ -67,7 +67,7 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="warehouse:inventoryReportDamage:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="warehouse:inventoryReportDamage:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="warehouse:inventoryReportDamage:export"> <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="warehouse:inventoryReportDamage:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
@ -192,14 +192,14 @@
var todoUserIdList = row.todoUserId.split(","); var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){ if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> '); actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+ row.instanceTypeName +"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
} }
} }
actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> '); actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> '); actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
} }
actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="detail(\'' + row.reportDamageId + '\')"><i class="fa fa-edit"></i>详情</a> '); actions.push('<a href="javascript:void(0)" onclick="detail(\'' + row.reportDamageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
var actionLinks = actions.join(''); var actionLinks = actions.join('');
return $.table.dropdownToggle(actionLinks); return $.table.dropdownToggle(actionLinks);
// return actions.join(''); // return actions.join('');

Write Preview
Loading…
Cancel
Save