车辆审核流程调整 不允许提前批

app/src/main/java/com/rehome/zhdcoa/bean/RowsBean.java

@@ -21,6 +21,8 @@ public class RowsBean {
     private String suplistid = "";
     private String istj = "";
     private String modifiedby = "";
+    private String curnodename = "";
+    private String states = "";
 
 
     public String getListid() {
@@ -118,4 +120,20 @@ public class RowsBean {
     public void setModifiedby(String modifiedby) {
         this.modifiedby = modifiedby;
     }
+
+    public String getCurnodename() {
+        return curnodename;
+    }
+
+    public void setCurnodename(String curnodename) {
+        this.curnodename = curnodename;
+    }
+
+    public String getStates() {
+        return states;
+    }
+
+    public void setStates(String states) {
+        this.states = states;
+    }
 }

app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyVehicleAuditActivity.java

@@ -6,6 +6,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.Toast;
+
 import com.rehome.zhdcoa.Api;
 import com.rehome.zhdcoa.Contans;
 import com.rehome.zhdcoa.R;
@@ -32,8 +33,10 @@ import com.rehome.zhdcoa.weiget.AuditDialog;
 import com.rehome.zhdcoa.weiget.AuditFlowDialog;
 import com.rehome.zhdcoa.weiget.CbRbLayout;
 import com.rehome.zhdcoa.weiget.InputLayout;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import retrofit2.Call;
@@ -128,6 +131,15 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl
             btnDx.setVisibility(View.GONE);
         }
         cbIdea.setRb1Check(true);
+
+        //默认不可指派司机，只有管理员才可以
+        ilDriver.setEnabled(false);
+        ilNum.setEnabled(false);
+        ilTEL.setEnabled(false);
+        ilSm.setEnabled(false);
+//        llOk.setBackgroundColor(0xeeeeeeee);
+
+
         llOk.setVisibility(cbIdea.getRb1Check() ? View.VISIBLE : View.GONE);
         btnDx.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -320,6 +332,23 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl
         ilNum.setContent(dataRowsBean.getVehicleCh());
         ilSm.setContent(dataRowsBean.getVehicleSm());
         ilTEL.setContent(dataRowsBean.getVehiclePhone());
+
+        if (bean.getRows() != null && bean.getRows().size() > 0) {
+            String states = bean.getRows().get(0).getStates();
+            String curnodename = bean.getRows().get(0).getCurnodename();
+            if (!TextUtils.isEmpty(curnodename) && !TextUtils.isEmpty(states)) {
+                if (states.equals("2") && curnodename.equals("车辆管理员审批")) {
+                    //states=2 和 curnodename=车辆管理员审批，才可以指派车辆
+                    ilDriver.setEnabled(true);
+                    ilNum.setEnabled(true);
+                    ilTEL.setEnabled(true);
+                    ilSm.setEnabled(true);
+                    //llOk.setBackgroundColor(0x00000000);
+                }else{
+                    llOk.setBackgroundColor(0xeeeeeeee);
+                }
+            }
+        }
     }
 
     public void getAuditpermission() {
@@ -350,6 +379,13 @@ public class ApplyVehicleAuditActivity extends BaseActivity implements View.OnCl
             initToolbar("预定车辆" + rowsBean.getAuditName(), "", this);
         }
         showView(vehicleBean);
+        if (TextUtils.isEmpty(rowsBean.getItemid())) {
+            //没有审核权限，不可编辑
+            ilDriver.setEnabled(false);
+            ilNum.setEnabled(false);
+            ilTEL.setEnabled(false);
+            ilSm.setEnabled(false);
+        }
         setToolbarTitle(rowsBean.getAuditName());
         rangeID = bean.getRows().get(0).getRange();
         datas.addAll(rowsBean.getStepSHList());

app/src/main/java/com/rehome/zhdcoa/ui/activity/GzpActivity.java

@@ -98,6 +98,8 @@ public class GzpActivity extends BaseActivity {
             public void onSuccess(Call<GzpListBean> call, Response<GzpListBean> response) {
 
                 GzpListBean bean = response.body();
+                String json = GsonUtils.GsonString(bean);
+                showLog(json);
 
                 if (bean != null) {
                     if (bean.getTotal().equals("0")) {

app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt

@@ -162,15 +162,19 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //        binding.etPassword.setText("Abc*00467309")
 //
 //        //马
-        binding.etUsername.setText("310482")
+//        binding.etUsername.setText("310482")
-        binding.etPassword.setText("Maying0509?")
+//        binding.etPassword.setText("Maying0509?")
 //
 //        //程宇翔
-        binding.etUsername.setText("310673")
+//        binding.etUsername.setText("310673")
-        binding.etPassword.setText("Abcd@1234")
+//        binding.etPassword.setText("Abcd@1234")
             //李耿
-//        binding.etUsername.setText("310261")
+            binding.etUsername.setText("310261")
-//        binding.etPassword.setText("!Lig770731")
+            binding.etPassword.setText("#LIgeng770731")
+            //古舒敏
+//            binding.etUsername.setText("310585")
+//            binding.etPassword.setText("Lama520+_*")
+
             //陈嘉
 //        binding.etUsername.setText("310408")
 //        binding.etPassword.setText("zhpCJ1981+")

app/src/main/java/com/rehome/zhdcoa/ui/fragment/ContactFragment.java

@@ -11,6 +11,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.gson.Gson;
 import com.rehome.zhdcoa.R;
 import com.rehome.zhdcoa.adapter.ContactAdapter;
 import com.rehome.zhdcoa.base.BaseCallBack;
@@ -117,6 +118,7 @@ public class ContactFragment extends BaseFragment {
             public void onSuccess(Call<ContactListBean> call, Response<ContactListBean> response) {
 
                 ContactListBean bean = response.body();
+                showLog(new Gson().toJson(bean));
                 if (bean != null) {
                     datas.clear();
                     initDatas.clear();