优化【库存不足】弹窗样式等；

25351b6d · Denglingling · 81f53c91 · 25351b6d · 25351b6d · 25351b6d
Commit 25351b6d authored Aug 06, 2020 by Denglingling
Showing with 36 additions and 127 deletions
app/containers/common/NotEnoughModel.js
app/containers/quickOrder/QuickOrderPage.js
app/containers/selfOrder/SelfOrderPage.js
app/containers/selfOrder/module/listTagData.js
--- a/app/containers/common/NotEnoughModel.js
+++ b/app/containers/common/NotEnoughModel.js
@@ -29,69 +29,33 @@ class NotEnoughModel extends Component {
        super(props);
        this.state = { 
            isVisible: this.props.show,
-            notEnoughList: this.props.notEnoughList,
+            not_enough_items_list: this.props.not_enough_items_list,
-            title: '以下物品缺失，是否继续提交?',
+            title: '以下物品缺失，是否继续提交?'
-            not_enough_items_list: [
-                {
-                    "item_code": "AR00000004",
-                    "reg_number": "国械注进20173466362",
-                    "plan_quantity": 10,
-                    "specification": "2.2mm带线锚钉,蓝色缝线",
-                    "item_name": "钛合金缝线锚钉",
-                    "general_name": "钛合金锚钉",
-                    "storage_quantity": 0
-                },
-                {
-                    "item_code": "AR00000003",
-                    "reg_number": "国械注进20173466362",
-                    "plan_quantity": 10,
-                    "specification": "3.5*12.1,蓝色缝线",
-                    "item_name": "钛合金缝线锚钉",
-                    "general_name": "钛合金锚钉",
-                    "storage_quantity": 6
-                },
-                {
-                    "item_code": "AR00000002",
-                    "reg_number": "国械注进20173466362",
-                    "plan_quantity": 10,
-                    "specification": "5.0X15.5,蓝色缝线",
-                    "item_name": "钛合金缝线锚钉",
-                    "general_name": "钛合金锚钉",
-                    "storage_quantity": 4
-                }
-            ],
        }
    }
    componentWillReceiveProps(nextProps) {
-        // console.warn('------show--------------',nextProps.show, this.state.isVisible )
        if (this.state.isVisible != nextProps.show) {
            this.setState({
                isVisible: nextProps.show
            });
        }
-        if (this.state.notEnoughList != nextProps.notEnoughList) {
+        if (this.state.not_enough_items_list != nextProps.not_enough_items_list) {
            this.setState({
-                notEnoughList: nextProps.notEnoughList
+                not_enough_items_list: nextProps.not_enough_items_list
            })
        }   
    }
-    // 取消
    closeModal() {
        this.setState({
            isVisible: false
        });
        this.props.closeModal(false);
    }
-    // 确定
    submitModal() {
-        console.log('确定！！！')
        this.props.callback();
        this.closeModal()
    }
    renderNotEnItem(item, index) {
        return (
            <TouchableOpacity
@@ -122,9 +86,8 @@ class NotEnoughModel extends Component {
            </TouchableOpacity>
        )
    }
    renderDialog() {
-        let { notEnoughList, title, not_enough_items_list } = this.state
+        let { not_enough_items_list, title } = this.state
        return (
            <View style={styles.opt_area}>
                <View style={styles.modal_style}>
@@ -146,10 +109,8 @@ class NotEnoughModel extends Component {
                            style={styles.item_scroll}
                            // showsVerticalScrollIndicator={false}
                            >
-                            {/* notEnoughList not_enough_items_list */}
                            {
-                                notEnoughList.map((item, index) => this.renderNotEnItem(item, index))
+                                not_enough_items_list.map((item, index) => this.renderNotEnItem(item, index))
                            }
                        </ScrollView>
                    </View>
@@ -250,8 +211,10 @@ const styles = StyleSheet.create({
        maxHeight: pxHeight(320),
        minHeight: pxHeight(220),
        borderWidth: 1,
-        borderColor: '#E0E0E0',
+        borderColor: '#eaeaea',
-        paddingLeft: 4
+        paddingLeft: 6,
+        borderRadius: 4,
+        paddingBottom: 6
    },
    item_scroll: {},
    modal_head: {
@@ -273,30 +236,30 @@ const styles = StyleSheet.create({
        fontFamily: font_family_medium
    },
    head_tou_clo: {
-        width: pxSize(28),
+        width: pxSize(24),
-        height: pxSize(28)
+        height: pxSize(24)
    },
    cont_list: {},
    co_li: {
        lineHeight: 20,
-        fontSize: 14,
+        fontSize: 12,
        fontFamily: font_family_regular,
        color: second_text_color
    },
    co_str: {
        fontFamily: font_family_semibold,
        fontWeight: '500',
-        fontSize: 16,
+        fontSize: 14,
        paddingTop: 6,
        paddingBottom: 2,
        color: first_text_color
    },
    plan_num: {
-        fontSize: 16,
+        fontSize: 14,
        fontFamily: font_family_semibold
    },
    sto_num: {
-        fontSize: 16,
+        fontSize: 14,
        fontFamily: font_family_semibold,
        color: 'red'
    },
@@ -305,13 +268,13 @@ const styles = StyleSheet.create({
        justifyContent: 'space-around'
    },
    foo_btn: {
-        width: pxSize(100),
+        width: '38%',
        height: pxSize(36),
        borderRadius: 5,
        marginTop: 20
    },
    btn_cel: {
-        backgroundColor: '#E0E0E0'
+        backgroundColor: '#E7F1FD'
    },
    btn_sub: {
        backgroundColor: promary_color
@@ -323,7 +286,7 @@ const styles = StyleSheet.create({
        lineHeight: 32
    },
    tit_cel: {
-        color: first_text_color
+        color: '#007EFF'
    },
 })

--- a/app/containers/quickOrder/QuickOrderPage.js
+++ b/app/containers/quickOrder/QuickOrderPage.js
@@ -33,7 +33,7 @@ import {
    FooterBtnStyle
 } from '../common/CellTextStyle';
 import { connect } from 'react-redux';
-import { show, isEmpty, dedupQuoteArray, formatStrForDate, cloneObject } from '../../utils/Utils';
+import { show, dedupQuoteArray, formatStrForDate, cloneObject } from '../../utils/Utils';
 import { AudioRecorder, AudioUtils } from 'react-native-audio';
 import Sound from 'react-native-sound';
 import DateModel from '../common/DateModel';
@@ -118,7 +118,7 @@ class EquipConsuPage extends Component {
                },
                {
                    "id": "8",
-                    title: '手术类时间',
+                    title: '手术时间',
                    name: '请选择',
                    value: '',
                    dateValue: new Date(),
@@ -214,7 +214,7 @@ class EquipConsuPage extends Component {
                }
            ],
            showNotEnogPop: false, // 库存不足弹窗
-            notEnoughList:[], // 库存不足数据
+            not_enough_items_list:[], // 库存不足数据
         }
    }
@@ -670,10 +670,8 @@ class EquipConsuPage extends Component {
        })
        return result
    }
    // 组织 点击
    handleOrganizationCheck() {
-        // console.warn('组织------check')
        let { state, props } = this
        this.setState({
            currentTitle: '组织',
@@ -688,10 +686,8 @@ class EquipConsuPage extends Component {
            props.requestQuickOrganizations(params)
        })
    }
    // 客户名称 点击
    handleCustomerCheck() {
-        // console.warn('客户名称------check')
        let { state, props } = this
        let self = this
        if(this.judgeOrgIsNull()) {
@@ -707,7 +703,6 @@ class EquipConsuPage extends Component {
            })   
        }
    }
    // 获取客户名称
    getCustomerData() {
        let { state, props } = this
@@ -718,10 +713,8 @@ class EquipConsuPage extends Component {
        }
        props.requestQuickSurgeryHospital(params)
    }
    // 收单地点 点击
    handleBillCheck() {
-        // console.warn('收单地点------check')
        let { localCustomersOption, listOptionData } = this.state
        let self = this
        if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
@@ -752,10 +745,8 @@ class EquipConsuPage extends Component {
            })
        }
    }
    // 收货地点 点击
    handleShipCheck() {
-        // console.warn('收货地点------check')
        let { localCustomersOption, listOptionData } = this.state
        let self = this
        if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
@@ -786,10 +777,8 @@ class EquipConsuPage extends Component {
            })
        }
    }
    // 主治医生 点击/输入
    handleDoctorCheck(text) {
-        // console.warn('主治医生------check', text)
        let { localCustomersOption, listOptionData } = this.state
        let self = this
        if(text) {
@@ -836,10 +825,8 @@ class EquipConsuPage extends Component {
            })
        }
    }
    // 手术类型 点击
    handleSurTypeCheck() {
-        // console.warn('手术类型------check')
        let { listOptionData, surgeryTypeOption } = this.state
        let self = this
        if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
@@ -857,10 +844,8 @@ class EquipConsuPage extends Component {
            })
        }
    }
    // 配台模版 点击
    handleMatchTempCheck() {
-        // console.warn('配台模版------check')
        let { state, props } = this
        if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
            this.setState({
@@ -887,16 +872,14 @@ class EquipConsuPage extends Component {
            })
        }
    }
