Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml

@@ -93,9 +93,6 @@
                         <a id="lr_editDept" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改部门、系部</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="no">
-                        <a id="lr_import" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;导入</a>
-                        </div>
                     </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/Index.js

@@ -89,7 +89,19 @@ var bootstrap = function ($, learun) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
                         }
                     },
-                    { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' },
+                    {
+                        label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name'] || value);
+                                }
+                            });
+                        }
+                    },
                     { label: '阅读次数', name: 'F_PV', index: 'F_PV', width: 80, align: 'center' },
                     {
                         label: "发布状态", name: "F_EnabledMark", index: "F_EnabledMark", width: 80, align: "center", autowidth: false,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexRecycle.js

@@ -50,7 +50,19 @@ var bootstrap = function ($, learun) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
                         }
                     },
-                    { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' },
+                    {
+                        label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name'] || value);
+                                }
+                            });
+                        }
+                    },
                     { label: '阅读次数', name: 'F_PV', index: 'F_PV', width: 80, align: 'center' },
                     {
                         label: "发布状态", name: "F_EnabledMark", index: "F_EnabledMark", width: 80, align: "center", autowidth: false,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/ViewIndex.js

@@ -53,7 +53,19 @@ var bootstrap = function ($, learun) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
                         }
                     },
-                    { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' },
+                    {
+                        label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name'] || value);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "阅读状态", name: "RNewsId", index: "RNewsId", width: 80, align: "center", autowidth: false,
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue

@@ -231,8 +231,10 @@ export default {
 	  		}
 	  	})
 		this.submitPostData = postData
-	  	this.modal = true
-	  	return
+		if(this.reviewerList.length>1){
+			this.modal = true
+			return
+		}			
 	  }
 
       const success = await this.HTTP_POST(