Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_bitliker

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 24 18:56:33 CST 2018
-debugName=143
+#Wed Jan 24 18:08:58 CST 2018
+debugName=152
 versionName=613
-debugCode=143
+debugCode=152
 versionCode=152

app_core/common/src/main/assets/work_menu.json

@@ -257,15 +257,6 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
-      },
-      {
-        "isLocalMenu": true,
-        "menuName": "str_company_salary",
-        "menuIcon": "company_salary",
-        "menuActivity": "com.modular.appme.CheckWagesActivity",
-        "menuUrl": "",
-        "caller": "",
-        "isHide": false
       }
     ]
   },

app_core/common/src/main/java/com/core/app/Constants.java

@@ -17,7 +17,7 @@ public class Constants {
         String url = "";
         if (BaseConfig.isDebug()) {
             url = IM_BASE_URL_TEST;
-            url = IM_BASE_URL;
+//            url = IM_BASE_URL;
         } else {
             url = IM_BASE_URL;
         }

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceDetailActivity.java

@@ -60,6 +60,7 @@ public class BServiceDetailActivity extends OABaseActivity implements View.OnCli
 		progressDialog.show();
 		mCompanyId = model.getCompanyid();
 		mServiceId = "0";
+		LogUtil.prinlnLongMsg("appStoreman","companyid = "+ mCompanyId + ",serviceid = " +mServiceId + ",Token = " + MyApplication.getInstance().mAccessToken);
 		mHttpClient.Api().send(new HttpClient.Builder()
 				.url("/user/appStoreman")
 				.add("companyid", mCompanyId)

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -125,7 +125,10 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
 
                 //{"result":[{"sc_industry":"医疗","sc_industrycode":"10001"}]}
                 JSONArray array = JSON.parseObject(o.toString()).getJSONArray("result");
-                if (ListUtils.isEmpty(array)) return;
+                if (ListUtils.isEmpty(array)) {
+                    progressDialog.dismiss();
+                    return;
+                }
                 JSONObject object = array.getJSONObject(0);
                 if (object == null) return;
                 sc_industry = object.getString("sc_industry");

app_modular/appworks/src/main/java/com/uas/appworks/activity/B2BBusinessMainActivity.java

@@ -214,7 +214,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                     params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
                     params.put("id", mPublicInquiryBeans.get(position).getId());
 
-                    HttpRequest.getInstance().sendRequest("http://218.17.158.219:24000/",
+                    HttpRequest.getInstance().sendRequest("http://192.168.253.192:8080/",
                             new HttpParams.Builder()
                                     .url("inquiry/sale/quote")
                                     .method(Method.GET)
@@ -287,7 +287,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 url = "mobile/sale/inquiry/info/search";
                 break;
             case OBTAIN_PUBLIC_INQUIRY_LIST:
-                host = "http://218.17.158.219:24000/";
+                host = "http://192.168.253.192:8080/";
                 url = "inquiry/public/mobile";
                 break;
         }

app_modular/appworks/src/main/java/com/uas/appworks/activity/CustomerInquiryDetailActivity.java

@@ -48,6 +48,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
     private RecyclerView mDataRecyclerView, mQuoteRecyclerView;
     private ImageView mAddImageView;
+    private View mAddLine;
     private Button mQuoteButton;
     private B2BDetailListAdapter mB2BDetailListAdapter;
     private List<B2BDetailListBean> mB2BDetailListBeans;
@@ -68,6 +69,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
         mDataRecyclerView = $(R.id.customer_inquiry_detail_data_rv);
         mQuoteRecyclerView = $(R.id.customer_inquiry_detail_quote_rv);
         mAddImageView = $(R.id.customer_inquiry_detail_add_iv);
+        mAddLine = $(R.id.customer_inquiry_detail_add_line);
         mQuoteButton = $(R.id.customer_inquiry_detail_quote_btn);
 
         mDataRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
@@ -152,7 +154,9 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
     private void initEditable(boolean editable, int visible) {
         mB2BDetailListAdapter.setEditable(editable);
         mB2BQuotePriceAdapter.setEditable(editable);
-        mAddImageView.setEnabled(editable);
+
+        mAddImageView.setVisibility(visible);
+        mAddLine.setVisibility(visible);
 
         mQuoteButton.setVisibility(visible);
     }
@@ -186,7 +190,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             String url = "mobile/sale/inquiry/" + mId + "/info";
             int flag = CUSTOMER_INQUIRY_DETAIL;
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
-                host = "http://218.17.158.219:24000/";
+                host = "http://192.168.253.192:8080/";
                 url = "inquiry/sale/publicInquiry/detail";
                 flag = PUBLIC_INQUIRY_DETAIL;
             }
@@ -269,7 +273,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
                     mB2BQuotePriceBeans.add(createB2BQuotePriceBean(id, amount, price));
                 }
             } else {
-                mB2BQuotePriceBeans.add(createB2BQuotePriceBean(0, "", ""));
+                mB2BQuotePriceBeans.add(createB2BQuotePriceBean(0, "0", ""));
             }
             mB2BQuotePriceAdapter.notifyDataSetChanged();
         }
