2020/06/07更新

PSCODELISTS/EhrCodeList0054/PSCODELIST.json

 {
   "pscodelistname" : "是否",
   "codelistsn" : "CODELIST_00052",
-  "numberitem" : 1,
+  "numberitem" : 0,
   "cltype" : "STATIC",
   "userscope" : 0,
   "validflag" : 1,
+  "ormode" : "STRINGORMODE",
   "codename" : "EhrCodeList0054",
   "pscodelisttemplid" : "CODELIST_00052",
   "pscodelisttemplname" : "是否",

PSCODELISTS/EhrCodeList0148/PSCODELIST.json

 {
   "psdeid" : "ORM/ORMBMKQDZ",
   "pscodelistname" : "考勤范围",
+  "numberitem" : 1,
   "cltype" : "STATIC",
   "userscope" : 0,
   "validflag" : 1,

PSCODELISTS/EhrCodeList0400/PSCODELIST.json

+{
+  "pscodelistname" : "是否逻辑",
+  "numberitem" : 1,
+  "cltype" : "STATIC",
+  "userscope" : 0,
+  "validflag" : 1,
+  "ormode" : "NUMBERORMODE",
+  "codename" : "EhrCodeList0400",
+  "pscodelisttemplid" : "CODELIST_00052",
+  "pscodelisttemplname" : "是否",
+  "pscodeitems" : [ {
+    "validflag" : 1,
+    "defaultflag" : 0,
+    "codeitemvalue" : "1",
+    "pscodeitemname" : "是",
+    "ordervalue" : 0
+  }, {
+    "validflag" : 1,
+    "defaultflag" : 0,
+    "codeitemvalue" : "0",
+    "pscodeitemname" : "否",
+    "ordervalue" : 1
+  } ]
+}
\ No newline at end of file

PSDETOOLBARS/Auto106/PSDETOOLBAR.json

 {
   "templtoolbar" : 1,
-  "psdetoolbarname" : "工具栏模板（表格界面、新建、删除、开启行编辑、帮助）",
+  "psdetoolbarname" : "【NEW】工具栏模板（表格界面、新建、删除、保存行、帮助）",
   "pssystoolbarid" : "TBTEMPL_00002",
   "codename" : "Auto106",
   "psdetbitems" : [ {
@@ -39,9 +39,9 @@
   }, {
     "hiddenitem" : 0,
     "tbitemtype" : "DEUIACTION",
-    "caption" : "开启行编辑",
+    "caption" : "保存",
     "psdetbitemname" : "deuiaction2",
-    "psdeuiactionid" : "GRIDVIEW_ROWEDITACTION(OpenRowEdit)",
+    "psdeuiactionid" : "GRIDVIEW_SAVEROWACTION(SaveRow)",
     "spanflag" : 0
   }, {
     "hiddenitem" : 0,

PSDETOOLBARS/Auto16/PSDETOOLBAR.json

 {
   "templtoolbar" : 0,
-  "psdetoolbarname" : "[Ｎ]默认行编辑操作(表格界面<新建、保存、删除、导入、导出>)",
+  "psdetoolbarname" : "【NEW】默认行编辑操作(表格界面<新建、保存、删除、导入、导出>)",
   "codename" : "Auto16",
   "psdetbitems" : [ {
     "hiddenitem" : 0,

PSDETOOLBARS/Auto175/PSDETOOLBAR.json

@@ -55,7 +55,7 @@
     "hiddenitem" : 0,
     "tbitemtype" : "DEUIACTION",
     "leveltag" : "ALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-    "caption" : "导出数据",
+    "caption" : "导出",
     "psdetbitemname" : "tbitem13",
     "levelvalue" : 1,
     "psdeuiactionid" : "GRIDVIEW_EXPORTACTION(ExportExcel)",

PSDETOOLBARS/Auto183/PSDETOOLBAR.json

 {
   "templtoolbar" : 1,
-  "psdetoolbarname" : "工具栏模板（默认表格界面、过滤）",
+  "psdetoolbarname" : "【NEW】工具栏模板（表格界面、实体行为、导出、过滤）",
   "pssystoolbarid" : "TBTEMPL_00002",
   "codename" : "Auto183",
   "psdetbitems" : [ {

PSDETOOLBARS/Auto189/PSDETOOLBAR.json

+{
+  "templtoolbar" : 0,
+  "psdetoolbarname" : "【NEW】行编辑操作（表格界面<新建、保存、删除>）",
+  "codename" : "Auto189",
+  "psdetbitems" : [ {
+    "hiddenitem" : 0,
+    "tbitemtype" : "DEUIACTION",
+    "caption" : "新建",
+    "psdetbitemname" : "deuiaction1",
+    "psdeuiactionid" : "GRIDVIEW_NEWROWACTION(NewRow)",
+    "spanflag" : 0
+  }, {
+    "hiddenitem" : 0,
+    "tbitemtype" : "DEUIACTION",
+    "caption" : "保存",
+    "psdetbitemname" : "deuiaction2",
+    "psdeuiactionid" : "GRIDVIEW_SAVEROWACTION(SaveRow)",
+    "spanflag" : 0
+  }, {
+    "hiddenitem" : 0,
+    "tbitemtype" : "DEUIACTION",
+    "caption" : "删除",
+    "psdetbitemname" : "deuiaction3",
+    "psdeuiactionid" : "GRIDVIEW_REMOVEACTION(Remove)",
+    "spanflag" : 0
+  } ]
+}
\ No newline at end of file

PSDETOOLBARS/Auto32/PSDETOOLBAR.json

 {
   "templtoolbar" : 1,
-  "psdetoolbarname" : "工具栏模板（编辑界面<保存、保存并关闭、关闭>）",
+  "psdetoolbarname" : "【NEW】工具栏模板（编辑界面<保存、保存并关闭、关闭>）",
   "pssystoolbarid" : "TBTEMPL_00001",
   "codename" : "Auto32",
   "psdetbitems" : [ {

PSDETOOLBARS/Auto47_5044/PSDETOOLBAR.json

+{
+  "templtoolbar" : 1,
+  "psdetoolbarname" : "工具栏模板（编辑页面<主信息专用>）",
+  "pssystoolbarid" : "TBTEMPL_00001",
+  "codename" : "Auto47_5044",
+  "psdetbitems" : [ {
+    "hiddenitem" : 0,
+    "tbitemtype" : "DEUIACTION",
+    "leveltag" : "ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+    "psdetbitemname" : "tbitem1",
+    "levelvalue" : 1,
+    "psdeuiactionid" : "VIEW_DEBHGROUP001",
+    "spanflag" : 0
+  }, {
+    "hiddenitem" : 0,
+    "tbitemtype" : "DEUIACTION",
+    "leveltag" : "ARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+    "psdetbitemname" : "tbitem17",
+    "levelvalue" : 1,
+    "psdeuiactionid" : "VIEW_DEBHGROUP002",
+    "spanflag" : 0
+  } ]
+}
\ No newline at end of file

PSDETOOLBARS/Auto5/PSDETOOLBAR.json

 {
   "templtoolbar" : 1,
-  "psdetoolbarname" : "工具栏模板（默认编辑界面）",
+  "psdetoolbarname" : "【NEW】工具栏模板（默认编辑界面）",
   "pssystoolbarid" : "TBTEMPL_00001",
   "codename" : "Auto5",
   "psdetbitems" : [ {

PSDEUIACTIONS/GRIDVIEW_NEWACTION(New)/PSDEUIACTION.json

 {
   "templmode" : 0,
-  "psdeopprivid" : "SRFUR__JGLYYPZSZYJTJ",
   "uiactiontype" : "SYS",
   "caption" : "新建",
   "codename" : "New",
@@ -8,7 +7,7 @@
   "cappslanresid" : "Auto11439",
   "pssysuiactionid" : "GRIDVIEW_NEWACTION",
   "tippslanresid" : "Auto1935",
-  "psdeuiactionname" : "表格界面_新建操作_应聘者社招引进条件专用",
+  "psdeuiactionname" : "表格界面_新建操作",
   "cappslanresname" : "工具栏按钮文本[*.NEW]",
   "pssysimageid" : "Auto366"
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCEMREPORT/PSDERS/DER1N_ATTENDANCEMREPORT_ATTENDENCESETUP_ATTENDENCESETUPID/PSDER.json

@@ -6,9 +6,7 @@
   "logicname" : "考勤设置-考勤月报",
   "majorpsdeid" : "<PSMODULE>/ATTENDENCESETUP",
   "validflag" : 1,
-  "sdpsdeviewid" : "<PSMODULE>/ATTENDENCESETUP/KQBYPickupView",
   "psdername" : "DER1N_ATTENDANCEMREPORT_ATTENDENCESETUP_ATTENDENCESETUPID",
   "codename" : "ATTENDENCESETUP",
-  "psdedatasetid" : "<PSMODULE>/ATTENDENCESETUP/KQYBXKQB",
   "removeactiontype" : 0
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCEMREPORT/PSDETREEVIEWS/ORMORGBMTree/PSDETREEVIEW.json

@@ -5,6 +5,7 @@
   "psdetreeviewname" : "组织树（考勤月报）",
   "showroot" : 0,
   "psdetreenodes" : [ {
+    "keypsdefid" : "ORM/ORMORG/ORGID",
     "enablequicksearch" : 1,
     "rootnode" : 0,
     "sortdir" : "ASC",
@@ -12,6 +13,7 @@
     "sortpsdefname" : "PX",
     "appendpnodeid" : 0,
     "psdename" : "ORMORG",
+    "navviewfilter" : "n_ormorgid_eq",
     "viewactions" : 0,
     "navviewparam" : "nodeid=%NODEID%",
     "psdeid" : "ORM/ORMORG",
@@ -19,10 +21,14 @@
     "treenodetype" : "DE",
     "psdedsid" : "ORM/ORMORG/CurChild",
     "textpsdefid" : "ORM/ORMORG/SHORTNAME",
-    "psdeviewbaseid" : "<PSDATAENTITY>/CurZZKQYBGridView",
+    "psdeviewbaseid" : "<PSDATAENTITY>/GridView",
+    "psdername" : "DER1N_ATTENDANCEMREPORT_ORMORG_ORMORGID",
     "nodetype" : "SubORG",
-    "sortpsdefid" : "ORM/ORMORG/PX"
+    "sortpsdefid" : "ORM/ORMORG/PX",
+    "keypsdefname" : "ORGID",
+    "psderid" : "<PSDATAENTITY>/DER1N_ATTENDANCEMREPORT_ORMORG_ORMORGID"
   }, {
+    "keypsdefid" : "ORM/ORMORG/ORGID",
     "enablequicksearch" : 1,
     "rootnode" : 0,
     "sortdir" : "ASC",
@@ -34,12 +40,14 @@
     "navviewparam" : "nodeid=%NODEID%",
     "psdeid" : "ORM/ORMORG",
     "textpsdefname" : "SHORTNAME",
+    "expand" : 1,
     "treenodetype" : "DE",
     "psdedsid" : "ORM/ORMORG/CurPorg",
     "textpsdefid" : "ORM/ORMORG/SHORTNAME",
-    "psdeviewbaseid" : "<PSDATAENTITY>/CurZZKQYBGridView",
+    "psdeviewbaseid" : "<PSDATAENTITY>/GridView",
     "nodetype" : "ORMORG",
-    "sortpsdefid" : "ORM/ORMORG/PX"
+    "sortpsdefid" : "ORM/ORMORG/PX",
+    "keypsdefname" : "ORGID"
   }, {
     "rootnode" : 1,
     "psdetreenodename" : "默认根节点",
@@ -50,24 +58,30 @@
   } ],
   "psdetreenoders" : [ {
     "validflag" : 1,
+    "pvaluelevel" : 1,
     "searchmode" : 3,
-    "psdetreenodersname" : "默认根节点 - 根组织节点",
-    "cpsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
-    "ppsdetreenodeid" : "<PSDETREEVIEW>/ROOT",
-    "ordervalue" : 100
+    "psdername" : "DER1N_ORMORG_ORMORG_PORGID",
+    "psdetreenodersname" : "子组织节点 - 子组织节点",
+    "cpsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
+    "ppsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
+    "ordervalue" : 10,
+    "psderid" : "ORM/ORMORG/DER1N_ORMORG_ORMORG_PORGID"
   }, {
     "validflag" : 1,
+    "pvaluelevel" : 1,
     "searchmode" : 3,
+    "psdername" : "DER1N_ORMORG_ORMORG_PORGID",
     "psdetreenodersname" : "根组织节点 - 子组织节点",
     "cpsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
     "ppsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
-    "ordervalue" : 200
+    "ordervalue" : 10,
+    "psderid" : "ORM/ORMORG/DER1N_ORMORG_ORMORG_PORGID"
   }, {
     "validflag" : 1,
     "searchmode" : 3,
-    "psdetreenodersname" : "子组织节点 - 子组织节点",
-    "cpsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
-    "ppsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
-    "ordervalue" : 300
+    "psdetreenodersname" : "默认根节点 - 根组织节点",
+    "cpsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
+    "ppsdetreenodeid" : "<PSDETREEVIEW>/ROOT",
+    "ordervalue" : 10
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCEMREPORT/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

 {
   "showcaptionbar" : 1,
+  "openmode" : "DRAWER_TOP",
   "caption" : "考勤月报",
   "titlepslanresid" : "Auto11652",
   "psdeviewbasetype" : "DEEDITVIEW",

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCEMREPORT/PSDEVIEWBASES/KQYBTreeExpView/PSDEVIEWBASE.json

@@ -20,10 +20,12 @@
     "defaultflag" : 1,
     "caption" : "组织树",
     "enabledynasys" : 0,
+    "width" : 250.0,
     "psdeid" : "<PSDATAENTITY>",
     "ctrlparam7" : 1,
     "psdeviewctrltype" : "TREEEXPBAR",
     "psdeviewctrlname" : "TREEEXPBAR",
+    "psctrlname" : "组织树（考勤月报）",
     "configinfo" : "[树视图]组织树（考勤月报）"
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCEMREPORTMX/PSDATAENTITY.json

@@ -137,6 +137,7 @@
     "deftype" : 1,
     "allowempty" : 1,
     "fkey" : 0,
+    "enableqs" : 0,
     "tablename" : "T_ATTENDANCEMREPORTMX",
     "psdefformitems" : [ {
       "psdefformitemname" : "[ATTENDANCEMREPORTMXNAME][考勤月报明细名称]",

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCEMREPORTMX/PSDEUIACTIONS/导出数据到Excel(export2Excel)/PSDEUIACTION.json

 {
   "templmode" : 0,
   "uiactiontype" : "BACKEND",
-  "caption" : "导出明细",
+  "caption" : "导出",
   "codename" : "export2Excel",
   "actiontarget" : "MULTIDATA",
   "psdeactionid" : "<PSDATAENTITY>/export2Excel",

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCEMREPORTMX/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

@@ -7,7 +7,7 @@
   "viewactions" : 0,
   "predefineviewtype" : "EDITVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ATTENDANCEMREPORTMX.EDITVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "考勤月报明细实体编辑视图",
   "readonlymode" : 0,
   "cappslanresid" : "Auto1312",

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCERECORD/PSDATAENTITY.json

@@ -191,6 +191,7 @@
     "deftype" : 1,
     "allowempty" : 1,
     "fkey" : 0,
+    "enableqs" : 0,
     "tablename" : "T_ATTENDANCERECORD",
     "psdefformitems" : [ {
       "psdefformitemname" : "[ATTENDANCERECORDNAME][考勤记录名称]",
@@ -1018,6 +1019,7 @@
     "fkey" : 1,
     "importtag" : "姓名",
     "psdername" : "DER1N_ATTENDANCERECORD_PIMPERSON_PIMPERSONID",
+    "enableqs" : 1,
     "psderid" : "<PSDATAENTITY>/DER1N_ATTENDANCERECORD_PIMPERSON_PIMPERSONID",
     "psdefformitems" : [ {
       "psdefformitemname" : "[PIMPERSONNAME][人员信息名称]",
@@ -1256,6 +1258,7 @@
     "allowempty" : 1,
     "fkey" : 0,
     "psdername" : "DER1N_ATTENDANCERECORD_PIMPERSON_PIMPERSONID",
+    "enableqs" : 1,
     "psderid" : "<PSDATAENTITY>/DER1N_ATTENDANCERECORD_PIMPERSON_PIMPERSONID",
     "psdefformitems" : [ {
       "psdefformitemname" : "[YGBH][员工编号]",

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCERECORD/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

 {
   "showcaptionbar" : 1,
+  "openmode" : "DRAWER_RIGHT",
   "caption" : "考勤记录",
   "titlepslanresid" : "Auto2847",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "EditView",
   "viewactions" : 0,
+  "width" : 1024,
   "predefineviewtype" : "EDITVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ATTENDANCERECORD.EDITVIEW]",
   "psappviewcnt" : 1,

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCESETTINGS/PSDATAENTITY.json

@@ -85,6 +85,7 @@
     "deftype" : 1,
     "allowempty" : 1,
     "fkey" : 0,
+    "enableqs" : 0,
     "tablename" : "T_ATTENDANCESETTINGS",
     "psdefformitems" : [ {
       "psdefformitemname" : "[ATTENDANCESETTINGSNAME][考勤人员名称]",

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCESETTINGS/PSDEDATAQUERIES/FYGZZKQ/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
+  "querycode" : "SELECT\nt1.ATTENDANCESETTINGSNAME AS ATTENDANCESETTINGSNAME,\nt1.ATTENDANCESETTINGSID AS ATTENDANCESETTINGSID,\nt1.PIMPERSONID AS PIMPERSONID,\nt1.PIMPERSONNAME AS PIMPERSONNAME,\nt1.YGBH AS YGBH,\nt1.ATTENDENCESETUPID AS ATTENDENCESETUPID,\nt3.Attendencesetupname AS ATTENDENCESETUPNAME,\nt21.SHORTNAME AS ORMORGSECTORNAME,\nt11.ORMORGSECTORID AS ORMORGSECTORID,\nt1.DKFS AS DKFS,\nt11.ormorgid AS ORMORGID,\nt12.ZZDZS AS ZZDZS,\nt3.ormorgid AS ORMORGID2,\nt31.orgname AS ORMORGNAME2,\nt11.ygzt AS YGZT\nFROM T_ATTENDANCESETTINGS t1\nLEFT JOIN T_PIMPERSON t11 ON t1.PIMPERSONID = t11.PIMPERSONID\nleft join T_SRFORG t12 on t11.ORMORGID=t12.ORGID\nLEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID\nLEFT JOIN T_ATTENDENCESETUP t3 ON t1.attendencesetupid=t3.attendencesetupid\nleft join T_SRFORG t31 on t3.ORMORGID = t31.ORGID\nWHERE EXISTS (\n      select 1 from T_PIMPERSON temp left join T_SRFORG  temp1 on temp1.ORGID = temp.ormorgid\n      WHERE temp.PIMPERSONID=t1.PIMPERSONID\n      AND temp.ENABLE=1 and temp.JLSS = '10'\n      AND (INSTR(temp1.companyflag,t31.companyflag) <> 1 OR temp.ygzt IN('40','50','60','130','51'))\n)",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5"
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCESETTINGS/PSDEDATAQUERIES/YGSZKQ/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

 {
+  "querycode" : "SELECT\nNULL AS ATTENDANCESETTINGSNAME,\nt11.pimpersonid AS ATTENDANCESETTINGSID,\nt11.PIMPERSONID AS PIMPERSONID,\nt11.PIMPERSONNAME AS PIMPERSONNAME,\nt11.YGBH AS YGBH,\nNULL AS ATTENDENCESETUPID,\nNULL AS ATTENDENCESETUPNAME,\nt21.SHORTNAME AS ORMORGSECTORNAME,\nt11.ORMORGSECTORID AS ORMORGSECTORID,\nNULL AS DKFS,\nt11.ormorgid AS ORMORGID,\nt31.ZZDZS AS ZZDZS,\nt31.orgid AS ORMORGID2,\nt31.zzdzs AS ORMORGNAME2,\nt11.ygzt AS YGZT\nFROM T_PIMPERSON t11\nLEFT JOIN T_SRFORG t31 ON t11.ORMORGID = t31.ORGID\nLEFT JOIN T_SRFORGSECTOR t21 ON t11.ORMORGSECTORID = t21.ORGSECTORID\nWHERE t11.ENABLE=1 and t11.JLSS = '10' and t11.YGZT <>'40' and t11.YGZT <>'50' and t11.YGZT <>'60' and t11.YGZT <>'130' and t11.YGZT <>'51'\nAND NOT EXISTS(\n    SELECT 1 FROM T_ATTENDANCESETTINGS temp WHERE temp.pimpersonid=t11.pimpersonid\n)",
   "dbtype" : "MYSQL5",
   "psdedqcodename" : "MySQL5"
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCESETTINGS/PSDEFORMS/Main/PSDEFORM.json

@@ -8,6 +8,29 @@
     "psdeformdetailname" : "formpage1",
     "detailtype" : "FORMPAGE",
     "cappslanresid" : "Auto1388",
-    "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.ATTENDANCESETTINGS.MAIN.FORMPAGE.FORMPAGE1]"
+    "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.ATTENDANCESETTINGS.MAIN.FORMPAGE.FORMPAGE1]",
+    "psdeformdetails" : [ {
+      "psdefid" : "<PSDATAENTITY>/PIMPERSONID",
+      "psdeformdetailname" : "pimpersonid",
+      "psdefname" : "pimpersonid",
+      "detailtype" : "FORMITEM",
+      "logicname" : "人员信息标识",
+      "psdeformid" : "<PSDEFORM>"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/ATTENDENCESETUPID",
+      "psdeformdetailname" : "attendencesetupid",
+      "psdefname" : "attendencesetupid",
+      "detailtype" : "FORMITEM",
+      "logicname" : "考勤设置标识",
+      "psdeformid" : "<PSDEFORM>"
+    }, {
+      "psdefid" : "<PSDATAENTITY>/ATTENDENCESETUPNAME",
+      "psdeformdetailname" : "attendencesetupname",
+      "psdefname" : "attendencesetupname",
+      "detailtype" : "FORMITEM",
+      "logicname" : "所属考勤表",
+      "allowempty" : 0,
+      "psdeformid" : "<PSDEFORM>"
+    } ]
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCESETTINGS/PSDERS/DER1N_ATTENDANCESETTINGS_PIMPERSON_PIMPERSONID/PSDER.json

@@ -8,7 +8,5 @@
   "validflag" : 1,
   "psdername" : "DER1N_ATTENDANCESETTINGS_PIMPERSON_PIMPERSONID",
   "codename" : "PIMPERSON",
-  "mdpsdeviewid" : "PIM/PIMPERSON/XZKQRYMPickupView",
-  "psdedatasetid" : "PIM/PIMPERSON/XZKQRY",
   "removeactiontype" : 1
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCESETTINGS/PSDEUIACTIONS/添加到考勤组(AddToKqz)/PSDEUIACTION.json

@@ -3,10 +3,11 @@
   "uiactiontype" : "FRONT",
   "caption" : "添加到考勤组",
   "codename" : "AddToKqz",
-  "actiontarget" : "MULTIKEY",
+  "actiontarget" : "SINGLEKEY",
   "psdeactionid" : "<PSDATAENTITY>/AddToKqz",
-  "psdeviewbaseid" : "PCM/WZD0001/YGSZKQOptionView",
-  "reloaddata" : 3,
+  "uiactionparams" : "ATTENDANCESETTINGS=%pimpersonid%",
+  "psdeviewbaseid" : "<PSDATAENTITY>/EditView",
+  "reloaddata" : 1,
   "frontprotype" : "WIZARD",
   "psdeuiactionname" : "添加到考勤组"
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCESETTINGS/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

 {
   "showcaptionbar" : 1,
   "openmode" : "POPUPMODAL",
+  "height" : 400,
   "caption" : "考勤人员",
   "titlepslanresid" : "Auto4101",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "EditView",
   "viewactions" : 0,
+  "width" : 600,
   "predefineviewtype" : "EDITVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ATTENDANCESETTINGS.EDITVIEW]",
   "psappviewcnt" : 1,
@@ -29,14 +31,14 @@
     "psdeformid" : "<PSDATAENTITY>/Main",
     "configinfo" : "[表单]主编辑表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
-    "psdetoolbarid" : "Auto47",
+    "psdetoolbarname" : "工具栏模板（编辑视图<确认、退出>）",
+    "psdetoolbarid" : "Auto162",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+    "configinfo" : "[工具栏]工具栏模板（编辑视图<确认、退出>）"
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDANCESETTINGS/PSDEVIEWBASES/GridView/PSDEVIEWBASE.json

@@ -11,7 +11,7 @@
   "viewparam6" : 0,
   "memo" : "f45d0057963907ef2c1a1fd30537f13d",
   "viewparam5" : 1,
-  "viewparam3" : 1,
+  "viewparam3" : 0,
   "psdeviewbasename" : "考勤人员实体表格视图",
   "readonlymode" : 0,
   "cappslanresid" : "Auto480",
@@ -45,27 +45,16 @@
     "psdeformid" : "<PSDATAENTITY>/Default",
     "configinfo" : "[表单]默认搜索表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（表格界面、新建、删除、开启行编辑、帮助）",
-    "psdetoolbarid" : "Auto106",
+    "psdetoolbarname" : "工具栏模板（表格界面、新建、删除）",
+    "psdetoolbarid" : "Auto43",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeid" : "<PSDATAENTITY>",
+    "memo" : "【NEW】工具栏模板（表格界面、新建、删除、保存行、帮助）",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（表格界面、新建、删除、开启行编辑、帮助）",
-    "pssyspfpluginid" : "Auto42"
-  }, {
-    "psdetoolbarname" : "工具栏模板（表格界面<保存、关闭行编辑>）",
-    "psdetoolbarid" : "Auto68",
-    "validflag" : 1,
-    "defaultflag" : 0,
-    "enabledynasys" : 0,
-    "psdeid" : "<PSDATAENTITY>",
-    "psdeviewctrltype" : "TOOLBAR",
-    "psdeviewctrlname" : "TOOLBAR2",
-    "configinfo" : "[工具栏]工具栏模板（表格界面<保存、关闭行编辑>）",
-    "pssyspfpluginid" : "Auto54"
+    "configinfo" : "[工具栏]工具栏模板（表格界面、新建、删除）"
   } ],
   "psdeviewrvs" : [ {
     "minorpsdeviewid" : "<PSDATAENTITY>/EditView",

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCEORMORGSECTOR/PSDATAENTITY.json

@@ -86,6 +86,7 @@
     "deftype" : 1,
     "allowempty" : 1,
     "fkey" : 0,
+    "enableqs" : 0,
     "tablename" : "T_ATTENDENCEORMORGSECTOR",
     "psdefformitems" : [ {
       "psdefformitemname" : "[ATTENDENCEORMORGSECTORNAME][考勤部门名称]",
@@ -515,6 +516,7 @@
     "allowempty" : 1,
     "fkey" : 1,
     "psdername" : "DER1N_ATTENDENCEORMORGSECTOR_ORMORGSECTOR_ORMORGSECTORID",
+    "enableqs" : 1,
     "psderid" : "<PSDATAENTITY>/DER1N_ATTENDENCEORMORGSECTOR_ORMORGSECTOR_ORMORGSECTORID",
     "psdefformitems" : [ {
       "psdefformitemname" : "[ORMORGSECTORNAME][部门名称]",

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCEORMORGSECTOR/PSDERS/DER1N_ATTENDENCEORMORGSECTOR_ATTENDENCESETUP_ATTENDENCESETUPID/PSDER.json

@@ -6,9 +6,7 @@
   "logicname" : "考勤设置-考勤部门",
   "majorpsdeid" : "<PSMODULE>/ATTENDENCESETUP",
   "validflag" : 1,
-  "sdpsdeviewid" : "<PSMODULE>/ATTENDENCESETUP/KQBYPickupView",
   "psdername" : "DER1N_ATTENDENCEORMORGSECTOR_ATTENDENCESETUP_ATTENDENCESETUPID",
   "codename" : "ATTENDENCESETUP",
-  "psdedatasetid" : "<PSMODULE>/ATTENDENCESETUP/KQYCZKQSZ",
   "removeactiontype" : 1
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCEORMORGSECTOR/PSDERS/DER1N_ATTENDENCEORMORGSECTOR_ORMORGSECTOR_ORMORGSECTORID/PSDER.json

@@ -8,6 +8,5 @@
   "validflag" : 1,
   "psdername" : "DER1N_ATTENDENCEORMORGSECTOR_ORMORGSECTOR_ORMORGSECTORID",
   "codename" : "ORMORGSECTOR",
-  "mdpsdeviewid" : "ORM/ORMORGSECTOR/KQSZMPickupView",
   "removeactiontype" : 1
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCEORMORGSECTOR/PSDEUIACTIONS/修改考勤地址(XGKQDZ)/PSDEUIACTION.json

@@ -3,7 +3,7 @@
   "uiactiontype" : "FRONT",
   "caption" : "修改考勤地址",
   "codename" : "XGKQDZ",
-  "actiontarget" : "SINGLEDATA",
+  "actiontarget" : "SINGLEKEY",
   "psdeviewbaseid" : "ORM/ORMORGSECTOR/BMKQSZEditView",
   "frontprotype" : "WIZARD",
   "psdeuiactionname" : "修改考勤地址"

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCESETUP/PSDEFORMS/KQSZ/PSDEFORM.json

@@ -32,12 +32,11 @@
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/ORMORGNAME",
-        "editortype" : "TEXTBOX",
         "psdeformdetailname" : "ormorgname",
-        "enablecond" : 0,
         "psdefname" : "ORMORGNAME",
         "detailtype" : "FORMITEM",
         "logicname" : "组织名称",
+        "allowempty" : 0,
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/ATTENDENCESETUPNAME",
@@ -70,14 +69,14 @@
         "psdeformdetailname" : "vacholidayrulesid",
         "psdefname" : "VACHOLIDAYRULESID",
         "detailtype" : "FORMITEM",
-        "logicname" : "假期规则标识",
+        "logicname" : "考勤规则标识",
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/VACHOLIDAYRULESNAME",
         "psdeformdetailname" : "vacholidayrulesname",
         "psdefname" : "VACHOLIDAYRULESNAME",
         "detailtype" : "FORMITEM",
-        "logicname" : "假期规则",
+        "logicname" : "考勤规则",
         "allowempty" : 0,
         "psdeformid" : "<PSDEFORM>"
       }, {

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCESETUP/PSDEFORMS/Main/PSDEFORM.json

@@ -28,15 +28,15 @@
         "psdefname" : "ORMORGID",
         "detailtype" : "FORMITEM",
         "logicname" : "组织标识",
-        "psdeformid" : "<PSDEFORM>"
+        "psdeformid" : "<PSDEFORM>",
+        "editortypename" : "隐藏表单项"
       }, {
         "psdefid" : "<PSDATAENTITY>/ORMORGNAME",
-        "editortype" : "TEXTBOX",
         "psdeformdetailname" : "ormorgname",
-        "enablecond" : 0,
         "psdefname" : "ORMORGNAME",
         "detailtype" : "FORMITEM",
         "logicname" : "组织名称",
+        "allowempty" : 0,
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/ATTENDENCESETUPNAME",
@@ -69,14 +69,14 @@
         "psdeformdetailname" : "vacholidayrulesid",
         "psdefname" : "VACHOLIDAYRULESID",
         "detailtype" : "FORMITEM",
-        "logicname" : "假期规则标识",
+        "logicname" : "考勤规则标识",
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/VACHOLIDAYRULESNAME",
         "psdeformdetailname" : "vacholidayrulesname",
         "psdefname" : "VACHOLIDAYRULESNAME",
         "detailtype" : "FORMITEM",
-        "logicname" : "假期规则",
+        "logicname" : "考勤规则",
         "allowempty" : 0,
         "psdeformid" : "<PSDEFORM>"
       }, {
@@ -131,6 +131,11 @@
         "detailtype" : "DRUIPART",
         "psdeformid" : "<PSDEFORM>"
       } ]
+    }, {
+      "height" : 30,
+      "psdeformdetailname" : "rawitem1",
+      "detailtype" : "RAWITEM",
+      "psdeformid" : "<PSDEFORM>"
     }, {
       "caption" : "考勤人员",
       "showcaption" : 0,

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCESETUP/PSDEGRIDS/Main/PSDEGRID.json

@@ -22,12 +22,13 @@
     "width" : 200,
     "gridcoltype" : "DEFGRIDCOLUMN"
   }, {
-    "psdefname" : "ATTENDENCESETUPNAME",
+    "psdefname" : "attendencesetupname",
     "psdefid" : "<PSDATAENTITY>/ATTENDENCESETUPNAME",
     "logicname" : "考勤表名称",
-    "psdegridcolname" : "attendencesetupname1",
+    "psdegridcolname" : "attendencesetupname",
     "width" : 250,
-    "gridcoltype" : "DEFGRIDCOLUMN"
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
   }, {
     "hiddendataitem" : 1,
     "psdefname" : "VACHOLIDAYRULESID",

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCESETUP/PSDERS/DER1N_ATTENDENCESETUP_ORMORG_ORMORGID/PSDER.json

@@ -6,9 +6,7 @@
   "logicname" : "组织-考勤设置",
   "majorpsdeid" : "ORM/ORMORG",
   "validflag" : 1,
-  "sdpsdeviewid" : "ORM/ORMORG/XjPickupView",
   "psdername" : "DER1N_ATTENDENCESETUP_ORMORG_ORMORGID",
   "codename" : "ORMORG",
-  "psdedatasetid" : "ORM/ORMORG/DanQian",
   "removeactiontype" : 0
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCESETUP/PSDETREEVIEWS/ATTENDENCESETUPTree/PSDETREEVIEW.json

@@ -5,6 +5,7 @@
   "psdetreeviewname" : "组织树（考勤设置）",
   "showroot" : 0,
   "psdetreenodes" : [ {
+    "keypsdefid" : "ORM/ORMORG/ORGID",
     "enablequicksearch" : 1,
     "rootnode" : 0,
     "sortdir" : "ASC",
@@ -12,6 +13,7 @@
     "sortpsdefname" : "PX",
     "appendpnodeid" : 0,
     "psdename" : "ORMORG",
+    "navviewfilter" : "n_ormorgid_eq",
     "viewactions" : 0,
     "navviewparam" : "nodeid=%NODEID%",
     "psdeid" : "ORM/ORMORG",
@@ -19,10 +21,14 @@
     "treenodetype" : "DE",
     "psdedsid" : "ORM/ORMORG/CurChild",
     "textpsdefid" : "ORM/ORMORG/SHORTNAME",
-    "psdeviewbaseid" : "<PSDATAENTITY>/CurOrgKQSZGridView",
+    "psdeviewbaseid" : "<PSDATAENTITY>/GridView",
+    "psdername" : "DER1N_ATTENDENCESETUP_ORMORG_ORMORGID",
     "nodetype" : "SubORG",
-    "sortpsdefid" : "ORM/ORMORG/PX"
+    "sortpsdefid" : "ORM/ORMORG/PX",
+    "keypsdefname" : "ORGID",
+    "psderid" : "<PSDATAENTITY>/DER1N_ATTENDENCESETUP_ORMORG_ORMORGID"
   }, {
+    "keypsdefid" : "ORM/ORMORG/ORGID",
     "enablequicksearch" : 1,
     "rootnode" : 0,
     "sortdir" : "ASC",
@@ -34,12 +40,14 @@
     "navviewparam" : "nodeid=%NODEID%",
     "psdeid" : "ORM/ORMORG",
     "textpsdefname" : "SHORTNAME",
+    "expand" : 1,
     "treenodetype" : "DE",
     "psdedsid" : "ORM/ORMORG/CurPorg",
     "textpsdefid" : "ORM/ORMORG/SHORTNAME",
-    "psdeviewbaseid" : "<PSDATAENTITY>/CurOrgKQSZGridView",
+    "psdeviewbaseid" : "<PSDATAENTITY>/GridView",
     "nodetype" : "ORMORG",
-    "sortpsdefid" : "ORM/ORMORG/PX"
+    "sortpsdefid" : "ORM/ORMORG/PX",
+    "keypsdefname" : "ORGID"
   }, {
     "rootnode" : 1,
     "psdetreenodename" : "默认根节点",
@@ -51,24 +59,30 @@
   } ],
   "psdetreenoders" : [ {
     "validflag" : 1,
+    "pvaluelevel" : 1,
     "searchmode" : 3,
-    "psdetreenodersname" : "默认根节点 - 根组织节点",
-    "cpsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
-    "ppsdetreenodeid" : "<PSDETREEVIEW>/ROOT",
-    "ordervalue" : 100
-  }, {
-    "validflag" : 1,
-    "searchmode" : 3,
+    "psdername" : "DER1N_ORMORG_ORMORG_PORGID",
     "psdetreenodersname" : "子组织节点 - 子组织节点",
     "cpsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
     "ppsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
-    "ordervalue" : 200
+    "ordervalue" : 10,
+    "psderid" : "ORM/ORMORG/DER1N_ORMORG_ORMORG_PORGID"
   }, {
     "validflag" : 1,
+    "pvaluelevel" : 1,
     "searchmode" : 3,
+    "psdername" : "DER1N_ORMORG_ORMORG_PORGID",
     "psdetreenodersname" : "根组织节点 - 子组织节点",
     "cpsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
     "ppsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
-    "ordervalue" : 300
+    "ordervalue" : 10,
+    "psderid" : "ORM/ORMORG/DER1N_ORMORG_ORMORG_PORGID"
+  }, {
+    "validflag" : 1,
+    "searchmode" : 3,
+    "psdetreenodersname" : "默认根节点 - 根组织节点",
+    "cpsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
+    "ppsdetreenodeid" : "<PSDETREEVIEW>/ROOT",
+    "ordervalue" : 10
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCESETUP/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

 {
+  "openmode" : "DRAWER_TOP",
   "titlepslanresid" : "Auto9866",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "EditView",
@@ -24,7 +25,7 @@
     "psdeformid" : "<PSDATAENTITY>/Main",
     "configinfo" : "[表单]主编辑表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（编辑界面<保存、保存并关闭、关闭>）",
+    "psdetoolbarname" : "【NEW】工具栏模板（编辑界面<保存、保存并关闭、关闭>）",
     "psdetoolbarid" : "Auto32",
     "validflag" : 1,
     "defaultflag" : 1,
@@ -32,6 +33,6 @@
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（编辑界面<保存、保存并关闭、关闭>）"
+    "configinfo" : "[工具栏]【NEW】工具栏模板（编辑界面<保存、保存并关闭、关闭>）"
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCESETUP/PSDEVIEWBASES/KQSZTreeExpView/PSDEVIEWBASE.json

@@ -20,10 +20,12 @@
     "defaultflag" : 1,
     "caption" : "组织树",
     "enabledynasys" : 0,
+    "width" : 250.0,
     "psdeid" : "<PSDATAENTITY>",
     "ctrlparam7" : 1,
     "psdeviewctrltype" : "TREEEXPBAR",
     "psdeviewctrlname" : "TREEEXPBAR",
+    "psctrlname" : "组织树（考勤设置）",
     "configinfo" : "[树视图]组织树（考勤设置）"
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCETYPE/PSDEGRIDS/Main/PSDEGRID.json

@@ -7,7 +7,7 @@
   "pagingsize" : 100,
   "codename" : "Main",
   "ignoredsitem" : 0,
-  "minorsortdir" : "DESC",
+  "minorsortdir" : "ASC",
   "psdegridcols" : [ {
     "hiddendataitem" : 1,
     "psdefname" : "ATTENDENCETYPEID",
@@ -37,20 +37,5 @@
     "enablerowedit" : 1,
     "width" : 300,
     "gridcoltype" : "DEFGRIDCOLUMN"
-  }, {
-    "psdefname" : "UPDATEMAN",
-    "psdefid" : "<PSDATAENTITY>/UPDATEMAN",
-    "logicname" : "更新人",
-    "psdegridcolname" : "updateman",
-    "width" : 150,
-    "gridcoltype" : "DEFGRIDCOLUMN"
-  }, {
-    "psdefname" : "UPDATEDATE",
-    "psdefid" : "<PSDATAENTITY>/UPDATEDATE",
-    "logicname" : "更新时间",
-    "valueformat" : "%1$tY-%1$tm-%1$td",
-    "psdegridcolname" : "updatedate",
-    "width" : 180,
-    "gridcoltype" : "DEFGRIDCOLUMN"
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCETYPE/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

@@ -24,14 +24,14 @@
     "psdeformid" : "<PSDATAENTITY>/Main",
     "configinfo" : "[表单]主编辑表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（编辑界面<保存、保存并关闭、关闭-考勤类型权限专用>）",
-    "psdetoolbarid" : "Auto54",
+    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
+    "psdetoolbarid" : "Auto47",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（编辑界面<保存、保存并关闭、关闭-考勤类型权限专用>）"
+    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENDENCETYPE/PSDEVIEWBASES/GridView/PSDEVIEWBASE.json

@@ -6,7 +6,7 @@
   "predefineviewtype" : "MDATAVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ATTENDENCETYPE.GRIDVIEW]",
   "psappviewcnt" : 1,
-  "viewparam3" : 0,
+  "viewparam3" : 1,
   "psdeviewbasename" : "考勤类型实体表格视图",
   "readonlymode" : 0,
   "dyncmode" : 0,
@@ -28,7 +28,7 @@
     "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
   }, {
     "psachandlerid" : "Auto5",
-    "validflag" : 1,
+    "validflag" : 0,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeformname" : "默认搜索表单",
@@ -36,39 +36,17 @@
     "psdeviewctrltype" : "SEARCHFORM",
     "psdeviewctrlname" : "SEARCHFORM",
     "psdeformid" : "<PSDATAENTITY>/Default",
+    "psctrlname" : "默认搜索表单",
     "configinfo" : "[表单]默认搜索表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（表格界面<新建、删除、过滤、行编辑开启开关、考勤类型权限专用>）",
-    "psdetoolbarid" : "Auto121",
+    "psdetoolbarname" : "【NEW】默认行编辑操作(表格界面<新建、保存、删除、导入、导出>)",
+    "psdetoolbarid" : "Auto16",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（表格界面<新建、删除、过滤、行编辑开启开关、考勤类型权限专用>）",
-    "pssyspfpluginid" : "Auto42"
-  }, {
-    "psdetoolbarname" : "行编辑操作（表格界面-考勤类型权限专用）",
-    "psdetoolbarid" : "Auto71",
-    "validflag" : 1,
-    "defaultflag" : 0,
-    "enabledynasys" : 0,
-    "psdeid" : "<PSDATAENTITY>",
-    "psdeviewctrltype" : "TOOLBAR",
-    "psdeviewctrlname" : "TOOLBAR2",
-    "configinfo" : "[工具栏]行编辑操作（表格界面-考勤类型权限专用）",
-    "pssyspfpluginid" : "Auto54"
-  } ],
-  "psdeviewrvs" : [ {
-    "minorpsdeviewid" : "<PSDATAENTITY>/EditView",
-    "refmodetext" : "编辑数据视图",
-    "psdeviewrvname" : "EDITDATA",
-    "defviewtype" : "EDITVIEW"
-  }, {
-    "minorpsdeviewid" : "<PSDATAENTITY>/EditView",
-    "refmodetext" : "新建数据视图",
-    "psdeviewrvname" : "NEWDATA",
-    "defviewtype" : "EDITVIEW"
+    "configinfo" : "[工具栏]【NEW】默认行编辑操作(表格界面<新建、保存、删除、导入、导出>)"
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENSUMMARY/PSDATAENTITY.json

@@ -87,6 +87,7 @@
     "deftype" : 1,
     "allowempty" : 1,
     "fkey" : 0,
+    "enableqs" : 0,
     "tablename" : "T_ATTENSUMMARY",
     "psdefformitems" : [ {
       "psdefformitemname" : "[ATTENSUMMARYNAME][考勤汇总名称]",

PSMODULES/ATT/PSDATAENTITIES/ATTENSUMMARY/PSDETREEVIEWS/ORMORGBMTree/PSDETREEVIEW.json

@@ -23,6 +23,7 @@
     "nodetype" : "SubORG",
     "sortpsdefid" : "ORM/ORMORG/PX"
   }, {
+    "keypsdefid" : "ORM/ORMORG/ORGID",
     "enablequicksearch" : 1,
     "rootnode" : 0,
     "sortdir" : "ASC",
@@ -34,12 +35,14 @@
     "navviewparam" : "nodeid=%NODEID%",
     "psdeid" : "ORM/ORMORG",
     "textpsdefname" : "SHORTNAME",
+    "expand" : 1,
     "treenodetype" : "DE",
     "psdedsid" : "ORM/ORMORG/CurPorg",
     "textpsdefid" : "ORM/ORMORG/SHORTNAME",
-    "psdeviewbaseid" : "<PSDATAENTITY>/CurZZKQHZGridView",
+    "psdeviewbaseid" : "<PSDATAENTITY>/GridView",
     "nodetype" : "ORMORG",
-    "sortpsdefid" : "ORM/ORMORG/PX"
+    "sortpsdefid" : "ORM/ORMORG/PX",
+    "keypsdefname" : "ORGID"
   }, {
     "rootnode" : 1,
     "psdetreenodename" : "默认根节点",
@@ -50,24 +53,30 @@
   } ],
   "psdetreenoders" : [ {
     "validflag" : 1,
+    "pvaluelevel" : 1,
     "searchmode" : 3,
-    "psdetreenodersname" : "默认根节点 - 根组织节点",
-    "cpsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
-    "ppsdetreenodeid" : "<PSDETREEVIEW>/ROOT",
-    "ordervalue" : 100
+    "psdername" : "DER1N_ORMORG_ORMORG_PORGID",
+    "psdetreenodersname" : "子组织节点 - 子组织节点",
+    "cpsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
+    "ppsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
+    "ordervalue" : 10,
+    "psderid" : "ORM/ORMORG/DER1N_ORMORG_ORMORG_PORGID"
   }, {
     "validflag" : 1,
+    "pvaluelevel" : 1,
     "searchmode" : 3,
+    "psdername" : "DER1N_ORMORG_ORMORG_PORGID",
     "psdetreenodersname" : "根组织节点 - 子组织节点",
     "cpsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
     "ppsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
-    "ordervalue" : 210
+    "ordervalue" : 10,
+    "psderid" : "ORM/ORMORG/DER1N_ORMORG_ORMORG_PORGID"
   }, {
     "validflag" : 1,
     "searchmode" : 3,
-    "psdetreenodersname" : "子组织节点 - 子组织节点",
-    "cpsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
-    "ppsdetreenodeid" : "<PSDETREEVIEW>/SubORG",
-    "ordervalue" : 300
+    "psdetreenodersname" : "默认根节点 - 根组织节点",
+    "cpsdetreenodeid" : "<PSDETREEVIEW>/ORMORG",
+    "ppsdetreenodeid" : "<PSDETREEVIEW>/ROOT",
+    "ordervalue" : 10
   } ]
 }
\ No newline at end of file

PSMODULES/ATT/PSDATAENTITIES/ATTENSUMMARY/PSDEVIEWBASES/GridView/PSDEVIEWBASE.json

@@ -8,6 +8,7 @@
   "predefineviewtype" : "MDATAVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ATTENSUMMARY.GRIDVIEW]",
   "psappviewcnt" : 1,
+  "viewparam6" : 0,
   "psdeviewbasename" : "考勤汇总实体表格视图",
   "readonlymode" : 0,
   "cappslanresid" : "Auto5834",

PSMODULES/ATT/PSDATAENTITIES/ATTENSUMMARY/PSDEVIEWBASES/KQHZTreeExpView/PSDEVIEWBASE.json

@@ -20,10 +20,12 @@
     "defaultflag" : 1,
     "caption" : "组织树",
     "enabledynasys" : 0,
+    "width" : 250.0,
     "psdeid" : "<PSDATAENTITY>",
     "ctrlparam7" : 1,
     "psdeviewctrltype" : "TREEEXPBAR",
     "psdeviewctrlname" : "TREEEXPBAR",
+    "psctrlname" : "组织树（考勤汇总）",
     "configinfo" : "[树视图]组织树（考勤汇总）"
   } ]
 }
\ No newline at end of file

PSMODULES/ORM/PSDATAENTITIES/ORMBMKQDZ/PSDEGRIDS/Main_2/PSDEGRID.json

@@ -53,6 +53,7 @@
     "psdegridcolname" : "attendancerange",
     "enablerowedit" : 1,
     "width" : 150,
+    "pscodelistid" : "EhrCodeList0148",
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
   }, {

PSMODULES/ORM/PSDATAENTITIES/ORMBMKQDZ/PSDEVIEWBASES/BMKQDZEditView/PSDEVIEWBASE.json

@@ -6,7 +6,7 @@
   "codename" : "BMKQDZEditView",
   "viewactions" : 0,
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMBMKQDZ.EDITVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "部门地址维护实体编辑视图(考勤设置)",
   "readonlymode" : 0,
   "dyncmode" : 0,

PSMODULES/ORM/PSDATAENTITIES/ORMBMKQDZ/PSDEVIEWBASES/BMKQDZGridView/PSDEVIEWBASE.json

@@ -6,7 +6,7 @@
   "codename" : "BMKQDZGridView",
   "viewactions" : 0,
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMBMKQDZ.GRIDVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "memo" : "b507c5997d4a6a783d9d651e5da0f222",
   "viewparam5" : 0,
   "viewparam3" : 1,

PSMODULES/ORM/PSDATAENTITIES/ORMBMKQDZ/PSDEVIEWBASES/PickupGridView/PSDEVIEWBASE.json

@@ -3,7 +3,7 @@
   "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
   "codename" : "PickupGridView",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMBMKQDZ.PICKUPGRIDVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "部门地址维护实体选择表格视图（部件视图）",
   "readonlymode" : 0,
   "dyncmode" : 0,

PSMODULES/ORM/PSDATAENTITIES/ORMBMKQDZ/PSDEVIEWBASES/PickupView/PSDEVIEWBASE.json

@@ -4,7 +4,7 @@
   "codename" : "PickupView",
   "predefineviewtype" : "PICKUPVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMBMKQDZ.PICKUPVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "部门地址维护实体数据选择视图",
   "readonlymode" : 0,
   "dyncmode" : 0,

PSMODULES/ORM/PSDATAENTITIES/ORMDUTY/PSDEVIEWBASES/PickupGridView/PSDEVIEWBASE.json

@@ -4,7 +4,7 @@
   "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
   "codename" : "PickupGridView",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMDUTY.PICKUPGRIDVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "职务管理实体选择表格视图（部件视图）",
   "readonlymode" : 0,
   "cappslanresid" : "Auto7925",
@@ -22,8 +22,8 @@
     "psdeviewctrltype" : "GRID",
     "psdeviewctrlname" : "GRID",
     "psdegridname" : "主表格",
-    "configinfo" : "[表格]主表格;[数据集合]CurOrg",
-    "psdedatasetid" : "<PSDATAENTITY>/CurOrg"
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
   }, {
     "psachandlerid" : "Auto5",
     "validflag" : 1,

PSMODULES/ORM/PSDATAENTITIES/ORMDUTY/PSDEVIEWBASES/PickupView/PSDEVIEWBASE.json

@@ -5,7 +5,7 @@
   "codename" : "PickupView",
   "predefineviewtype" : "PICKUPVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMDUTY.PICKUPVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "职务管理实体数据选择视图",
   "readonlymode" : 0,
   "cappslanresid" : "Auto2026",

PSMODULES/ORM/PSDATAENTITIES/ORMORG/PSDETREEVIEWS/ORMORGTree2/PSDETREEVIEW.json

@@ -14,7 +14,6 @@
     "caption" : "一级组织",
     "navviewfilter" : "n_porgid_eq",
     "viewactions" : 0,
-    "navviewparam" : "nodeid=%NODEID%",
     "psdeid" : "<PSDATAENTITY>",
     "textpsdefname" : "SHORTNAME",
     "expand" : 1,
@@ -57,7 +56,6 @@
     "caption" : "二级组织",
     "navviewfilter" : "n_porgid_eq",
     "viewactions" : 0,
-    "navviewparam" : "nodeid=%NODEID%",
     "psdeid" : "<PSDATAENTITY>",
     "textpsdefname" : "SHORTNAME",
     "treenodetype" : "DE",

PSMODULES/ORM/PSDATAENTITIES/ORMORG/PSDEVIEWBASES/JQGZSYFPXXPickupView/PSDEVIEWBASE.json

@@ -4,7 +4,7 @@
   "psdeviewbasetype" : "DEPICKUPVIEW",
   "codename" : "JQGZSYFPXXPickupView",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMORG.PICKUPVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "组织实体数据选择视图（当前可选择组织列表-考勤规则使用）",
   "readonlymode" : 0,
   "cappslanresid" : "Auto2282",

PSMODULES/ORM/PSDATAENTITIES/ORMORG/PSDEVIEWBASES/JQGZSYPickupGridView/PSDEVIEWBASE.json

@@ -4,7 +4,7 @@
   "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
   "codename" : "JQGZSYPickupGridView",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMORG.PICKUPGRIDVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "组织管理实体选择表格视图（当前可选择组织列表-考勤规则使用）",
   "readonlymode" : 0,
   "cappslanresid" : "Auto10658",

PSMODULES/ORM/PSDATAENTITIES/ORMORG/PSDEVIEWBASES/PickupGridView/PSDEVIEWBASE.json

@@ -4,7 +4,7 @@
   "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
   "codename" : "PickupGridView",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMORG.PICKUPGRIDVIEW]",
-  "psappviewcnt" : 3,
+  "psappviewcnt" : 4,
   "psdeviewbasename" : "组织管理实体选择表格视图（部件视图）",
   "readonlymode" : 0,
   "dyncmode" : 0,

PSMODULES/ORM/PSDATAENTITIES/ORMORG/PSDEVIEWBASES/PickupView/PSDEVIEWBASE.json

@@ -5,7 +5,7 @@
   "codename" : "PickupView",
   "predefineviewtype" : "PICKUPVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMORG.PICKUPVIEW]",
-  "psappviewcnt" : 3,
+  "psappviewcnt" : 4,
   "psdeviewbasename" : "组织管理实体数据选择视图",
   "readonlymode" : 0,
   "dyncmode" : 0,

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEDATAQUERIES/CurZZBM_KQSZ/PSDEDATAQUERY.json

@@ -8,16 +8,11 @@
   "custommode" : 0,
   "psdedqjoins" : [ {
     "psdedqjoinname" : "ORMORGSECTOR",
-    "condflag" : 1,
+    "memo" : "当前考勤设置中组织的部门\nt1.orgid in (select  t.ormorgid from  V_ATTENDENCESETUP  t  where  t.ATTENDENCESETUPid= ${srfwebcontext('srfparentkey')})",
+    "condflag" : 0,
     "psdejointypeid" : "MAIN",
     "joinpsdeid" : "<PSDATAENTITY>",
     "mainflag" : 1,
-    "psdejointypename" : "主查询",
-    "psdedqconds" : [ {
-      "condtype" : "CUSTOM",
-      "psdedqid" : "<PSDEDATAQUERY>",
-      "condvalue" : "t1.orgid in (select  t.ormorgid from  V_ATTENDENCESETUP  t  where  t.ATTENDENCESETUPid= ${srfwebcontext('srfparentkey')})",
-      "psdedqcondname" : "当前考勤设置中组织的部门"
-    } ]
+    "psdejointypename" : "主查询"
   } ]
 }
\ No newline at end of file

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEDATAQUERIES/CurZZBM_KQSZ/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

@@ -286,10 +286,5 @@
     "expcode" : "t51.`ZZDZS`",
     "ordervalue" : 70,
     "psdedqcodeexpname" : "ZZDZS"
-  } ],
-  "psdedqcodeconds" : [ {
-    "condcode" : "( t1.orgid in (select  t.ormorgid from  V_ATTENDENCESETUP  t  where  t.ATTENDENCESETUPid= ${srfwebcontext('srfparentkey')}) )",
-    "psdedqcodecondname" : "查询条件",
-    "ordervalue" : 0
   } ]
 }
\ No newline at end of file

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEDATAQUERIES/DEFAULT/PSDEDATAQUERY.json

@@ -6,20 +6,10 @@
   "custommode" : 0,
   "psdedqjoins" : [ {
     "psdedqjoinname" : "ORMORGSECTOR",
-    "condflag" : 1,
+    "condflag" : 0,
     "psdejointypeid" : "MAIN",
     "joinpsdeid" : "<PSDATAENTITY>",
     "mainflag" : 1,
-    "psdejointypename" : "主查询",
-    "psdedqconds" : [ {
-      "psdbvalueopid" : "NOTEQ",
-      "psdbvalueopname" : "不等于(<>)",
-      "condtype" : "SINGLE",
-      "psdefname" : "ORGSECTORID",
-      "psdefid" : "<PSDATAENTITY>/ORGSECTORID",
-      "psdedqid" : "<PSDEDATAQUERY>",
-      "condvalue" : "DEFAULT",
-      "psdedqcondname" : "ORGSECTORID 不等于(<>) (DEFAULT)"
-    } ]
+    "psdejointypename" : "主查询"
   } ]
 }
\ No newline at end of file

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEDATAQUERIES/DEFAULT/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

@@ -286,10 +286,5 @@
     "expcode" : "t51.`ZZDZS`",
     "ordervalue" : 70,
     "psdedqcodeexpname" : "ZZDZS"
-  } ],
-  "psdedqcodeconds" : [ {
-    "condcode" : "( t1.`ORGSECTORID` <> 'DEFAULT' )",
-    "psdedqcodecondname" : "查询条件",
-    "ordervalue" : 0
   } ]
 }
\ No newline at end of file

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEFORMS/Default/PSDEFORM.json

@@ -12,29 +12,28 @@
     "colmodel" : "33%;33%;34%",
     "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.ORMORGSECTOR.DEFAULT.FORMPAGE.FORMPAGE1]",
     "psdeformdetails" : [ {
-      "psdefid" : "<PSDATAENTITY>/ZZDZS",
-      "labelwidth" : 100,
-      "psdefsfitemname" : "N_ZZDZS_LIKE",
+      "psdefid" : "<PSDATAENTITY>/ORGNAME",
+      "psdefsfitemname" : "N_ORGNAME_LIKE",
       "editortype" : "TEXTBOX",
-      "caption" : "组织简称",
-      "psdeformdetailname" : "n_zzdzs_like",
-      "psdefname" : "ZZDZS",
+      "caption" : "组织全称",
+      "psdeformdetailname" : "n_orgname_like",
+      "psdefname" : "orgname",
       "detailtype" : "FORMITEM",
-      "logicname" : "组织[文本包含(%)]",
-      "labelpos" : "LEFT",
+      "logicname" : "组织机构[文本包含(%)]",
+      "col_lg" : 8,
       "psdeformid" : "<PSDEFORM>",
       "col_md" : 8,
-      "psdefsfitemid" : "<PSDATAENTITY>/ZZDZS/N_ZZDZS_LIKE"
+      "editortypename" : "文本框",
+      "psdefsfitemid" : "<PSDATAENTITY>/ORGNAME/N_ORGNAME_LIKE"
     }, {
       "psdefid" : "<PSDATAENTITY>/ORGSECTORNAME",
-      "labelwidth" : 100,
       "psdefsfitemname" : "N_ORGSECTORNAME_LIKE",
       "caption" : "部门/项目部",
       "psdeformdetailname" : "n_orgsectorname_like",
       "psdefname" : "ORGSECTORNAME",
       "detailtype" : "FORMITEM",
       "logicname" : "部门名称[文本包含(%)]",
-      "labelpos" : "LEFT",
+      "col_lg" : 8,
       "psdeformid" : "<PSDEFORM>",
       "cappslanresid" : "Auto11236",
       "col_md" : 8,

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEVIEWBASES/BMKQSZEditView/PSDEVIEWBASE.json

@@ -6,7 +6,7 @@
   "codename" : "BMKQSZEditView",
   "viewactions" : 0,
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMORGSECTOR.EDITVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 2,
   "psdeviewbasename" : "部门考勤设置编辑视图",
   "readonlymode" : 0,
   "cappslanresid" : "Auto11530",

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEVIEWBASES/MPickupView/PSDEVIEWBASE.json

@@ -17,17 +17,6 @@
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "PICKUPVIEWPANEL",
     "psdeviewctrlname" : "PICKUPVIEWPANEL",
-    "configinfo" : "[实体视图]部门管理实体选择表格视图（部件视图）"
-  }, {
-    "psachandlerid" : "Auto5",
-    "validflag" : 1,
-    "defaultflag" : 0,
-    "enabledynasys" : 0,
-    "psdeformname" : "默认搜索表单(2)",
-    "psdeid" : "<PSDATAENTITY>",
-    "psdeviewctrltype" : "SEARCHFORM",
-    "psdeviewctrlname" : "SEARCHFORM",
-    "psdeformid" : "<PSDATAENTITY>/Default_2",
-    "configinfo" : "[表单]默认搜索表单(2)"
+    "configinfo" : "[实体视图]部门管理实体选择表格视图"
   } ]
 }
\ No newline at end of file

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEVIEWBASES/PickupGridView/PSDEVIEWBASE.json

@@ -3,9 +3,10 @@
   "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
   "codename" : "PickupGridView",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMORGSECTOR.PICKUPGRIDVIEW]",
-  "psappviewcnt" : 2,
-  "psdeviewbasename" : "部门管理实体选择表格视图（当前组织）",
+  "psappviewcnt" : 4,
+  "psdeviewbasename" : "部门管理实体选择表格视图",
   "readonlymode" : 0,
+  "viewparams" : "SRFNAVCTX.ormorg=null\nSRFNAVCTX.orgid=null\nSRFNAVCTX.orgname=null\nSRFNAVCTX.zzdzs=null",
   "dyncmode" : 0,
   "title" : "部门管理选择表格视图",
   "psdeviewctrls" : [ {
@@ -19,8 +20,8 @@
     "psdeviewctrltype" : "GRID",
     "psdeviewctrlname" : "GRID",
     "psdegridname" : "主表格",
-    "configinfo" : "[表格]主表格;[数据集合]CURORG",
-    "psdedatasetid" : "<PSDATAENTITY>/CURORG"
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
   }, {
     "psachandlerid" : "Auto5",
     "validflag" : 1,

PSMODULES/ORM/PSDATAENTITIES/ORMORGSECTOR/PSDEVIEWBASES/PickupView/PSDEVIEWBASE.json

@@ -4,7 +4,7 @@
   "codename" : "PickupView",
   "predefineviewtype" : "PICKUPVIEW",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMORGSECTOR.PICKUPVIEW]",
-  "psappviewcnt" : 1,
+  "psappviewcnt" : 4,
   "psdeviewbasename" : "部门管理实体数据选择视图",
   "readonlymode" : 0,
   "dyncmode" : 0,
@@ -17,6 +17,6 @@
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "PICKUPVIEWPANEL",
     "psdeviewctrlname" : "PICKUPVIEWPANEL",
-    "configinfo" : "[实体视图]部门管理实体选择表格视图（当前组织）"
+    "configinfo" : "[实体视图]部门管理实体选择表格视图"
   } ]
 }
\ No newline at end of file

PSMODULES/ORM/PSDATAENTITIES/ORMPOST/PSDEVIEWBASES/ORGIDPickupGridView/PSDEVIEWBASE.json

@@ -4,7 +4,7 @@
   "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
   "codename" : "ORGIDPickupGridView",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMPOST.JZBGWPICKUPGRIDVIEW]",
-  "psappviewcnt" : 2,
+  "psappviewcnt" : 3,
   "psdeviewbasename" : "岗位管理实体选择表格视图（通过orgid过滤）",
   "readonlymode" : 0,
   "cappslanresid" : "Auto5393",

PSMODULES/ORM/PSDATAENTITIES/ORMPOST/PSDEVIEWBASES/ORGIDPickupView/PSDEVIEWBASE.json

@@ -3,7 +3,7 @@
   "psdeviewbasetype" : "DEPICKUPVIEW",
   "codename" : "ORGIDPickupView",
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.ORMPOST.ORGIDPICKUPVIEW]",
-  "psappviewcnt" : 2,
+  "psappviewcnt" : 3,
   "psdeviewbasename" : "岗位管理实体数据选择视图(通过orgid所属的二级单位来过滤)",
   "readonlymode" : 0,
   "dyncmode" : 0,

PSMODULES/ORM/PSDATAENTITIES/ORMPOST/PSDEVIEWBASES/PickupGridView/PSDEVIEWBASE.json

@@ -19,8 +19,8 @@
     "psdeviewctrltype" : "GRID",
     "psdeviewctrlname" : "GRID",
     "psdegridname" : "主表格",
-    "configinfo" : "[表格]主表格;[数据集合]GWXH",
-    "psdedatasetid" : "<PSDATAENTITY>/GWXH"
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
   }, {
     "psachandlerid" : "Auto5",
     "validflag" : 1,

PSMODULES/PAR/PSDATAENTITIES/PARZNBMMX/PSDATAENTITY.json

@@ -148,7 +148,7 @@
     "validflag" : 1,
     "derpsdefid" : "ORM/ORMORGSECTOR/ORDERVALUE",
     "physicalfield" : 0,
-    "codename" : "ORDERVALUE",
+    "codename" : "OrderValue",
     "psdatatypeid" : "PICKUPDATA",
     "derpsdefname" : "ORDERVALUE",
     "pkey" : 0,

PSMODULES/PCM/PSDATAENTITIES/PCMDDSQDMX/PSDEFORMS/Main/PSDEFORM.json

@@ -153,14 +153,15 @@
         "createdv" : "10"
       }, {
         "psdefid" : "<PSDATAENTITY>/SFGBDD",
-        "createdvt" : "CONTEXT",
         "editortype" : "HIDDEN",
         "psdeformdetailname" : "sfgbdd",
         "psdefname" : "SFGBDD",
         "detailtype" : "FORMITEM",
         "logicname" : "是否干部调动",
         "psdeformid" : "<PSDEFORM>",
-        "createdv" : "sfgbdd"
+        "editortypename" : "隐藏表单项",
+        "updatedv" : "0",
+        "createdv" : "0"
       }, {
         "psdefid" : "<PSDATAENTITY>/RZWJ",
         "editortype" : "FILEUPLOADER",
@@ -169,6 +170,17 @@
         "detailtype" : "FORMITEM",
         "logicname" : "任职文件",
         "psdeformid" : "<PSDEFORM>"
+      }, {
+        "psdefid" : "<PSDATAENTITY>/FINISHDD",
+        "editortype" : "HIDDEN",
+        "psdeformdetailname" : "finishdd",
+        "psdefname" : "finishdd",
+        "detailtype" : "FORMITEM",
+        "logicname" : "完成调动",
+        "psdeformid" : "<PSDEFORM>",
+        "editortypename" : "隐藏表单项",
+        "updatedv" : "1",
+        "createdv" : "1"
       } ]
     } ]
   } ],

PSMODULES/PCM/PSDATAENTITIES/PCMDDSQDMX/PSDERS/DER1N_PCMDDSQDMX_ORMDUTY_ORMDUTYID/PSDER.json

@@ -6,10 +6,10 @@
   "logicname" : "职务",
   "majorpsdeid" : "ORM/ORMDUTY",
   "validflag" : 1,
-  "sdpsdeviewid" : "ORM/ORMDUTY/OrgSectorPickupView",
+  "sdpsdeviewid" : "ORM/ORMDUTY/PickupView",
   "derfieldlname" : "职务ID",
   "psdername" : "DER1N_PCMDDSQDMX_ORMDUTY_ORMDUTYID",
   "codename" : "ORMDUTY",
-  "psdedatasetid" : "ORM/ORMDUTY/CurOrgsector",
+  "psdedatasetid" : "ORM/ORMDUTY/DEFAULT",
   "removeactiontype" : 2
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMDDSQDMX/PSDERS/DER1N_PCMDDSQDMX_ORMORGSECTOR_ORGSECTORID/PSDER.json

@@ -9,10 +9,10 @@
   "majorpsdeid" : "ORM/ORMORGSECTOR",
   "validflag" : 1,
   "extminorpsdefid" : "<PSDATAENTITY>/ORGID",
-  "sdpsdeviewid" : "ORM/ORMORGSECTOR/FPXXPickupView",
+  "sdpsdeviewid" : "ORM/ORMORGSECTOR/PickupView",
   "enaextrange" : 1,
   "psdername" : "DER1N_PCMDDSQDMX_ORMORGSECTOR_ORGSECTORID",
   "codename" : "ORMORGSECTOR",
-  "psdedatasetid" : "ORM/ORMORGSECTOR/CURORG",
+  "psdedatasetid" : "ORM/ORMORGSECTOR/DEFAULT",
   "removeactiontype" : 2
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMDDSQDMX/PSDERS/DER1N_PCMDDSQDMX_ORMORG_ORGID/PSDER.json

@@ -6,9 +6,9 @@
   "logicname" : "组织",
   "majorpsdeid" : "ORM/ORMORG",
   "validflag" : 1,
-  "sdpsdeviewid" : "ORM/ORMORG/SJYXZZQXPickupView",
+  "sdpsdeviewid" : "ORM/ORMORG/PickupView",
   "psdername" : "DER1N_PCMDDSQDMX_ORMORG_ORGID",
   "codename" : "ORMORG",
-  "psdedatasetid" : "ORM/ORMORG/AuthSJYXZZ",
+  "psdedatasetid" : "ORM/ORMORG/DEFAULT",
   "removeactiontype" : 2
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMDDSQDMX/PSDERS/DER1N_PCMDDSQDMX_ORMPOST_ORMPOSTID/PSDER.json

@@ -6,11 +6,11 @@
   "logicname" : "岗位",
   "majorpsdeid" : "ORM/ORMPOST",
   "validflag" : 1,
-  "sdpsdeviewid" : "ORM/ORMPOST/ORGIDPickupView",
+  "sdpsdeviewid" : "ORM/ORMPOST/PickupView",
   "derfieldlname" : "岗位ID",
   "enaextrange" : 0,
   "psdername" : "DER1N_PCMDDSQDMX_ORMPOST_ORMPOSTID",
   "codename" : "ORMPOST",
-  "psdedatasetid" : "ORM/ORMPOST/DQORGGW",
+  "psdedatasetid" : "ORM/ORMPOST/DEFAULT",
   "removeactiontype" : 2
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMDDSQDMX/PSDEVIEWBASES/DDEditView/PSDEVIEWBASE.json

 {
   "showcaptionbar" : 0,
-  "height" : 500,
+  "openmode" : "POPUPMODAL",
+  "height" : 650,
   "titlepslanresid" : "Auto8269",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "DDEditView",

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDATAENTITY.json

@@ -122,6 +122,7 @@
     "psdetableid" : "<PSDATAENTITY>/T_PCMJXSYGZZJLMX",
     "lnpslanresname" : "属性逻辑名称（DEF.LNAME.*）[CHECKSTATUS]",
     "pscodelistname" : "审核状态",
+    "defaultvalue" : "2",
     "pkey" : 0,
     "length" : 60,
     "logicname" : "审核状态",
@@ -298,6 +299,7 @@
     "psdatatypeid" : "YESNO",
     "psdetableid" : "<PSDATAENTITY>/T_PCMJXSYGZZJLMX",
     "lnpslanresname" : "属性逻辑名称（DEF.LNAME.*）[PCMJXSYGZZJLMX.FINISHED]",
+    "defaultvalue" : "0",
     "pkey" : 0,
     "logicname" : "是否审核完成",
     "majorfield" : 0,
@@ -376,6 +378,7 @@
     "psdatatypeid" : "YESNO",
     "psdetableid" : "<PSDATAENTITY>/T_PCMJXSYGZZJLMX",
     "lnpslanresname" : "属性逻辑名称（DEF.LNAME.*）[ISTEMP]",
+    "defaultvalue" : "0",
     "pkey" : 0,
     "logicname" : "是否为临时数据",
     "majorfield" : 0,

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEACTIONS/SetPass/PSDEACTION.json

+{
+  "memo" : "审核通过逻辑",
+  "logicname" : "审核通过",
+  "psdelogicid" : "<PSDATAENTITY>/SetPass",
+  "psdeactionname" : "SetPass",
+  "actiontype" : "DELOGIC",
+  "codename" : "SetPass",
+  "psdelogicname" : "审核通过逻辑"
+}
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEACTIONS/SetReject/PSDEACTION.json

+{
+  "memo" : "审核不通过逻辑",
+  "logicname" : "审核不通过",
+  "psdelogicid" : "<PSDATAENTITY>/SetReject",
+  "psdeactionname" : "SetReject",
+  "actiontype" : "DELOGIC",
+  "codename" : "SetReject",
+  "psdelogicname" : "审核不通过逻辑"
+}
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEDATAQUERIES/ALLDQ/PSDEDATAQUERY.json

@@ -7,10 +7,30 @@
   "custommode" : 0,
   "psdedqjoins" : [ {
     "psdedqjoinname" : "PCMJXSYGZZJLMX",
-    "condflag" : 0,
+    "condflag" : 1,
     "psdejointypeid" : "MAIN",
     "joinpsdeid" : "<PSDATAENTITY>",
     "mainflag" : 1,
-    "psdejointypename" : "主查询"
+    "psdejointypename" : "主查询",
+    "psdedqconds" : [ {
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "condtype" : "SINGLE",
+      "psdefname" : "FINISHED",
+      "psdefid" : "<PSDATAENTITY>/FINISHED",
+      "psdedqid" : "<PSDEDATAQUERY>",
+      "condvalue" : "0",
+      "psdedqcondname" : "FINISHED 等于(=) (0)"
+    }, {
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "condtype" : "SINGLE",
+      "psdefname" : "CHECKSTATUS",
+      "psdefid" : "<PSDATAENTITY>/CHECKSTATUS",
+      "psdedqid" : "<PSDEDATAQUERY>",
+      "condvalue" : "2",
+      "condvaluetext" : "审核中",
+      "psdedqcondname" : "CHECKSTATUS 等于(=) (2)"
+    } ]
   } ]
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEDATAQUERIES/ALLDQ/PSDEDQCODES/MYSQL5/PSDEDQCODE.json

@@ -118,5 +118,10 @@
     "expcode" : "t1.`ZZID`",
     "ordervalue" : 28,
     "psdedqcodeexpname" : "ZZID"
+  } ],
+  "psdedqcodeconds" : [ {
+    "condcode" : "( t1.`FINISHED` = 0  AND  t1.`CHECKSTATUS` = '2' )",
+    "psdedqcodecondname" : "查询条件",
+    "ordervalue" : 0
   } ]
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEFORMS/Main/PSDEFORM.json

@@ -2,7 +2,8 @@
   "formtype" : "EDITFORM",
   "dynasysrefmode" : 0,
   "codename" : "Main",
-  "psdeformname" : "主编辑表单",
+  "psdeformname" : "主信息表单",
+  "infoformflag" : 1,
   "psdeformdetails" : [ {
     "caption" : "基本信息",
     "psdeformdetailname" : "formpage1",
@@ -10,13 +11,14 @@
     "cappslanresid" : "Auto1111",
     "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.PCMJXSYGZZJLMX.MAIN.FORMPAGE.FORMPAGE1]",
     "psdeformdetails" : [ {
-      "caption" : "员工信息",
+      "caption" : "详细信息",
       "showcaption" : 1,
       "psdeformdetailname" : "group1",
       "buildinaction" : 0,
       "detailtype" : "GROUPPANEL",
       "psdeformid" : "<PSDEFORM>",
       "cappslanresid" : "Auto5622",
+      "titlebarclosemode" : 1,
       "child_col_md" : 8,
       "colmodel" : "50%;50%",
       "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.PCMJXSYGZZJLMX.MAIN.GROUPPANEL.GROUP1]",
@@ -49,7 +51,6 @@
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/YGBH",
-        "editortype" : "TEXTBOX",
         "psdeformdetailname" : "ygbh",
         "enablecond" : 0,
         "psdefname" : "YGBH",
@@ -66,7 +67,6 @@
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/ZZ",
-        "editortype" : "TEXTBOX",
         "psdeformdetailname" : "zz",
         "enablecond" : 0,
         "psdefname" : "ZZ",
@@ -75,7 +75,6 @@
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/BM",
-        "editortype" : "TEXTBOX",
         "psdeformdetailname" : "bm",
         "enablecond" : 0,
         "psdefname" : "BM",
@@ -84,7 +83,6 @@
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/ZZGW",
-        "editortype" : "TEXTBOX",
         "psdeformdetailname" : "zzgw",
         "enablecond" : 0,
         "psdefname" : "ZZGW",
@@ -93,7 +91,6 @@
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/RZQD",
-        "editortype" : "TEXTBOX",
         "psdeformdetailname" : "rzqd",
         "enablecond" : 0,
         "psdefname" : "RZQD",
@@ -130,7 +127,7 @@
         "createdv" : "1"
       } ]
     }, {
-      "caption" : "转正考核成绩",
+      "caption" : "转正考核信息",
       "child_col_xs" : 8,
       "psdeformdetailname" : "grouppanel1",
       "buildinaction" : 0,
@@ -138,6 +135,7 @@
       "psdeformid" : "<PSDEFORM>",
       "child_col_sm" : 8,
       "cappslanresid" : "Auto2358",
+      "titlebarclosemode" : 1,
       "child_col_md" : 8,
       "child_col_lg" : 8,
       "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.PCMJXSYGZZJLMX.MAIN.GROUPPANEL.GROUPPANEL1]",
@@ -154,17 +152,16 @@
       }, {
         "psdefid" : "<PSDATAENTITY>/QSSJ",
         "editorparams" : "width=auto",
-        "editortype" : "DATEPICKEREX_NOTIME",
+        "caption" : "到公司时间",
         "psdeformdetailname" : "qssj",
         "enablecond" : 0,
         "psdefname" : "QSSJ",
         "detailtype" : "FORMITEM",
-        "logicname" : "到中建三局时间",
+        "logicname" : "到局时间",
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/JSSJ",
         "editorparams" : "width=auto",
-        "editortype" : "DATEPICKEREX_NOTIME",
         "psdeformdetailname" : "jssj",
         "enablecond" : 0,
         "psdefname" : "JSSJ",
@@ -173,7 +170,6 @@
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/FS",
-        "editortype" : "TEXTBOX",
         "psdeformdetailname" : "fs",
         "psdefname" : "FS",
         "detailtype" : "FORMITEM",
@@ -181,7 +177,6 @@
         "psdeformid" : "<PSDEFORM>"
       }, {
         "psdefid" : "<PSDATAENTITY>/PJ",
-        "editortype" : "DROPDOWNLIST",
         "psdeformdetailname" : "pj",
         "psdefname" : "PJ",
         "detailtype" : "FORMITEM",

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEFORMS/NewDataForm/PSDEFORM.json

@@ -2,7 +2,7 @@
   "formtype" : "EDITFORM",
   "dynasysrefmode" : 0,
   "codename" : "NewDataForm",
-  "psdeformname" : "新建数据的表单",
+  "psdeformname" : "主编辑表单",
   "psdeformdetails" : [ {
     "caption" : "基本信息",
     "psdeformdetailname" : "formpage1",
@@ -10,13 +10,14 @@
     "cappslanresid" : "Auto1111",
     "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.PCMJXSYGZZJLMX.MAIN.FORMPAGE.FORMPAGE1]",
     "psdeformdetails" : [ {
-      "caption" : "员工信息",
+      "caption" : "详细信息",
       "showcaption" : 1,
       "psdeformdetailname" : "group1",
       "buildinaction" : 0,
       "detailtype" : "GROUPPANEL",
       "psdeformid" : "<PSDEFORM>",
       "cappslanresid" : "Auto5622",
+      "titlebarclosemode" : 1,
       "child_col_md" : 8,
       "colmodel" : "50%;50%",
       "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.PCMJXSYGZZJLMX.MAIN.GROUPPANEL.GROUP1]",
@@ -143,7 +144,8 @@
         "detailtype" : "FORMITEM",
         "logicname" : "审核状态",
         "psdeformid" : "<PSDEFORM>",
-        "createdv" : "1"
+        "editortypename" : "隐藏表单项",
+        "createdv" : "2"
       }, {
         "psdefid" : "<PSDATAENTITY>/PIMPERSONID",
         "psdefiupdateid" : "<PSDEFORM>/填充人员信息",
@@ -155,7 +157,7 @@
         "psdeformid" : "<PSDEFORM>"
       } ]
     }, {
-      "caption" : "转正考核成绩",
+      "caption" : "转正考核信息",
       "child_col_xs" : 8,
       "psdeformdetailname" : "grouppanel1",
       "buildinaction" : 0,
@@ -163,6 +165,7 @@
       "psdeformid" : "<PSDEFORM>",
       "child_col_sm" : 8,
       "cappslanresid" : "Auto2358",
+      "titlebarclosemode" : 1,
       "child_col_md" : 8,
       "child_col_lg" : 8,
       "cappslanresname" : "控件文本（CONTROL.*）[DEFORM.PCMJXSYGZZJLMX.MAIN.GROUPPANEL.GROUPPANEL1]",
@@ -180,12 +183,14 @@
         "psdefid" : "<PSDATAENTITY>/QSSJ",
         "editorparams" : "width=auto",
         "editortype" : "DATEPICKEREX_NOTIME",
+        "caption" : "到公司时间",
         "psdeformdetailname" : "qssj",
         "enablecond" : 0,
         "psdefname" : "QSSJ",
         "detailtype" : "FORMITEM",
-        "logicname" : "到中建三局时间",
-        "psdeformid" : "<PSDEFORM>"
+        "logicname" : "到局时间",
+        "psdeformid" : "<PSDEFORM>",
+        "editortypename" : "时间选择控件_无小时"
       }, {
         "psdefid" : "<PSDATAENTITY>/JSSJ",
         "editorparams" : "width=auto",

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEGRIDS/Main/PSDEGRID.json

@@ -9,12 +9,21 @@
   "ignoredsitem" : 0,
   "minorsortdir" : "DESC",
   "psdegridcols" : [ {
+    "psdeuagroupid" : "<PSDATAENTITY>/Auto86",
+    "align" : "CENTER",
+    "psdegridcolname" : "uagridcolumn1",
+    "caption" : "操作",
+    "widthunit" : "PX",
+    "width" : 150,
+    "gridcoltype" : "UAGRIDCOLUMN",
+    "treeitem" : 0
+  }, {
     "psdefname" : "YGBH",
     "psdefid" : "<PSDATAENTITY>/YGBH",
     "logicname" : "员工编号",
     "psdegridcolname" : "ygbh",
     "widthunit" : "px",
-    "width" : 150,
+    "width" : 120,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
   }, {
@@ -23,7 +32,7 @@
     "logicname" : "员工姓名",
     "psdegridcolname" : "pimpersonname",
     "widthunit" : "px",
-    "width" : 150,
+    "width" : 130,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
   }, {
@@ -31,7 +40,7 @@
     "psdefid" : "<PSDATAENTITY>/ZZ",
     "logicname" : "组织",
     "psdegridcolname" : "zz",
-    "width" : 150,
+    "width" : 170,
     "gridcoltype" : "DEFGRIDCOLUMN"
   }, {
     "psdefname" : "BM",
@@ -46,7 +55,7 @@
     "logicname" : "转正岗位",
     "psdegridcolname" : "zzgw",
     "widthunit" : "px",
-    "width" : 150,
+    "width" : 130,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
   }, {
@@ -54,7 +63,7 @@
     "psdefid" : "<PSDATAENTITY>/DURATION",
     "logicname" : "见习期限（月）",
     "psdegridcolname" : "duration",
-    "width" : 200,
+    "width" : 180,
     "gridcoltype" : "DEFGRIDCOLUMN"
   }, {
     "psdefname" : "RZQD",
@@ -62,22 +71,15 @@
     "logicname" : "入职渠道",
     "psdegridcolname" : "rzqd",
     "widthunit" : "px",
-    "width" : 150,
+    "width" : 120,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
-  }, {
-    "psdefname" : "QSSJ",
-    "psdefid" : "<PSDATAENTITY>/QSSJ",
-    "logicname" : "到中建三局时间",
-    "psdegridcolname" : "qssj",
-    "width" : 180,
-    "gridcoltype" : "DEFGRIDCOLUMN"
   }, {
     "psdefname" : "JSSJ",
     "psdefid" : "<PSDATAENTITY>/JSSJ",
     "logicname" : "见习到期时间",
     "psdegridcolname" : "jssj",
-    "width" : 150,
+    "width" : 160,
     "gridcoltype" : "DEFGRIDCOLUMN"
   }, {
     "psdefname" : "FS",
@@ -85,7 +87,16 @@
     "logicname" : "分数",
     "psdegridcolname" : "fs",
     "widthunit" : "px",
-    "width" : 150,
+    "width" : 100,
+    "gridcoltype" : "DEFGRIDCOLUMN",
+    "treeitem" : 0
+  }, {
+    "psdefname" : "PJ",
+    "psdefid" : "<PSDATAENTITY>/PJ",
+    "logicname" : "评价",
+    "psdegridcolname" : "pj",
+    "width" : 100,
+    "pscodelistid" : "EhrCodeList0046",
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
   }, {
@@ -94,7 +105,7 @@
     "logicname" : "审核状态",
     "psdegridcolname" : "checkstatus",
     "widthunit" : "px",
-    "width" : 150,
+    "width" : 120,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
   }, {
@@ -127,14 +138,5 @@
     "width" : 150,
     "gridcoltype" : "DEFGRIDCOLUMN",
     "treeitem" : 0
-  }, {
-    "psdefname" : "PJ",
-    "psdefid" : "<PSDATAENTITY>/PJ",
-    "logicname" : "评价",
-    "psdegridcolname" : "pj",
-    "width" : 150,
-    "pscodelistid" : "EhrCodeList0046",
-    "gridcoltype" : "DEFGRIDCOLUMN",
-    "treeitem" : 0
   } ]
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDELOGICS/SetPass/PSDELOGIC.json

+{
+  "memo" : "审核通过逻辑",
+  "codename" : "SetPass",
+  "psdelogicname" : "审核通过逻辑",
+  "logictype" : "DELOGIC",
+  "psdelogiclinks" : [ {
+    "defaultlink" : 0,
+    "srcpsdelogicnodeid" : "<PSDELOGIC>/Begin",
+    "srcendpoint" : "BottomCenter",
+    "dstpsdelogicnodeid" : "<PSDELOGIC>/Prepareparam1",
+    "linkinfo" : "连接3786:100",
+    "psdelogiclinkname" : "连接3786",
+    "ordervalue" : 100,
+    "dstendpoint" : "Left"
+  } ],
+  "psdelogicnodes" : [ {
+    "leftpos" : 160,
+    "logicnodetype" : "BEGIN",
+    "toppos" : 31,
+    "codename" : "Begin",
+    "paralleloutput" : 1,
+    "psdelogicnodename" : "开始"
+  }, {
+    "leftpos" : 511,
+    "logicnodetype" : "PREPAREPARAM",
+    "toppos" : 217,
+    "codename" : "Prepareparam1",
+    "paralleloutput" : 1,
+    "psdelogicnodename" : "设置准备参数",
+    "psdelnparams" : [ {
+      "paramtype" : "SETPARAMVALUE",
+      "psdelnparamname" : "直接值[1] ==> Default[FINISHED]",
+      "dstpsdlparamid" : "<PSDELOGIC>/Default",
+      "customdstparam" : "FINISHED",
+      "dstpsdlparamname" : "Default",
+      "ordervalue" : 100,
+      "srcvalue" : "1",
+      "srcvaluetype" : "SRCVALUE"
+    }, {
+      "paramtype" : "SETPARAMVALUE",
+      "psdelnparamname" : "直接值[3] ==> Default[CHECKSTATUS]",
+      "dstpsdlparamid" : "<PSDELOGIC>/Default",
+      "customdstparam" : "CHECKSTATUS",
+      "dstpsdlparamname" : "Default",
+      "ordervalue" : 100,
+      "srcvalue" : "3",
+      "srcvaluetype" : "SRCVALUE"
+    } ]
+  } ],
+  "psdelogicparams" : [ {
+    "psdelogicparamname" : "Default",
+    "parampsdeid" : "<PSDATAENTITY>",
+    "globalparam" : 0,
+    "defaultparam" : 1,
+    "logicname" : "传入变量"
+  } ]
+}
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDELOGICS/SetReject/PSDELOGIC.json

+{
+  "memo" : "审核不通过逻辑",
+  "codename" : "SetReject",
+  "psdelogicname" : "审核不通过逻辑",
+  "logictype" : "DELOGIC",
+  "psdelogiclinks" : [ {
+    "defaultlink" : 0,
+    "srcpsdelogicnodeid" : "<PSDELOGIC>/Begin",
+    "srcendpoint" : "BottomCenter",
+    "dstpsdelogicnodeid" : "<PSDELOGIC>/Prepareparam1",
+    "linkinfo" : "连接6839:100",
+    "psdelogiclinkname" : "连接6839",
+    "ordervalue" : 100,
+    "dstendpoint" : "Left"
+  } ],
+  "psdelogicnodes" : [ {
+    "leftpos" : 186,
+    "logicnodetype" : "BEGIN",
+    "toppos" : 43,
+    "codename" : "Begin",
+    "paralleloutput" : 1,
+    "psdelogicnodename" : "开始"
+  }, {
+    "leftpos" : 541,
+    "logicnodetype" : "PREPAREPARAM",
+    "toppos" : 203,
+    "codename" : "Prepareparam1",
+    "paralleloutput" : 1,
+    "psdelogicnodename" : "设置准备参数",
+    "psdelnparams" : [ {
+      "paramtype" : "SETPARAMVALUE",
+      "psdelnparamname" : "直接值[1] ==> Default[FINISHED]",
+      "dstpsdlparamid" : "<PSDELOGIC>/Default",
+      "customdstparam" : "FINISHED",
+      "dstpsdlparamname" : "Default",
+      "ordervalue" : 100,
+      "srcvalue" : "1",
+      "srcvaluetype" : "SRCVALUE"
+    }, {
+      "paramtype" : "SETPARAMVALUE",
+      "psdelnparamname" : "直接值[4] ==> Default[CHECKSTATUS]",
+      "dstpsdlparamid" : "<PSDELOGIC>/Default",
+      "customdstparam" : "CHECKSTATUS",
+      "dstpsdlparamname" : "Default",
+      "ordervalue" : 100,
+      "srcvalue" : "4",
+      "srcvaluetype" : "SRCVALUE"
+    } ]
+  } ],
+  "psdelogicparams" : [ {
+    "psdelogicparamname" : "Default",
+    "parampsdeid" : "<PSDATAENTITY>",
+    "globalparam" : 0,
+    "defaultparam" : 1,
+    "logicname" : "传入变量"
+  } ]
+}
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEUAGROUPS/Auto86/PSDEUAGROUP.json

+{
+  "codename" : "Auto86",
+  "psdeuagroupname" : "查看、删除",
+  "psdeuagrpdetails" : [ {
+    "validflag" : 1,
+    "addseparator" : 1,
+    "detailtype" : "DEUIACTION",
+    "psdeuiactionid" : "<PSDATAENTITY>/打开主信息页面(CheckDetail)",
+    "ordervalue" : 1000
+  }, {
+    "validflag" : 1,
+    "detailtype" : "DEUIACTION",
+    "psdeuiactionid" : "GRIDVIEW_REMOVEACTION(Remove)",
+    "ordervalue" : 2000
+  } ]
+}
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEUIACTIONS/审核不通过(SHBTG)/PSDEUIACTION.json

@@ -2,10 +2,13 @@
   "templmode" : 0,
   "closeeditview" : 1,
   "uiactiontype" : "BACKEND",
-  "caption" : "不通过",
+  "caption" : "审核不通过",
   "codename" : "SHBTG",
   "actiontarget" : "SINGLEKEY",
-  "psdeactionid" : "<PSDATAENTITY>/SHBTG",
+  "successinfo" : "审核不通过！",
+  "psdeactionid" : "<PSDATAENTITY>/SetReject",
+  "userconfirm" : 1,
+  "confirminfo" : "确认审核不通过？",
   "reloaddata" : 1,
   "psdeuiactionname" : "审核不通过"
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEUIACTIONS/审核通过(SHTG)/PSDEUIACTION.json

@@ -2,10 +2,13 @@
   "templmode" : 0,
   "closeeditview" : 1,
   "uiactiontype" : "BACKEND",
-  "caption" : "通过",
+  "caption" : "审核通过",
   "codename" : "SHTG",
   "actiontarget" : "SINGLEKEY",
-  "psdeactionid" : "<PSDATAENTITY>/SHTG",
+  "successinfo" : "审核已通过！",
+  "psdeactionid" : "<PSDATAENTITY>/SetPass",
+  "userconfirm" : 1,
+  "confirminfo" : "确认审核通过？",
   "reloaddata" : 1,
   "psdeuiactionname" : "审核通过"
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEUIACTIONS/打开主信息页面(CheckDetail)/PSDEUIACTION.json

+{
+  "templmode" : 0,
+  "uiactiontype" : "FRONT",
+  "caption" : "查看",
+  "codename" : "CheckDetail",
+  "actiontarget" : "SINGLEKEY",
+  "psdeviewbaseid" : "<PSDATAENTITY>/EditView9",
+  "frontprotype" : "WIZARD",
+  "psdeuiactionname" : "打开主信息页面"
+}
\ No newline at end of file

PSMODULES/VAC/PSDATAENTITIES/VACLEAVEMANAGE/PSDEVIEWBASES/WFQXJ_D30_WFGridView/PSDEVIEWBASE.json → PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEVIEWBASES/ApproavlGridView/PSDEVIEWBASE.json

 {
-  "pdvtparam" : "WFQXJ:D:30",
-  "pswfdeid" : "WFQXJ/VACLEAVEMANAGE",
-  "psdeviewbasetype" : "DEWFGRIDVIEW",
-  "codename" : "WFQXJ_D30_WFGridView",
-  "predefineviewtype" : "WFMDATAVIEW",
-  "deviewtag3" : "bc97d2e2b6c5c2adc8795ba5a79f374f",
+  "showcaptionbar" : 1,
+  "caption" : "见习期员工转正审核",
+  "titlepslanresid" : "Auto9279",
+  "psdeviewbasetype" : "DEGRIDVIEW",
+  "codename" : "ApproavlGridView",
+  "viewactions" : 0,
+  "titlepslanresname" : "界面文本（PAGE.*）[TITLE.PCMJXSYGZZJLMX.GRIDVIEW]",
   "psappviewcnt" : 0,
-  "psdeviewbasename" : "请假管理实体工作流表格视图(开发环境-请销假流程:已通过)",
-  "wfviewparam" : 0,
+  "psdeviewbasename" : "见习生员工转正明细实体表格视图（审核）",
   "readonlymode" : 0,
-  "deviewtag4" : "D:30",
   "dyncmode" : 0,
-  "title" : "请假管理工作流表格视图(开发环境-请销假流程:已通过)",
+  "title" : "见习期员工转正审核",
   "psdeviewctrls" : [ {
-    "psachandlerid" : "Auto121",
+    "psachandlerid" : "Auto25",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
@@ -23,10 +22,10 @@
     "psdeviewctrltype" : "GRID",
     "psdeviewctrlname" : "GRID",
     "psdegridname" : "主表格",
-    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
-    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
+    "configinfo" : "[表格]主表格;[数据集合]ALLDS",
+    "psdedatasetid" : "<PSDATAENTITY>/ALLDS"
   }, {
-    "psachandlerid" : "Auto29",
+    "psachandlerid" : "Auto5",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
@@ -37,23 +36,31 @@
     "psdeformid" : "<PSDATAENTITY>/Default",
     "configinfo" : "[表单]默认搜索表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（流程表格界面）",
-    "psdetoolbarid" : "Auto49",
+    "psdetoolbarname" : "工具栏模板（表格界面<过滤、帮助>）",
+    "psdetoolbarid" : "Auto146",
+    "psdeuagroupid" : "<PSDATAENTITY>/Auto173",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（流程表格界面）"
+    "configinfo" : "[工具栏]工具栏模板（表格界面<过滤、帮助>）",
+    "psdeuagroupname" : "审核"
   } ],
   "psdeviewrvs" : [ {
+    "minorpsdeviewid" : "<PSDATAENTITY>/EditView9",
     "refmodetext" : "编辑数据视图",
     "psdeviewrvname" : "EDITDATA",
+    "refmode" : "EDITDATA",
+    "openmode" : "POPUPMODAL",
     "defviewtype" : "EDITVIEW"
   }, {
+    "minorpsdeviewid" : "<PSDATAENTITY>/XZEditView",
     "refmodetext" : "新建数据视图",
     "psdeviewrvname" : "NEWDATA",
+    "refmode" : "NEWDATA",
+    "openmode" : "POPUPMODAL",
     "defviewtype" : "EDITVIEW"
   } ]
 }
\ No newline at end of file

PSMODULES/VAC/PSDATAENTITIES/VACLEAVEMANAGE/PSDEVIEWBASES/WFQXJ_W_WFEditView3/PSDEVIEWBASE.json → PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEVIEWBASES/EditView9/PSDEVIEWBASE.json

 {
-  "pdvtparam" : "WFQXJ:W",
-  "pswfdeid" : "WFQXJ/VACLEAVEMANAGE",
-  "psdeviewbasetype" : "DEWFEDITVIEW3",
-  "codename" : "WFQXJ_W_WFEditView3",
-  "predefineviewtype" : "WFEDITVIEW",
-  "deviewtag3" : "bc97d2e2b6c5c2adc8795ba5a79f374f",
+  "openmode" : "POPUPMODAL",
+  "height" : 750,
+  "caption" : "见习期员工转正",
+  "psdeviewbasetype" : "DEEDITVIEW9",
+  "codename" : "EditView9",
   "psappviewcnt" : 0,
-  "psdeviewbasename" : "请假管理实体工作流视图（分页关系）(开发环境-请销假流程)",
-  "wfviewparam" : 1,
+  "psdeviewbasename" : "见习生员工转正明细实体编辑视图（主信息页面）",
   "readonlymode" : 0,
-  "deviewtag4" : "W",
   "dyncmode" : 0,
-  "title" : "请假管理工作流编辑视图(开发环境-请销假流程)",
+  "title" : "见习期员工转正",
   "psdeviewctrls" : [ {
-    "validflag" : 1,
-    "defaultflag" : 1,
-    "enabledynasys" : 0,
-    "psdeid" : "<PSDATAENTITY>",
-    "psdeviewctrltype" : "DRTAB",
-    "psdeviewctrlname" : "DRTAB",
-    "psdedrname" : "请销假管理/请销假流程关系界面组",
-    "configinfo" : "[关系组]请销假管理/请销假流程关系界面组",
-    "psdedrid" : "<PSDATAENTITY>/WFQXJDR"
-  }, {
     "psachandlerid" : "Auto117",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
-    "psdeformname" : "审批中",
+    "psdeformname" : "主信息表单",
     "psdeid" : "<PSDATAENTITY>",
     "enableviewactions" : 1,
     "psdeviewctrltype" : "FORM",
     "psdeviewctrlname" : "FORM",
-    "psdeformid" : "<PSDATAENTITY>/SPZ",
-    "configinfo" : "[表单]审批中"
+    "psdeformid" : "<PSDATAENTITY>/Main",
+    "configinfo" : "[表单]主信息表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（流程编辑界面）",
-    "psdetoolbarid" : "Auto153",
+    "psdetoolbarname" : "工具栏模板（编辑界面<仅关闭>）",
+    "psdetoolbarid" : "Auto26",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（流程编辑界面）"
+    "configinfo" : "[工具栏]工具栏模板（编辑界面<仅关闭>）"
   } ]
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEVIEWBASES/XZEditView/PSDEVIEWBASE.json

 {
+  "openmode" : "POPUPMODAL",
+  "height" : 750,
+  "caption" : "见习期员工转正申请",
   "titlepslanresid" : "Auto861",
   "psdeviewbasetype" : "DEEDITVIEW",
   "codename" : "XZEditView",
   "viewactions" : 0,
   "titlepslanresname" : "界面文本（PAGE.*）[TITLE.PCMJXSYGZZJLMX.EDITVIEW]",
   "psappviewcnt" : 1,
-  "psdeviewbasename" : "见习生员工转正记录引用明细实体编辑视图(新增)",
+  "psdeviewbasename" : "见习生员工转正明细实体编辑视图(新增)",
   "readonlymode" : 0,
   "dyncmode" : 0,
-  "title" : "见习生员工转正记录引用明细",
+  "title" : "见习期员工转正申请",
   "psdeviewctrls" : [ {
     "psachandlerid" : "Auto20",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
-    "psdeformname" : "新建数据的表单",
+    "psdeformname" : "主编辑表单",
     "psdeid" : "<PSDATAENTITY>",
     "enableviewactions" : 1,
     "psdeviewctrltype" : "FORM",
     "psdeviewctrlname" : "FORM",
     "psdeformid" : "<PSDATAENTITY>/NewDataForm",
-    "configinfo" : "[表单]新建数据的表单"
+    "configinfo" : "[表单]主编辑表单"
   }, {
-    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
-    "psdetoolbarid" : "Auto47",
+    "psdetoolbarname" : "工具栏模板（编辑视图<确认、退出>）",
+    "psdetoolbarid" : "Auto162",
     "validflag" : 1,
     "defaultflag" : 1,
     "enabledynasys" : 0,
     "psdeid" : "<PSDATAENTITY>",
     "psdeviewctrltype" : "TOOLBAR",
     "psdeviewctrlname" : "TOOLBAR",
-    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+    "configinfo" : "[工具栏]工具栏模板（编辑视图<确认、退出>）"
   } ]
 }
\ No newline at end of file

PSMODULES/PCM/PSDATAENTITIES/PCMJXSYGZZJLMX/PSDEVIEWBASES/ZZJLGridView/PSDEVIEWBASE.json

 {
-  "caption" : "见习生期转正记录",
+  "caption" : "见习期转正记录",
   "titlepslanresid" : "Auto9279",
   "psdeviewbasetype" : "DEGRIDVIEW",
   "codename" : "ZZJLGridView",
@@ -12,7 +12,7 @@
   "dyncmode" : 0,
   "cappslanresname" : "界面文本（PAGE.*）[CAPTION.PCMJXSYGZZJLMX.WSHGRIDVIEW]",
   "pssysimageid" : "Auto750",
-  "title" : "见习生期转正记录",
+  "title" : "见习期转正记录",
   "psdeviewctrls" : [ {
     "psachandlerid" : "Auto15",
     "validflag" : 1,
@@ -51,7 +51,7 @@
     "psdeuagroupname" : "删除"
   } ],
   "psdeviewrvs" : [ {
-    "minorpsdeviewid" : "<PSDATAENTITY>/CKEditView",
+    "minorpsdeviewid" : "<PSDATAENTITY>/EditView9",
     "refmodetext" : "编辑数据视图",
     "psdeviewrvname" : "EDITDATA",
     "refmode" : "EDITDATA",

PSMODULES/PCM/PSDATAENTITIES/PCMPROFILE/PSDEWIZARDS/XD_FP/PSDEWIZARD.json

@@ -3,7 +3,7 @@
   "finishcaption" : "保存",
   "memo" : "应聘者信息录入向导(返聘)",
   "wizardstyle" : "STYLE2",
-  "finishpsdeactionid" : "<PSDATAENTITY>/Save",
+  "finishpsdeactionid" : "<PSDATAENTITY>/Update",
   "codename" : "XD_FP",
   "initpsdeactionid" : "<PSDATAENTITY>/Create",
   "psdewizardsteps" : [ {

PSMODULES/PCM/PSDATAENTITIES/PCMPROFILE/PSDEWIZARDS/XD_QTZP/PSDEWIZARD.json

@@ -3,7 +3,7 @@
   "finishcaption" : "保存",
   "memo" : "应聘者信息录入向导(其他招聘)",
   "wizardstyle" : "STYLE2",
-  "finishpsdeactionid" : "<PSDATAENTITY>/Save",
+  "finishpsdeactionid" : "<PSDATAENTITY>/Update",
   "codename" : "XD_QTZP",
   "initpsdeactionid" : "<PSDATAENTITY>/Create",
   "psdewizardsteps" : [ {

PSMODULES/PCM/PSDATAENTITIES/PCMPROFILE/PSDEWIZARDS/XD_SZ/PSDEWIZARD.json

@@ -3,7 +3,7 @@
   "finishcaption" : "保存",
   "memo" : "应聘者信息录入向导(社招)",
   "wizardstyle" : "STYLE2",
-  "finishpsdeactionid" : "<PSDATAENTITY>/Save",
+  "finishpsdeactionid" : "<PSDATAENTITY>/Update",
   "codename" : "XD_SZ",
   "initpsdeactionid" : "<PSDATAENTITY>/Create",
   "psdewizardsteps" : [ {

PSMODULES/PCM/PSDATAENTITIES/PCMXYGZZJLMX/PSDATAENTITY.json

@@ -122,6 +122,7 @@
     "psdetableid" : "<PSDATAENTITY>/T_PCMXYGZZJLMX",
     "lnpslanresname" : "属性逻辑名称（DEF.LNAME.*）[CHECKSTATUS]",
     "pscodelistname" : "审核状态",
+    "defaultvalue" : "2",
     "pkey" : 0,
     "length" : 60,
     "logicname" : "审核状态",
@@ -297,6 +298,7 @@
     "psdatatypeid" : "YESNO",
     "psdetableid" : "<PSDATAENTITY>/T_PCMXYGZZJLMX",
     "lnpslanresname" : "属性逻辑名称（DEF.LNAME.*）[PCMXYGZZJLMX.FINISHED]",
+    "defaultvalue" : "0",
     "pkey" : 0,
     "logicname" : "是否完成",
     "majorfield" : 0,
@@ -375,6 +377,7 @@
     "psdatatypeid" : "YESNO",
     "psdetableid" : "<PSDATAENTITY>/T_PCMXYGZZJLMX",
     "lnpslanresname" : "属性逻辑名称（DEF.LNAME.*）[ISTEMP]",
+    "defaultvalue" : "0",
     "pkey" : 0,
     "logicname" : "是否为临时数据",
     "majorfield" : 0,