1.流程手册更改。

com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java

@@ -204,28 +204,28 @@ public class Report1Gener {
 				for(int i=0; i<object.size(); i++) {
 					String key = object.getJSONObject(i).getString("key");
 					//if (key.equals("explain") || key.equals("statistical_period") || key.equals("unit_measurement") || key.equals("data_sources") || key.equals("computational_formula") || key.equals("Index_definition") || key.equals("objective") || key.equals("Name_process_performance_indicator")) {
-					 if (key.equals("statistical_period")){//statistical_period
+					 if (key.equals("Name_process_performance_indicator")){//指标名称      Name_process_performance_indicator
 						String value = object.getJSONObject(i).getString("value");
-						dataMap.put("pl_statistical_period", value);
+						dataMap.put("pl_Name_process_performance_indicator", value);
-					}else if (key.equals("unit_measurement")){//unit_measurement
+					}else if (key.equals("set_the_purpose")){//设置目的      set_the_purpose
 						String value = object.getJSONObject(i).getString("value");
-						dataMap.put("pl_unit_measurement", value);
+						dataMap.put("pl_set_the_purpose", value);
-					}else if (key.equals("data_sources")){//data_sources
+					}else if (key.equals("Index_definition")){//指标定义     Index_definition
-						String value = object.getJSONObject(i).getString("value");
-						dataMap.put("pl_data_sources", value);
-					}else if (key.equals("computational_formula")){//computational_formula
-						String value = object.getJSONObject(i).getString("value");
-						dataMap.put("pl_computational_formula", value);
-					}else if (key.equals("Index_definition")){//Index_definition
 						String value = object.getJSONObject(i).getString("value");
 						dataMap.put("pl_Index_definition", value);
-					}else if (key.equals("objective")){//objective
+					}else if (key.equals("computational_formula")){//计算公式    computational_formula
 						String value = object.getJSONObject(i).getString("value");
-						dataMap.put("pl_objective", value);
+						dataMap.put("pl_computational_formula", value);
-					}else if (key.equals("Name_process_performance_indicator")){//Name_process_performance_indicator
+					}else if (key.equals("data_sources")){//数据来源     data_sources
 						String value = object.getJSONObject(i).getString("value");
-						dataMap.put("pl_Name_process_performance_indicatort", value);
+						dataMap.put("pl_data_sources", value);
-					}else if (key.equals("explain")){//explain
+					}else if (key.equals("unit_measurement")){//计量单位     unit_measurement
+						String value = object.getJSONObject(i).getString("value");
+						dataMap.put("pl_unit_measurement", value);
+					}else if (key.equals("statistical_period")){//统计周期      statistical_period
+						String value = object.getJSONObject(i).getString("value");
+						dataMap.put("pl_statistical_period", value);
+					}else if (key.equals("explain")){//说    明     explain
 						String value = object.getJSONObject(i).getString("value");
 						dataMap.put("pl_explain", value);
 					}

com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml

@@ -7328,7 +7328,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                         <w:sz w:val="21"/>
                                         <w:sz-cs w:val="21"/>
                                     </w:rPr>
-                                    <w:t>${pl_Name_process_performance_indicatort}</w:t>
+                                    <w:t>${pl_statistical_period}</w:t>
                                 </w:r>
                             </w:p>
                         </w:tc>

com.actionsoft.apps.coe.pal/method/control.kpi/diagram.attribute.custom.xml

@@ -19,5 +19,8 @@
   <attribute key="Process_Architecture_L1" title="L1" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="Process_Architecture_L2" title="L2" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="Process_Architecture_L3" title="L3" type="string" value="" desc="1" isRequired="false" ref="" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
-  <attribute key="element" title="元素" type="table" value="" desc="元素" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> 
+  <attribute key="element" title="元素" type="table" value="" desc="元素" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="set_the_purpose" title="设置目的" type="string" value="" desc="设置目的" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="data_sources" title="数据来源" type="string" value="" desc="数据来源" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="explain" title="说明" type="string" value="" desc="说明" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> 
 </attributes>

com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml

@@ -6,15 +6,15 @@
   <attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="application" title="适用范围" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="versions" title="版本" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
-  <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
   <attribute key="auditor" title="审核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="reviewer" title="复核人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="approver" title="审批人" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="related_files" title="相关文件" type="relation" value="" desc="1" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="support_files" title="支持文件" type="relation" value="" desc="1" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
+  <attribute key="support_files" title="支持文件" type="relation" value="" desc="支持文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="T_supplementary_articles" title="附则" type="string" value="" desc="1" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
   <attribute key="Process_owner" title="流程责任人" type="awsorg" value="" desc="流程责任人" isRequired="false" ref="{&quot;scope&quot;:[&quot;user&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="effective_date" title="生效日期" type="DateTimePicker" value="" desc="生效日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>  
@@ -24,7 +24,8 @@
   <attribute key="next_process" title="后置流程" type="relation" value="" desc="后置流程" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;shape&quot;,&quot;multiple&quot;:false,&quot;value&quot;:&quot;&quot;}" readonly="true" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="related_knowledge" title="相关知识" type="link" value="" desc="相关知识" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
   <attribute key="Issuing_department" title="发布部门" type="awsorg" value="" desc="发布部门" isRequired="false" ref="{&quot;scope&quot;:[&quot;department&quot;],&quot;multiple&quot;:false}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="Drafted_and_revised_date" title="拟制/修订日期" type="DateTimePicker" value="" desc="拟制/修订日期" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;listing1&quot;,&quot;secondColumn&quot;:&quot;listing2&quot;}" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>  
+  <attribute key="term" title="术语" type="table" value="" desc="术语" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;术语&quot;,&quot;secondColumn&quot;:&quot;定义&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
-  <attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;listing1&quot;,&quot;secondColumn&quot;:&quot;listing2&quot;}" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/> 
+  <attribute key="Organizational_role" title="组织角色" type="table" value="" desc="组织角色" isRequired="false" ref="{&quot;firstColumn&quot;:&quot;组织&quot;,&quot;secondColumn&quot;:&quot;职责&quot;}" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>  
+  <attribute key="content" title="内容" type="string" value="" desc="内容" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/> 
 </attributes>

com.awspaas.user.apps.coe.pal.output.zd/制度-手册(修改中).xml

@@ -4666,52 +4666,6 @@
                         </w:tc>
                     </w:tr>
 					</#list>
-                    <w:tr wsp:rsidR="008F1C42" wsp:rsidTr="008F1C42">
-                        <w:trPr>
-                            <w:trHeight w:val="340"/>
-                        </w:trPr>
-                        <w:tc>
-                            <w:tcPr>
-                                <w:tcW w:w="790" w:type="dxa"/>
-                                <w:tcBorders>
-                                    <w:top w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="auto"/>
-                                    <w:left w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="auto"/>
-                                    <w:bottom w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="auto"/>
-                                    <w:right w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
-                                </w:tcBorders>
-                                <w:vAlign w:val="center"/>
-                            </w:tcPr>
-                            <w:p wsp:rsidR="008F1C42" wsp:rsidRDefault="008F1C42" wsp:rsidP="008F1C42">
-                                <w:pPr>
-								<w:jc w:val="center"/>
-                                    <w:rPr>
-                                        <w:rFonts w:h-ansi="宋体" w:cs="Arial"/>
-                                        <w:color w:val="0000FF"/>
-                                    </w:rPr>
-                                </w:pPr>
-                            </w:p>
-                        </w:tc>
-                        <w:tc>
-                            <w:tcPr>
-                                <w:tcW w:w="4470" w:type="dxa"/>
-                                <w:tcBorders>
-                                    <w:top w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="auto"/>
-                                    <w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
-                                    <w:bottom w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="auto"/>
-                                    <w:right w:val="single" w:sz="6" wx:bdrwidth="15" w:space="0" w:color="auto"/>
-                                </w:tcBorders>
-                                <w:vAlign w:val="center"/>
-                            </w:tcPr>
-                            <w:p wsp:rsidR="008F1C42" wsp:rsidRDefault="008F1C42" wsp:rsidP="008F1C42">
-                                <w:pPr>
-                                    <w:rPr>
-                                        <w:rFonts w:h-ansi="宋体" w:cs="Arial"/>
-                                        <w:color w:val="0000FF"/>
-                                    </w:rPr>
-                                </w:pPr>
-                            </w:p>
-                        </w:tc>
-                    </w:tr>
                 </w:tbl>
             </wx:sub-section>
             <wx:sub-section>