消耗添加费用及手术时间修改

app.json

-// TODO: 提交前删除
 {
-  "name": "BoneHouse_Hospital_APP",
-  "displayName": "BoneHouse_Hospital_APP"
+  "name": "BoneHouse_Business_APP",
+  "displayName": "BoneHouse_Business_APP"
 }
\ No newline at end of file

app/Router.js

@@ -11,7 +11,7 @@ import ChooseProductPage from './containers/selfOrder/module/ChooseProductPage';
 import EditThirdLevelPage from './containers/selfOrder/module/EditThirdLevelPage';
 import EquipConsuPage from './containers/equipConsu/EquipConsuPage';
 import ConsumDetailsPage from './containers/equipConsu/module/ConsumDetailsPage';
-import ChargeDetailsPage from './containers/equipConsu/module/ChargeDetailsPage';
+import ChargeDetailsPage from './containers/equipConsu/module/ChargeDetailsPageRef';
 import FillUnitPricePage from './containers/equipConsu/module/FillUnitPricePage';
 import OrdersPage from './containers/equipConsu/module/OrdersPage';
 import ShowDetailPage from './containers/equipConsu/module/ShowDetailPage';

app/action/EquipAction.js

@@ -125,6 +125,16 @@ export const reqEquipOrderInfo = async (global_domain_config, params) => {
     return await GetRequest(global_domain_config, getUrlParams('/surgery/collect_order/search', params))
 }
 
