[fix]

生产管理 生产领料
修改生产领料列表页面，修改搜索栏定义，修改表格定义，添加行样式，添加当前状态字段，新增导出方法；
修改生产领料详情页面，调整表格显示样式；
修改生产经理和生产主管审批页面表格显示样式；

ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html

@@ -33,12 +33,14 @@
                     <input name="pickUserName" th:field="*{pickUserName}" class="form-control" type="text" readonly>
                 </div>
             </div>
-            <!--缺订单类型-->
-            <div class="row">
+            <div class="col-xs-12" style="margin-left: 20px;">
+                <div class="form-group-sm">
                     <div class="col-sm-12 select-table table-striped">
                         <table id="bootstrap-sub-table-1"></table>
                     </div>
                 </div>
+            </div>
+            <!--缺订单类型-->
         </form>
     </div>
     <th:block th:include="include :: footer" />

ruoyi-admin/src/main/resources/templates/system/makeorderpick/makeorderpick.html

@@ -19,14 +19,21 @@
                                 <input type="text" name="saleNo"/>
                             </li>
                             <li>
-                                <label>领料员：</label>
-                                <input type="text" name="pickUser"/>
+                                <label>关联生产订单号：</label>
+                                <input type="text" name="makeNo"/>
+                            </li>
+                            <li>
+                                <label>申请人：</label>
+<!--                                <input type="text" name="applyUser"/>-->
+                                <select name="applyUser">
+                                    <option value="">所有</option>
+                                </select>
                             </li>
                             <li class="select-time">
-                                <label>创建时间： </label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                                <label>录入时间： </label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -44,7 +51,7 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:makeorderpick:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:makeorderpick:export">
+                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:makeorderpick:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -67,6 +74,22 @@
         var prefix = ctx + "system/makeorderpick";
 
         $(function() {
+            $.ajax({
+                url: prefix + '/getBinessMembers',
+                type: 'get',
+                success: function (res) {
+                    console.log(res)
+                    if (res.rows.length > 0) {
+                        var usertData = res.rows;
+                        for (let i in usertData) {
+                            $("select[name='applyUser']").append(
+                                "<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
+                        }
+                    } else {
+                        $.modal.msgError(res.msg);
+                    }
+                }
+            });
             var options = {
                 url: prefix + "/list",
                 createUrl: prefix + "/add",
@@ -91,76 +114,68 @@
                 {
                     field: 'instanceId',
                     title: '流程实例ID',
+                    align: 'center',
                     visible: false
                 },
                 {
                     field: 'submitInstanceId',
                     title: '流程提交实例ID',
+                    align: 'center',
                     visible: false
                 },
                 {
                     field: 'cancelInstanceId',
                     title: '流程作废实例ID',
+                    align: 'center',
                     visible: false
                 },
                 {
                     field: 'restoreInstanceId',
                     title: '流程恢复实例ID',
+                    align: 'center',
                     visible: false
                 },
                 {
                     field: 'instanceTypeName',
                     title: '流程实例类型',
+                    align: 'center',
                     visible: false
                 },
                 {
                     field: 'applyUser',
+                    align: 'center',
                     title: '申请人ID',
                     visible: false
                 },
-                {
-                    field: 'applyUserName',
-                    title: '<span style="color: red;">申请人</span>',
+                    { title: '当前状态',field: 'taskStatus',align: 'center',width: 120,
                         formatter: function(value, row, index) {
-                        return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                            if(row.auditStatus!="1"&&value != "未启动"){
+                                return '<span class="badge badge-danger">' + value + '</span>';
+                            }
+                            if(value === "未启动"){
+                                return '<span class="badge badge-primary">' + value + '</span>';
+                            }
+                            return '<span class="badge badge-primary">' + value + '</span>';
                         }
                     },
                 {
-                    field: 'applyTime',
-                    title: '申请时间'
-                },
-                {
-                    field: 'taskId',
-                    title: '当前任务ID',
-                    visible: false
-                },
-                {
-                    field: 'todoUserId',
-                    title: '待办用户ID',
-                    visible: false
-                },
-                {
-                    field: 'taskName',
-                    title: '当前任务名称',
+                    title: '生产领料单号',
                     align: 'center',
-                    formatter: function(value, row, index) {
-                        return '<span class="badge badge-primary">' + value + '</span>';
-                    }
+                    field: 'pickNo',
                 },
                 {
                     title: '生产订单号',
+                    align: 'center',
                     field: 'makeNo',
                 },
                 {
                     title: '关联销售订单号',
+                    align: 'center',
                     field: 'saleNo',
                 },
-                {
-                    title: '生产领料单号',
-                    field: 'pickNo',
-                },
                 {
                     title: '领料状态',
+                    align: 'center',
                     field: 'pickStatus',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(pickStatusDatas, value);
@@ -168,19 +183,69 @@
                 },
                 {
                     title: '领料员',
+                    align: 'center',
                     field: 'pickUser',
+                    visible: false,
                 },
                 {
                     title: '物料合计',
+                    align: 'center',
                     field: 'materialSum',
                 },
                 {
                     title: '数量合计',
+                    align: 'center',
                     field: 'enterpriseSum',
                 },
+                {
+                    field: 'applyUserName',
+                    align: 'center',
+                    title: '申请人',
+                    // title: '<span style="color: red;">申请人</span>',
+                    // formatter: function(value, row, index) {
+                    //     return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                    // }
+                },
+                {
+                    field: 'applyTime',
+                    align: 'center',
+                    title: '申请时间'
+                },
+                {
+                    field: 'taskId',
+                    title: '当前任务ID',
+                    align: 'center',
+                    visible: false
+                },
+                {
+                    field: 'todoUserId',
+                    title: '待办用户ID',
+                    align: 'center',
+                    visible: false
+                },
+                {
+                    field: 'taskName',
+                    title: '当前任务名称',
+                    align: 'center',
+                    visible: false,
+                    formatter: function(value, row, index) {
+                        return '<span class="badge badge-primary">' + value + '</span>';
+                    }
+                },
+                {
+                    field: 'createTime',
+                    align: 'center',
+                    title: '录入时间',
+                },
+                {
+                    field: 'updateTime',
+                    align: 'center',
+                    title: '上次更新时间',
+                },
                 {
                     title: '审核状态',
                     field: 'auditStatus',
+                    visible: false,
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(auditStatusDatas, value);
                     }
@@ -214,10 +279,41 @@
                         actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> ');
                         return actions.join('');
                     }
-                }]
+                }],
+                rowStyle: function (row, index) {
+                    if (row.auditStatus=="0") {
+                        // 如果审核状态为待审核，则设置为红色
+                        return {css:{"color":"red"}};
+                    }
+                    // 否则使用默认样式
+                    return {};
+                }
             };
             $.table.init(options);
         });
