From ced3b31b7f17eedbfdb532886adcfa31cbefb63e Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Tue, 14 May 2024 15:18:52 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E5=90=88=E5=90=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jnpf-app/pages/scm/form/contractL/index.vue | 211 ++++++++++++++------
 1 file changed, 151 insertions(+), 60 deletions(-)

diff --git a/jnpf-app/pages/scm/form/contractL/index.vue b/jnpf-app/pages/scm/form/contractL/index.vue
index 9403ba6b..f3dc6037 100644
--- a/jnpf-app/pages/scm/form/contractL/index.vue
+++ b/jnpf-app/pages/scm/form/contractL/index.vue
@@ -4,10 +4,8 @@
 			label-align="right" :label-width="labelwidth" class="jnpf-form">
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="合同类型" content="合同类型">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>合同类型
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -17,16 +15,14 @@
 					:left-icon-style="{'color':'#a0acb7'}" prop="contractType">
 					<jnpf-radio v-model="dataForm.contractType" :disabled="judgeWrite('contractType')"
 						@change="changeData('contractType',-1)" optionType="button" direction="horizontal"
-						:props="contractTypeProps" :options="contractTypeOptions">
+						:props="contractTypeProps" :options="contractTypeOptions" :showOnly="true">
 					</jnpf-radio>
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="基本信息" content="基本信息">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>基本信息
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -115,10 +111,8 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="主体信息" content="主体信息">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>主体信息
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -147,18 +141,14 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="财务信息" content="财务信息">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>财务信息
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="合同信息" content="合同信息">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>合同信息
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -208,10 +198,8 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="交货和运输信息" content="交货和运输信息">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>交货和运输信息
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -252,10 +240,8 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value=" 合同条款信息" content=" 合同条款信息">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>合同条款信息
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -485,14 +471,128 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="商品明细" content="商品明细">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>商品明细
 				</u-form-item>
 			</view>
 			<view class="jnpf-table" v-if="judgeShow('contractLCommodityList')">
