[feat]销售估价去除恢复，废弃按钮，关闭父子表显示属性。

ruoyi-admin/src/main/resources/templates/sales/salesEstimate/salesEstimate.html

@@ -96,7 +96,7 @@
                 pageSize: 10,
                 sortable: true,                                     // 是否启用排序
                 sortStable: true,                                   // 设置为 true 将获得稳定的排序
-                detailView: true,
+                detailView: false,
                 fixedColumns: true, // 启用冻结列
                 rightFixedColumns:1,
                 fixedRightNumber: 1, // 冻结右列个数
@@ -127,11 +127,6 @@
                             var actions = [];
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.aftersalesEstimateId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             actions.push('<a class="btn btn-primary btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.aftersalesEstimateId + '\')"><i class="fa fa-remove"></i>详情</a> ');
-                            if(row.delFlag == '0'){
-                                actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
-                            }else{
-                                actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
-                            }
                             return actions.join('');
                         }
                     }
@@ -147,7 +142,7 @@
                         var usertData = res.rows;
                         for (let i in usertData) {
                             $("select[name='createBy']").append(
-                                "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                                "<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
                         }
                     } else {
                         $.modal.msgError(res.msg);