+
+        // 导出
+        function exportExcel() {
+            var ids = $.table.selectColumns("pickNo");
+            var dataParam = $("#formId").serializeArray();
+
+            let tipMsg = "确定导出当前所有数据吗?";
+            if ($.common.isNotEmpty(ids)) {
+                tipMsg = `确定导出 ${ids} 数据吗?`;
+                dataParam.push({ "name": "ids", "value": ids });
+            }
+            $.modal.confirm(tipMsg, function () {
+                $.modal.loading("正在导出数据，请稍后...");
+                $.post( prefix + "/export", dataParam, function (result) {
+                    if (result.code === web_status.SUCCESS) {
+                        window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                });
+            });
+        }
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html

@@ -75,11 +75,13 @@
         </div>
 
         <!--缺订单类型-->
-        <div class="row">
+        <div class="col-xs-12" style="margin-left: 20px;">
+            <div class="form-group-sm">
                 <div class="col-sm-12 select-table table-striped">
                     <table id="bootstrap-sub-table-1"></table>
                 </div>
             </div>
+        </div>
         <hr />
     </form>
 </div>

ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html

@@ -73,11 +73,13 @@
             </div>
         </div>
         <!--缺订单类型-->
-        <div class="row">
+        <div class="col-xs-12" style="margin-left: 20px;">
+            <div class="form-group-sm">
                 <div class="col-sm-12 select-table table-striped">
                     <table id="bootstrap-sub-table-1"></table>
                 </div>
             </div>
+        </div>
         <hr />
 
     </form>