Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

commit for removing extra files #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

commit for removing extra files #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d7d2e7
commit for removing extra files
May 22, 2019
da85780
Update build.gralde - supporting springboot
Jul 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 6 additions & 4 deletions backend-sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@

MODELNAME=retailscm
[email protected]
cd ~/githome/${MODELNAME}-biz-suite/ && rm -rf bizcore/WEB-INF/${MODELNAME}_core_src
java -jar ~/githome/splitter.jar ${MODELNAME}
cd ~/githome/${MODELNAME}-biz-suite/&& git pull --allow-unrelated-histories && cd ../
cd ~/githome/${MODELNAME}-biz-suite/bizcore&& gradle classes && cd ../../
cd ~/githome/${MODELNAME}-biz-suite/ && rsync -avz bizcore/* [email protected]:~/resin-3.1.12/webapps/${MODELNAME}/
ssh [email protected] "mysql -uroot -p0254891276 -h 127.0.0.1 < resin-3.1.12/webapps/${MODELNAME}/WEB-INF/${MODELNAME}_core_src/META-INF/${MODELNAME}_mysql.sql"
# cd ~/githome/${MODELNAME}-biz-suite/&& git pull --allow-unrelated-histories && cd ../
cd ~/githome/${MODELNAME}-biz-suite/bizcore&& ~/.sdkman/candidates/gradle/5.2.1/bin/gradle classes && cd ../../
cd ~/githome/${MODELNAME}-biz-suite/ && rsync -avz bizcore/* ${DEST_HOST}:~/resin-3.1.12/webapps/${MODELNAME}/
ssh ${DEST_HOST} "mysql -uroot -p0254891276 -h 127.0.0.1 < resin-3.1.12/webapps/${MODELNAME}/WEB-INF/${MODELNAME}_core_src/META-INF/${MODELNAME}_mysql.sql"

2 changes: 2 additions & 0 deletions bizui/.webpackrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ export default {
disableDynamicImport: true,
publicPath: '',
hash: true,
devtool: 'cheap-module-source-map',

};
30,429 changes: 0 additions & 30,429 deletions bizui/package-lock.json
View file
Open in desktop

This file was deleted.

105 changes: 0 additions & 105 deletions bizui/package.json.back
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bizui/src/axios/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

export const SYSTEM_SHORT_NAME = "retailscm" //Use for requssting different apps
export const SYSTEM_LOCAL_NAME = "双链小超全流程供应链系统"
export const BUILD_TIIME="Wed Mar 27 19:31:39 CST 2019"
export const BUILD_TIIME="Wed Jul 03 14:06:54 CST 2019"
export const MEDIA_UPLOAD_URL="https://www.doublechaintech.com/mss/upload.html"
export const MEDIA_PREFIX="https://www.doublechaintech.com/mss/"

Expand Down
19 changes: 10 additions & 9 deletions bizui/src/axios/tools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ export const get3 = ({ url, msg = '接口异常', headers }) =>
console.log(err);
message.warn(msg);
});

// const headers = { 'X-App-Version':"35",'Content-Type': 'application/x-www-form-urlencoded' }
export const get = ({ url, msg = '接口异常', headers }) =>
axios
.get(url, headers)
.get(url, {headers:{"X-App-Version":35}})
.then(function(res) {
console.log('http headers', res.headers);
const clazz = res.headers['x-class'];
Expand Down Expand Up @@ -89,12 +89,12 @@ export const getURLPrefix = () => {
return `http://${url.hostname}:8080/${SYSTEM_SHORT_NAME}/`
}
if (url.hostname === '127.0.0.1') {
return `https://app.art0x.com/moyi/`
return `https://demo.doublechaintech.com/${SYSTEM_SHORT_NAME}/`
}
//return `http://xm.jl51.com.cn/cis/`

return `${url.origin}/${SYSTEM_SHORT_NAME}/`;
//return `${url.origin}/${SYSTEM_SHORT_NAME}/`
// return `https://demo.doublechaintech.com/${SYSTEM_SHORT_NAME}/`;
return `${url.origin}/${SYSTEM_SHORT_NAME}/`
};

export const joinParameters = (parameters) => {
Expand Down Expand Up @@ -174,19 +174,20 @@ export const PREFIX = getURLPrefix();
export const postForm = ({ url, requestParameters, msg = '接口异常'})=>{


const headers = { 'Content-Type': 'application/x-www-form-urlencoded' }
const headers = { 'X-App-Version':"35",'Content-Type': 'application/x-www-form-urlencoded' }
const options ={headers}
return post({
url,
data: joinPostParameters(requestParameters),
headers,
options,
})
}



export const post = ({ url, data, msg = '接口异常', headers }) =>
export const post = ({ url, data, msg = '接口异常', options }) =>
axios
.post(url, data, headers)
.post(url, data, options)
.then(res => res.data)
.catch(err => {
console.log(err);
Expand Down
57 changes: 34 additions & 23 deletions bizui/src/bizcomponents/accountingdocument/AccountingDocument.app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@ import GlobalComponents from '../../custcomponents';

import PermissionSettingService from '../../permission/PermissionSetting.service'
import appLocaleName from '../../common/Locale.tool'
import BizAppTool from '../../common/BizApp.tool'

const { filterForMenuPermission } = PermissionSettingService
const { Header, Sider, Content } = Layout
const { SubMenu } = Menu
const {
defaultFilteredNoGroupMenuItems,
defaultFilteredMenuItemsGroup,
defaultRenderMenuItem,

const isMenuItemForDisplay = (item, targetObject, targetComponent) => {
return true
}
} = BizAppTool

const filteredMenuItems = (targetObject, targetComponent) => {
const menuData = sessionObject('menuData')
const isMenuItemForDisplayFunc = targetComponent.props.isMenuItemForDisplayFunc||isMenuItemForDisplay
return menuData.subItems.filter(item=>filterForMenuPermission(item,targetObject,targetComponent)).filter(item=>isMenuItemForDisplayFunc(item,targetObject,targetComponent))
}

const filteredNoGroupMenuItems = defaultFilteredNoGroupMenuItems
const filteredMenuItemsGroup = defaultFilteredMenuItemsGroup
const renderMenuItem=defaultRenderMenuItem


const { Header, Sider, Content } = Layout
const { SubMenu } = Menu

const query = {
'screen-xs': {
Expand Down Expand Up @@ -135,17 +135,26 @@ class AccountingDocumentBizApp extends React.PureComponent {
<Link to={`/accountingDocument/${this.props.accountingDocument.id}/dashboard`}><Icon type="dashboard" /><span>{appLocaleName(userContext,"Dashboard")}</span></Link>
</Menu.Item>


{filteredMenuItems(targetObject,this).map((item)=>(<Menu.Item key={item.name}>
<Link to={`/${menuData.menuFor}/${objectId}/list/${item.name}/${item.displayName}${appLocaleName(userContext,"List")}`}>
<Icon type="bars" /><span>{item.displayName}</span>
</Link>
</Menu.Item>))}

<Menu.Item key="preference">
<Link to={`/accountingDocument/${this.props.accountingDocument.id}/preference`}><Icon type="setting" /><span>{appLocaleName(userContext,"Preference")}</span></Link>
</Menu.Item>
{filteredNoGroupMenuItems(targetObject,this).map((item)=>(renderMenuItem(item)))}
{filteredMenuItemsGroup(targetObject,this).map((groupedMenuItem,index)=>{
return(
<SubMenu key={`vg${index}`} title={<span><Icon type="folder" /><span>{`${groupedMenuItem.viewGroup}`}</span></span>} >
{groupedMenuItem.subItems.map((item)=>(renderMenuItem(item)))}
</SubMenu>

)}
)}

<SubMenu key="sub4" title={<span><Icon type="setting" /><span>{appLocaleName(userContext,"Setting")}</span></span>} >
<Menu.Item key="profile">
<Link to={`/accountingDocument/${this.props.accountingDocument.id}/permission`}><Icon type="safety-certificate" /><span>{appLocaleName(userContext,"Permission")}</span></Link>
</Menu.Item>
<Menu.Item key="permission">
<Link to={`/accountingDocument/${this.props.accountingDocument.id}/profile`}><Icon type="cluster" /><span>{appLocaleName(userContext,"Profile")}</span></Link>
</Menu.Item>

</SubMenu>

</Menu>
)
}
Expand Down Expand Up @@ -255,12 +264,14 @@ class AccountingDocumentBizApp extends React.PureComponent {

buildRouters = () =>{
const {AccountingDocumentDashboard} = GlobalComponents
const {AccountingDocumentPreference} = GlobalComponents
const {AccountingDocumentPermission} = GlobalComponents
const {AccountingDocumentProfile} = GlobalComponents


const routers=[
{path:"/accountingDocument/:id/dashboard", component: AccountingDocumentDashboard},
{path:"/accountingDocument/:id/preference", component: AccountingDocumentPreference},
{path:"/accountingDocument/:id/profile", component: AccountingDocumentProfile},
{path:"/accountingDocument/:id/permission", component: AccountingDocumentPermission},



Expand Down
10 changes: 5 additions & 5 deletions bizui/src/bizcomponents/accountingdocument/AccountingDocument.associateform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ const testValues = {};
/*
const testValues = {
name: '记账凭证',
accountingDocumentDate: '2018-07-01',
accountingPeriodId: 'AP000001',
documentTypeId: 'ADT000001',
accountingDocumentDate: '2018-06-19',
accountingPeriodId: 'AP00000001',
documentTypeId: 'ADT00000001',
}
*/

Expand Down Expand Up @@ -142,7 +142,7 @@ class AccountingDocumentAssociateForm extends Component {
{getFieldDecorator('name', {
rules: [{ required: true, message: appLocaleName(userContext,"PleaseInput") }],
})(
<Input size="large" placeholder="请输入名称" />
<Input size="large" placeholder="名称" />
)}
</Form.Item>
</Col>
Expand All @@ -152,7 +152,7 @@ class AccountingDocumentAssociateForm extends Component {
{getFieldDecorator('accountingDocumentDate', {
rules: [{ required: true, message: appLocaleName(userContext,"PleaseInput") }],
})(
<DatePicker size="large" format="YYYY-MM-DD" placeholder="请输入会计凭证日期" />
<DatePicker size="large" format="YYYY-MM-DD" placeholder="会计凭证日期" />
)}
</Form.Item>
</Col>
Expand Down
Loading