hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用餐申请 事由增加下拉选项

Browse Source
master
hwf452 9 months ago
parent fb3c57e611
commit 32719872bb
10 changed files with 69 additions and 56 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -902,10 +902,6 @@
android:name=".ui.activity.JcyrsqActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize|stateHidden" />
<activity
android:name=".ui.activity.DepartmentTreeActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize|stateHidden" />
<activity
android:name=".ui.activity.DagerEnterApplyActivity"
android:screenOrientation="portrait"

7
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerActivity.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.rehome.zhdcoa.R;
import com.rehome.zhdcoa.base.BaseActivity;
import com.rehome.zhdcoa.bean.ApplyListBean;
import com.rehome.zhdcoa.utils.ApplyListUtils;
import com.rehome.zhdcoa.utils.GsonUtils;
public class ApplyDinnerActivity extends BaseActivity implements ApplyListUtils.OnItemClickListener {
@ -68,16 +69,18 @@ public class ApplyDinnerActivity extends BaseActivity implements ApplyListUtils.
ApplyListBean.ApplyList apply = (ApplyListBean.ApplyList) object;
showLog("---------------apply.getIstj()--------------");
showLog(apply.getIstj());
if (apply.getIstj().equals("1")) {
Intent intent = new Intent(this, ApplyDinnerAuditActivity.class);
intent.putExtra("ActivityCode", "0");
intent.putExtra(Contans.KEY.APPLYLIST, apply);
intent.putExtra(Contans.KEY.APPLYLIST, GsonUtils.GsonString(apply));
startActivityForResult(intent, REQUEST_CODE_ADD);
} else {
Intent intent = new Intent(this, ApplyDinnerDetailActivity.class);
intent.putExtra("ActivityCode", "0");
intent.putExtra(Contans.KEY.ISEDIT, true);
intent.putExtra(Contans.KEY.APPLYLIST, apply);
intent.putExtra(Contans.KEY.APPLYLIST, GsonUtils.GsonString(apply));
startActivityForResult(intent, REQUEST_CODE_ADD);
}
}

10
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerAuditActivity.java
Unescape Escape View File