+    // 手术时间 点击 2020-04-23 17:41
-    // 手术类时间 点击 2020-04-23 17:41
    handleSurDateCheck() {
-        // console.warn('手术类时间 点击 ===')
        let { listOptionData } = this.state
        let date = listOptionData[8].value
        if(date) {
            this.setState({
                listOptionData: listOptionData.map((item, index) => {
-                    if(item.title === '手术类时间') {
+                    if(item.title === '手术时间') {
                        item.dateValue = formatStrForDate(date)
                    }
                    return item
@@ -905,20 +888,18 @@ class EquipConsuPage extends Component {
        } 
        this.closeDateModal(true)
    }
    // 关闭日期选择器
    closeDateModal(show) {
        this.setState({
            dateModelPop: show
        })
    }
    // 修改当前日期数据
    dateModalCallback(date) {
        let { listOptionData } = this.state
        this.setState({
            listOptionData: listOptionData.map((item) => {
-                if(item.title === '手术类时间') {
+                if(item.title === '手术时间') {
                    item.name = date
                    item.value = date
                    item.dateValue = formatStrForDate(date)
@@ -927,10 +908,8 @@ class EquipConsuPage extends Component {
            })
        })
    }    
    // 订单类型 点击
    handleOrderCheck() {
-        // console.warn('订单类型------check')
        let { state, props } = this
        if(this.judgeOrgIsNull() && this.judgeCustomerIsNull()) {
            this.setState({
@@ -949,10 +928,8 @@ class EquipConsuPage extends Component {
            })   
        }
    }
    // 备注 输入
    handleRemarkInput(text) {
-        // console.warn('备注---',text)
        let { listOptionData } = this.state
        this.setState({
            listOptionData: listOptionData.map((item, index) => {
@@ -963,18 +940,15 @@ class EquipConsuPage extends Component {
            })
        })
    }
    // 生成订单 点击
    async handleSubmit() {
        this.changeCanSub(true)
        let { state, props } = this
        let that = this    
        // 可提交 并且 不处于正在提交中
        if(state.canSubFlag && !state.isSubLoding) {
            // 先提交录音，再提交接口
            if(state.stop) {
-                // 有录音
                let params = {
                    access_token: props.token,
                    path: state.audioPath
@@ -1010,7 +984,6 @@ class EquipConsuPage extends Component {
            }
        }
    }
    // 提交订单
    submitQuickOrder() {
        let { state, props } = this
@@ -1036,7 +1009,6 @@ class EquipConsuPage extends Component {
        }
        props.requestQuickSumbit(params)
    }
    // 判断组织是否为空
    judgeOrgIsNull() {
        let { listOptionData } = this.state
@@ -1048,7 +1020,6 @@ class EquipConsuPage extends Component {
            return true
        }
    }
    // 判断客户名称是否为空
    judgeCustomerIsNull() {
        let { listOptionData } = this.state
@@ -1060,7 +1031,6 @@ class EquipConsuPage extends Component {
            return true
        }
    }
    // 处理提交后返回的数据
    processReturnData() {
        let { quickOrderOption, setQuickInitData } = this.props
@@ -1068,10 +1038,9 @@ class EquipConsuPage extends Component {
            if(quickOrderOption.create_success == 'N') {
                // 打开库存不足弹窗
                this.setState({
-                    notEnoughList: quickOrderOption.not_enough_items_list,
+                    not_enough_items_list: quickOrderOption.not_enough_items_list,
                    showNotEnogPop: true
                })
            } else if(quickOrderOption.create_success == 'Y') {
                // 打开下单成功页面
                this.clearAllData()
@@ -1080,12 +1049,9 @@ class EquipConsuPage extends Component {
                    title: `${title} - 下单成功`, 
                    orderNumber: quickOrderOption.survey_collect_number
                })            
            }
        }
    }
    // 清空数据
    clearAllData() {
        let {props} = this
@@ -1098,7 +1064,6 @@ class EquipConsuPage extends Component {
            stop: false
        })
    }
    // 库存不足弹窗回调 -- 确定
    handleNotEnoughCallBack() {
        let { submitOption } = this.state
@@ -1111,16 +1076,13 @@ class EquipConsuPage extends Component {
        }, () => {
            self.handleSubmit()
        })       
    }
    // 库存不足弹窗关闭
    handleNotEnoughCloseModal(show) {
        this.setState({
            showNotEnogPop: show
        })
    }   
    // 返回备注以上的元素
    renderListItem() {
        let { listOptionData, dateModelPop } = this.state
@@ -1244,7 +1206,7 @@ class EquipConsuPage extends Component {
                        onPress={() => this.handleSurDateCheck()}
                        >
                        <CellTextStyle>
-                            <TitleTextStyle>{'手术类时间'}</TitleTextStyle>
+                            <TitleTextStyle>{'手术时间'}</TitleTextStyle>
                            <ContTextStyle>{listOptionData[8].name}</ContTextStyle>
                            { this.renderRightArrowItem() }
                        </CellTextStyle>
@@ -1286,7 +1248,6 @@ class EquipConsuPage extends Component {
            </ImageTextStyle>
        )
    }
    // 返回选择器弹窗
    renderPickerModel() {
        let {   
@@ -1308,7 +1269,6 @@ class EquipConsuPage extends Component {
            </SafeAreaView>
        )
    }
    // 返回备注元素
    renderRemarksItem() {
        let { state } = this
@@ -1378,9 +1338,7 @@ class EquipConsuPage extends Component {
                                        </TouchableOpacity>
                                    </View>
                                </View>
                    }                
                </View>
            </CellTextStyle>
        )
@@ -1397,13 +1355,13 @@ class EquipConsuPage extends Component {
    // 返回库存不足弹窗
    renderNotEnoughModel() {   
        let {   
-            notEnoughList,
+            not_enough_items_list,
            showNotEnogPop
        } = this.state
        return (
            <SafeAreaView style={styles.item_container}>
                <NotEnoughModel 
-                    notEnoughList={notEnoughList}
+                    not_enough_items_list={not_enough_items_list}
                    callback={() => this.handleNotEnoughCallBack()}
                    show={showNotEnogPop}
                    closeModal={(show) => this.handleNotEnoughCloseModal(show)}
@@ -1423,20 +1381,15 @@ class EquipConsuPage extends Component {
                    backgroundColor={promary_color}
                    barStyle = 'light-content'
                    />
                <SafeAreaView style={safe_view}>
                    <HeadBackItem title={title} navigation={navigation} />
                    <ScrollView
                        style={styles.quick_main}
                        showsVerticalScrollIndicator={false}
                        >
                        {this.renderListItem()}
                        {this.renderRemarksItem()}
                        {this.renderRecordingItem()}
                        <FooterBtnStyle
                            style={canSubFlag ? styles.sub_btn_pro : ''}
                            activeOpacity={canSubFlag ? .8 : 1}
@@ -1444,13 +1397,9 @@ class EquipConsuPage extends Component {
                            textStyle= {styles.sub_btn}
                            onPress={() => this.handleSubmit()}
                            />
                    </ScrollView>                    
                    { this.renderLodingItem() }
                    { this.renderNotEnoughModel() }                    
                </SafeAreaView>
            </View>
         );
@@ -1509,9 +1458,6 @@ const mapDispatchToProps = (dispatch) => {
        requestQuickTemplateCollect: (params) => {
            dispatch(requestQuickTemplateCollect(params))
        },
-        // requestQuickAudio: (params) => {
-        //     dispatch(requestQuickAudio(params))
-        // },
        requestQuickSumbit: (params) => {
            dispatch(requestQuickSumbit(params))
        },

--- a/app/containers/selfOrder/SelfOrderPage.js
+++ b/app/containers/selfOrder/SelfOrderPage.js
@@ -114,7 +114,7 @@ class SelfOrderPage extends Component {
                },
                {
                    "id": "7",
-                    title: '手术类时间',
+                    title: '手术时间',
                    name: '请选择',
                    value: '',
                    dateValue: new Date(),
@@ -743,15 +743,15 @@ class SelfOrderPage extends Component {
        // console.warn('手术名称---',listOptionData[6])
    }
-    // 手术类时间 点击 2020-04-23 17:41
+    // 手术时间 点击 2020-04-23 17:41
    handleSurDateCheck() {
-        console.warn('手术类时间 点击 ===')
+        console.warn('手术时间 点击 ===')
        let { listOptionData } = this.state
        let date = listOptionData[7].value
        if(date) {
            this.setState({
                listOptionData: listOptionData.map((item, index) => {
-                    if(item.title === '手术类时间') {
+                    if(item.title === '手术时间') {
                        item.dateValue = formatStrForDate(date)
                    }
                    return item
@@ -775,7 +775,7 @@ class SelfOrderPage extends Component {
        let { listOptionData } = this.state
        this.setState({
            listOptionData: listOptionData.map((item, index) => {
-                if(item.title === '手术类时间') {
+                if(item.title === '手术时间') {
                    item.name = date
                    item.value = date
                    item.dateValue = formatStrForDate(date)
@@ -996,7 +996,7 @@ class SelfOrderPage extends Component {
                        onPress={() => this.handleSurDateCheck()}
                        >
                        <CellTextStyle>
-                            <TitleTextStyle>{'手术类时间'}</TitleTextStyle>
+                            <TitleTextStyle>{'手术时间'}</TitleTextStyle>
                            <ContTextStyle>{listOptionData[7].name} -- {listOptionData[7].value}</ContTextStyle>
                            { this.renderRightArrowItem() }
                        </CellTextStyle>

--- a/app/containers/selfOrder/module/listTagData.js
+++ b/app/containers/selfOrder/module/listTagData.js
@@ -45,7 +45,7 @@ export default [
    },
    {
        isRequest: false,
-        title: '手术类时间',
+        title: '手术时间',
        value: '请选择',
        isPicker: true,
        showDatePicker: true