修改物料的展示信息

app/containers/common/listDataComponent/PicTitDetaiCalcu.js

@@ -28,6 +28,8 @@ class PicTitDetaiCalcu extends Component {
         tipTextOneTit: PropTypes.string,
         tipTextTwo: PropTypes.string,
         tipTextTwoTit: PropTypes.string,
+        tipTextThr: PropTypes.string,
+        tipTextThrTit: PropTypes.string,
         listImgIcon: PropTypes.string,
         listStyleImg: PropTypes.objec,
         plusCallBack: PropTypes.func, // 加法的回调函数
@@ -86,8 +88,8 @@ class PicTitDetaiCalcu extends Component {
 
     render() {
         let { listItem, listIndex, calField, listStyleBox, listStyleTit, listStyleTip, listStyleCalBtn, listPicType, titCallBack,
-            titText, tipTextStr, tipTextOne, tipTextTwo, listImgIcon, listStyleImg, showClearIcon, showClearIndex, listCardActIndex,
-            listStyleClearBtn, clearCallBack, onlyShowNum, onlyShowSelect, tipTextStrTit, tipTextOneTit, tipTextTwoTit,
+            titText, tipTextStr, tipTextOne, tipTextTwo, tipTextThr, listImgIcon, listStyleImg, showClearIcon, showClearIndex, listCardActIndex,
+            listStyleClearBtn, clearCallBack, onlyShowNum, onlyShowSelect, tipTextStrTit, tipTextOneTit, tipTextTwoTit, tipTextThrTit,
             global_domain_config, listMaxNum } = this.props
         let { listPicTypeArr, picStyleArr } = this.state
 
@@ -131,10 +133,10 @@ class PicTitDetaiCalcu extends Component {
                         onPress={() => { titCallBack ? titCallBack(listItem, listIndex) : {} }}
                         style={styles.oth_box}
                     >
-                        <Text numberOfLines={1} style={[styles.thr_ot, listStyleTit]}>
+                        <Text numberOfLines={2} style={[styles.thr_ot, listStyleTit]}>
                             {listItem[titText]}
                         </Text>
-                        {listItem[tipTextStr] ? <Text numberOfLines={1} style={[styles.ri_te_ot, styles.te_ot_str, listStyleTip]}>
+                        {listItem[tipTextStr] ? <Text numberOfLines={2} style={[styles.ri_te_ot, styles.te_ot_str, listStyleTip]}>
                             {tipTextStrTit ? `${tipTextStrTit}：` : ''}{listItem[tipTextStr]}
                         </Text> : null}
                         {listItem[tipTextOne] ? <Text numberOfLines={1} style={[styles.ri_te_ot, listStyleTip]}>
@@ -143,6 +145,9 @@ class PicTitDetaiCalcu extends Component {
                         {listItem[tipTextTwo] ? <Text numberOfLines={1} style={[styles.ri_te_ot, listStyleTip]}>
                             {tipTextTwoTit ? `${tipTextTwoTit}：` : ''}{listItem[tipTextTwo]}
                         </Text> : null}
+                        {listItem[tipTextThr] ? <Text numberOfLines={1} style={[styles.ri_te_ot, listStyleTip]}>
+                            {tipTextThrTit ? `${tipTextThrTit}：` : ''}{listItem[tipTextThr]}
+                        </Text> : null}
                     </TouchableOpacity>
                 </View>
                 {

app/containers/selfOrder/module/EditThirdLevelPage.js

@@ -232,8 +232,6 @@ class EditThirdLevelPage extends Component {
             }
         } else if (leftIndex === 2) {
             curTopList = []
-        } else {
-            curTit = 'title'
         }
         return (
             <ChooseCardList
@@ -301,12 +299,12 @@ class EditThirdLevelPage extends Component {
         let curTit = '', curTipStr = '', curTipOne = '', curTipTwo = '', curCalField = '', curImgIcon = ''
         let curTipStrTit = '', curTipOneTit = '', curTipTwoTit = ''
         curTit = 'item_name'
-        curTipStr = 'item_code'
+        curTipStr = 'general_name'
         curTipOne = 'specification'
-        curTipTwo = 'general_name'
-        curTipStrTit = '物料代码'
+        curTipTwo = 'item_desc'
+        curTipStrTit = '通用名称'
         curTipOneTit = '规格型号'
-        curTipTwoTit = '通用名称'
+        curTipTwoTit = '物料说明'
         curCalField = LocalVariable.QUANTITY_FIELD
         curImgIcon = 'photos'
 

app/containers/selfOrder/module/ProductRightStyle.js

@@ -209,21 +209,27 @@ class ProductRightStyle extends Component {
     renderSecondtem(item, index) {
         let { leftIndex } = this.props
         let curTitCallBack = '', curPlusCallBack = '', curReduceCallBack = ''
-        let curTit = '', curTipStr = '', curTipOne = '', curTipTwo = '', curTipStrTit = '', curTipOneTit = '', curTipTwoTit = '', curIcon = ''
+        let curTit = '', curTipStr = '', curTipOne = '', curTipTwo = '', curTipThr = '', curTipStrTit = '', curTipOneTit = '', curTipTwoTit = '', curTipThrTit = '', curIcon = ''
         let curListMaxNum = ''
         if (leftIndex === 0) {
             curTit = 'template_name'
-            curTipOne = 'surgery_type_name'
-            curTipTwo = 'template_number'
-            curTipOneTit = '手术类型'
-            curTipTwoTit = '模板号'
+            curTipStr = 'customer_name'
+            curTipOne = 'doctor_name'
+            curTipTwo = 'surgery_type'
+            curTipThr = 'template_desc'
+            curTipStrTit = '客户'
+            curTipOneTit = '主治医生'
+            curTipTwoTit = '手术类型'
+            curTipThrTit = '模板说明'
             curIcon = 'photos'
         } else if (leftIndex === 1 || leftIndex === 2 || leftIndex === 3) {
             curTit = 'item_name'
-            curTipStr = 'item_code'
+            curTipStr = 'general_name'
             curTipOne = 'specification'
-            curTipStrTit = '物料代码'
+            curTipTwo = 'item_desc'
+            curTipStrTit = '通用名称'
             curTipOneTit = '规格型号'
+            curTipTwoTit = '物料说明'
             curIcon = 'photos'
         }
         if (leftIndex === 1) {
@@ -259,9 +265,11 @@ class ProductRightStyle extends Component {
                     tipTextStr={curTipStr}
                     tipTextOne={curTipOne}
                     tipTextTwo={curTipTwo}
+                    tipTextThr={curTipThr}
                     tipTextStrTit={curTipStrTit}
                     tipTextOneTit={curTipOneTit}
                     tipTextTwoTit={curTipTwoTit}
+                    tipTextThrTit={curTipThrTit}
                     listImgIcon={curIcon}
                     listPicType={'SQUARE'}
                     plusCallBack={curPlusCallBack}
@@ -300,10 +308,12 @@ class ProductRightStyle extends Component {
                     calField={LocalVariable.QUANTITY_FIELD}
                     subCalCallBack={(item, index) => this.handleCalCallBack(item, index, 'rowSingleData')}
                     titText={'item_name'}
-                    tipTextOne={'general_name'}
-                    tipTextTwo={'item_code'}
-                    tipTextOneTit={'通用名称'}
-                    tipTextTwoTit={'物料代码'}
+                    tipTextStr={'general_name'}
+                    tipTextOne={'specification'}
+                    tipTextTwo={'item_desc'}
+                    tipTextStrTit={'通用名称'}
+                    tipTextOneTit={'规格型号'}
+                    tipTextTwoTit={'物料说明'}
                     listImgIcon={'photos'}
                 />
             </SafeAreaView>
@@ -328,19 +338,21 @@ class ProductRightStyle extends Component {
 
     // 单选耗材 -- 大类每一列
     renderOtherListItem(item, index) {
-        let curTit = '', curTipOne = '', curTipTwo = '', curTipOneTit = '', curTipTwoTit = '', curIcon = ''
+        let curTit = '', curTipStr = '', curTipOne = '', curTipTwo = '', curTipStrTit = '', curTipOneTit = '', curTipTwoTit = '', curIcon = ''
         let curTitCallBack = '', curPlusCallBack = '', curReduceCallBack = ''
         if (item[LocalVariable.ONLY_TWO_LEVELS]) {
             // 两级数据
             curTit = 'item_name'
-            curTipOne = 'item_code'
-            curTipOneTit = '物料代码'
+            curTipStr = 'general_name'
+            curTipOne = 'specification'
+            curTipTwo = 'item_desc'
+            curTipStrTit = '通用名称'
+            curTipOneTit = '规格型号'
+            curTipTwoTit = '物料说明'
             curIcon = 'photos'
         } else {
             // 三级数据
             curTit = 'category_name'
-            curTipOne = 'category_code'
-            curTipOneTit = '分类编码'
             curTitCallBack = (item, index) => this.TitleClickEvent(item, index)
             curPlusCallBack = (item, index) => this.handleAllPlusReduce(item, index, true)
             curReduceCallBack = (item, index) => this.handleAllPlusReduce(item, index)
@@ -357,8 +369,10 @@ class ProductRightStyle extends Component {
                     subCalCallBack={(item, index) => this.handleCalCallBack(item, index, 'rightSecondData', LocalVariable.QUANTITY_FIELD)}
                     titCallBack={curTitCallBack}
                     titText={curTit}
+                    tipTextStr={curTipStr}
                     tipTextOne={curTipOne}
                     tipTextTwo={curTipTwo}
+                    tipTextStrTit={curTipStrTit}
                     tipTextOneTit={curTipOneTit}
                     tipTextTwoTit={curTipTwoTit}
                     plusCallBack={curPlusCallBack}