-				<view class="jnpf-table-item" v-for="(item,i) in dataForm.contractLCommodityList" :key="i">
+				<u-collapse>
+					<u-collapse-item :title="dataForm.contractLCommodityList[i].commodityName+'(' + (i+1) + ') '" v-for="(item,i) in dataForm.contractLCommodityList" :key="i">
+						<!-- <view class="jnpf-table-item-title u-flex u-row-between">
+							<text class="jnpf-table-item-title-num">商品明细({{i+1}})</text>
+							<view class="jnpf-table-item-title-action"
+								v-if=" !judgeWrite('contractLCommodityList') && dataForm.contractLCommodityList.length>0"
+								@click="delcontractlcommodityList(i)">删除</view>
+						</view> -->
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-productId')"
+								:required="requiredList['contractlcommodityList-productId']" label="商品ID">
+								<jnpf-popup-select v-model="dataForm.contractLCommodityList[i].productId"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-productId')"
+									@change="changeData('contractlcommodity-productId',i)" :rowIndex="i"
+									:formData="dataForm" :templateJson="interfaceRes.contractlcommodityproductId" clearable
+									propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+									relationField='id' :vModel="'productId'+i"
+									:columnOptions="contractlcommodityproductIdColumnOptions"
+									interfaceId="530288111456878597" :pageSize="20" placeholder="请选择" type="popup"
+									:style='{"width":"100%"}'>
+								</jnpf-popup-select>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-commodityCode')"
+								:required="requiredList['contractlcommodityList-commodityCode']" label="商品编码">
+								<u-input v-model="dataForm.contractLCommodityList[i].commodityCode"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-commodityCode')"
+									@change="changeData('contractlcommodity-commodityCode',i)" input-align='right' clearable
+									placeholder="请输入" :style='{"width":"100%"}' readonly>
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-commodityName')"
+								:required="requiredList['contractlcommodityList-commodityName']" label="商品名称">
+								<u-input v-model="dataForm.contractLCommodityList[i].commodityName"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-commodityName')"
+									@change="changeData('contractlcommodity-commodityName',i)" input-align='right' clearable
+									placeholder="请输入" :style='{"width":"100%"}' readonly>
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-specifications')"
+								:required="requiredList['contractlcommodityList-specifications']" label="商品规格">
+								<u-input v-model="dataForm.contractLCommodityList[i].specifications"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-specifications')"
+									@change="changeData('contractlcommodity-specifications',i)" input-align='right'
+									clearable placeholder="请输入" :style='{"width":"100%"}' readonly>
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-inventoryUnitId')"
+								:required="requiredList['contractlcommodityList-inventoryUnitId']" label="库存单位">
+								<u-input :value="getProductUnitName(dataForm.contractLCommodityList[i].inventoryUnitId)"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-inventoryUnitId')"
+									@change="changeData('contractlcommodity-inventoryUnitId',i)" input-align='right'
+									clearable placeholder="请输入" :style='{"width":"100%"}' readonly>
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-procureUnit')"
+								:required="requiredList['contractlcommodityList-procureUnit']" label="采购单位">
+								<jnpf-select v-model="dataForm.contractLCommodityList[i].procureUnit"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-procureUnit')"
+									@change="changeData('contractlcommodity-procureUnit',i)" clearable placeholder="请选择"
+									:props="contractlcommodityprocureUnitProps"
+									:options="contractlcommodityprocureUnitOptions" :style='{"width":"100%"}'>
+								</jnpf-select>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-number')"
+								:required="requiredList['contractlcommodityList-number']" label="数量">
+								<u-input v-model="dataForm.contractLCommodityList[i].number"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-number')"
+									@change="changeData('contractlcommodity-number',i)" input-align='right' clearable
+									placeholder="请输入" :style='{"width":"100%"}'>
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-taxRate')"
+								:required="requiredList['contractlcommodityList-taxRate']" label="税率">
+								<u-input v-model="dataForm.contractLCommodityList[i].taxRate"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-taxRate')"
+									@change="changeData('contractlcommodity-taxRate',i)" input-align='right' clearable
+									placeholder="请输入" :style='{"width":"100%"}'>
+								</u-input><span style="padding: 0px 5px">%</span>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-priceRate')"
+								:required="requiredList['contractlcommodityList-priceRate']" label="含税单价">
+								<u-input v-model="dataForm.contractLCommodityList[i].priceRate"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-priceRate')"
+									@change="changeData('contractlcommodity-priceRate',i)" input-align='right' clearable
+									placeholder="请输入" :style='{"width":"100%"}'>
+								</u-input>
+							</u-form-item>
+						</view>
+						<view class="u-p-l-20 u-p-r-20 form-item-box">
+							<u-form-item v-if="judgeShow('contractlcommodityList-totalRate')"
+								:required="requiredList['contractlcommodityList-totalRate']" label="含税总金额">
+								<u-input v-model="dataForm.contractLCommodityList[i].totalRate"
+									:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-totalRate')"
+									@change="changeData('contractlcommodity-totalRate',i)" input-align='right' clearable
+									placeholder="请输入" :style='{"width":"100%"}'>
+								</u-input>
+							</u-form-item>
+						</view>
+					</u-collapse-item>
+				</u-collapse>
+				<!-- <view class="jnpf-table-item" v-for="(item,i) in dataForm.contractLCommodityList" :key="i">
 					<view class="jnpf-table-item-title u-flex u-row-between">
 						<text class="jnpf-table-item-title-num">商品明细({{i+1}})</text>
 						<view class="jnpf-table-item-title-action"
@@ -605,7 +705,7 @@
 							</u-input>
 						</u-form-item>
 					</view>
-				</view>
+				</view> -->
 				<view class="jnpf-table-addBtn" @click="addcontractlcommodityList"
 					v-if="!judgeWrite('contractLCommodityList')">
 					<u-icon name="plus" color="#2979ff"></u-icon>
@@ -614,10 +714,8 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="费用条款" content="费用条款">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>费用条款
 				</u-form-item>
 			</view>
 			<view class="jnpf-table" v-if="judgeShow('contractLFeeClauseList')">
