2022-09-08 合同基本修改，焊接数据分析修改
This commit is contained in:
@@ -94,6 +94,48 @@
|
||||
<f:RenderField ColumnID="LineNumber_Electrophore" DataField="LineNumber_Electrophore" Width="150px" FieldType="String" HeaderText="行号-电承" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="Status" DataField="Status" Width="150px" FieldType="String" HeaderText="合同状态" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ContactUnitOfPartyA" DataField="ContactUnitOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系单位" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ContactPersonOfPartyA" DataField="ContactPersonOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系人" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ContactPersonOfPartyB" DataField="ContactPersonOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ContactPersonPhoneOfPartyB" DataField="ContactPersonPhoneOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人电话" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ContactPersonEmailOfPartyB" DataField="ContactPersonEmailOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人邮箱" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ContractAmountExcludingTax" DataField="ContractAmountExcludingTax" Width="150px" FieldType="String" HeaderText="合同不含税金额" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="PriceMethod" DataField="PriceMethod" Width="150px" FieldType="String" HeaderText="计价方式" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="SignedOnDate" DataField="SignedOnDate" Width="150px" FieldType="String" HeaderText="签订日期" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ContractStartDate" DataField="ContractStartDate" Width="150px" FieldType="String" HeaderText="合同起始日期" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ContractEndDate" DataField="ContractEndDate" Width="150px" FieldType="String" HeaderText="合同终止日期" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="PricingBasis" DataField="PricingBasis" Width="150px" FieldType="String" HeaderText="计价依据" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="SubcontractingMethod" DataField="SubcontractingMethod" Width="150px" FieldType="String" HeaderText="分包模式" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="IsItACentralizedPurchaseSupplier" DataField="IsItACentralizedPurchaseSupplier" Width="150px" FieldType="String" HeaderText="乙方是否为集采供应商/分包商" TextAlign="Center"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
|
||||
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
|
||||
|
||||
@@ -130,6 +172,6 @@
|
||||
</f:Window>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
</script>
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -46,11 +46,11 @@ namespace FineUIPro.Web.PHTGL.Filing
|
||||
WHEN '5' THEN 'ds' END) AS ContractType,
|
||||
( CASE Rev.State
|
||||
WHEN @ContractCreating THEN '编制中'
|
||||
WHEN @Contract_countersign THEN '会签中'
|
||||
WHEN @Contract_countersign THEN '会签中'
|
||||
WHEN @ContractReviewing THEN '审批中'
|
||||
WHEN @ContractReview_Complete THEN '审批成功'
|
||||
WHEN @ContractReview_Refuse THEN '审批被拒' END) AS State ,
|
||||
Con.Remarks,
|
||||
Con.Remarks,
|
||||
Con.EPCCode,
|
||||
Con.ProjectShortName,
|
||||
Con.[OpeningBank-TT] as OpeningBank_TT ,
|
||||
@@ -58,11 +58,28 @@ namespace FineUIPro.Web.PHTGL.Filing
|
||||
Con.[BankAccount-TT] as BankAccount_TT,
|
||||
Con.[BankAccount-electrophore] as BankAccount_electrophore,
|
||||
Con.[LineNumber-electrophore] as LineNumber_electrophore,
|
||||
Con.Retentionmoney,
|
||||
Con.Retentionmoney,
|
||||
(CASE Con.Status WHEN '0' THEN '已签订'
|
||||
WHEN '1' THEN '已完毕' END) as Status,
|
||||
Con.ContactUnitOfPartyA,
|
||||
Con.ContactPersonOfPartyA,
|
||||
Con.ContactPersonOfPartyB,
|
||||
Con.ContactPersonPhoneOfPartyB,
|
||||
Con.ContactPersonEmailOfPartyB,
|
||||
Con.ContractAmountExcludingTax,
|
||||
Con.PriceMethod,
|
||||
CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
|
||||
CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
|
||||
CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
|
||||
Con.PricingBasis,
|
||||
(CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
|
||||
WHEN '2' THEN '外部分包' END ) as SubcontractingMethod,
|
||||
(CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
|
||||
WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
|
||||
Pro.ProjectCode,
|
||||
Pro.ProjectName,
|
||||
Dep.DepartName,
|
||||
U.PersonName AS AgentName"
|
||||
U.PersonName AS AgentName "
|
||||
+ @" from PHTGL_ContractReview AS Rev"
|
||||
+ @" LEFT JOIN PHTGL_Contract AS Con ON Con.ContractId=Rev.ContractId"
|
||||
//+ @" left join PHTGL_ActionPlanFormation as Act on Act.EPCCode=Con.EPCCode"
|
||||
|
||||
Reference in New Issue
Block a user