diff --git a/src/main/resources/static/js/basis/standard/child/testForm.js b/src/main/resources/static/js/basis/standard/child/testForm.js
index 567c2eb..490ada6 100644
--- a/src/main/resources/static/js/basis/standard/child/testForm.js
+++ b/src/main/resources/static/js/basis/standard/child/testForm.js
@@ -394,9 +394,9 @@ function saveData(data) {
let url = dataUrl + "/experimental/addTestData";
let params = obj;
- // if(params.id !=""){
- // url = dataUrl + "/experimentStandard/editData";
- // }
+ if(params.id !=""){
+ url = dataUrl + "/experimental/editTestData";
+ }
params={
encryptedData:encryptCBC(JSON.stringify(params))
}
@@ -634,7 +634,6 @@ function setFormData(data) {
sampleQuantity = data.sampleDeviceVos.length;
for (let i = 1; i <= data.sampleDeviceVos.length; i++) {
var dateId = '#manufactureDate-'+i;
- console.log(dateId)
laydate.render({
elem: dateId,
max:formatCurrentMonth()
diff --git a/src/main/resources/static/js/basis/standard/child/testList.js b/src/main/resources/static/js/basis/standard/child/testList.js
index e8b083c..1a2ca58 100644
--- a/src/main/resources/static/js/basis/standard/child/testList.js
+++ b/src/main/resources/static/js/basis/standard/child/testList.js
@@ -78,7 +78,7 @@ function initTable(dataList, limit, page) {
{title: "原始记录", unresize: true, width: 300, align: "center",
templet: function (d) {
var html = '';
- let search="查看";
+ let search="查看";
if (d.status == "待试验" || d.status == "待提交" || d.status == "审阅不通过" || d.status == "审核不通过" || d.status == "审批不通过") {
let edit="编制";
html=search+edit;
@@ -136,6 +136,17 @@ function reloadData() {
pages(pageNum, limitSize);
}
+// 查看
+function checkData(experId,sampleId,devTypeCode) {
+ let param = {
+ 'experId': experId,
+ 'sampleId': sampleId,
+ 'devTypeCode':devTypeCode,
+ 'customNum':customNumParam
+ }
+ openIframeMax("testCheck.html", "查看试验", "testCheck.html", '80%', '100%', param);
+}
+
// 试验新增、修改
function addData(experId,sampleId,devTypeCode) {
let title = '新增试验'
diff --git a/src/main/resources/static/js/basis/standard/child/testUpdateForm.js b/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
new file mode 100644
index 0000000..e2914b1
--- /dev/null
+++ b/src/main/resources/static/js/basis/standard/child/testUpdateForm.js
@@ -0,0 +1,135 @@
+//修改前的传参
+function getTestViewById(){
+ let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+ let url = dataUrl + "/experimental/viewTestData";
+ let params = {
+ id: experIdParam
+ }
+ params={
+ encryptedData:encryptCBC(JSON.stringify(params))
+ }
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ layer.close(loadingMsg); // 关闭提示层
+ if (result.code === 200) {
+ // console.log("试验form=" + result.data)
+ setFormUpadteData(result.data);
+ } else if (result.code === 500) {
+ layer.alert(result.msg, {icon: 2},function (index){
+ closePage(1);
+ })
+ }
+ }, function (xhr) {
+ layer.close(loadingMsg); // 关闭提示层
+ error(xhr)
+ });
+}
+
+function setFormUpadteData(data) {
+ if (data) {
+ console.log("修改",data)
+ $('#id').val(data.id);
+ $('#sampleId').val(data.sampleId);
+ $('#customId').val(data.customId);
+ //设备类别
+ // getDicts("dev_code",'devTypeName',data.devTypeName,"设备类别",30);
+ $('#devCode option[value=' + data.devTypeCode + ']').attr('selected', true);
+
+ //设备规格
+ $('#devModule').val(data.devModule);
+
+ //收样日期
+ $('#sampleDate').val(data.sampleDate);
+
+ //试验日期
+ $('#experTime').val(data.experTime);
+
+ //下次试验日期
+ $('#nextExperTime').val(data.nextExperTime);
+
+ //试验地点
+ getDicts("sy_local",'experLocal',data.experLocal,"试验地点",30);
+
+ //试验设备列表
+ /*for (let i = 0; i < data.deviceVos.length; i++) {
+ var k = i+1;
+ if(k>1){
+ devAdd()
+ }
+ getDevList("devName-"+k ,data.deviceVos[i].devName,"试验设备列表",30);
+ }*/
+
+ //设备名称
+ getDevList("experDevName" ,data.mainDeviceVos[0].experDevName,"设备名称",30);
+
+ //设备型号
+ $('#experDevModule').val(data.mainDeviceVos[0].experDevModule)
+ //设备编号
+ $('#experDevCode').val(data.mainDeviceVos[0].experDevCode)
+ //合同生效日期
+ $('#devContractDate').val(data.mainDeviceVos[0].devContractDate)
+
+ //试验依据
+ for (let i = 0; i < data.basisVos.length; i++) {
+ var k = i+1;
+ if(k>1){
+ basisAdd()
+ }
+ getDicts("sy_basis",'basisName-'+k,data.basisVos[i].basisName,"试验依据",30);
+ }
+
+ //试验项信息
+ //插入一级表头
+ generateHeaders(data.configItemsVos);
+ //插入单位格
+ generateRows(data.configItemsVos, data.experDevVos);
+
+ //生产日期
+ var sampleQuantity = 0;
+ if(data.experDevVos.length>0){
+ sampleQuantity = data.experDevVos.length;
+ for (let i = 1; i <= data.experDevVos.length; i++) {
+ var dateId = '#manufactureDate-'+i;
+ laydate.render({
+ elem: dateId,
+ max:formatCurrentMonth()
+ });
+ }
+ }
+
+ //进行表格赋值操作
+ setTableData(data.experDevVos);
+ //样品数量
+ $("#sampleQuantity").val(sampleQuantity);
+
+ //试验标准
+ $("#experStand").val(data.experStand);
+ //试验结论
+ $("#experConclu").val(data.experConclu);
+ //备注
+ $("#remarsk").val(data.remarsk);
+ layui.form.render();
+ }
+}
+
+function setTableData(data){
+ // 遍历数据
+ data.forEach((item, index) => {
+ // 计算index+1，因为你的ID从1开始
+ const rowNumber = index + 1;
+ // 赋值
+ $(`#devId-${rowNumber}`).val(item.id);
+ $(`#devCode-${rowNumber}`).val(item.devCode);
+ $(`#manufacturer-${rowNumber}`).val(item.manufacturer);
+ $(`#manufactureDate-${rowNumber}`).val(item.manufactureDate);
+ $(`#devModule-${rowNumber}`).val(item.devModule);
+ $(`#devStatus-${rowNumber}`).val(item.devStatus);
+ $(`#amount-${rowNumber}`).val(item.amount);
+ $(`#remarks-${rowNumber}`).val(item.remarks);
+ // devData 是一个字符串，需要解析为数组
+ const devDataArray = JSON.parse(item.devData);
+ for (let i = 0; i < devDataArray.length; i++) {
+ $(`#devData-${rowNumber}-${i + 1}`).val(devDataArray[i]);
+ }
+ });
+}
\ No newline at end of file
diff --git a/src/main/resources/static/js/basis/tools/testStandardsList.js b/src/main/resources/static/js/basis/tools/testStandardsList.js
index 7396724..2a8b2ba 100644
--- a/src/main/resources/static/js/basis/tools/testStandardsList.js
+++ b/src/main/resources/static/js/basis/tools/testStandardsList.js
@@ -130,7 +130,7 @@ function addData(id) {
let param = {
'id': id
}
- openIframeMax("addOrEditTestStandards", title, "child/addTestStandards.html", '80%', '100%', param);
+ openIframeMax("addOrEditTestStandards", title, "child/addTestStandards.html", '1000px', '625px', param);
}
// 查看试验标准
@@ -138,7 +138,7 @@ function checkData(id) {
let param = {
'id': id
}
- openIframeMax("addOrEditTestStandards", "查看试验标准", "child/checkTestStandards.html", '80%', '80%', param);
+ openIframeMax("addOrEditTestStandards", "查看试验标准", "child/checkTestStandards.html", '1000px', '625px', param);
}
/*删除用户*/
diff --git a/src/main/resources/static/pages/basic/standard/child/testCheck.html b/src/main/resources/static/pages/basic/standard/child/testCheck.html
new file mode 100644
index 0000000..911752b
--- /dev/null
+++ b/src/main/resources/static/pages/basic/standard/child/testCheck.html
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 试验查看
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/static/pages/basic/standard/child/testForm.html b/src/main/resources/static/pages/basic/standard/child/testForm.html
index 1e80413..01b120a 100644
--- a/src/main/resources/static/pages/basic/standard/child/testForm.html
+++ b/src/main/resources/static/pages/basic/standard/child/testForm.html
@@ -203,5 +203,6 @@