+/**
+ * @description: 请求费用行
+ * @param {*} global_domain_config
+ * @param {*} params
+ * @return {*}
+ */
+export const reqConsumeFeeLines = async (global_domain_config, params) => {
+    return await GetRequest(global_domain_config, getUrlParams('/surgery/consume_fee_line/search', params))
+}
+
 function requestListDataing() {
     return {
         type: EQUIP_CONSU_LIST_DOING

app/containers/common/DateModel.js

@@ -91,6 +91,9 @@ class DateModel extends Component {
 
     renderDialog() {
         let { currentDate, date_mode } = this.state
+        const {minuteInterval, maximumDate, minimumDate} = this.props
+        const date = currentDate && new Date(currentDate)
+
         return (
             <View style={styles.opt_area}>
                 <View style={styles.modal_style}>
@@ -113,10 +116,13 @@ class DateModel extends Component {
                         </View>
                         <View style={styles.date_box}>
                             <DatePicker
-                                date={currentDate}
+                                date={date}
                                 onDateChange={(date) => this.currentDateChange(date)}
                                 locale="zh"
+                                minuteInterval={minuteInterval || 5}
                                 mode={date_mode}
+                                maximumDate={maximumDate}
+                                minimumDate={minimumDate}
                             />
                         </View>
                     </View>

app/containers/common/listDataComponent/PageListArrow.js

@@ -60,11 +60,11 @@ class PageListArrow extends Component {
                     >
                     <CellTextStyle style={listCellStyle ? listCellStyle : ''}>
                         { listHasAster ? <AsteriskTextStyle>*</AsteriskTextStyle> : null }
-                        <TitleTextStyle style={isTitInputStyle ? styles.cell_title : ''}>{listItem[listTitle]}</TitleTextStyle>
+                        <TitleTextStyle style={isTitInputStyle ? styles.cell_title : ''}>{listItem[listTitle] || listTitle}</TitleTextStyle>
                         { (listEditAble || inputCallBack) ? <ContInputTextStyle 
                             style={isTitInputStyle ? styles.cell_input : ''}
-                            editable={!listEditAble}
-                            defaultValue={listItem[listDefaValue]}
+                            editable={listEditAble}
+                            defaultValue={listItem[listDefaValue] && listItem[listDefaValue].toString()}
                             placeholder={listInputPlace}
                             keyboardType={inputKeyboardType ? inputKeyboardType : 'default'}
                             onChangeText={(text) => {return inputCallBack ? inputCallBack(text) : ''}}

app/containers/equipConsu/module/ChargeDetailsPage.js

@@ -12,8 +12,12 @@ import { connect } from 'react-redux';
 import PageListArrow from '../../common/listDataComponent/PageListArrow';
 import { CellTextStyle } from '../../common/CellTextStyle';
 import LoadingModel from '../../common/listDataComponent/LoadingModel';
-
-// 费用明细
+/**
+ * @description: // 费用明细
+ * @param {*}
+ * @return {*}
+ * @deprecated 已废弃，使用ChargeDetailsPageRef 
+ */
 class ChargeDetailsPage extends Component {
     constructor(props) {
         super(props);

app/containers/quickOrder/QuickOrderPage.js

@@ -132,9 +132,24 @@ class EquipConsuPage extends Component {
                 {
                     "id": "8",
                     title: '手术时间',
-                    name: moment(new Date()).format("YYYY-MM-DD HH:mm"),
-                    value: moment(new Date()).format("YYYY-MM-DD HH:mm"),
-                    dateValue: new Date(),
+                    name: (() => {
+                        let date = moment(new Date()).add(1, 'd')
+                        date.set('hour', 10) 
+                        date.set('minute', 0)
+                        return date.format('YYYY-MM-DD HH:mm')
+                    })(),
+                    value: (() => {
+                        let date = moment(new Date()).add(1, 'd')
+                        date.set('hour', 10) 
+                        date.set('minute', 0)
+                        return date.format('YYYY-MM-DD HH:mm')
+                    })(),
+                    dateValue: (() => {
+                        let date = moment(new Date()).add(1, 'd')
+                        date.set('hour', 10) 
+                        date.set('minute', 0)
+                        return date
+                    })(),
                     showDatePicker: true
                 },
                 {
@@ -1797,6 +1812,7 @@ class EquipConsuPage extends Component {
                     closeModal={(show) => this.closeDateModal(show)}
                     show={dateModelPop}
                     callback={(date) => this.dateModalCallback(date, listOptionData[8])}
+                    minuteInterval={60}
                 />
                 { this.renderPickerModel() }
             </View>

app/containers/selfOrder/SelfOrderPage.js

@@ -71,10 +71,25 @@ class SelfOrderPage extends Component {
                 },
                 {
                     "id": "6",
-                    title: '需求时间',
-                    name: moment(new Date()).format("YYYY-MM-DD HH:mm"),
-                    value: moment(new Date()).format("YYYY-MM-DD HH:mm"),
-                    dateValue: new Date(),
+                    title: '手术时间',
+                    name: (() => {
+                        let date = moment(new Date()).add(1, 'd')
+                        date.set('hour', 10) 
+                        date.set('minute', 0)
+                        return date.format('YYYY-MM-DD HH:mm')
+                    })(),
+                    value: (() => {
+                        let date = moment(new Date()).add(1, 'd')
+                        date.set('hour', 10) 
+                        date.set('minute', 0)
+                        return date.format('YYYY-MM-DD HH:mm')
+                    })(),
+                    dateValue: (() => {
+                        let date = moment(new Date()).add(1, 'd')
+                        date.set('hour', 10) 
+                        date.set('minute', 0)
+                        return date
+                    })(),
                     showDatePicker: true
                 },
                 {
@@ -1998,6 +2013,7 @@ class SelfOrderPage extends Component {
                     closeModal={(show) => this.closeDateModal(show)}
                     show={dateModelPop}
                     callback={(date) => this.dateModalCallback(date, listOptionData[6])}
+                    minuteInterval={60}
                 />
                 { this.renderPickerModel()}
                 {/* { this.renderTipModelPackage()}

package.json

@@ -8,7 +8,12 @@
     "test": "jest"
   },
   "dependencies": {
+    "@ant-design/react-native": "^4.2.0",
+    "@react-native-community/cameraroll": "^4.0.4",
+    "@react-native-community/segmented-control": "^2.2.2",
+    "@react-native-community/slider": "^3.0.3",
     "@types/ramda": "^0.27.39",
+    "lodash.debounce": "^4.0.8",
     "moment": "2.29.1",
     "ramda": "^0.27.1",
     "react": "16.8.3",
@@ -20,6 +25,7 @@
     "react-native-fs": "2.14.1",
     "react-native-image-picker": "0.28.0",
     "react-native-image-zoom-viewer": "3.0.1",
+    "react-native-pager-view": "^5.2.1",
     "react-native-root-toast": "3.1.1",
     "react-native-scrollable-tab-view": "0.9.0",
     "react-native-sound": "0.11.0",