@ -12,62 +12,62 @@
< 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" >
< input name = "outOrderCode" th:field = "*{outOrderCode}" class = "form-control" type = "text" > < input name = "outOrderCode" th:field = "*{outOrderCode}" class = "form-control" type = "text" readonly >
< / div > < / div >
< / div > < / div >
< 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" >
< input name = "outOrderName" th:field = "*{outOrderName}" class = "form-control" type = "text" > < input name = "outOrderName" th:field = "*{outOrderName}" 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 = "salesOrderCode" th:field = "*{salesOrderCode}" class = "form-control" type = "text" >
< / div > < / div >
< / div > < / div >
<!-- <div class="form - group"> -->
<!-- <label class="col - sm - 3 control - label">销售单号：</label> -->
<!-- <div class="col - sm - 8"> -->
<!-- <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form - control" type="text"> -->
<!-- </div> -->
<!-- </div> -->
< 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" >
< input name = "applyName" th:field = "*{applyName}" class = "form-control" type = "text" > < input name = "applyName" th:field = "*{applyName}" 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 = "makeNo" th:field = "*{makeNo}" class = "form-control" type = "text" >
< / div > < / div >
< / div > < / div >
<!-- <div class="form - group"> -->
<!-- <label class="col - sm - 3 control - label">生产单号：</label> -->
<!-- <div class="col - sm - 8"> -->
<!-- <input name="makeNo" th:field="*{makeNo}" class="form - control" type="text"> -->
<!-- </div> -->
<!-- </div> -->
< div class = "form-group" > < div class = "form-group" >
< label class = "col-sm-3 control-label" > 客户ID：< / label > < label class = "col-sm-3 control-label" > 客户ID：< / label >
< div class = "col-sm-8" > < div class = "col-sm-8" >
< input name = "customerId" th:field = "*{customerId}" class = "form-control" type = "text" > < input name = "customerId" th:field = "*{customerId}" class = "form-control" type = "text" readonly >
< / div > < / div >
< / div > < / div >
< 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" >
< input name = "customerName" th:field = "*{customerName}" class = "form-control" type = "text" > < input name = "customerName" th:field = "*{customerName}" class = "form-control" type = "text" readonly >
< / div > < / div >
< / div > < / div >
< 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" >
< input name = "deliveryName" th:field = "*{deliveryName}" class = "form-control" type = "text" > < input name = "deliveryName" th:field = "*{deliveryName}" class = "form-control" type = "text" readonly >
< / div > < / div >
< / div > < / div >
< 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" >
< input name = "deliveryNumber" th:field = "*{deliveryNumber}" class = "form-control" type = "text" > < input name = "deliveryNumber" th:field = "*{deliveryNumber}" class = "form-control" type = "text" readonly >
< / div > < / div >
< / div > < / div >
< 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" >
< input name = "deliveryAddress" th:field = "*{deliveryAddress}" class = "form-control" type = "text" > < input name = "deliveryAddress" th:field = "*{deliveryAddress}" class = "form-control" type = "text" readonly >
< / div > < / div >
< / div > < / div >
@ -105,6 +105,7 @@
< script th:inline = "javascript" > < script th:inline = "javascript" >
var addFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:addShippingDevices')}]]; var addFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:addShippingDevices')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "aftersales/aftersalesOutOrder"; var prefix = ctx + "aftersales/aftersalesOutOrder";
var aftersalesOutOrder = [[${aftersalesOutOrder}]]; var aftersalesOutOrder = [[${aftersalesOutOrder}]];
@ -218,6 +219,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '单位', title: '单位',
@ -340,8 +344,17 @@
editable:{ editable:{
type:'date', type:'date',
title: '锁机时间', title: '锁机时间',
clear: false,//隐藏clear按钮
placement: 'center',//居中显示 placement: 'center',//居中显示
clear: false,//隐藏clear按钮
//动态禁用行内编辑
noEditFormatter: function(value, row, index){
if (row.lockDateFlag === "1"){
return "不可锁机";
}else {
return false;
}
},
} }
}, },
{ {
