Skip to content

zhangzhonghua / BoneHouse_Business_APP

Go to a project
Commit 6096bb83 by peii
Options

修改基础信息

parent 17c9068f
Inline Side-by-side
Showing with 284 additions and 20 deletions
package.json
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"@react-native-community/segmented-control": "^2.2.2", "@react-native-community/segmented-control": "^2.2.2",
"@react-native-community/slider": "^3.0.3", "@react-native-community/slider": "^3.0.3",
"@types/ramda": "^0.27.39", "@types/ramda": "^0.27.39",
"dayjs": "^1.10.7",
"lodash.debounce": "^4.0.8", "lodash.debounce": "^4.0.8",
"moment": "2.29.1", "moment": "2.29.1",
"ramda": "^0.27.1", "ramda": "^0.27.1",
...@@ -39,22 +40,22 @@ ...@@ -39,22 +40,22 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.4.5", "@babel/core": "^7.4.5",
"@babel/runtime": "^7.4.5",
"babel-jest": "^24.8.0",
"jest": "^24.8.0",
"jetifier": "^1.6.6",
"metro-react-native-babel-preset": "^0.54.1",
"react-native-gesture-handler": "1.0.5",
"react-test-renderer": "16.8.3",
"@babel/plugin-transform-runtime": "^7.13.10", "@babel/plugin-transform-runtime": "^7.13.10",
"@babel/runtime": "^7.4.5",
"@types/jest": "^26.0.22", "@types/jest": "^26.0.22",
"@types/ramda": "^0.27.39", "@types/ramda": "^0.27.39",
"@types/react": "^17.0.3", "@types/react": "^17.0.3",
"@types/react-native": "^0.64.2", "@types/react-native": "^0.64.2",
"@types/react-test-renderer": "^17.0.1", "@types/react-test-renderer": "^17.0.1",
"babel-jest": "^24.8.0",
"babel-plugin-module-resolver": "^4.1.0", "babel-plugin-module-resolver": "^4.1.0",
"jest": "^24.8.0",
"jetifier": "^1.6.6",
"metro-react-native-babel-preset": "^0.54.1",
"react-native-gesture-handler": "1.0.5",
"react-native-postcss-transformer": "^1.2.4", "react-native-postcss-transformer": "^1.2.4",
"react-native-stylus-transformer": "^1.2.0", "react-native-stylus-transformer": "^1.2.0",
"react-test-renderer": "16.8.3",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"stylus": "^0.54.8", "stylus": "^0.54.8",
"typescript": "^4.2.4" "typescript": "^4.2.4"
......
src/assets/styles/base.ts
...@@ -35,11 +35,11 @@ export function pxHeight(uiElementPx) { ...@@ -35,11 +35,11 @@ export function pxHeight(uiElementPx) {
} }
// 背景色 // 背景色
export const primary_color = "#20BEB8"; // 主色 export const primary_color = "#007EFF"; // 主色
export const foundation_color = "#ffffff"; // 底色 export const foundation_color = "#ffffff"; // 底色
export const promary_shadow_color = "#3CA2FF"; // 按钮阴影色 export const promary_shadow_color = "#3CA2FF"; // 按钮阴影色
export const home_background_color = "#F7F7F7"; // 背景色 export const home_background_color = "#F7F7F7"; // 背景色
export const btn_sub_color = "#20BEB8"; // 按钮色 export const btn_sub_color = "#007EFF"; // 按钮色
export const dis_sub_color = "#BBBBBB"; // 禁用按钮色 export const dis_sub_color = "#BBBBBB"; // 禁用按钮色
// 字体色 // 字体色
......
src/assets/styles/variable.styl
// 背景色 // 背景色
primary_color = #20BEB8// 主色 primary_color = #007EFF// 主色
foundation_color = #ffffff // 底色 foundation_color = #ffffff // 底色
promary_shadow_color = #20BEB8// 按钮阴影色 promary_shadow_color = #007EFF// 按钮阴影色
home_background_color = #F7F7F7 // 背景色 home_background_color = #F7F7F7 // 背景色
btn_sub_color = #20BEB8 // 按钮色 btn_sub_color = #007EFF // 按钮色
dis_sub_color = #BBBBBB // 禁用按钮色 dis_sub_color = #BBBBBB // 禁用按钮色
input_background_color = #efefef // 输入框底色 input_background_color = #efefef // 输入框底色
btn_color = #ffffff // 按钮字体颜色 btn_color = #ffffff // 按钮字体颜色
...@@ -33,4 +33,4 @@ font_family_semibold = 'PingFangSC-Semibold' ...@@ -33,4 +33,4 @@ font_family_semibold = 'PingFangSC-Semibold'
font_family_medium = 'PingFangSC-Medium' font_family_medium = 'PingFangSC-Medium'
font_family_regular = 'PingFangSC-Regular' font_family_regular = 'PingFangSC-Regular'
font_family_light = 'PingFangSC-Light' font_family_light = 'PingFangSC-Light'
header_height = 66.5px header_height = 62px
src/components/form/index.tsx
/* /*
* @FilePath: /BoneHouse_Hospital_APP/src/components/form/index.tsx * @FilePath: /BoneHouse_Business_APP/src/components/form/index.tsx
* @Author: peii * @Author: peii
* @Date: 2021-04-25 22:40:31 * @Date: 2021-04-25 22:40:31
* @Vision: 1.0 * @Vision: 1.0
...@@ -59,7 +59,7 @@ export default class Form extends Component<IProps> { ...@@ -59,7 +59,7 @@ export default class Form extends Component<IProps> {
componentDidMount() { componentDidMount() {
this.checkCanSubmit = debounce(this.checkCanSubmit.bind(this)) this.checkCanSubmit = debounce(this.checkCanSubmit.bind(this))
this.submitHandler = debounce(this.submitHandler.bind(this), 50) this.submitHandler = debounce(this.submitHandler.bind(this), 200)
} }
/** /**
...@@ -84,7 +84,6 @@ export default class Form extends Component<IProps> { ...@@ -84,7 +84,6 @@ export default class Form extends Component<IProps> {
*/ */
checkCanSubmit() { checkCanSubmit() {
const { fields, data } = this.props const { fields, data } = this.props
for (const item of fields) { for (const item of fields) {
if (isBlank(item.rules)) continue if (isBlank(item.rules)) continue
...@@ -97,8 +96,9 @@ export default class Form extends Component<IProps> { ...@@ -97,8 +96,9 @@ export default class Form extends Component<IProps> {
return this.setState({ canSubmit: false }) return this.setState({ canSubmit: false })
} }
} }
this.setState({ canSubmit: true })
} }
this.setState({ canSubmit: true })
} }
/** /**
......
src/components/form/input.tsx
...@@ -52,7 +52,7 @@ export default class Input extends Component<IProps> { ...@@ -52,7 +52,7 @@ export default class Input extends Component<IProps> {
placeholder={item.placeholder || '请输入'} placeholder={item.placeholder || '请输入'}
onChangeText={this.onChangeText} onChangeText={this.onChangeText}
multiline={item.multiline} multiline={item.multiline}
numberOfLines={4} numberOfLines={item.numberOfLines || 4}
maxLength={140} maxLength={140}
placeholderTextColor={placehold_text_color} placeholderTextColor={placehold_text_color}
underlineColorAndroid="transparent" underlineColorAndroid="transparent"
......
src/pages/order/quick.tsx
/* /*
* @FilePath: /BoneHouse_Hospital_APP/src/pages/order/quick.tsx * @FilePath: /BoneHouse_Business_APP/src/pages/order/quick.tsx
* @Author: peii * @Author: peii
* @Date: 2021-05-30 14:38:19 * @Date: 2021-05-30 14:38:19
* @Vision: 1.0 * @Vision: 1.0
...@@ -197,7 +197,7 @@ class QuickOrder extends Component<IProps> { ...@@ -197,7 +197,7 @@ class QuickOrder extends Component<IProps> {
field: 'departmentCode', field: 'departmentCode',
label: '部门', label: '部门',
type: FieldType.SELECT, type: FieldType.SELECT,
placeholder: '请选择', placeholder: '请选择',
options: [], options: [],
rules: [{ required: dep.required, message: '请选择客户' }], rules: [{ required: dep.required, message: '请选择客户' }],
refrence: ['orgCode'], refrence: ['orgCode'],
......
types/global.ts 0 → 100644
/*
* @FilePath: /BoneHouse_Business_APP/types/global.ts
* @Author: peii
* @Date: 2021-04-24 22:45:15
* @Vision: 1.0
* @Description:
*
* @Revision:
*
*/
/// <reference types="react" />
/// <reference types="react-native" />
declare module 'bonehouse' {
export type EnumType = { [s: string]: any }
export type IDepartment = {
departmentCode: string
departmentName: string
}
export type IFunction = {
child_list: IFunction[]
functionCode: string
functionName: string
functionOrder: number
}
export type IInventory = {
invCode: string
invName: string
}
export type IOption = {
label: string
value: string
}
export type IRule = {
required?: boolean
message?: string
pattern?: RegExp
func?: Function
}
export type IFormField = {
field: string
label: string
type: EnumType
dateMode: 'date' | 'datetime'
selectMode: EnumType
options?: IOption[]
loading?: boolean
arrow?: boolean
placeholder?: string
rules?: IRule[]
disabled?: boolean
refrence?: string[]
multiline?: boolean
numberOfLines?: number
customHandler?: Function
order?: number
minuteInterval?: number
}
export type IOrganization = {
orgName: string
orgCode: string
}
export type IShipToSite = {
shipToSiteCode: string
shipToSiteName: string
}
export type IBillToSite = {
billToSiteCode: string
billToSiteName: string
shipToSites: IShipToSite[]
}
export type ICustomer = {
customerCode: string
customerName: string
billToSites: IBillToSite[]
}
export type ISurgeryCollectHeader = {
address: string
approvedDate: string
billToSiteCode: string
billToSiteId: string
billToSiteName: string
businessManagerCode: string
businessManagerName: string
collectConfirmor: string
collectConfirmorCode: string
collectConfirmorName: string
collectNumber: string
collectedDate: string
collector: string
collectorCode: string
collectorName: string
combinedAddress: string
consumeOrderAutoShip: string
consumeOrderTypeCode: string
consumeOrderTypeName: string
createBy: string
createTime: string
customerCode: string
customerId: string
customerName: string
deliveryTerms: string
deliverymanCode: string
deliverymanName: string
departmentCode: string
departmentName: string
destinationCode: string
destinationName: string
doctorName: string
headerStatus: string
headerStatusName: string
lastProcess: string
orderCurrency: string
orderTypeCode: string
orderTypeId: string
orderTypeName: string
orgCode: string
orgId: string
orgName: string
paymentControl: string
paymentMethod: string
paymentTerms: string
salOrderTypeCode: string
salOrderTypeName: string
selfCollectRequiredConfirmation: string
selfReturnRequiredConfirmation: string
sellerCode: string
sellerId: string
sellerName: string
shipToSiteCode: string
shipToSiteId: string
shipToSiteName: string
shippingMethod: string
shippingMethodCode: string
shippingMethodName: string
sourceCode: string
surgeryCollectNumber: string
surgeryDate: string
surgeryFollowerCode: string
surgeryFollowerName: string
surgeryName: string
updateBy: string
updateTime: string
}
export type ISurgeryCollectLine = {
basePrice: number
collectedDate: string
collectedQuantity: number
expirationDate: string
generalName: string
invCode: string
invName: string
itemCode: string
itemName: string
lineNumber: string
manufactureItemCode: string
manufacturerProductCode: string
productionBatchNumber: string
productionDate: string
productionSerialNumber: string
raisedConsume: string
regNumber: string
salePrice: number
serialNumber: string
serialNumberV: string
specification: string
subinvCode: string
subinvName: string
supplierLotNumber: string
supplierSerialNumber: string
surCollectLineNumber: string
surgeryCollectNumber: string
}
export type IFee = {
feeType: string
feeAmount: number
remark: string
}
export type IPlan = {
brxb: string
brxm: string
centercode: string
companycode: string
customerId: string
customerSiteId: string
customercode: string
flmc: string
id: string
invId: string
jgid: string
operationid: string
orgId: string
org_code: string
sectioncode: string
ssdm: string
ssfl: string
ssmc: string
status: string
zyh: string
zysx: string
ssDate: string
ssTime: string
}
}
declare module 'navigation' {
export type IAction = {
pop: Function
popToTop: Function
push: Function
replace: Function
reset: Function
}
type IRouteState = {
params: any
routeName: string
key: string
}
export type INavigation = {
actions: IAction
addListener: Function
dangerouslyGetParent: Function
dismiss: Function
dispatch: (action: IAction) => void
emit: Function
getChildNavigation: Function
getParam: (paramName: string, defaultValue: any) => any
getScreenProps: Function
goBack: Function
isFirstRouteInParent: Function
isFocused: Function
navigate: Function
pop: Function
popToTop: Function
push: Function
replace: Function
reset: Function
router: undefined
setParams: Function
state: IRouteState
}
}
yarn.lock
...@@ -2234,6 +2234,11 @@ data-urls@^1.0.0: ...@@ -2234,6 +2234,11 @@ data-urls@^1.0.0:
whatwg-mimetype "^2.2.0" whatwg-mimetype "^2.2.0"
whatwg-url "^7.0.0" whatwg-url "^7.0.0"
dayjs@^1.10.7:
version "1.10.7"
resolved "https://rg.cnpmjs.org/dayjs/download/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
integrity sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg=
debounce@^1.2.0: debounce@^1.2.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.npm.taobao.org/debounce/download/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131" resolved "https://registry.npm.taobao.org/debounce/download/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment