diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js index 6cf6edb7d..3acd72024 100644 --- a/src/i18n/langs/en/orderAuthor.js +++ b/src/i18n/langs/en/orderAuthor.js @@ -103,5 +103,8 @@ export default { statusType: 'Status type', private: 'Private', public: 'Public', - pleaseEnterContent: 'Please enter content' + pleaseEnterContent: 'Please enter content', + selectGoods: 'Select Goods', + month: ' month', + yuan: ' yuan' }; diff --git a/src/i18n/langs/en/publish.js b/src/i18n/langs/en/publish.js index dd182c9ae..a810458c1 100644 --- a/src/i18n/langs/en/publish.js +++ b/src/i18n/langs/en/publish.js @@ -89,5 +89,20 @@ export default { totalScore: 'Total score', addExamRluesError: 'Add rule does not match full score', addExamRules: 'Please add exam rules!', - saveRuleFailed: 'Save rules failed: ' + saveRuleFailed: 'Save rules failed: ', + + selectTypeScope: 'Please select type scope', + operationType: 'Operation type', + selectScope: 'Please select scope', + questionNumbers: 'Question number', + allNumberTipOne: '', + allNumberTipTwo: 'questions in this type.', + scorePerQuestion: 'Score/Question', + inputQuestionNumber: 'Please input question number', + inputQuestionNumberError: 'The number of questions entered must be greater than 0', + inputValidNumber: 'Please input valid number', + inputNumberError: 'The input value must be greater than the number of questions', + inputScorePerQuestion: 'Please input score per question', + selectTestType: 'Please select test type', + modifyRules: 'Modify Rules' }; diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js index 5a2c3af97..3ba810697 100644 --- a/src/i18n/langs/zh/orderAuthor.js +++ b/src/i18n/langs/zh/orderAuthor.js @@ -102,5 +102,8 @@ export default { orderDetails: '订单详情', statusType: '状态类型', createPackage: '创建权限', - pleaseEnterContent: '请输入内容' + pleaseEnterContent: '请输入内容', + selectGoods: '选择商品', + month: '月', + yuan: '元' }; diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js index 353c24835..24e3153a3 100644 --- a/src/i18n/langs/zh/publish.js +++ b/src/i18n/langs/zh/publish.js @@ -89,23 +89,23 @@ export default { totalScore: '总分', addExamRluesError: '添加规则不匹配满分', addExamRules: '请添加考试规则!', - saveRuleFailed: '保存规则失败: ' + saveRuleFailed: '保存规则失败: ', - // 请选择类型范围 - // 操作类型 - // 请选择范围 - // 题数 - // 此类型有 - // 道题 - // 每题分值 - // 请输入题数 - // 输入的题数大于0 - // 请输入有效数字 - // 输入值必须大于题数 - // 请输入每题分值 - // 请输入数字值 - // 添加规则 - // 请选择试题类型 - // 修改规则 - // 刷新失败 + selectTypeScope: '请选择类型范围', + operationType: '操作类型', + selectScope: '请选择范围', + questionNumbers: '题数', + allNumberTipOne: '此类型有', + allNumberTipTwo: '道题', + scorePerQuestion: '每题分值', + inputQuestionNumber: '请输入题数', + inputQuestionNumberError: '输入的题数大于0', + inputValidNumber: '请输入有效数字', + inputNumberError: '输入值必须大于题数', + inputScorePerQuestion: '请输入每题分值', + // inputNumericType 请输入数字值 + // addRules 添加规则 + selectTestType: '请选择试题类型', + modifyRules: '修改规则' + // refreshFailed 刷新失败 }; diff --git a/src/views/orderauthor/author/index.vue b/src/views/orderauthor/author/index.vue index a2fc9d0f4..d370240b0 100644 --- a/src/views/orderauthor/author/index.vue +++ b/src/views/orderauthor/author/index.vue @@ -191,3 +191,9 @@ export default { } }; + diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue index b0b1a1851..e87b4763e 100644 --- a/src/views/orderauthor/order/draft.vue +++ b/src/views/orderauthor/order/draft.vue @@ -155,16 +155,16 @@ export default { labelWidth: this.$i18n.locale == 'en' ? '200px': '145px', items: [ { prop: 'organizationId', label: this.$t('orderAuthor.organizationOrEnterprise'), type: 'select', required: false, disabled: this.isDisabled, options: this.OrganizationList, allowCreate: true, onChange: this.onChange }, - { prop: 'goodsName', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false, disabled: true, rightWidth: true, buttontip: '选择商品', buttonClick: this.buttonClick }, - { prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: '元' }, + { prop: 'goodsName', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false, disabled: true, rightWidth: true, buttontip: this.$t('orderAuthor.selectGoods'), buttonClick: this.buttonClick }, + { prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: this.$t('orderAuthor.yuan') }, { prop: 'orderType', label: this.$t('orderAuthor.orderType'), type: 'select', required: false, disabled: this.isDisabled, options: this.OrderTypeList }, { prop: 'sellerId', label: this.$t('orderAuthor.salesman'), type: 'select', required: false, show: this.isShowSeller, disabled: this.isDisabled, options: this.SellerList }, { prop: 'contractNo', label: this.$t('orderAuthor.contractNumber'), type: 'text', required: false, show: this.isShowContractNo }, { prop: 'amount', label: this.totalTitle, type: 'number', required: false, show: true, min: 0 }, { prop: 'forever', label: this.$t('orderAuthor.permanenceOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled }, { prop: 'startTime', label: this.$t('orderAuthor.startDate'), type: 'date', required: false, show: this.isShowStartDate, viewFormat: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd', picker: this.DatePicker }, - { prop: 'monthAmount', label: this.monthsTitle, type: 'number', required: false, show: this.isShowMonths, min: 0, message: '月' }, - { prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: '元' }, + { prop: 'monthAmount', label: this.monthsTitle, type: 'number', required: false, show: this.isShowMonths, min: 0, message: this.$t('orderAuthor.month') }, + { prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: this.$t('orderAuthor.yuan') }, { prop: 'bizType', label: this.$t('orderAuthor.businessType'), type: 'select', required: false, disabled: true, options: this.BizTypeList }, { prop: 'payWays', label: this.$t('orderAuthor.paymentMethod'), type: 'select', required: false, disabled: this.payTypeIsDisabled, show: this.isShowPayType, options: this.PayTypeList }, { prop: 'payStatus', label: this.$t('orderAuthor.paymentStatus'), type: 'select', required: false, disabled: this.payStatusDisabled, show: this.isShowPayStatus, options: this.PayStatusTypeList } diff --git a/src/views/orderauthor/permission/create/order.vue b/src/views/orderauthor/permission/create/order.vue index 058833f85..b5e071071 100644 --- a/src/views/orderauthor/permission/create/order.vue +++ b/src/views/orderauthor/permission/create/order.vue @@ -104,16 +104,16 @@ export default { labelWidth: this.$i18n.locale == 'en' ? '200px': '145px', items: [ { prop: 'organizationId', label: this.$t('orderAuthor.organizationOrEnterprise'), type: 'select', required: false, options: this.OrganizationList, allowCreate: true, onChange: this.onChange }, - { prop: 'goodsName', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false, disabled: true, rightWidth: true, buttontip: '选择商品', buttonClick: this.buttonClick }, - { prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: '元' }, + { prop: 'goodsName', label: this.$t('orderAuthor.commodityName'), type: 'text', required: false, disabled: true, rightWidth: true, buttontip: this.$t('orderAuthor.selectGoods'), buttonClick: this.buttonClick }, + { prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: this.$t('orderAuthor.yuan') }, { prop: 'orderType', label: this.$t('orderAuthor.orderType'), type: 'select', required: false, options: this.OrderTypeList }, { prop: 'sellerId', label: this.$t('orderAuthor.salesman'), type: 'select', required: false, show: this.isShowSeller, options: this.SellerList }, { prop: 'contractNo', label: this.$t('orderAuthor.contractNumber'), type: 'text', required: false, show: this.isShowContractNo }, { prop: 'amount', label: this.totalTitle, type: 'number', required: false, show: true, min: 0 }, { prop: 'forever', label: this.$t('orderAuthor.permanenceOrNot'), type: 'radio', required: false, options: this.$ConstSelect.Whether, disabled: this.foreverIsDisabled }, { prop: 'startTime', label: this.$t('orderAuthor.startDate'), type: 'date', required: false, show: this.isShowStartDate, viewFormat: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd', picker: this.DatePicker }, - { prop: 'monthAmount', label: this.$t('orderAuthor.choosePurchaseTime'), type: 'number', required: false, show: this.isShowMonths, min: 0, message: '月' }, - { prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: '元' }, + { prop: 'monthAmount', label: this.$t('orderAuthor.choosePurchaseTime'), type: 'number', required: false, show: this.isShowMonths, min: 0, message: this.$t('orderAuthor.month') }, + { prop: 'totalPrice', label: this.$t('orderAuthor.totalPrice'), type: 'number', required: false, show: this.isShowPrice, min: 0, message: this.$t('orderAuthor.yuan') }, { prop: 'bizType', label: this.$t('orderAuthor.businessType'), type: 'select', required: false, disabled: true, options: this.BizTypeList }, { prop: 'payWays', label: this.$t('orderAuthor.paymentMethod'), type: 'select', required: false, show: this.isShowPayType, options: this.PayTypeList }, { prop: 'payStatus', label: this.$t('orderAuthor.paymentStatus'), type: 'select', required: false, show: this.isShowPayStatus, options: this.PayStatusTypeList } diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue index 4260220b4..36ed8994d 100644 --- a/src/views/publish/examRule/draft/editRule.vue +++ b/src/views/publish/examRule/draft/editRule.vue @@ -1,11 +1,12 @@