JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改]修改部分组件名称

Browse Source
This commit is contained in:
zer0Black
2021-03-11 11:19:01 +08:00
parent e203b7d812
commit fbd81a8a7f
24 changed files with 87 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/jero/JeroEditableTableExample.vue
+1 -1
View File
@@ -26,7 +26,7 @@
import ThreeLinkage from './modules/JEditableTable/ThreeLinkage'
export default {
name: 'JeecgEditableTableExample',
name: 'JeroEditableTableExample',
components: { DefaultTable, ReadOnlyTable, ThreeLinkage },
data() {
return {}
jero-web/src/views/jero/SelectDemo.vue
+2 -2
View File
@@ -500,8 +500,8 @@
jcheckbox: {
values: 'spring,jeecgboot',
options: [
{ label: 'Jeecg', value: 'jero' },
{ label: 'Jeecg-Boot', value: 'jeecgboot' },
{ label: 'Jero', value: 'jero' },
{ label: 'Jero-Boot', value: 'jeroboot' },
{ label: 'Spring', value: 'spring', disabled: true },
{ label: 'MyBaits', value: 'mybatis' }
]
jero-web/src/views/jero/TableExpandeSub.vue
+3 -3
View File
@@ -92,20 +92,20 @@
<!-- table区域-end -->
<!-- 表单区域 -->
<jeecgOrderDMain-modal ref="modalForm" @ok="modalFormOk"></jeecgOrderDMain-modal>
<jeroOrderDMain-modal ref="modalForm" @ok="modalFormOk"></jeroOrderDMain-modal>
</a-card>
</template>
<script>
import { getAction } from '@/api/manage'
import JeecgOrderDMainModal from '@views/jero/tablist/form/JeroOrderDMainModal'
import JeroOrderDMainModal from '@views/jero/tablist/form/JeroOrderDMainModal'
import {JeroListMixin} from '@/mixins/JeroListMixin'
export default {
name: "TableDemo",
mixins: [JeroListMixin],
components: {
JeecgOrderDMainModal
JeroOrderDMainModal
},
data() {
return {
jero-web/src/views/jero/modules/JeecgDemoModal.vue → jero-web/src/views/jero/modules/JeroDemoModal.vue
+7 -7
View File
@@ -7,10 +7,10 @@
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -71,7 +71,7 @@
hasFeedback >
<a-input placeholder="请输入个人简介" v-decorator="['content', {}]" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
@@ -83,7 +83,7 @@
import moment from "moment"
export default {
name: "JeecgDemoModal",
name: "JeroDemoModal",
data () {
return {
title:"操作",
@@ -103,8 +103,8 @@
validatorRules:{
},
url: {
add: "/test/jeecgDemo/add",
edit: "/test/jeecgDemo/edit",
add: "/test/jeroDemo/add",
edit: "/test/jeroDemo/edit",
},
}
},
@@ -149,7 +149,7 @@
//时间格式化
formData.punchTime = formData.punchTime?formData.punchTime.format('YYYY-MM-DD HH:mm:ss'):null;
formData.birthday = formData.birthday?formData.birthday.format():null;
console.log(formData)
httpAction(httpurl,formData,method).then((res)=>{
if(res.success){
jero-web/src/views/jero/modules/JeecgDemoTabsModal.vue → jero-web/src/views/jero/modules/JeroDemoTabsModal.vue
+3 -3
View File
@@ -108,7 +108,7 @@
import moment from "moment"
export default {
name: "JeecgDemoTabsModal",
name: "JeroDemoTabsModal",
data() {
return {
title: "操作",
@@ -171,8 +171,8 @@
form: this.$form.createForm(this),
validatorRules: {},
url: {
add: "/test/jeecgDemo/add",
edit: "/test/jeecgDemo/edit",
add: "/test/jeroDemo/add",
edit: "/test/jeroDemo/edit",
},
}
},
jero-web/src/views/jero/modules/JeecgOrderMainModal.vue → jero-web/src/views/jero/modules/JeroOrderMainModal.vue
+30 -30
View File
@@ -70,20 +70,20 @@
<a-col :span="4">操作</a-col>
</a-row>
<a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeecgOrderCustomerList" :key="index">
<a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeroOrderCustomerList" :key="index">
<a-col :span="6" style="display: none">
<a-form-item>
<a-input placeholder="id" v-decorator="['jeecgOrderCustomerList['+index+'].id', {'initialValue':item.id}]" />
<a-input placeholder="id" v-decorator="['jeroOrderCustomerList['+index+'].id', {'initialValue':item.id}]" />
</a-form-item>
</a-col>
<a-col :span="5">
<a-form-item>
<a-input placeholder="客户名" v-decorator="['jeecgOrderCustomerList['+index+'].name', {'initialValue':item.name,rules: [{ required: true, message: '请输入用户名!' }]}]" />
<a-input placeholder="客户名" v-decorator="['jeroOrderCustomerList['+index+'].name', {'initialValue':item.name,rules: [{ required: true, message: '请输入用户名!' }]}]" />
</a-form-item>
</a-col>
<a-col :span="5">
<a-form-item>
<a-select placeholder="性别" v-decorator="['jeecgOrderCustomerList['+index+'].sex', {'initialValue':item.sex}]">
<a-select placeholder="性别" v-decorator="['jeroOrderCustomerList['+index+'].sex', {'initialValue':item.sex}]">
<a-select-option value="1">男</a-select-option>
<a-select-option value="2">女</a-select-option>
</a-select>
@@ -91,12 +91,12 @@
</a-col>
<a-col :span="5">
<a-form-item>
<a-input placeholder="身份证号" v-decorator="['jeecgOrderCustomerList['+index+'].idcard', {'initialValue':item.idcard,rules: [{ pattern: '^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|[xX])$', message: '身份证号格式不对!' }]}]"/>
<a-input placeholder="身份证号" v-decorator="['jeroOrderCustomerList['+index+'].idcard', {'initialValue':item.idcard,rules: [{ pattern: '^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|[xX])$', message: '身份证号格式不对!' }]}]"/>
</a-form-item>
</a-col>
<a-col :span="5">
<a-form-item>
<a-input placeholder="手机号" v-decorator="['jeecgOrderCustomerList['+index+'].telphone', {'initialValue':item.telphone,rules: [{ pattern: '^1(3|4|5|7|8)\\d{9}$', message: '手机号格式不对!' }]}]"/>
<a-input placeholder="手机号" v-decorator="['jeroOrderCustomerList['+index+'].telphone', {'initialValue':item.telphone,rules: [{ pattern: '^1(3|4|5|7|8)\\d{9}$', message: '手机号格式不对!' }]}]"/>
</a-form-item>
</a-col>
<a-col :span="4">
@@ -116,20 +116,20 @@
<a-col :span="6">航班时间</a-col>
<a-col :span="6">操作</a-col>
</a-row>
<a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeecgOrderTicketList" :key="index">
<a-row type="flex" style="margin-bottom:10px" :gutter="16" v-for="(item, index) in orderMainModel.jeroOrderTicketList" :key="index">
<a-col :span="6" style="display: none">
<a-form-item>
<a-input placeholder="id" v-decorator="['jeecgOrderTicketList['+index+'].id', {'initialValue':item.id}]" />
<a-input placeholder="id" v-decorator="['jeroOrderTicketList['+index+'].id', {'initialValue':item.id}]" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item>
<a-input placeholder="航班号" v-decorator="['jeecgOrderTicketList['+index+'].ticketCode', {'initialValue':item.ticketCode,rules: [{ required: true, message: '请输入航班号!' }]}]" />
<a-input placeholder="航班号" v-decorator="['jeroOrderTicketList['+index+'].ticketCode', {'initialValue':item.ticketCode,rules: [{ required: true, message: '请输入航班号!' }]}]" />
</a-form-item>
</a-col>
<a-col :span="6">
<a-form-item>
<j-date placeholder="航班时间" :trigger-change="true" v-decorator="['jeecgOrderTicketList['+index+'].tickectDate', {'initialValue':item.tickectDate}]"></j-date>
<j-date placeholder="航班时间" :trigger-change="true" v-decorator="['jeroOrderTicketList['+index+'].tickectDate', {'initialValue':item.tickectDate}]"></j-date>
</a-form-item>
</a-col>
<a-col :span="6">
@@ -155,7 +155,7 @@
import moment from "moment"
export default {
name: "JeecgOrderMainModal",
name: "JeroOrderMainModal",
components: {
JDate
},
@@ -163,8 +163,8 @@
return {
title:"操作",
visible: false,
orderMainModel: {jeecgOrderCustomerList: [{}],
jeecgOrderTicketList: [{}]},
orderMainModel: {jeroOrderCustomerList: [{}],
jeroOrderTicketList: [{}]},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
@@ -179,10 +179,10 @@
validatorRules:{
},
url: {
add: "/test/jeecgOrderMain/add",
edit: "/test/jeecgOrderMain/edit",
orderCustomerList: "/test/jeecgOrderMain/queryOrderCustomerListByMainId",
orderTicketList: "/test/jeecgOrderMain/queryOrderTicketListByMainId",
add: "/test/jeroOrderMain/add",
edit: "/test/jeroOrderMain/edit",
orderCustomerList: "/test/jeroOrderMain/queryOrderCustomerListByMainId",
orderTicketList: "/test/jeroOrderMain/queryOrderTicketListByMainId",
},
}
},
@@ -195,8 +195,8 @@
edit (record) {
this.form.resetFields();
this.orderMainModel = Object.assign({}, record);
this.orderMainModel.jeecgOrderCustomerList = [{}];
this.orderMainModel.jeecgOrderTicketList = [{}];
this.orderMainModel.jeroOrderCustomerList = [{}];
this.orderMainModel.jeroOrderTicketList = [{}];
//--------------------------------------------------------
//初始化明细表数据
console.log(this.orderMainModel.id)
@@ -205,14 +205,14 @@
//初始化订单机票列表
getAction(this.url.orderCustomerList,params).then((res)=>{
if(res.success){
this.orderMainModel.jeecgOrderCustomerList = res.result;
this.orderMainModel.jeroOrderCustomerList = res.result;
this.$forceUpdate()
}
})
//初始化订单客户列表
getAction(this.url.orderTicketList,params).then((res)=>{
if(res.success){
this.orderMainModel.jeecgOrderTicketList = res.result;
this.orderMainModel.jeroOrderTicketList = res.result;
this.$forceUpdate()
}
})
@@ -248,8 +248,8 @@
orderMainData.orderDate = orderMainData.orderDate?orderMainData.orderDate.format('YYYY-MM-DD HH:mm:ss'):null;
let formData = {
...orderMainData,
jeecgOrderCustomerList: orderMainData.jeecgOrderCustomerList,
jeecgOrderTicketList: orderMainData.jeecgOrderTicketList
jeroOrderCustomerList: orderMainData.jeroOrderCustomerList,
jeroOrderTicketList: orderMainData.jeroOrderTicketList
}
console.log(formData)
httpAction(httpurl,formData,method).then((res)=>{
@@ -271,28 +271,28 @@
this.close()
},
addRowCustom () {
this.orderMainModel.jeecgOrderCustomerList.push({});
this.orderMainModel.jeroOrderCustomerList.push({});
this.$forceUpdate();
},
delRowCustom (index) {
console.log(index)
let all = this.form.getFieldsValue()
all['jeecgOrderCustomerList'].splice(index,1);
all['jeroOrderCustomerList'].splice(index,1);
this.form.setFieldsValue(all)
this.orderMainModel.jeecgOrderCustomerList.splice(index,1);
this.orderMainModel.jeroOrderCustomerList.splice(index,1);
this.$forceUpdate();
},
addRowTicket () {
this.orderMainModel.jeecgOrderTicketList.push({});
console.log(this.orderMainModel.jeecgOrderTicketList)
this.orderMainModel.jeroOrderTicketList.push({});
console.log(this.orderMainModel.jeroOrderTicketList)
this.$forceUpdate();
},
delRowTicket (index) {
console.log(index)
let all = this.form.getFieldsValue()
all['jeecgOrderTicketList'].splice(index,1);
all['jeroOrderTicketList'].splice(index,1);
this.form.setFieldsValue(all)
this.orderMainModel.jeecgOrderTicketList.splice(index,1);
this.orderMainModel.jeroOrderTicketList.splice(index,1);
this.$forceUpdate();
},
jero-web/src/views/jero/modules/JeecgOrderModalForJEditableTable.vue → jero-web/src/views/jero/modules/JeroOrderModalForJEditableTable.vue
+7 -7
View File
@@ -107,7 +107,7 @@
import moment from 'moment'
export default {
name: 'JeecgOrderModalForJEditableTable',
name: 'JeroOrderModalForJEditableTable',
components: {
JDate, JEditableTable
},
@@ -204,10 +204,10 @@
]
},
url: {
add: '/test/jeecgOrderMain/add',
edit: '/test/jeecgOrderMain/edit',
orderCustomerList: '/test/jeecgOrderMain/queryOrderCustomerListByMainId',
orderTicketList: '/test/jeecgOrderMain/queryOrderTicketListByMainId'
add: '/test/jeroOrderMain/add',
edit: '/test/jeroOrderMain/edit',
orderCustomerList: '/test/jeroOrderMain/queryOrderCustomerListByMainId',
orderTicketList: '/test/jeroOrderMain/queryOrderTicketListByMainId'
}
}
},
@@ -307,8 +307,8 @@
orderMain.orderDate = orderMain.orderDate ? orderMain.orderDate.format('YYYY-MM-DD HH:mm:ss') : null
return {
...orderMain, // 展开
jeecgOrderCustomerList: allValues.tablesValue[0].values,
jeecgOrderTicketList: allValues.tablesValue[1].values
jeroOrderCustomerList: allValues.tablesValue[0].values,
jeroOrderTicketList: allValues.tablesValue[1].values
}
},
/** 发起新增或修改的请求 */
jero-web/src/views/system/modules/SysDataSourceModal.vue
+1 -1
View File
@@ -152,7 +152,7 @@
// Oracle
'2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' },
// SQLServer 数据库
'3': { dbUrl: 'jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jeecgboot' },
'3': { dbUrl: 'jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jeroboot' },
// SQLServer 数据库
'5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useSSL=false' },
// SQLServer 数据库