@ -20,6 +20,7 @@ import com.rehome.zhdcoa.bean.GetAuditParamBean;
import com.rehome.zhdcoa.bean.SetAuditBean;
import com.rehome.zhdcoa.ui.toastview.toastviewbymyself;
import com.rehome.zhdcoa.utils.GetAuditPermissionUtils;
import com.rehome.zhdcoa.utils.GsonUtils;
import com.rehome.zhdcoa.utils.HttpUtils;
import com.rehome.zhdcoa.utils.SetAuditUtils;
import com.rehome.zhdcoa.weiget.AuditDialog;
@ -150,9 +151,11 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli
} else {
applyList = (ApplyListBean.ApplyList) intent.getExtras().get(Contans.KEY.APPLYLIST);
String item = intent.getStringExtra(Contans.KEY.APPLYLIST);
applyList = GsonUtils.GsonToBean(item,ApplyListBean.ApplyList.class);
showLog(item);
toastviewbymyself.makeText(context, applyList.getProposername(), Toast.LENGTH_LONG).show();
//toastviewbymyself.makeText(context, applyList.getProposername(), Toast.LENGTH_LONG).show();
ListId = applyList.getListid();
@ -174,7 +177,10 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli
@Override
public void onSuccess(Call<DinnerBean> call, Response<DinnerBean> response) {
showLog("----------onSuccess---------");
DinnerBean bean = response.body();
showLog(GsonUtils.GsonString(bean));
if (bean != null) {
dinnerBean = bean;
getAuditpermission();

29
app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyDinnerDetailActivity.java
Unescape Escape View File

@ -24,6 +24,7 @@ import com.rehome.zhdcoa.utils.HttpUtils;
import com.rehome.zhdcoa.utils.SaveApplyUtils;
import com.rehome.zhdcoa.weiget.DinnerLayout;
import com.rehome.zhdcoa.weiget.InputLayout;
import com.rehome.zhdcoa.weiget.ListDialog;
import com.rehome.zhdcoa.weiget.SaveOrCommitDialog;
import com.rehome.zhdcoa.bean.RowsBean;
import java.text.SimpleDateFormat;
@ -50,6 +51,11 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
private static final int REQUEST_PUSH_USER = 2;
private static final int REQUEST_PUSH_DEPARTMENT = 3;
private final List<String> syDialogData = new ArrayList<>() {{
add("现场加班");
add("外单位接待");
}};;
private ApplyListBean.ApplyList applyList;
private DinnerBean dinnerBean;
@ -150,6 +156,14 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
startActivityForResult(intent, REQUEST_PUSH_DEPARTMENT);
}
});
ilDinnerSY.setOnClickListener(v -> {
ListDialog dialog = new ListDialog(context, syDialogData, (time, position) -> {
String sy = syDialogData.get(position);
ilDinnerSY.setContent(sy);
});
dialog.show();
});
}
/**
@ -219,7 +233,7 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
userInfos = new ArrayList<>();
selectDepartments = new ArrayList<>();
// userInfo = App.getInstance().getUserInfo();
ilDinnerApplyp.setContent(userInfo.getUsernames());
@ -234,25 +248,14 @@ public class ApplyDinnerDetailActivity extends BaseActivity implements SaveApply
if (isEdit) {
if (intent.getStringExtra("ActivityCode").equals("1")) {
ListId = intent.getStringExtra("ListId");
listcode = intent.getStringExtra("ListCode");
} else {
applyList = (ApplyListBean.ApplyList) getIntent().getExtras().get(Contans.KEY.APPLYLIST);
applyList = GsonUtils.GsonToBean(intent.getStringExtra(Contans.KEY.APPLYLIST),ApplyListBean.ApplyList.class);
ListId = applyList.getListid();
listcode = applyList.getListcode();
}
getDatas();
} else {
}

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -174,8 +174,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (isApkInDebug(context)) {
// 管理员
// binding.etUsername.setText("ZHPS_Admin")
// binding.etPassword.setText("Rehome.zhps@996")
binding.etUsername.setText("ZHPS_Admin")
binding.etPassword.setText("Rehome.zhps@996")
//公司内网215管理员
// binding.etUsername.setText("ZHPS_Admin")

4
app/src/main/java/com/rehome/zhdcoa/ui/activity/WorkTickerSelectListActivity.kt
Unescape Escape View File

@ -4,7 +4,7 @@ import android.content.DialogInterface
import android.graphics.Color
import android.view.View
import android.widget.CheckBox
import androidx.appcompat.app.AlertDialog
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.rehome.zhdcoa.Contans
@ -154,7 +154,7 @@ class WorkTickerSelectListActivity : BaseActivityOaToolbarViewBinding<ActivityWo
override fun cancel() {
}
})
dialog.setTvMsg("您确定要设置工作票作业日期?")
dialog.setTvMsg("您确定要设置工作票作业?")
dialog.show()
}else{
showToast("致少选择一个工作票才能提交")

2
app/src/main/java/com/rehome/zhdcoa/utils/AuthenticationLoginAIUtils.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class AuthenticationLoginAIUtils {
params.put("password", password);
String json = GsonUtils.GsonString(params);
//showLog(json);
showLog(json,mActivity);
String jsonEncrypt = RSAUtils.encryptBASE64Str(json);
//showLog(jsonEncrypt);
request.setDefineRequestBodyForJson(jsonEncrypt);

1
app/src/main/java/com/rehome/zhdcoa/utils/HttpUtils.java
Unescape Escape View File

@ -66,6 +66,7 @@ public class HttpUtils {
}
public static Api getCompanyServerApi(String token) {
showLog("url:"+Contans.BASE_URL_COMPANY_SERVER);
return getAuthenticatorApi(Contans.BASE_URL_COMPANY_SERVER, token);
}

60
app/src/main/res/layout/fragment_home.xml
Unescape Escape View File

@ -12,41 +12,45 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="ExtraText">
<LinearLayout
android:id="@+id/ll_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFF00"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textColor="#d9524b"
android:text="本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息。"
android:textSize="18sp" />
</LinearLayout>
android:orientation="vertical">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="30px"
android:layout_height="15dp"
android:scaleType="fitXY"
android:src="@drawable/top_image" />
<com.rehome.zhdcoa.weiget.AutoGridView
android:id="@+id/gv"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:numColumns="4" />
android:layout_height="wrap_content">
<com.rehome.zhdcoa.weiget.AutoGridView
android:id="@+id/gv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingBottom="10dp"
android:numColumns="4" />
<LinearLayout
android:id="@+id/ll_tip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFF00"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textColor="#d9524b"
android:text="本平台为非涉密平台，严禁处理、传输国家秘密、工作秘密、商业秘密、敏感信息。"
android:textSize="18sp" />
</LinearLayout>
</FrameLayout>
<RelativeLayout
android:visibility="gone"

4
app/src/main/res/layout/item_grid.xml
Unescape Escape View File

@ -8,8 +8,8 @@
>
<ImageView
android:id="@+id/iv"
android:layout_width="110px"
android:layout_height="120px"
android:layout_width="55dp"
android:layout_height="60dp"
android:src="@mipmap/ic_launcher"
android:backgroundTint="@color/gray"/>

Write Preview
Loading…
Cancel
Save