From ce2799dc337fd88a658615188b885f99d17768c1 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 17 May 2024 13:25:40 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E6=B8=85=E5=8D=95=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/purchasePlan/detail.html         | 38 +------------------
 .../purchase/purchasePlan/purchasePlan.html   | 10 ++---
 .../purchasePlanChild/purchasePlanChild.html  |  5 ---
 3 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/detail.html
index c420dadd..c3c4c535 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/detail.html
@@ -30,10 +30,10 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">采购来源：</label>
                 <div class="col-sm-8">
-                    <select name="purchasePlanType" class="form-control m-b">
+                    <select name="purchasePlanType" class="form-control m-b" th:with="type=${@dict.getType('purchase_plan_source')}">
                         <option value="">所有</option>
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{purchasePlanType}"></option>
                     </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>
             <div class="form-group">    
@@ -66,40 +66,6 @@
                     <input name="applyUser" th:field="*{applyUser}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">录入时间：</label>
-                <div class="col-sm-8">
-                    <input name="firstAddTime" th:field="*{firstAddTime}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">修改时间：</label>
-                <div class="col-sm-8">
-                    <input name="updateInfoTime" th:field="*{updateInfoTime}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">审核状态：</label>
-                <div class="col-sm-8">
-                    <select name="auditStatus" class="form-control m-b" th:with="type=${@dict.getType('auditStatus')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{auditStatus}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">使用状态：</label>
-                <div class="col-sm-8">
-                    <select name="useStatus" class="form-control m-b" th:with="type=${@dict.getType('useStatus')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{useStatus}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
-                </div>
-            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
index 4c881cb0..2d688795 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
@@ -73,7 +73,7 @@
         var processMethodDatas = [[${@dict.getType('processMethod')}]];
         var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]];
         var purchasePlanTypeDatas = [[${@dict.getType('purchase_plan_source')}]];
-        var prefix = ctx + "purchase/plan";
+        var prefix = ctx + "purchase/purchasePlan";
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -94,7 +94,7 @@
                         '<table class="table-container" id="purchase_plan_'+row.id+'"></table>'
                     ).find('table');
                     // 一阶
-                    initOneLevelTable(index,row,$detail);
+                    initChildTable(index,row,$detail);
                 },
                 columns: [
                     {checkbox: true},
@@ -126,14 +126,14 @@
             $.table.init(options);
         });
         //采购计划物料清单
-        initOneLevelTable = function(index, row, $detail) {
+        initChildTable = function(index, row, $detail) {
             $("#"+"purchase_plan_"+row.id).bootstrapTable({
-                url: prefix + "/oneLevelList",
+                url: ctx + "purchase/purchasePlanChild/list",
                 method: 'post',
                 sidePagination: "server",
                 contentType: "application/x-www-form-urlencoded",
                 queryParams : {
-                    parentId: row.id
+                    purchasePlanCode: row.purchasePlanCode
                 },
                 columns: [
                     {field: 'purchasePlanId',title: '主键id',visible: false},
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlanChild/purchasePlanChild.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlanChild/purchasePlanChild.html
index 29392df8..7b06b68f 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlanChild/purchasePlanChild.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlanChild/purchasePlanChild.html
@@ -18,10 +18,6 @@
                                 <label>关联采购计划编号字段：</label>
                                 <input type="text" name="purchasePlanCode"/>
                             </li>
-                            <li>
-                                <label>物料表中的id：</label>
-                                <input type="text" name="materialId"/>
-                            </li>
                             <li>
                                 <label>物料表中的编号：</label>
                                 <input type="text" name="materialCode"/>
@@ -34,7 +30,6 @@
                                 <label>物料的类型：</label>
                                 <select name="materialType">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
                                 </select>
                             </li>
                             <li>