@@ -427,7 +431,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             String host = "http://192.168.253.102:8090/platform-b2b/";
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
                 url = "inquiry/sale/inquiry/detail";
-                host = "http://218.17.158.219:24000/";
+                host = "http://192.168.253.192:8080/";
             }
             HttpRequest.getInstance().sendRequest(host
                     , new HttpParams.Builder()

app_modular/appworks/src/main/java/com/uas/appworks/activity/PublicInquiryDetailActivity.java

@@ -5,8 +5,10 @@ import android.content.Intent;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
@@ -26,8 +28,10 @@ import com.me.network.app.http.HttpRequest;
 import com.me.network.app.http.Method;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.B2BDetailListAdapter;
+import com.uas.appworks.adapter.B2BQuotePriceAdapter;
 import com.uas.appworks.model.bean.B2BAttachBean;
 import com.uas.appworks.model.bean.B2BDetailListBean;
+import com.uas.appworks.model.bean.B2BQuotePriceBean;
 import com.uas.appworks.presenter.WorkPlatPresenter;
 
 import java.io.File;
@@ -45,9 +49,12 @@ import java.util.Map;
 public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresenter> implements HttpCallback {
     private final int PUBLIC_INQUIRY_DETAIL = 0x16;
 
-    private RecyclerView mInquiryRecyclerView, mMaterialRecyclerView;
+    private RecyclerView mInquiryRecyclerView, mMaterialRecyclerView, mQuoteRecyclerView;
+    private TextView mLeadTimeTextView, mMinOrderTextView, mMinPackTextView;
     private List<B2BDetailListBean> mInquiryListBeans, mMaterialListBeans;
     private B2BDetailListAdapter mInquiryListAdapter, mMaterialListAdapter;
+    private B2BQuotePriceAdapter mB2BQuotePriceAdapter;
+    private List<B2BQuotePriceBean> mB2BQuotePriceBeans;
 
     private String mId, mState, mJson;
     private String mEnuu;
@@ -63,11 +70,17 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
 
         mInquiryRecyclerView = $(R.id.public_inquiry_detail_inquiry_information_rv);
         mMaterialRecyclerView = $(R.id.public_inquiry_detail_material_information_rv);
+        mQuoteRecyclerView = $(R.id.public_inquiry_detail_quote_rv);
+        mLeadTimeTextView = $(R.id.public_inquiry_detail_leadtime_tv);
+        mMinOrderTextView = $(R.id.public_inquiry_detail_min_order_tv);
+        mMinPackTextView = $(R.id.public_inquiry_detail_min_pack_tv);
 
         mInquiryRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
         mInquiryRecyclerView.setNestedScrollingEnabled(false);
         mMaterialRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
         mMaterialRecyclerView.setNestedScrollingEnabled(false);
+        mQuoteRecyclerView.setLayoutManager(new LinearLayoutManager(mContext));
+        mQuoteRecyclerView.setNestedScrollingEnabled(false);
 
         mInquiryListBeans = new ArrayList<>();
         mInquiryListAdapter = new B2BDetailListAdapter(mContext, mInquiryListBeans);
@@ -77,6 +90,11 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         mMaterialListAdapter = new B2BDetailListAdapter(mContext, mMaterialListBeans);
         mMaterialRecyclerView.setAdapter(mMaterialListAdapter);
 
+        mB2BQuotePriceBeans = new ArrayList<>();
+        mB2BQuotePriceAdapter = new B2BQuotePriceAdapter(mContext, mB2BQuotePriceBeans);
+        mB2BQuotePriceAdapter.setEditable(false);
+        mQuoteRecyclerView.setAdapter(mB2BQuotePriceAdapter);
+
         Intent intent = getIntent();
         if (intent != null) {
             mId = intent.getStringExtra(Constants.FLAG.EXTRA_B2B_LIST_ID);
@@ -112,7 +130,7 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
             params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
             params.put("id", mId);
 
-            HttpRequest.getInstance().sendRequest("http://218.17.158.219:24000/",
+            HttpRequest.getInstance().sendRequest("http://192.168.253.192:8080/",
                     new HttpParams.Builder()
                             .url("inquiry/sale/publicInquiry/detail")
                             .flag(PUBLIC_INQUIRY_DETAIL)
@@ -131,6 +149,8 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         String inquiryId = "", inquiryCompany = "", phone = "", contact = "", enddate = "", attachs = "", model = "", brand = "", spec = "", material = "", unit = "", amount = "";
 
         amount = JSONUtil.getText(contentObject, "needquantity");
+        contact = JSONUtil.getText(contentObject, "userName");
+        phone = JSONUtil.getText(contentObject, "userTel");
         if (productObject != null) {
             model = JSONUtil.getText(productObject, "cmpCode");
             brand = JSONUtil.getText(productObject, "brand");
@@ -196,6 +216,29 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         mMaterialListBeans.add(createB2BDetailListBean(B2BDetailListBean.TYPE_DETAIL_TEXT_WHITE, getString(R.string.public_inquiry_amount), amount, "", "数量", ""));
 
         mMaterialListAdapter.notifyDataSetChanged();
+
+        String leadtime = JSONUtil.getText(contentObject, "leadtime");//交货周期
+        String minOrderQty = JSONUtil.getText(contentObject, "minOrderQty");//最小起订
+        String minPackQty = JSONUtil.getText(contentObject, "minPackQty");//最小包装
+
+        mLeadTimeTextView.setText(leadtime);
+        mMinOrderTextView.setText(minOrderQty);
+        mMinPackTextView.setText(minPackQty);
+
+        JSONArray replies = contentObject.getJSONArray("replies");
+        if (replies != null && replies.size() > 0) {
+            for (int i = 0; i < replies.size(); i++) {
+                JSONObject replyObject = replies.getJSONObject(i);
+                long id = JSONUtil.getLong(replyObject, "id");
+                String lapQty = JSONUtil.getText(replyObject, "lapQty");
+                String price = JSONUtil.getText(replyObject, "price");
+
+                mB2BQuotePriceBeans.add(createB2BQuotePriceBean(id, lapQty, price));
+            }
+        } else {
+            mB2BQuotePriceBeans.add(createB2BQuotePriceBean(0, "0", ""));
+        }
+        mB2BQuotePriceAdapter.notifyDataSetChanged();
     }
 
     private B2BDetailListBean createB2BDetailListBean(int itemType,
@@ -216,6 +259,16 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         return b2BDetailListBean;
     }
 
+    private B2BQuotePriceBean createB2BQuotePriceBean(long id, String amount, String price) {
+        B2BQuotePriceBean b2BQuotePriceBean = new B2BQuotePriceBean();
+
+        b2BQuotePriceBean.setId(id);
+        b2BQuotePriceBean.setAmount(amount);
+        b2BQuotePriceBean.setPrice(price);
+
+        return b2BQuotePriceBean;
+    }
+
     @Override
     public void showLoading(String loadStr) {
         progressDialog.show();

app_modular/appworks/src/main/java/com/uas/appworks/adapter/B2BQuotePriceAdapter.java

@@ -75,6 +75,9 @@ public class B2BQuotePriceAdapter extends RecyclerView.Adapter<B2BQuotePriceAdap
             holder.mAmountTextView.setVisibility(View.GONE);
             holder.mPriceTextView.setVisibility(View.GONE);
 
+            holder.mDeleteImageView.setVisibility(View.VISIBLE);
+            holder.mDeleteLine.setVisibility(View.VISIBLE);
+
             if (holder.mAmountEditText.getTag() instanceof TextWatcher) {
                 holder.mAmountEditText.removeTextChangedListener((TextWatcher) holder.mAmountEditText.getTag());
             }
@@ -143,6 +146,9 @@ public class B2BQuotePriceAdapter extends RecyclerView.Adapter<B2BQuotePriceAdap
             holder.mAmountTextView.setVisibility(View.VISIBLE);
             holder.mPriceTextView.setVisibility(View.VISIBLE);
 
+            holder.mDeleteImageView.setVisibility(View.GONE);
+            holder.mDeleteLine.setVisibility(View.GONE);
+
             holder.mAmountTextView.setText(b2BQuotePriceBean.getAmount());
             holder.mPriceTextView.setText(b2BQuotePriceBean.getPrice());
 
@@ -162,6 +168,7 @@ public class B2BQuotePriceAdapter extends RecyclerView.Adapter<B2BQuotePriceAdap
         private EditText mAmountEditText, mPriceEditText;
         private ImageView mDeleteImageView;
         private TextView mAmountTextView, mPriceTextView;
+        private View mDeleteLine;
 
         public QuotePriceViewHolder(View itemView) {
             super(itemView);
@@ -171,6 +178,7 @@ public class B2BQuotePriceAdapter extends RecyclerView.Adapter<B2BQuotePriceAdap
             mDeleteImageView = (ImageView) itemView.findViewById(R.id.list_subsection_quotation_delete_iv);
             mAmountTextView = (TextView) itemView.findViewById(R.id.list_subsection_quotation_amount_tv);
             mPriceTextView = (TextView) itemView.findViewById(R.id.list_subsection_quotation_price_tv);
+            mDeleteLine = itemView.findViewById(R.id.list_subsection_quotation_delete_line);
         }
     }
 }

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -262,7 +262,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
 
         String host = "http://192.168.253.102:8090/platform-b2b/";
         if (mListType == B2BBusinessListBean.PUBLIC_INQUIRY_LIST) {
-            host = "http://218.17.158.219:24000/";
+            host = "http://192.168.253.192:8080/";
         }
         HttpRequest.getInstance().sendRequest(host,
                 new HttpParams.Builder()

app_modular/appworks/src/main/res/layout/activity_customer_inquiry_detail.xml

@@ -89,6 +89,7 @@
                     android:src="@drawable/ic_b2b_add" />
 
                 <View
+                    android:id="@+id/customer_inquiry_detail_add_line"
                     style="@style/expense_table_v_1dp"
                     />
             </LinearLayout>

app_modular/appworks/src/main/res/layout/activity_public_inquiry_detail.xml

@@ -1,49 +1,248 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.v4.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <TextView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/b2b_tab_bg"
-        android:paddingLeft="12dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:text="@string/str_inquiry_information"
-        android:textColor="@color/black"
-        android:textSize="16sp" />
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/public_inquiry_detail_inquiry_information_rv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        android:scrollbars="none" />
+        android:layout_height="match_parent"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:background="@color/gray_light" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/b2b_tab_bg"
+            android:paddingBottom="8dp"
+            android:paddingLeft="12dp"
+            android:paddingTop="8dp"
+            android:text="@string/str_inquiry_information"
+            android:textColor="@color/black"
+            android:textSize="16sp" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/b2b_tab_bg"
-        android:paddingLeft="12dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:text="@string/str_material_information"
-        android:textColor="@color/black"
-        android:textSize="16sp" />
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/public_inquiry_detail_material_information_rv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        android:scrollbars="none" />
-</LinearLayout>
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/public_inquiry_detail_inquiry_information_rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:overScrollMode="never"
+            android:scrollbars="none" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="8dp"
+            android:background="@color/gray_light" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/b2b_tab_bg"
+            android:paddingBottom="8dp"
+            android:paddingLeft="12dp"
+            android:paddingTop="8dp"
+            android:text="@string/str_quote_information"
+            android:textColor="@color/black"
+            android:textSize="16sp" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/public_inquiry_detail_material_information_rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:overScrollMode="never"
+            android:scrollbars="none" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingBottom="6dp"
+            android:paddingLeft="12dp"
+            android:paddingTop="6dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="交货周期："
+                android:textColor="@color/black"
+                tools:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/public_inquiry_detail_leadtime_tv"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:background="@drawable/shape_b2b_detail_edittext"
+                android:gravity="right|center_vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:textSize="14sp"
+                android:text="天" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingBottom="6dp"
+            android:paddingLeft="12dp"
+            android:paddingTop="6dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="最小起订："
+                android:textColor="@color/black"
+                tools:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/public_inquiry_detail_min_order_tv"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:background="@drawable/shape_b2b_detail_edittext"
+                android:gravity="right|center_vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:textSize="14sp"
+                android:text="PCS" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="42dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingBottom="6dp"
+            android:paddingLeft="12dp"
+            android:paddingTop="6dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="最小包装："
+                android:textColor="@color/black"
+                tools:textSize="14sp" />
+
+
+            <TextView
+                android:id="@+id/public_inquiry_detail_min_pack_tv"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:background="@drawable/shape_b2b_detail_edittext"
+                android:gravity="right|center_vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6dp"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:textSize="14sp"
+                android:text="PCS" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="12dp"
+            android:text="分段报价"
+            android:textColor="@color/black" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp"
+            android:orientation="vertical">
+
+            <View
+                style="@style/expense_table_h_1dp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <View
+                    style="@style/expense_table_v_1dp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:paddingLeft="10dp"
+                    android:text="@string/str_divisions_count" />
+
+                <View
+                    style="@style/expense_table_v_1dp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="2"
+                    android:paddingLeft="10dp"
+                    android:text="@string/str_segments_amount"
+                    />
+
+                <View
+                    style="@style/expense_table_v_1dp" />
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="2"
+                    android:paddingLeft="10dp"
+                    android:text="@string/str_segments_price"
+                    />
+
+                <View
+                    style="@style/expense_table_v_1dp" />
+
+            </LinearLayout>
+
+            <View
+                style="@style/expense_table_h_1dp" />
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/public_inquiry_detail_quote_rv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp" />
+    </LinearLayout>
+</android.support.v4.widget.NestedScrollView>

app_modular/appworks/src/main/res/layout/layout_list_subsection_quotation.xml

@@ -121,6 +121,7 @@
             android:src="@drawable/ic_b2b_delete" />
 
         <View
+            android:id="@+id/list_subsection_quotation_delete_line"
             style="@style/expense_table_v_1dp" />
     </LinearLayout>
 

app_modular/appworks/src/main/res/values-en/strings.xml

@@ -124,4 +124,5 @@
     <string name="str_material_spec">物料规格：</string>
     <string name="modify_quote_price">修改报价</string>
     <string name="str_currency">币别：</string>
+    <string name="str_quote_information">报价信息</string>
 </resources>

app_modular/appworks/src/main/res/values-zh-rCN/strings.xml

@@ -123,4 +123,5 @@
     <string name="str_material_spec">物料规格：</string>
     <string name="modify_quote_price">修改报价</string>
     <string name="str_currency">币别：</string>
+    <string name="str_quote_information">报价信息</string>
 </resources>

app_modular/appworks/src/main/res/values-zh-rTW/strings.xml

@@ -123,4 +123,5 @@
     <string name="str_material_spec">物料规格</string>
     <string name="modify_quote_price">修改报价</string>
     <string name="str_currency">币别：</string>
+    <string name="str_quote_information">报价信息</string>
 </resources>

app_modular/appworks/src/main/res/values/strings.xml

@@ -155,6 +155,7 @@
     <string name="str_material_spec">物料规格：</string>
     <string name="modify_quote_price">修改报价</string>
     <string name="str_currency">币别：</string>
+    <string name="str_quote_information">报价信息</string>
 
 
 </resources>