提交分类： 开发版本；

提交内容：  1、加班申请单时间类型添加DT判断
当前版本：  正式版本6.6.2
是否冲突：  否

app_core/common/build.gradle

@@ -76,5 +76,5 @@ dependencies {
     compile files('libs/hellocharts-library-1.5.8.jar')
     compile deps.wechatSdk
     compile 'com.github.hss01248:NotifyUtil:1.0.1'
-//    compile deps.basePopup
+    compile deps.basePopup
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -1163,6 +1163,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     model.text.setText(data.getName());
                     model.selectIv.setVisibility(View.GONE);
                     if (data.getType().equals("D") ||
+                            data.getType().equals("DT") ||
                             data.getType().equals("C") ||
                             data.getType().equals("MF") ||
                             data.getType().equals("SF") ||
@@ -1191,7 +1192,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                 ToastUtil.showToast(ct, R.string.networks_out);
                                 return;
                             }
-                            if (data.getType().equals("D")) {
+                            if (data.getType().equals("D") || data.getType().equals("DT") ) {
                                 boolean hasMenu = false;
                                 if ("Ask4Leave".equals(caller)) hasMenu = true;
                                 Log.d("date:", startDate_v + "," + endDate_v);

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitDetailsActivity.java

@@ -24,6 +24,7 @@ import com.modular.apputils.listener.OnSmartHttpListener;
 import com.modular.apputils.model.BillGroupModel;
 import com.modular.apputils.network.Parameter;
 import com.modular.apputils.network.Tags;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.modular.apputils.utils.UUHttpHelper;
 import com.modular.apputils.widget.VeriftyDialog;
 import com.uas.appworks.R;
@@ -53,12 +54,13 @@ public class CustomerVisitDetailsActivity extends OABaseActivity {
         menu.clear();
         if (isMe) {
             if ("已审核".equals(mBillStatus)) {
-                if (mListAdapter != null && !ListUtils.isEmpty(mListAdapter.getUpdateBillModels())) {
-                    getMenuInflater().inflate(com.modular.apputils.R.menu.menu_input_update, menu);
-                }
-            } else {
-                getMenuInflater().inflate(com.modular.apputils.R.menu.menu_input_edit, menu);
+//                if (mListAdapter != null && !ListUtils.isEmpty(mListAdapter.getUpdateBillModels())) {
+                getMenuInflater().inflate(com.modular.apputils.R.menu.menu_input_update, menu);
+//                }
             }
+//            else {
+//                getMenuInflater().inflate(com.modular.apputils.R.menu.menu_input_edit, menu);
+//            }
         }
         return super.onPrepareOptionsMenu(menu);
     }
@@ -85,7 +87,6 @@ public class CustomerVisitDetailsActivity extends OABaseActivity {
                     });
         } else if (item.getItemId() == R.id.update) {
             if (mListAdapter != null && !ListUtils.isEmpty(mListAdapter.getUpdateBillModels())) {
-
             } else {
                 toast(R.string.no_fields_to_update);
             }

version.gradle

@@ -8,7 +8,7 @@ ext {
     android = [
             compileSdkVersion: 26,
             buildToolsVersion: '27.0.0',
-            minSdkVersion    : 15,
+            minSdkVersion    : 17,
             targetSdkVersion : 26,
             javaVersion      : JavaVersion.VERSION_1_8,
             versionCode      : 158,