1.修改bug

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialDetailActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
-import android.text.Editable;
+import android.os.Bundle;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
@@ -68,6 +67,8 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
     TextView tvAgree;
     @BindView(R.id.ll_bottom)
     LinearLayout llBottom;
+    @BindView(R.id.ll_check)
+    LinearLayout llCheck;
     private MoneyOutBean.RecordsBean dataBean;
     private Map<String, Object> param;
 
@@ -80,16 +81,19 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
         tvCode.setText(dataBean.getSerialNumber());
 //        tvDesc.setText();
         tvPerson.setText(dataBean.getApplierName());
-        tvRemark.setText(dataBean.getAuditRemark());
-        tvReviewRemark.setText(dataBean.getApplyRemark());
+        tvRemark.setText(dataBean.getApplyRemark());
+        tvReviewRemark.setText(dataBean.getAuditRemark());
         tvPrice.setText(MathUtils.converData(String.valueOf(dataBean.getApplyAmount()), 3));
         tvProcess.setText(dataBean.getProcessName());
         tvReview.setText(dataBean.getUpdatedByName());
         tvReviewTime.setText(dataBean.getUpdatedTime());
         tvStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(dataBean.getStatus())));
         tvTime.setText(dataBean.getCreatedTime());
-        if (!TextUtils.equals(dataBean.getStatus(),"0")){
+        if (!TextUtils.equals(dataBean.getStatus(), "0")) {
             llBottom.setVisibility(View.GONE);
+            llCheck.setVisibility(View.VISIBLE);
+        } else {
+            llCheck.setVisibility(View.GONE);
         }
         param = WorkUtils.simpleParam();
         param.put("id", dataBean.getId());
@@ -147,7 +151,7 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
         TextView tvNum = view.findViewById(R.id.tv_num);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         EditText etRemark = view.findViewById(R.id.et_content);
-        WorkUtils.addNumListener(etRemark,tvNum);
+        WorkUtils.addNumListener(etRemark, tvNum);
         builder.setView(view);
         AlertDialog addCartDialog = builder.create();
         tvOk.setOnClickListener(new View.OnClickListener() {
@@ -204,4 +208,5 @@ public class WorkFinancialDetailActivity extends WorkToolBarActivity {
             }
         });
     }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialPayActivity.java

@@ -77,7 +77,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
                 //0未审核      1已通过      2不通过
                 if (TextUtils.equals(value, "全部类型")) {
                     param.put("status", "");
-                } else if (TextUtils.equals(value, "未审核")) {
+                } else if (TextUtils.equals(value, "待审核")) {
                     param.put("status", "0");
                 } else if (TextUtils.equals(value, "已通过")) {
                     param.put("status", "1");

app/src/main/res/layout/activity_work_financial_out_detail.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-   >
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:id="@+id/ll_bottom"
@@ -38,8 +37,8 @@
 
     <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_above="@id/ll_bottom"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_above="@id/ll_bottom">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -245,7 +244,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="备注"
+                    android:text="申请备注"
                     android:textSize="14sp" />
 
                 <TextView
@@ -261,6 +260,12 @@
 
             <View style="@style/dividerX" />
 
+            <LinearLayout
+                android:id="@+id/ll_check"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -340,6 +345,7 @@
 
                 </LinearLayout>
             </LinearLayout>
+        </LinearLayout>
 
 
     </androidx.core.widget.NestedScrollView>

app/src/main/res/layout/fg_pro_stock.xml

@@ -114,13 +114,14 @@
                 android:orientation="vertical">
 
                 <TextView
+                    android:id="@+id/tv_stock4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="0"
                     android:textSize="22sp" />
 
                 <TextView
-                    android:id="@+id/tv_stock4"
+
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5mm"