From f09745bee2880b1e987f3f4e6c987d126197145b Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 8 Nov 2024 20:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/demandPlan/child/add_jj_data.js     | 49 ++++++++++++++++++++++----
 js/demandPlan/child/send_goods_form.js | 12 ++++---
 page/demandPlan/child/add_jj_data.html |  7 ++--
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/js/demandPlan/child/add_jj_data.js b/js/demandPlan/child/add_jj_data.js
index 8888b6b..cb6e5ea 100644
--- a/js/demandPlan/child/add_jj_data.js
+++ b/js/demandPlan/child/add_jj_data.js
@@ -1,13 +1,20 @@
-let form, layer;
+let form, layer,idParam,objParam;
 function setParams(params) {
+  objParam = JSON.parse(params);
+  idParam = objParam.proId;
+  alert(idParam);
   layui.use(["form", "layer"], function () {
     form = layui.form;
     layer = layui.layer;
+    form.on('select(name)',function(data){
+        alert(data.value);
+        getProDevSelected(data.value,2);
+    });
   });
-  getProDevSelected();
-  if(params!=='-1'){
+  getProDevSelected('',1);
+  if(objParam.jjDataArrStr){
     // 表格数据回显
-    let dataArr = JSON.parse(params);
+    let dataArr = JSON.parse(idParam.jjDataArrStr);
     $.each(dataArr,function(index,item){
       let html =
       "<tr class='pa' jjNameId='"+item.jjNameId+"' jjggId='"+item.jjggId+"'>" +
@@ -25,22 +32,50 @@ function setParams(params) {
 }
 
 // 获取需求计划外机具
-function getProDevSelected(){
+function getProDevSelected(id,type){
   let encryptedData = {
-    'pId':0
+    'pId':id,
+    'proId':idParam
   };
   let url = dataUrl + 'backstage/planOut/getProDevSelected?encryptedData=' + encodeURIComponent(JSON.stringify(encryptedData));
   ajaxRequest(url, "GET", null, true, function () {
   }, function (result) {
       console.log(result);
       if (result.code === 200) {
-      } else if (result.code === 500) {
+        if(type === 1){
+          setSelectData(result.data);
+        }else if(type === 2){
+          setSelectData2(result.data);
+        }
       }
   }, function (xhr, status, error) {
       errorFn(xhr, status, error)
   }, null);
 }
 
+// 机具下拉选赋值
+function setSelectData(list) {
+  let html = '<option value="">请选择</option>';
+  if(list && list.length > 0){
+    $.each(list, function (index, item) {
+          html += '<option value="' + item.id + '">' + item.name + '</option>';
+      })
+  }
+  $('#name').empty().append(html);
+ layui.form.render();
+}
+
+function setSelectData2(list) {
+  let html = '<option value="">请选择</option>';
+  if(list && list.length > 0){
+    $.each(list, function (index, item) {
+          html += '<option value="' + item.id + '">' + item.name + '</option>';
+      })
+  }
+  $('#module').empty().append(html);
+ layui.form.render();
+}
+
 // 保存并继续添加
 function addTableData() {
     let size = $(".pa").length;
diff --git a/js/demandPlan/child/send_goods_form.js b/js/demandPlan/child/send_goods_form.js
index bd9b8c7..02961d1 100644
--- a/js/demandPlan/child/send_goods_form.js
+++ b/js/demandPlan/child/send_goods_form.js
@@ -354,8 +354,8 @@ function submitApply(data) {
   // 校验调整量发生变化是否填写备注
   for (let i = 0; i < jjDetailArr.length; i++) {
     let obj = jjDetailArr[i];
-    if(obj.tzNum > 0 && !obj.remarks){
-      return layer.msg(obj.type+'-' + obj.name+'-' + obj.module + '，已修改调整量，请填写备注', { icon: 7 });
+    if (obj.tzNum > 0 && !obj.remarks) {
+      return layer.msg(obj.type + '-' + obj.name + '-' + obj.module + '，已修改调整量，请填写备注', { icon: 7 });
     }
   }
   data.field.proId = idParam;
@@ -415,11 +415,13 @@ function openDetail() {
 
 // 新增需求计划外机具
 function addJjData() {
-  let params = '-1';
+  let params = {
+    'proId': idParam
+  };
   if (jjDataArr && jjDataArr.length > 0) {
-    params = JSON.stringify(jjDataArr);
+    params.jjDataArrStr = JSON.stringify(jjDataArr);
   }
-  openIframeByParam("addJjData", '新增需求计划外机具', "./add_jj_data.html", '72%', '80%', params);
+  openIframeByParamObj("addJjData", '新增需求计划外机具', "./add_jj_data.html", '72%', '80%', params);
 }
 
 function addJjDatas(data) {
diff --git a/page/demandPlan/child/add_jj_data.html b/page/demandPlan/child/add_jj_data.html
index c40556e..b52ab60 100644
--- a/page/demandPlan/child/add_jj_data.html
+++ b/page/demandPlan/child/add_jj_data.html
@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="../../../css/demandPlan/add_jj_data.css" media="all">
     <link rel="stylesheet" href="../../../css/tips.css" media="all">
 </head>
+
 <body>
     <div id="main-box">
         <div style="width: 100%;height: 100px;margin-bottom: 20px;">
@@ -28,13 +29,11 @@
                 <tbody>
                     <tr>
                         <td>
-                            <form class='layui-form'><select id="jjName" class='layui-select' lay-search>
-                                    <option value="1">机具</option>
+                            <form class='layui-form'><select id="name" class='layui-select' lay-search lay-filter="name">
                                 </select></form>
                         </td>
                         <td>
-                            <form class='layui-form'><select id="jjgg" class='layui-select' lay-search>
-                                    <option value="2">KM101</option>
+                            <form class='layui-form'><select id="module" class='layui-select' lay-search>
                                 </select></form>
                         </td>
                         <td>asdfas</td>