Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

src/views/orderauthor/author/draft/choosePermission.vue

@@ -73,12 +73,8 @@ export default {
 				indexShow: true,
 				columns: [
 					{
-						title: '创建时间',
+						title: '权限名称',
-						prop: 'createTime'
+						prop: 'name'
-					},
-					{
-						title: '创建者',
-						prop: 'creatorUserName'
 					},
 					{
 						title: '是否包权限',
@@ -87,10 +83,6 @@ export default {
 						columnValue: (row) => { return this.$convertField(row.isPackage, this.ruleLists, ['value', 'label']); },
 						tagType: (row) => { return ''; }
 					},
-					{
-						title: '权限名称',
-						prop: 'name'
-					},
 					{
 						title: this.$t('orderAuthor.permissionType'),
 						prop: 'type',
@@ -98,6 +90,14 @@ export default {
 						columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']); },
 						tagType: (row) => { return ''; }
 					},
+					{
+						title: '创建时间',
+						prop: 'createTime'
+					},
+					{
+						title: '创建者',
+						prop: 'creatorUserName'
+					},
 					{
 						type: 'button',
 						title: this.$t('global.operate'),

src/views/orderauthor/rules/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="修改权限内容" :visible.sync="dialogShow" width="800px" :before-close="close">
+  <el-dialog title="打包详情" :visible.sync="dialogShow" width="800px" :before-close="close">
     <div>
       <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     </div>

src/views/package/draft/editRule.vue

@@ -162,6 +162,7 @@ export default {
 			validator[PermissionType.SCREEN] = () => { return true; };
 
 			if (endTime && startTime && this.formModel.permissionType && validator[this.formModel.permissionType]()) {
+				if (endTime > startTime) {
 					const model = {
 						startTime: startTime,
 						endTime: endTime,
@@ -180,11 +181,17 @@ export default {
 
 					getTotalRemains(model).then(response => {
 						this.maxTotal = response.data;
-					this.numberMessage = this.$t('permission.restPermissionMaxNumber').replace('{0}', this.maxTotal);
+						if (this.maxTotal == 0) {
+							this.numberMessage = '可用权限数量为0';
+						} else {
+							this.numberMessage = `（${this.$t('global.remainPermissionNumber')}：${this.maxTotal}）`;
+						}
 					}).catch(() => {
-					this.numberMessage = '';
+						this.$messageBox(this.$t('error.obtainMaxNumberFailed'));
 					});
-
+				} else {
+					this.numberMessage = '结束时间必须大于开始时间';
+				}
 			} else {
 				this.numberMessage = '';
 			}