KH/kh-device-admin
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/.env
+1 -1
View File
@@ -1,3 +1,3 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_PLATFORM_NAME=JeecgBoot 企业级快速开发平台 VUE_APP_PLATFORM_NAME=JeroBoot 企业级快速开发平台
VUE_APP_SSO=false VUE_APP_SSO=false
jero-web/.env.development
+2 -2
View File
@@ -1,4 +1,4 @@
NODE_ENV=development NODE_ENV=development
VUE_APP_API_BASE_URL=http://localhost:8080/jeecg-boot VUE_APP_API_BASE_URL=http://localhost:8080/jero-boot
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview
jero-web/.env.production
+2 -2
View File
@@ -1,4 +1,4 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_API_BASE_URL=https://bootapi.jeecg.com VUE_APP_API_BASE_URL=https://bootapi.jero.com
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview
jero-web/.env.test
+2 -2
View File
@@ -1,4 +1,4 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_API_BASE_URL=http://boot.jeecg.com:8080/jeecg-boot VUE_APP_API_BASE_URL=http://boot.jero.com:8080/jero-boot
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview
jero-web/Dockerfile
+4 -4
View File
@@ -1,12 +1,12 @@
FROM nginx FROM nginx
MAINTAINER jeecgos@163.com MAINTAINER test@163.com
VOLUME /tmp VOLUME /tmp
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
RUN echo "server { \ RUN echo "server { \
listen 80; \ listen 80; \
location ^~ /jeecg-boot { \ location ^~ /jero-boot { \
proxy_pass http://jeecg-boot-system:8080/jeecg-boot/; \ proxy_pass http://jero-boot-system:8080/jero-boot/; \
proxy_set_header Host jeecg-boot-system; \ proxy_set_header Host jero-boot-system; \
proxy_set_header X-Real-IP \$remote_addr; \ proxy_set_header X-Real-IP \$remote_addr; \
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; \ proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; \
} \ } \
jero-web/public/index.html
Vendored
+1 -1
View File
@@ -251,7 +251,7 @@
<div id="loader"></div> <div id="loader"></div>
<div class="loader-section section-left"></div> <div class="loader-section section-left"></div>
<div class="loader-section section-right"></div> <div class="loader-section section-right"></div>
<div class="load_title">正在加载 JeecgBoot 快速开发平台,请耐心等待 <div class="load_title">正在加载,请耐心等待
</div> </div>
</div> </div>
jero-web/src/components/jero/JFormContainer.vue
+8 -8
View File
@@ -35,27 +35,27 @@
} }
</script> </script>
<style> <style>
.jeecg-form-container-disabled{ .jero-form-container-disabled{
cursor: not-allowed; cursor: not-allowed;
} }
.jeecg-form-container-disabled fieldset[disabled] { .jero-form-container-disabled fieldset[disabled] {
-ms-pointer-events: none; -ms-pointer-events: none;
pointer-events: none; pointer-events: none;
} }
.jeecg-form-container-disabled .ant-select{ .jero-form-container-disabled .ant-select{
-ms-pointer-events: none; -ms-pointer-events: none;
pointer-events: none; pointer-events: none;
} }
.jeecg-form-container-disabled .ant-upload-select{display:none} .jero-form-container-disabled .ant-upload-select{display:none}
.jeecg-form-container-disabled .ant-upload-list{cursor:grabbing} .jero-form-container-disabled .ant-upload-list{cursor:grabbing}
.jeecg-form-container-disabled fieldset[disabled] .ant-upload-list{ .jero-form-container-disabled fieldset[disabled] .ant-upload-list{
-ms-pointer-events: auto !important; -ms-pointer-events: auto !important;
pointer-events: auto !important; pointer-events: auto !important;
} }
.jeecg-form-container-disabled .ant-upload-list-item-actions .anticon-delete, .jero-form-container-disabled .ant-upload-list-item-actions .anticon-delete,
.jeecg-form-container-disabled .ant-upload-list-item .anticon-close{ .jero-form-container-disabled .ant-upload-list-item .anticon-close{
display: none; display: none;
} }
</style> </style>
jero-web/src/components/jero/JImageUpload.vue
-4
View File
@@ -227,10 +227,6 @@
</script> </script>
<style scoped> <style scoped>
/* update--begin--autor:lvdandan-----date:20201016------for：j-image-upload图片组件单张图片详情回显空白
* https://github.com/zhangdaiscott/jeecg-boot/issues/1810
* https://github.com/zhangdaiscott/jeecg-boot/issues/1779
*/
/deep/ .imgupload .ant-upload-select{display:block} /deep/ .imgupload .ant-upload-select{display:block}
/deep/ .imgupload .ant-upload.ant-upload-select-picture-card{ width:120px;height: 120px;} /deep/ .imgupload .ant-upload.ant-upload-select-picture-card{ width:120px;height: 120px;}
/deep/ .imgupload .iconp{padding:32px;} /deep/ .imgupload .iconp{padding:32px;}
jero-web/src/components/jero/README.md
+1 -1
View File
@@ -90,7 +90,7 @@ fieldList结构示例：
```vue ```vue
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'; import JSuperQuery from '@/components/jeecg/JSuperQuery.vue';
export default { export default {
name: "JeecgDemoList", name: "JeroDemoList",
components: { components: {
JSuperQuery JSuperQuery
}, },
jero-web/src/components/jerobiz/JSelectBizComponent/README.md
+1 -1
View File
@@ -1,6 +1,6 @@
# JSelectBizComponent # JSelectBizComponent
Jeecg 选择组件的公共可复用组件 Jero 选择组件的公共可复用组件
## 引用方式 ## 引用方式
jero-web/src/components/layouts/TabLayout.vue
+1 -1
View File
@@ -171,7 +171,7 @@
// update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题 // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
changeTitle(title) { changeTitle(title) {
let projectTitle = "Jeecg-Boot 企业级快速开发平台" let projectTitle = "Jero-Boot 企业级快速开发平台"
// 首页特殊处理 // 首页特殊处理
if (this.$route.path === indexKey) { if (this.$route.path === indexKey) {
document.title = projectTitle document.title = projectTitle
jero-web/src/components/layouts/UserLayout.vue
+3 -5
View File
@@ -5,11 +5,11 @@
<div class="header"> <div class="header">
<a href="/"> <a href="/">
<img src="~@/assets/logo.svg" class="logo" alt="logo"> <img src="~@/assets/logo.svg" class="logo" alt="logo">
<span class="title">Jeecg Boot</span> <span class="title">Jero Boot</span>
</a> </a>
</div> </div>
<div class="desc"> <div class="desc">
Jeecg Boot 是中国最具影响力的 企业级 快速开发平台 Jero Boot 快速开发平台
</div> </div>
</div> </div>
@@ -18,11 +18,9 @@
<div class="footer"> <div class="footer">
<div class="links"> <div class="links">
<a href="http://doc.jeecg.com" target="_blank">帮助</a> <a href="http://doc.jeecg.com" target="_blank">帮助</a>
<a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">隐私</a>
<a href="https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE" target="_blank">条款</a>
</div> </div>
<div class="copyright"> <div class="copyright">
Copyright &copy; 2019 <a href="http://www.jeecg.com" target="_blank">JEECG开源社区</a> 出品 Copyright &copy; 2019 <a href="" target="_blank">hzwl&syxy</a>
</div> </div>
</div> </div>
</div> </div>
jero-web/src/components/page/GlobalHeader.vue
+1 -1
View File
@@ -18,7 +18,7 @@
@click="toggle"/> @click="toggle"/>
<span v-if="device === 'desktop'">欢迎进入 Jero-Boot 平台</span> <span v-if="device === 'desktop'">欢迎进入 Jero-Boot 平台</span>
<span v-else>Jeecg-Boot</span> <span v-else>Jero-Boot</span>
<user-menu :theme="theme"/> <user-menu :theme="theme"/>
</div> </div>
jero-web/src/components/tools/Logo.vue
+1 -1
View File
@@ -21,7 +21,7 @@
props: { props: {
title: { title: {
type: String, type: String,
default: 'Jeecg-Boot Pro', default: 'Jero-Boot Pro',
required: false required: false
}, },
showTitle: { showTitle: {
jero-web/src/main.js
+2 -2
View File
@@ -42,7 +42,7 @@ import config from '@/defaultSettings'
import JDictSelectTag from './components/dict/index.js' import JDictSelectTag from './components/dict/index.js'
import hasPermission from '@/utils/hasPermission' import hasPermission from '@/utils/hasPermission'
import vueBus from '@/utils/vueBus'; import vueBus from '@/utils/vueBus';
import JeecgComponents from '@/components/jero/index' import JeroComponents from '@/components/jero/index'
import '@/assets/less/JAreaLinkage.less' import '@/assets/less/JAreaLinkage.less'
import VueAreaLinkage from 'vue-area-linkage' import VueAreaLinkage from 'vue-area-linkage'
import '@/components/jero/JVxeTable/install' import '@/components/jero/JVxeTable/install'
@@ -58,7 +58,7 @@ Vue.use(JDictSelectTag)
Vue.use(Print) Vue.use(Print)
Vue.use(preview) Vue.use(preview)
Vue.use(vueBus); Vue.use(vueBus);
Vue.use(JeecgComponents); Vue.use(JeroComponents);
Vue.use(VueAreaLinkage); Vue.use(VueAreaLinkage);
SSO.init(() => { SSO.init(() => {
jero-web/src/views/jero/JeroEditableTableExample.vue
+1 -1
View File
@@ -26,7 +26,7 @@
import ThreeLinkage from './modules/JEditableTable/ThreeLinkage' import ThreeLinkage from './modules/JEditableTable/ThreeLinkage'
export default { export default {
name: 'JeecgEditableTableExample', name: 'JeroEditableTableExample',
components: { DefaultTable, ReadOnlyTable, ThreeLinkage }, components: { DefaultTable, ReadOnlyTable, ThreeLinkage },
data() { data() {
return {} return {}
jero-web/src/views/jero/SelectDemo.vue
+2 -2
View File
@@ -500,8 +500,8 @@
jcheckbox: { jcheckbox: {
values: 'spring,jeecgboot', values: 'spring,jeecgboot',
options: [ options: [
{ label: 'Jeecg', value: 'jero' }, { label: 'Jero', value: 'jero' },
{ label: 'Jeecg-Boot', value: 'jeecgboot' }, { label: 'Jero-Boot', value: 'jeroboot' },
{ label: 'Spring', value: 'spring', disabled: true }, { label: 'Spring', value: 'spring', disabled: true },
{ label: 'MyBaits', value: 'mybatis' } { label: 'MyBaits', value: 'mybatis' }
] ]
jero-web/src/views/jero/TableExpandeSub.vue
+3 -3
View File
@@ -92,20 +92,20 @@
<!-- table区域-end --> <!-- table区域-end -->
<!-- 表单区域 --> <!-- 表单区域 -->
<jeecgOrderDMain-modal ref="modalForm" @ok="modalFormOk"></jeecgOrderDMain-modal> <jeroOrderDMain-modal ref="modalForm" @ok="modalFormOk"></jeroOrderDMain-modal>
</a-card> </a-card>
</template> </template>
<script> <script>
import { getAction } from '@/api/manage' 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' import {JeroListMixin} from '@/mixins/JeroListMixin'
export default { export default {
name: "TableDemo", name: "TableDemo",
mixins: [JeroListMixin], mixins: [JeroListMixin],
components: { components: {
JeecgOrderDMainModal JeroOrderDMainModal
}, },
data() { data() {
return { 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" @ok="handleOk"
@cancel="handleCancel" @cancel="handleCancel"
cancelText="关闭"> cancelText="关闭">
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<a-form :form="form"> <a-form :form="form">
<a-form-item <a-form-item
:labelCol="labelCol" :labelCol="labelCol"
:wrapperCol="wrapperCol" :wrapperCol="wrapperCol"
@@ -71,7 +71,7 @@
hasFeedback > hasFeedback >
<a-input placeholder="请输入个人简介" v-decorator="['content', {}]" /> <a-input placeholder="请输入个人简介" v-decorator="['content', {}]" />
</a-form-item> </a-form-item>
</a-form> </a-form>
</a-spin> </a-spin>
</a-modal> </a-modal>
@@ -83,7 +83,7 @@
import moment from "moment" import moment from "moment"
export default { export default {
name: "JeecgDemoModal", name: "JeroDemoModal",
data () { data () {
return { return {
title:"操作", title:"操作",
@@ -103,8 +103,8 @@
validatorRules:{ validatorRules:{
}, },
url: { url: {
add: "/test/jeecgDemo/add", add: "/test/jeroDemo/add",
edit: "/test/jeecgDemo/edit", edit: "/test/jeroDemo/edit",
}, },
} }
}, },
@@ -149,7 +149,7 @@
//时间格式化 //时间格式化
formData.punchTime = formData.punchTime?formData.punchTime.format('YYYY-MM-DD HH:mm:ss'):null; formData.punchTime = formData.punchTime?formData.punchTime.format('YYYY-MM-DD HH:mm:ss'):null;
formData.birthday = formData.birthday?formData.birthday.format():null; formData.birthday = formData.birthday?formData.birthday.format():null;
console.log(formData) console.log(formData)
httpAction(httpurl,formData,method).then((res)=>{ httpAction(httpurl,formData,method).then((res)=>{
if(res.success){ 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" import moment from "moment"
export default { export default {
name: "JeecgDemoTabsModal", name: "JeroDemoTabsModal",
data() { data() {
return { return {
title: "操作", title: "操作",
@@ -171,8 +171,8 @@
form: this.$form.createForm(this), form: this.$form.createForm(this),
validatorRules: {}, validatorRules: {},
url: { url: {
add: "/test/jeecgDemo/add", add: "/test/jeroDemo/add",
edit: "/test/jeecgDemo/edit", 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-col :span="4">操作</a-col>
</a-row> </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-col :span="6" style="display: none">
<a-form-item> <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-form-item>
</a-col> </a-col>
<a-col :span="5"> <a-col :span="5">
<a-form-item> <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-form-item>
</a-col> </a-col>
<a-col :span="5"> <a-col :span="5">
<a-form-item> <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="1">男</a-select-option>
<a-select-option value="2">女</a-select-option> <a-select-option value="2">女</a-select-option>
</a-select> </a-select>
@@ -91,12 +91,12 @@
</a-col> </a-col>
<a-col :span="5"> <a-col :span="5">
<a-form-item> <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-form-item>
</a-col> </a-col>
<a-col :span="5"> <a-col :span="5">
<a-form-item> <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-form-item>
</a-col> </a-col>
<a-col :span="4"> <a-col :span="4">
@@ -116,20 +116,20 @@
<a-col :span="6">航班时间</a-col> <a-col :span="6">航班时间</a-col>
<a-col :span="6">操作</a-col> <a-col :span="6">操作</a-col>
</a-row> </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-col :span="6" style="display: none">
<a-form-item> <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-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item> <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-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item> <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-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
@@ -155,7 +155,7 @@
import moment from "moment" import moment from "moment"
export default { export default {
name: "JeecgOrderMainModal", name: "JeroOrderMainModal",
components: { components: {
JDate JDate
}, },
@@ -163,8 +163,8 @@
return { return {
title:"操作", title:"操作",
visible: false, visible: false,
orderMainModel: {jeecgOrderCustomerList: [{}], orderMainModel: {jeroOrderCustomerList: [{}],
jeecgOrderTicketList: [{}]}, jeroOrderTicketList: [{}]},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 5 }, sm: { span: 5 },
@@ -179,10 +179,10 @@
validatorRules:{ validatorRules:{
}, },
url: { url: {
add: "/test/jeecgOrderMain/add", add: "/test/jeroOrderMain/add",
edit: "/test/jeecgOrderMain/edit", edit: "/test/jeroOrderMain/edit",
orderCustomerList: "/test/jeecgOrderMain/queryOrderCustomerListByMainId", orderCustomerList: "/test/jeroOrderMain/queryOrderCustomerListByMainId",
orderTicketList: "/test/jeecgOrderMain/queryOrderTicketListByMainId", orderTicketList: "/test/jeroOrderMain/queryOrderTicketListByMainId",
}, },
} }
}, },
@@ -195,8 +195,8 @@
edit (record) { edit (record) {
this.form.resetFields(); this.form.resetFields();
this.orderMainModel = Object.assign({}, record); this.orderMainModel = Object.assign({}, record);
this.orderMainModel.jeecgOrderCustomerList = [{}]; this.orderMainModel.jeroOrderCustomerList = [{}];
this.orderMainModel.jeecgOrderTicketList = [{}]; this.orderMainModel.jeroOrderTicketList = [{}];
//-------------------------------------------------------- //--------------------------------------------------------
//初始化明细表数据 //初始化明细表数据
console.log(this.orderMainModel.id) console.log(this.orderMainModel.id)
@@ -205,14 +205,14 @@
//初始化订单机票列表 //初始化订单机票列表
getAction(this.url.orderCustomerList,params).then((res)=>{ getAction(this.url.orderCustomerList,params).then((res)=>{
if(res.success){ if(res.success){
this.orderMainModel.jeecgOrderCustomerList = res.result; this.orderMainModel.jeroOrderCustomerList = res.result;
this.$forceUpdate() this.$forceUpdate()
} }
}) })
//初始化订单客户列表 //初始化订单客户列表
getAction(this.url.orderTicketList,params).then((res)=>{ getAction(this.url.orderTicketList,params).then((res)=>{
if(res.success){ if(res.success){
this.orderMainModel.jeecgOrderTicketList = res.result; this.orderMainModel.jeroOrderTicketList = res.result;
this.$forceUpdate() this.$forceUpdate()
} }
}) })
@@ -248,8 +248,8 @@
orderMainData.orderDate = orderMainData.orderDate?orderMainData.orderDate.format('YYYY-MM-DD HH:mm:ss'):null; orderMainData.orderDate = orderMainData.orderDate?orderMainData.orderDate.format('YYYY-MM-DD HH:mm:ss'):null;
let formData = { let formData = {
...orderMainData, ...orderMainData,
jeecgOrderCustomerList: orderMainData.jeecgOrderCustomerList, jeroOrderCustomerList: orderMainData.jeroOrderCustomerList,
jeecgOrderTicketList: orderMainData.jeecgOrderTicketList jeroOrderTicketList: orderMainData.jeroOrderTicketList
} }
console.log(formData) console.log(formData)
httpAction(httpurl,formData,method).then((res)=>{ httpAction(httpurl,formData,method).then((res)=>{
@@ -271,28 +271,28 @@
this.close() this.close()
}, },
addRowCustom () { addRowCustom () {
this.orderMainModel.jeecgOrderCustomerList.push({}); this.orderMainModel.jeroOrderCustomerList.push({});
this.$forceUpdate(); this.$forceUpdate();
}, },
delRowCustom (index) { delRowCustom (index) {
console.log(index) console.log(index)
let all = this.form.getFieldsValue() let all = this.form.getFieldsValue()
all['jeecgOrderCustomerList'].splice(index,1); all['jeroOrderCustomerList'].splice(index,1);
this.form.setFieldsValue(all) this.form.setFieldsValue(all)
this.orderMainModel.jeecgOrderCustomerList.splice(index,1); this.orderMainModel.jeroOrderCustomerList.splice(index,1);
this.$forceUpdate(); this.$forceUpdate();
}, },
addRowTicket () { addRowTicket () {
this.orderMainModel.jeecgOrderTicketList.push({}); this.orderMainModel.jeroOrderTicketList.push({});
console.log(this.orderMainModel.jeecgOrderTicketList) console.log(this.orderMainModel.jeroOrderTicketList)
this.$forceUpdate(); this.$forceUpdate();
}, },
delRowTicket (index) { delRowTicket (index) {
console.log(index) console.log(index)
let all = this.form.getFieldsValue() let all = this.form.getFieldsValue()
all['jeecgOrderTicketList'].splice(index,1); all['jeroOrderTicketList'].splice(index,1);
this.form.setFieldsValue(all) this.form.setFieldsValue(all)
this.orderMainModel.jeecgOrderTicketList.splice(index,1); this.orderMainModel.jeroOrderTicketList.splice(index,1);
this.$forceUpdate(); 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' import moment from 'moment'
export default { export default {
name: 'JeecgOrderModalForJEditableTable', name: 'JeroOrderModalForJEditableTable',
components: { components: {
JDate, JEditableTable JDate, JEditableTable
}, },
@@ -204,10 +204,10 @@
] ]
}, },
url: { url: {
add: '/test/jeecgOrderMain/add', add: '/test/jeroOrderMain/add',
edit: '/test/jeecgOrderMain/edit', edit: '/test/jeroOrderMain/edit',
orderCustomerList: '/test/jeecgOrderMain/queryOrderCustomerListByMainId', orderCustomerList: '/test/jeroOrderMain/queryOrderCustomerListByMainId',
orderTicketList: '/test/jeecgOrderMain/queryOrderTicketListByMainId' orderTicketList: '/test/jeroOrderMain/queryOrderTicketListByMainId'
} }
} }
}, },
@@ -307,8 +307,8 @@
orderMain.orderDate = orderMain.orderDate ? orderMain.orderDate.format('YYYY-MM-DD HH:mm:ss') : null orderMain.orderDate = orderMain.orderDate ? orderMain.orderDate.format('YYYY-MM-DD HH:mm:ss') : null
return { return {
...orderMain, // 展开 ...orderMain, // 展开
jeecgOrderCustomerList: allValues.tablesValue[0].values, jeroOrderCustomerList: allValues.tablesValue[0].values,
jeecgOrderTicketList: allValues.tablesValue[1].values jeroOrderTicketList: allValues.tablesValue[1].values
} }
}, },
/** 发起新增或修改的请求 */ /** 发起新增或修改的请求 */
jero-web/src/views/system/modules/SysDataSourceModal.vue
+1 -1
View File
@@ -152,7 +152,7 @@
// Oracle // Oracle
'2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' }, '2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' },
// SQLServer 数据库 // 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 数据库 // SQLServer 数据库
'5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useSSL=false' }, '5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useSSL=false' },
// SQLServer 数据库 // SQLServer 数据库
jero-web/vue.config.js
+3 -3
View File
@@ -83,11 +83,11 @@ module.exports = {
ws: false, ws: false,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'/jero-boot': '' //默认所有请求都加了jeecg-boot前缀，需要去掉 '/jero-boot': '' //默认所有请求都加了jero-boot前缀，需要去掉
} }
},*/ },*/
'/jeecg-boot': { '/jero-boot': {
target: 'http://localhost:8080', //请求本地 需要jeecg-boot后台项目 target: 'http://localhost:8080', //请求本地 jero-boot后台项目
ws: false, ws: false,
changeOrigin: true changeOrigin: true
}, },