diff --git a/js/car_basic/child/framework_contract_detail.js b/js/car_basic/child/framework_contract_detail.js
index 1815837..22d3354 100644
--- a/js/car_basic/child/framework_contract_detail.js
+++ b/js/car_basic/child/framework_contract_detail.js
@@ -272,6 +272,7 @@ function exportExcel() {
function viewFile(obj) {
let fileName = obj.fileName.toLowerCase();
if (fileName.indexOf('png') > -1 || fileName.indexOf('jpg') > -1 || fileName.indexOf('jpeg') > -1) {
+ console.log("调用系统自带预览服务:" + fileUrl + obj.fileUrl);
layer.photos({
shade: 0.5,
photos: {
@@ -281,12 +282,14 @@ function viewFile(obj) {
{
"alt": "layer",
"pid": 1,
- "src": fileUrl + obj.fileUrl + '?token=' + sessionStorage.getItem("gz-token"),
+ "src": fileUrl + obj.fileUrl,
+ // "src": fileUrl + obj.fileUrl + '?token=' + sessionStorage.getItem("gz-token"),
}
]
}
});
} else {
+ console.log("调用公司预览服务");
// 调用公司的预览文件的服务
commonViewFile(obj.fileUrl);
}
diff --git a/js/car_demand_plan/child/apply_plan_form.js b/js/car_demand_plan/child/apply_plan_form.js
index baeee22..2aabe63 100644
--- a/js/car_demand_plan/child/apply_plan_form.js
+++ b/js/car_demand_plan/child/apply_plan_form.js
@@ -276,7 +276,7 @@ function setTableData(results) {
html += "| " + l.model + " | ";
html += "" + l.unit + " | ";
html += "" + setFormInput(l.needNum, 1) + " | ";
- html += "" + setFormInput(l.times == null ? 0 : l.times, 2) + " | ";
+ html += "" + setFormInput(l.times, 2) + " | ";
html += "" + setFormInput(l.remarks, 3) + " | ";
html += "";
}
@@ -284,6 +284,14 @@ function setTableData(results) {
html += "| 没有相关数据 |
";
}
$("#baseTable tbody").empty().append(html);
+
+ // 渲染日期选择器
+ $('.refund-date').each(function(){
+ laydate.render({
+ elem: this, // 指定元素
+ type: 'date' // 可选，指定为日期类型，默认即是'date'
+ });
+ });
layui.form.render();
}
@@ -292,7 +300,7 @@ function setFormInput(value, type) {
if (type === 1) { // 需用量
html += '';
} else if (type === 2) { // 需用天数
- html += '';
+ html += '';
} else if (type === 3) { // 备注
html += '';
}
diff --git a/js/car_demand_plan/child/choose_type_list.js b/js/car_demand_plan/child/choose_type_list.js
index 2934f70..6b8565d 100644
--- a/js/car_demand_plan/child/choose_type_list.js
+++ b/js/car_demand_plan/child/choose_type_list.js
@@ -159,7 +159,7 @@ function initTable() {
{
field: "times",
width: '15%',
- title: " * 需用天数",
+ title: " * 预计使用时间",
unresize: true,
align: "center",
edit: 'text',
@@ -218,14 +218,6 @@ function initTable() {
return layer.msg('需用量格式不正确，最大数量只能输入10，且为正整数！', { icon: 7 })
}
}
- } else if (field === 'times') { // 需用天数
- if (value) {
- const regex = /^(0|[1-9]\d{0,6})$/;
- if (!regex.test(value)) {
- obj.reedit();
- return layer.msg('需用天数格式不正确，最大输入6位数，且为正整数！', { icon: 7 })
- }
- }
} else if (field === 'remarks') { // 备注
if (value) {
if (value.length > 255) {
diff --git a/page/car_demand_plan/child/apply_plan_detail.html b/page/car_demand_plan/child/apply_plan_detail.html
index 3ba4068..1db995f 100644
--- a/page/car_demand_plan/child/apply_plan_detail.html
+++ b/page/car_demand_plan/child/apply_plan_detail.html
@@ -56,10 +56,10 @@
- | 所需运输车辆车长 |
- 所需运输车辆车宽 |
- 所需运输车辆车高 |
- 预计运输物品重量 |
+ 所需运输车辆车长（米） |
+ 所需运输车辆车宽（米） |
+ 所需运输车辆车高（米） |
+ 预计运输物品重量（吨） |
|
diff --git a/page/car_demand_plan/child/apply_plan_edit_form.html b/page/car_demand_plan/child/apply_plan_edit_form.html
index 12f889c..4c27d01 100644
--- a/page/car_demand_plan/child/apply_plan_edit_form.html
+++ b/page/car_demand_plan/child/apply_plan_edit_form.html
@@ -50,13 +50,13 @@
lay-verify="required" maxlength="50" lay-affix="clear">
-
+
+
+
+
+
+
+