Merge branch 'develop_temp' into develop

81e0c089 · wong.peiyi · 576c3a2c · a8938b2c · 81e0c089 · 81e0c089
Commit 81e0c089 authored Feb 26, 2021 by wong.peiyi
Showing with 27 additions and 20 deletions
app/containers/quickOrder/QuickOrderPage.js
app/containers/transOrder/TransOrderPage.js
yarn.lock
--- a/app/containers/quickOrder/QuickOrderPage.js
+++ b/app/containers/quickOrder/QuickOrderPage.js
@@ -215,7 +215,7 @@ class EquipConsuPage extends Component {
            // ],
            showNotEnogPop: false, // 库存不足弹窗
            not_enough_items_list:[], // 库存不足数据
-            bor_ware_required: '', // APP借货仓库必填权限   
+            bor_ware_required: 0, // APP借货仓库必填权限
         }
    }
@@ -223,7 +223,7 @@ class EquipConsuPage extends Component {
        this.getSellerName()
        this.getAudioAuthorize()
        this.getOrganizationData()
-        // this.getSysConfigValue()
+        this.getSysConfigValue()
    }
    // 赋值销售员 初始化数据
@@ -559,7 +559,7 @@ class EquipConsuPage extends Component {
        let tempStatus = false
        let tempTit = ''
        let maxIndex = 10
-        if(bor_ware_required === 'Y'){
+        if(bor_ware_required === 3){
            maxIndex = 11
        }
        for(let chIndex in listOptionData) {
@@ -1223,7 +1223,7 @@ class EquipConsuPage extends Component {
        tempSubOption.template_collect_number = state.listOptionData[7].value
        tempSubOption.surgery_date = state.listOptionData[8].value
        tempSubOption.order_type_code = state.listOptionData[9].value
-        // tempSubOption.collect_src_inv_code = state.listOptionData[10].value
+        tempSubOption.collect_src_inv_code = state.listOptionData[10].value
        tempSubOption.surgery_desc = state.listOptionData[11].value
        tempSubOption.voice_url = state.listOptionData[12].value
        let params = {
@@ -1325,10 +1325,10 @@ class EquipConsuPage extends Component {
        console.log('sysRes:==', sysRes)
        if(sysRes.error_code === 0){
            this.setState({
-                bor_ware_required: sysRes.data.profile_value
+                bor_ware_required: Number(sysRes.data.profile_value) || 0
            })
-        }else {
+        // }else {
-            this.showWarnError(sysRes)
+            // this.showWarnError(sysRes)
        }
    }
    showWarnError(res){
@@ -1437,15 +1437,19 @@ class EquipConsuPage extends Component {
                    listCallBack={() => this.handleOrderCheck(listOptionData[9])}
                    listHasArrow={true}
                />
-                {/* <PageListArrow
+                {
+                    bor_ware_required > 1 ?
+                        <PageListArrow
                            listActOpa={.8}
-                    listHasAster={bor_ware_required === 'Y'}
+                            listHasAster={bor_ware_required === 3}
                            listItem={listOptionData[10]}
                            listName={'name'}
                            listTitle={'title'}
                            listCallBack={() => this.handleWareCheck(listOptionData[10])}
                            listHasArrow={true}
-                /> */}
+                        />
+                        : <Text></Text>
+                }
                <DateModel
                    date={listOptionData[8].dateValue}

--- a/app/containers/transOrder/TransOrderPage.js
+++ b/app/containers/transOrder/TransOrderPage.js
@@ -172,7 +172,7 @@ class TransOrderPage extends Component {
            ],
            isShowImage: false,
            currShowImgIndex: 0,
-            bor_ware_required: '', // APP目标仓库必填权限   
+            bor_ware_required: 0, // APP目标仓库显示及必填权限
         }
    }
@@ -181,7 +181,7 @@ class TransOrderPage extends Component {
        this.getSellerName()
        this.getAudioAuthorize()
        this.getOrganizationData()
-        // this.getSysConfigValue()
+        this.getSysConfigValue()
    }
    // 赋值销售员 初始化数据
@@ -515,7 +515,7 @@ class TransOrderPage extends Component {
        let tempStatus = false
        let tempTit = ''
        let maxIndex = 4
-        if(bor_ware_required === 'Y'){
+        if(bor_ware_required === 3){
            maxIndex = 5
        }
        for(let chIndex in listOptionData) {
@@ -1093,7 +1093,7 @@ class TransOrderPage extends Component {
        let tempSubOption = state.submitOption
        tempSubOption.org_code = state.listOptionData[1].value
        tempSubOption.collect_number = state.listOptionData[3].value
-        // tempSubOption.destination_inv_code = state.listOptionData[4].value
+        tempSubOption.destination_inv_code = state.listOptionData[4].value
        tempSubOption.remark = state.listOptionData[5].value
        tempSubOption.voice_url = state.listOptionData[6].value
        tempSubOption.sur_order_transfer_line = state.listOptionData[7].subOption
@@ -1183,10 +1183,10 @@ class TransOrderPage extends Component {
        console.log('sysRes:==', sysRes)
        if(sysRes.error_code === 0){
            this.setState({
-                bor_ware_required: sysRes.data.profile_value
+                bor_ware_required: Number(sysRes.data.profile_value) || 0
            })
-        }else {
+        // }else {
-            this.showWarnError(sysRes)
+        //     this.showWarnError(sysRes)
        }
    }
    showWarnError(res){
@@ -1240,15 +1240,18 @@ class TransOrderPage extends Component {
                    listHasArrow={true}
                    listMaxLines={3}
                />
-                {/* <PageListArrow
+                {
+                    bor_ware_required > 1 &&
+                        <PageListArrow
                            listActOpa={.8}
-                    listHasAster={bor_ware_required === 'Y'}
+                            listHasAster={bor_ware_required === 3}
                            listItem={listOptionData[4]}
                            listName={'name'}
                            listTitle={'title'}
                            listCallBack={() => this.handleWareCheck(listOptionData[4])}
                            listHasArrow={true}
-                /> */}
+                        />
+                }
                { this.renderPickerModel() }

--- a/yarn.lock
+++ b/yarn.lock