驳回逻辑状态

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -87,8 +87,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -118,7 +118,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -204,7 +204,9 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
-                            } else {
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >驳回</span>';
+                            }else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
                         }
@@ -223,7 +225,9 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
-                            } else {
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
+                            }else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.cshtml

@@ -13,7 +13,7 @@
     </div>
     <div class="col-xs-4 lr-form-item" data-table="Purchase_Edu_apply">
         <div class="lr-form-item-title">填报时间</div>
-        <input id="Createtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Createtime').trigger('change'); } })" />
+        <input id="Createtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#Createtime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Edu_apply">
         <div class="lr-form-item-title">收款人<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',                
             });
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -86,8 +86,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -117,7 +117,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交！");
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status == 0) {
-                        learun.alert.warning("当前课程异动记录未提交，请提交后再查看！");
+                        learun.alert.warning("当前记录未提交，请提交后再查看！");
                         return false;
                     }
                     learun.layerForm({
@@ -203,6 +203,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if(cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -222,7 +224,9 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
-                            } else {
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
+                            }else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.cshtml

@@ -13,7 +13,7 @@
     </div>
     <div class="col-xs-4 lr-form-item" data-table="Purchase_Info_apply">
         <div class="lr-form-item-title">填报时间</div>
-        <input id="Createtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Createtime').trigger('change'); } })" />
+        <input id="Createtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#Createtime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Info_apply">
         <div class="lr-form-item-title">收款人<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -86,8 +86,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -117,7 +117,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交！");
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status == 0) {
-                        learun.alert.warning("当前课程异动记录未提交，请提交后再查看！");
+                        learun.alert.warning("当前记录未提交，请提交后再查看！");
                         return false;
                     }
                     learun.layerForm({
@@ -203,6 +203,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -222,6 +224,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.cshtml

@@ -13,7 +13,7 @@
     </div>
     <div class="col-xs-4 lr-form-item" data-table="Purchase_Logistic_apply">
         <div class="lr-form-item-title">填报时间</div>
-        <input id="Createtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Createtime').trigger('change'); } })" />
+        <input id="Createtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#Createtime').trigger('change'); } })" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Logistic_apply">
         <div class="lr-form-item-title">收款人<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#checkstatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -86,8 +86,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -117,7 +117,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交！");
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status == 0) {
-                        learun.alert.warning("当前课程异动记录未提交，请提交后再查看！");
+                        learun.alert.warning("当前记录未提交，请提交后再查看！");
                         return false;
                     }
                     learun.layerForm({
@@ -203,6 +203,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -222,6 +224,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -86,8 +86,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -117,7 +117,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交！");
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status == 0) {
-                        learun.alert.warning("当前课程异动记录未提交，请提交后再查看！");
+                        learun.alert.warning("当前记录未提交，请提交后再查看！");
                         return false;
                     }
                     learun.layerForm({
@@ -203,6 +203,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -222,6 +224,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -87,8 +87,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -118,7 +118,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -204,6 +204,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -223,6 +225,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',                
             });
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -86,8 +86,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -117,7 +117,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交！");
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status == 0) {
-                        learun.alert.warning("当前课程异动记录未提交，请提交后再查看！");
+                        learun.alert.warning("当前记录未提交，请提交后再查看！");
                         return false;
                     }
                     learun.layerForm({
@@ -203,6 +203,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -222,6 +224,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -89,8 +89,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -120,7 +120,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -200,6 +200,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -219,6 +221,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',                
             });
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -86,8 +86,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status == 1) {//提交
-                        learun.alert.warning("当前课程异动记录已提交！");
+                    if (selectedRow.Status !== 0) {//提交
+                        learun.alert.warning("当前课程记录已提交！");
                         return false;
                     }
                     learun.layerForm({
@@ -117,7 +117,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交，无法删除！");
+                        learun.alert.warning("当前记录已提交，无法删除！");
                         return false;
                     }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
@@ -136,7 +136,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status !== 0) {
-                        learun.alert.warning("当前课程异动记录已提交！");
+                        learun.alert.warning("当前记录已提交！");
                         return false;
                     }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
@@ -164,7 +164,7 @@ var bootstrap = function ($, learun) {
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
                     if (selectedRow.Status == 0) {
-                        learun.alert.warning("当前课程异动记录未提交，请提交后再查看！");
+                        learun.alert.warning("当前记录未提交，请提交后再查看！");
                         return false;
                     }
                     learun.layerForm({
@@ -203,6 +203,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if(cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -222,6 +224,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核未通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#DepartmentId').lrDepartmentSelect();
             $('#CheckStatus').lrselect({
-                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
+                data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }],
                 text: 'text',
                 value: 'value',
             });
@@ -76,7 +76,7 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 selectedRow = $('#gridtable').jfGridGet('rowdata');
                 if (learun.checkrow(keyValue)) {
-                    if (selectedRow.Status != 0) {
+                    if (selectedRow.Status !== 0) {
                         learun.alert.warning("当前记录已提交！");
                         return false;
                     }
@@ -195,6 +195,8 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 1) {
                                 return '<span class=\"label label-success\" >已提交</span>';
+                            } else if (cellvalue == 2) {
+                                return '<span class=\"label label-danger\" >已驳回</span>';
                             } else {
                                 return '<span class=\"label label-default\" >未提交</span>';
                             }
@@ -214,6 +216,8 @@ var bootstrap = function ($, learun) {
                                 return '<span class=\"label label-warning\" >审核中</span>';
                             } else if (cellvalue == 2) {
                                 return '<span class=\"label label-success\" >审核通过</span>';
+                            } else if (cellvalue == 3) {
+                                return '<span class=\"label label-danger\" >审核不通过</span>';
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs

@@ -108,7 +108,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
-            //this.CreateTime = DateTime.Now;
+            this.CreateTime = DateTime.Now;
             this.Status = 0;
             this.CheckStatus = 0;
             this.ApplyStatus = 0;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs

@@ -332,7 +332,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             entity.Status = 1;
                         }
                     }
-                    else
+                    //审核不通过
+                    else if (status == 3)
+                    {
+                        entity.Status = 2;//驳回
+                    }
+                    else if (status == 1)
                     {
                         entity.Status = status;
                     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/PurchaseWorkMethod.cs

@@ -14,11 +14,15 @@ namespace Learun.Application.WorkFlow
         
         public void Execute(WfMethodParameter parameter)
         {
-
+            //撤回1，删除3
             if (parameter.code == "agree")
             {
                 purchase_WorkIBLL.ModifyStatusByProcessId(2, parameter.processId);
             }
+            else if (parameter.code == "disagree")
+            {
+                purchase_WorkIBLL.ModifyStatusByProcessId(3, parameter.processId);
+            }
             else
             {
                 purchase_WorkIBLL.ModifyStatusByProcessId(0, parameter.processId);