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

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

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

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/OA/platform/activity/PurchaseDetailsActivity.java

@@ -114,7 +114,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
 
     private void loadData() {
         showProgress();
-        String phone = "15671616315";
+        String phone = MyApplication.getInstance().mLoginUser.getTelephone();
         Parameter.Builder builder = new Parameter.Builder();
         String url = "mobile/sale/orders/" + varId + "/info";//卖方
         builder.mode(Method.GET)
@@ -151,7 +151,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     }
 
     private void reply(String json) {
-        String phone = "15671616315";
+        String phone = MyApplication.getInstance().mLoginUser.getTelephone();
         Parameter.Builder builder = new Parameter.Builder();
         builder.mode(Method.POST)
                 .url("mobile/sale/orders/reply")
@@ -293,12 +293,14 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
             code = JSONUtil.getText(product, "code");
             remarks = JSONUtil.getText(product, "title");
             alls = JSONUtil.getText(product, "spec");
+            String unit = JSONUtil.getText(product, "unit");
             String amount = JSONUtil.getText(object, "amount");
-            String number = JSONUtil.getText(object, "number");//数量
-            LogUtil.i("number=" + number);
-            LogUtil.i("amount=" + amount);
+            String price = JSONUtil.getText(object, "price");
+            String number = JSONUtil.getText(object, "qty");//数量
             purchase.setNumber(number);
             purchase.setAmount(amount);
+            purchase.setPrice(price);
+            purchase.setUnit(unit);
         }
         purchase.setCanInput(status == 200);
         purchase.setId(id);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/PurchaseDetailsAdapter.java

@@ -84,7 +84,7 @@ public class PurchaseDetailsAdapter extends RecyclerView.Adapter<RecyclerView.Vi
     }
 
     class ViewHolder extends RecyclerView.ViewHolder {
-        TextView timeTv, remarksTv, totalTv, dateEd,amountTv;
+        TextView timeTv, remarksTv, totalTv, dateEd,amountTv,numberUnit;
         EditText numberEd, remarksInputEd;
 
         public ViewHolder(ViewGroup viewGroup) {
@@ -94,6 +94,7 @@ public class PurchaseDetailsAdapter extends RecyclerView.Adapter<RecyclerView.Vi
         public ViewHolder(View itemView) {
             super(itemView);
             timeTv = itemView.findViewById(R.id.timeTv);
+            numberUnit = itemView.findViewById(R.id.numberUnit);
             amountTv = itemView.findViewById(R.id.amountTv);
             remarksTv = itemView.findViewById(R.id.remarksTv);
             totalTv = itemView.findViewById(R.id.totalTv);
@@ -167,10 +168,11 @@ public class PurchaseDetailsAdapter extends RecyclerView.Adapter<RecyclerView.Vi
         holder.totalTv.setText(purchase.getTotal());
         holder.remarksTv.setText(purchase.getRemarks());
         holder.timeTv.setText(purchase.getCode());
-        holder.amountTv.setText(purchase.getAmount());
+        holder.amountTv.setText(purchase.getPrice());
         holder.dateEd.setText(purchase.getDate());
         holder.numberEd.setText(purchase.getNumber());
         holder.remarksInputEd.setText(purchase.getRemarksInput());
+        holder.numberUnit.setText(purchase.getUnit());
 
         if (canReply && purchase.isCanInput()) {
             holder.dateEd.setTag(position);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/model/Purchase.java

@@ -18,6 +18,24 @@ public class Purchase {
     private String remarksInput;
     private String amount;//单价
     private String currency;//币种
+    private String unit;//单位
+    private String price;//单位
+
+    public String getPrice() {
+        return price;
+    }
+
+    public void setPrice(String price) {
+        this.price = price;
+    }
+
+    public String getUnit() {
+        return unit==null?"PCS":unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
 
     public String getCurrency() {
         return currency==null?"":currency;

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

@@ -104,41 +104,43 @@
         android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/totalTag"
+        android:id="@+id/currencyTag"
         android:layout_width="80dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/remarksTv"
         android:layout_marginTop="@dimen/padding"
-        android:text="金额:"
+        android:text="币别:"
         android:textColor="@color/hintColor"
         android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/totalTv"
+        android:id="@+id/currencyTv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/totalTag"
+        android:layout_alignTop="@id/currencyTag"
         android:layout_toRightOf="@id/customerTag"
-        android:text="客户:"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/currencyTag"
+        android:id="@+id/totalTag"
         android:layout_width="80dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/totalTv"
+        android:layout_below="@id/currencyTv"
         android:layout_marginTop="@dimen/padding"
-        android:text="币种:"
+        android:text="金额:"
         android:textColor="@color/hintColor"
         android:textSize="@dimen/text_hine" />
 
     <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/currencyTv"
+        android:id="@+id/totalTv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/currencyTag"
+        android:layout_alignTop="@id/totalTag"
         android:layout_toRightOf="@id/customerTag"
+        android:text="客户:"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_hine" />
+
+
 </RelativeLayout>