@@ -668,10 +766,8 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="付款节点" content="付款节点">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>付款节点
 				</u-form-item>
 			</view>
 			<view class="jnpf-table" v-if="judgeShow('contractLPaymentList')">
@@ -743,7 +839,7 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('totalAmount')" :required="requiredList.totalAmount" label="合计金额（人民币）"
-					prop="totalAmount">
+					prop="totalAmount" label-position="top" label-align="left">
 					<jnpf-number-box v-model="dataForm.totalAmount" :disabled="judgeWrite('totalAmount')"
 						@change="changeData('totalAmount',-1)" :precision="2" addonAfter="元" :controls="false"
 						placeholder="数字文本" :step="1">
@@ -752,7 +848,7 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('amountCapitalization')" :required="requiredList.amountCapitalization"
-					label="大写金额（人民币）" prop="amountCapitalization">
+					label="大写金额（人民币）" prop="amountCapitalization" label-position="top" label-align="left">
 					<u-input v-model="dataForm.amountCapitalization" :disabled="judgeWrite('amountCapitalization')"
 						@change="changeData('amountCapitalization',-1)" input-align='right' clearable placeholder="请输入"
 						:style='{"width":"100%"}'>
@@ -761,10 +857,8 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="其他信息" content="其他信息">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>其他信息
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -777,8 +871,7 @@
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
-				<u-form-item v-if="judgeShow('remark')" :required="requiredList.remark" label="备注" label-width="0"
-					prop="remark">
+				<u-form-item v-if="judgeShow('remark')" :required="requiredList.remark" label="备注" prop="remark">
 					<u-input v-model="dataForm.remark" :disabled="judgeWrite('remark')"
 						@change="changeData('remark',-1)" input-align='right' placeholder="请输入" type="textarea"
 						:style='{"width":"100%"}'>
@@ -787,15 +880,13 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item>
-					<jnpf-text
-						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
-						value="附件信息" content="附件信息">
-					</jnpf-text>
+					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
+					</view>附件信息
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('contractAppendices')" :required="requiredList.contractAppendices"
-					label="合同附件" prop="contractAppendices">
+					label="合同附件" prop="contractAppendices" label-position="top" label-align="left">
 					<jnpf-file v-model="dataForm.contractAppendices" :disabled="judgeWrite('contractAppendices')"
 						@change="changeData('contractAppendices',-1)" :list="dataForm.contractAppendices"
 						tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
@@ -805,7 +896,7 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('ancillaryDocuments')" :required="requiredList.ancillaryDocuments"
-					label="附属文件" prop="ancillaryDocuments">
+					label="附属文件" prop="ancillaryDocuments" label-position="top" label-align="left">
 					<jnpf-file v-model="dataForm.ancillaryDocuments" :disabled="judgeWrite('ancillaryDocuments')"
 						@change="changeData('ancillaryDocuments',-1)" :list="dataForm.ancillaryDocuments"
 						tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
@@ -815,7 +906,7 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('transactionAppendices')" :required="requiredList.transactionAppendices"
-					label="关联交易合同（二级）" prop="transactionAppendices">
+					label="关联交易合同（二级）" prop="transactionAppendices" label-position="top" label-align="left">
 					<jnpf-file v-model="dataForm.transactionAppendices" :disabled="judgeWrite('transactionAppendices')"
 						@change="changeData('transactionAppendices',-1)" :list="dataForm.transactionAppendices"
 						tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
@@ -825,7 +916,7 @@
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('transactionAppendices2')" :required="requiredList.transactionAppendices2"
-					label="关联交易合同（三级）" prop="transactionAppendices2">
+					label="关联交易合同（三级）" prop="transactionAppendices2" label-position="top" label-align="left">
 					<jnpf-file v-model="dataForm.transactionAppendices2"
 						:disabled="judgeWrite('transactionAppendices2')"
 						@change="changeData('transactionAppendices2',-1)" :list="dataForm.transactionAppendices2"
@@ -1246,7 +1337,7 @@
 					"multiple": false,
 					"children": ""
 				},
-				labelwidth: 130 * 1.5,
+				labelwidth: 160 * 1.5,
 				menuId: '',
 				jurisdictionType: '',
 				ruleList: {