支付说明

 Conflicts:

	view/listingItems/itemsDetail.html

static/js/project/listingItems/items2.js

@@ -921,6 +921,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
     //项目类型
     module.projectNumberDictionaries = function (data) {
         if (data.code == 200 && module.data.outProjectInformationDetail.projectNumber!='') {
+            module.data.outProjectInformationDetail.projectNumberOriginal = module.data.outProjectInformationDetail.projectNumber;
             var content = data.data;
             var projectNumber = content.filter(function (e) { return e.dictValue == module.data.outProjectInformationDetail.projectNumber; })[0].dictLabel;
             module.data.outProjectInformationDetail.projectNumber = projectNumber;
@@ -979,6 +980,7 @@ define(['jquery', "template", "Tools", 'swiper', 'itemsApi', 'swiper'], function
     //支付方式
     module.paymentTypeDictionaries = function (data) {
         if (data.code == 200 && module.data.outProjectInformationDetail.paymentType!='') {
+            module.data.outProjectInformationDetail.paymentTypeOriginal = module.data.outProjectInformationDetail.paymentType;
             var content = data.data;
             var paymentType = content[(module.data.outProjectInformationDetail.paymentType-1)].dictLabel;
             module.data.outProjectInformationDetail.paymentType = paymentType;

view/listingItems/itemsDetail.html

@@ -420,7 +420,7 @@
                         <td colspan="6">{{outProjectInformationDetail.linkPhone}}</td>
                     </tr>
                     <tr>
-                        <td rowspan="{{26+outProjectInformationDetail.subjectList.length}}">转出项目<br/>基本情况</td>
+                        <td rowspan="{{25+outProjectInformationDetail.subjectList.length}}">转出项目<br/>基本情况</td>
                         <td colspan="10">项目类型</td>
                         <td colspan="17">{{outProjectInformationDetail.projectNumber}}</td>
                     </tr>
@@ -507,7 +507,17 @@
                     </tr>
                     <tr>
                         <td colspan="10">支付说明</td>
-                        <td colspan="17">{{outProjectInformationDetail.paymentCondition}}</td>
+                        <td colspan="17">
+                            {{if outProjectInformationDetail.paymentTypeOriginal=='1'}}
+                                <span v-if="outProjectInformationDetail.projectNumberOriginal!=='8'">本合同签订之日起</span>
+                                <span v-if="outProjectInformationDetail.projectNumberOriginal=='8'">项目完成后</span>
+                                <span>{{outProjectInformationDetail.paymentComment}}日内，</span>
+                                <span v-if="outProjectInformationDetail.projectNumberOriginal!=='8'">乙方一次性将租赁费支付给甲方。</span>
+                                <span v-if="outProjectInformationDetail.projectNumberOriginal=='8'">甲方一次性将工程款支付给乙方。</span>
+                            {{else if outProjectInformationDetail.paymentTypeOriginal!='1'}}
+                                {{outProjectInformationDetail.paymentCondition}}
+                            {{/if}}
+                        </td>
                     </tr>
                     <tr>
                         <td colspan="10">授权情况</td>