diff --git a/jnpf-app/pages/scm/form/cwsettlement/index.vue b/jnpf-app/pages/scm/form/cwsettlement/index.vue
index 1fe3e12f..d4d347a9 100644
--- a/jnpf-app/pages/scm/form/cwsettlement/index.vue
+++ b/jnpf-app/pages/scm/form/cwsettlement/index.vue
@@ -24,10 +24,10 @@
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 ">
-				<u-form-item>			
+				<u-form-item>
 					<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">
@@ -53,7 +53,7 @@
 					</u-input>
 				</u-form-item>
 			</view>
-			<view class="u-p-l-20 u-p-r-20 form-item-box">
+			<!-- 	<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('settlementType')" :required="requiredList.settlementType" label="应付调整类型"
 					prop="settlementType">
 					<jnpf-select v-model="dataForm.settlementType" :disabled="judgeWrite('settlementType')"
@@ -61,8 +61,8 @@
 						:props="settlementTypeProps" :options="settlementTypeOptions" :style='{"width":"100%"}'>
 					</jnpf-select>
 				</u-form-item>
-			</view>
-			<view class="u-p-l-20 u-p-r-20 form-item-box">
+			</view> -->
+			<!-- 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('settlementExpenses')" :required="requiredList.settlementExpenses"
 					label="应付调整费用" prop="settlementExpenses">
 					<u-input v-model="dataForm.settlementExpenses" :disabled="judgeWrite('settlementExpenses')"
@@ -70,8 +70,8 @@
 						placeholder="请输入" :style='{"width":"100%"}'>
 					</u-input>
 				</u-form-item>
-			</view>
-			<view class="u-p-l-20 u-p-r-20 form-item-box">
+			</view> -->
+			<!-- <view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('paymentAmount')" :required="requiredList.paymentAmount" label="已付金额"
 					prop="paymentAmount">
 					<u-input v-model="dataForm.paymentAmount" :disabled="judgeWrite('paymentAmount')"
@@ -79,7 +79,7 @@
 						placeholder="请输入" :style='{"width":"100%"}'>
 					</u-input>
 				</u-form-item>
-			</view>
+			</view> -->
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('prepaidDeductionAmount')" :required="requiredList.prepaidDeductionAmount"
 					label="预付抵扣" prop="prepaidDeductionAmount">
@@ -89,7 +89,7 @@
 					</u-input>
 				</u-form-item>
 			</view>
-			<view class="u-p-l-20 u-p-r-20 form-item-box">
+			<!-- <view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('returnAmount')" :required="requiredList.returnAmount" label="退回金额"
 					prop="returnAmount">
 					<u-input v-model="dataForm.returnAmount" :disabled="judgeWrite('returnAmount')"
@@ -97,7 +97,7 @@
 						placeholder="请输入" :style='{"width":"100%"}'>
 					</u-input>
 				</u-form-item>
-			</view>
+			</view> -->
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('marginAmount')" :required="requiredList.marginAmount" label="抵扣保证金金额"
 					prop="marginAmount">
@@ -154,7 +154,7 @@
 					</u-input>
 				</u-form-item>
 			</view>
-		<!-- 	<view class="u-p-l-20 u-p-r-20 ">
+			<!-- 	<view class="u-p-l-20 u-p-r-20 ">
 				<u-form-item>
 					<jnpf-group value="结算调整" content="结算调整" contentPosition="left">
 					</jnpf-group>
@@ -171,7 +171,7 @@
 					</u-input>
 				</u-form-item>
 			</view>
-			<view class="u-p-l-20 u-p-r-20 form-item-box">
+			<!-- <view class="u-p-l-20 u-p-r-20 form-item-box">
 				<u-form-item v-if="judgeShow('applyAmount')" :required="requiredList.applyAmount" label="申请金额"
 					prop="applyAmount">
 					<u-input v-model="dataForm.applyAmount" :disabled="judgeWrite('applyAmount')"
@@ -179,7 +179,7 @@
 						placeholder="请输入" :style='{"width":"100%"}'>
 					</u-input>
 				</u-form-item>
-			</view>
+			</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="备注" prop="remark">
 					<u-input v-model="dataForm.remark" :disabled="judgeWrite('remark')"
@@ -214,31 +214,46 @@
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementsubjectList-paymentMethod')"
 							:required="requiredList['cwsettlementsubjectList-paymentMethod']" label="付款方式">
-							<u-input v-model="dataForm.cwsettlementsubjectList[i].paymentMethod"
+
+
+							<jnpf-select v-model="dataForm.cwsettlementsubjectList[i].paymentMethod"
 								:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-paymentMethod')"
-								@change="changeData('cwsettlementsubject-paymentMethod',i)" input-align='right'
-								clearable placeholder="请输入" :style='{"width":"100%"}'>
-							</u-input>
+								@change="changeData('cwsettlementsubject-paymentMethod',i)" clearable placeholder="请选择"
+								:props="paymentMethodProps" :options="paymentMethodOptions" :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('cwsettlementsubjectList-collaborationMethod')"
 							:required="requiredList['cwsettlementsubjectList-collaborationMethod']" label="合作方式">
-							<u-input v-model="dataForm.cwsettlementsubjectList[i].collaborationMethod"
-								:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-collaborationMethod')"
-								@change="changeData('cwsettlementsubject-collaborationMethod',i)" input-align='right'
-								clearable placeholder="请输入" :style='{"width":"100%"}'>
-							</u-input>
+
+							<jnpf-select v-model="dataForm.cwsettlementsubjectList[i].collaborationMethod"
+								:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubject-collaborationMethod')"
+								@change="changeData('cwsettlementsubject-collaborationMethod',i)" clearable
+								placeholder="请选择" :props="collaborationMethodProps"
+								:options="collaborationMethodOptions" :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('cwsettlementsubjectList-settlementMethod')"
 							:required="requiredList['cwsettlementsubjectList-settlementMethod']" label="结算方式">
-							<u-input v-model="dataForm.cwsettlementsubjectList[i].settlementMethod"
+							<!-- 	<u-input v-model="dataForm.cwsettlementsubjectList[i].settlementMethod"
 								:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-settlementMethod')"
 								@change="changeData('cwsettlementsubject-settlementMethod',i)" input-align='right'
 								clearable placeholder="请输入" :style='{"width":"100%"}'>
-							</u-input>
+							</u-input> -->
+
+							<jnpf-select v-model="dataForm.cwsettlementsubjectList[i].settlementMethod"
+								:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-settlementMethod')"
+								@change="changeData('cwsettlementsubject-settlementMethod',i)" clearable
+								placeholder="请选择" :props="settlementMethodProps" :options="settlementMethodOptions"
+								:style='{"width":"100%"}'>
+							</jnpf-select>
+
 						</u-form-item>
 					</view>
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -341,7 +356,7 @@
 							</u-input>
 						</u-form-item>
 					</view>
-					<view class="u-p-l-20 u-p-r-20 form-item-box">
+					<!-- <view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementcontractList-currency')"
 							:required="requiredList['cwsettlementcontractList-currency']" label="币种">
 							<u-input v-model="dataForm.cwsettlementcontractList[i].currency"
@@ -350,15 +365,19 @@
 								placeholder="请输入" :style='{"width":"100%"}'>
 							</u-input>
 						</u-form-item>
-					</view>
+					</view> -->
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementcontractList-procurementModel')"
 							:required="requiredList['cwsettlementcontractList-procurementModel']" label="采购模式">
-							<u-input v-model="dataForm.cwsettlementcontractList[i].procurementModel"
+
+
+							<jnpf-select v-model="dataForm.cwsettlementcontractList[i].procurementModel"
 								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-procurementModel')"
-								@change="changeData('cwsettlementcontract-procurementModel',i)" input-align='right'
-								clearable placeholder="请输入" :style='{"width":"100%"}'>
-							</u-input>
+								@change="changeData('cwsettlementcontractList-procurementModel',i)" clearable
+								placeholder="请选择" :options="procurementModelOptions" :props="procurementModelProps">
+								:style='{"width":"100%"}'>
+							</jnpf-select>
+
 						</u-form-item>
 					</view>
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -379,6 +398,13 @@
 								@change="changeData('cwsettlementcontract-pricingModel',i)" input-align='right'
 								clearable placeholder="请输入" :style='{"width":"100%"}'>
 							</u-input>
+
+							<jnpf-select v-model="dataForm.cwsettlementcontractList[i].pricingModel"
+								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontract-pricingModel')"
+								@change="changeData('cwsettlementcontract-pricingModel',i)" clearable placeholder="请选择"
+								:options="pricingModelOptions" :props="pricingModelProps" :style='{"width":"100%"}'>
+							</jnpf-select>
+
 						</u-form-item>
 					</view>
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -424,14 +450,18 @@
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementcontractList-deliveryModel')"
 							:required="requiredList['cwsettlementcontractList-deliveryModel']" label="交货方式">
-							<u-input v-model="dataForm.cwsettlementcontractList[i].deliveryModel"
+
+
+							<jnpf-select v-model="dataForm.cwsettlementcontractList[i].deliveryModel"
 								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-deliveryModel')"
-								@change="changeData('cwsettlementcontract-deliveryModel',i)" input-align='right'
-								clearable placeholder="请输入" :style='{"width":"100%"}'>
-							</u-input>
+								@change="changeData('cwsettlementcontractList-deliveryModel',i)" clearable
+								placeholder="请选择" :options="deliveryModelOptions" :props="deliveryModelProps"
+								:style='{"width":"100%"}'>
+							</jnpf-select>
+
 						</u-form-item>
 					</view>
-					<view class="u-p-l-20 u-p-r-20 form-item-box">
+					<!-- <view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementcontractList-deliveryMethod')"
 							:required="requiredList['cwsettlementcontractList-deliveryMethod']" label="配送方式">
 							<u-input v-model="dataForm.cwsettlementcontractList[i].deliveryMethod"
@@ -440,15 +470,19 @@
 								clearable placeholder="请输入" :style='{"width":"100%"}'>
 							</u-input>
 						</u-form-item>
-					</view>
+					</view> -->
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementcontractList-modeTransport')"
 							:required="requiredList['cwsettlementcontractList-modeTransport']" label="运输方式">
-							<u-input v-model="dataForm.cwsettlementcontractList[i].modeTransport"
-								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-modeTransport')"
-								@change="changeData('cwsettlementcontract-modeTransport',i)" input-align='right'
-								clearable placeholder="请输入" :style='{"width":"100%"}'>
-							</u-input>
+
+
+
+							<jnpf-select v-model="dataForm.cwsettlementcontractList[i].modeTransport"
+								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontract-modeTransport')"
+								@change="changeData('cwsettlementcontract-modeTransport',i)" clearable placeholder="请选择"
+							:props="modeTransportProps"	:options="modeTransportOptions"  :style='{"width":"100%"}'>
+							</jnpf-select>
+
 						</u-form-item>
 					</view>
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -459,6 +493,13 @@
 								@change="changeData('cwsettlementcontract-costBearingMian',i)" input-align='right'
 								clearable placeholder="请输入" :style='{"width":"100%"}'>
 							</u-input>
+							
+							<jnpf-select v-model="dataForm.cwsettlementcontractList[i].modeTransport"
+								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontract-costBearingMian')"
+								@change="changeData('cwsettlementcontract-costBearingMian',i)" clearable placeholder="请选择"
+							:options="costBearingMianOptions" :props="costBearingMianProps"  :style='{"width":"100%"}'>
+							</jnpf-select>
+							
 						</u-form-item>
 					</view>
 				</view>
@@ -528,7 +569,7 @@
 					</view>
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementaccountList-type')"
-							:required="requiredList['cwsettlementaccountList-type']" label="类型（1：采购对账 2：销售对账 3：其他对账）">
+							:required="requiredList['cwsettlementaccountList-type']" label="类型">
 							<jnpf-select v-model="dataForm.cwsettlementaccountList[i].type"
 								:disabled="judgeWrite('cwsettlementaccountList')||judgeWrite('cwsettlementaccountList-type')"
 								@change="changeData('cwsettlementaccount-type',i)" clearable placeholder="请选择"
@@ -644,7 +685,7 @@
 					</view>
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementcostList-type')"
-							:required="requiredList['cwsettlementcostList-type']" label="收付类型（1：收款 2：付款）">
+							:required="requiredList['cwsettlementcostList-type']" label="收付类型">
 							<jnpf-select v-model="dataForm.cwsettlementcostList[i].type"
 								:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-type')"
 								@change="changeData('cwsettlementcost-type',i)" clearable placeholder="请选择"
@@ -660,7 +701,7 @@
 							<jnpf-select v-model="dataForm.cwsettlementcostList[i].wayType"
 								:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-wayType')"
 								@change="changeData('cwsettlementcost-wayType',i)" clearable placeholder="请选择"
-								:props="cwsettlementcostwayTypeProps" :options="cwsettlementcostwayTypeOptions"
+								:props="settlementcostwayTypeProps" :options="settlementcostwayTypeOptions"
 								:style='{"width":"100%"}'>
 							</jnpf-select>
 						</u-form-item>
@@ -694,7 +735,7 @@
 					</view>
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementpaymentreceiptList-type')"
-							:required="requiredList['cwsettlementpaymentreceiptList-type']" label="类型（1：付款方 2：收款方）">
+							:required="requiredList['cwsettlementpaymentreceiptList-type']" label="类型）">
 							<jnpf-select v-model="dataForm.cwsettlementpaymentreceiptList[i].type"
 								:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-type')"
 								@change="changeData('cwsettlementpaymentreceipt-type',i)" clearable placeholder="请选择"
@@ -743,7 +784,7 @@
 							</u-input>
 						</u-form-item>
 					</view>
-					<view class="u-p-l-20 u-p-r-20 form-item-box">
+					<!-- 	<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementpaymentreceiptList-depositArea')"
 							:required="requiredList['cwsettlementpaymentreceiptList-depositArea']" label="开户地区">
 							<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].depositArea"
@@ -752,7 +793,7 @@
 								clearable placeholder="请输入" :style='{"width":"100%"}'>
 							</u-input>
 						</u-form-item>
-					</view>
+					</view> -->
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementpaymentreceiptList-bankBranchName')"
 							:required="requiredList['cwsettlementpaymentreceiptList-bankBranchName']" label="支行名称">
@@ -888,7 +929,7 @@
 							</u-input>
 						</u-form-item>
 					</view>
-					<view class="u-p-l-20 u-p-r-20 form-item-box">
+					<!-- <view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementsummaryList-otherType')"
 							:required="requiredList['cwsettlementsummaryList-otherType']" label="其他费用类型">
 							<u-input v-model="dataForm.cwsettlementsummaryList[i].otherType"
@@ -897,8 +938,8 @@
 								placeholder="请输入" :style='{"width":"100%"}'>
 							</u-input>
 						</u-form-item>
-					</view>
-					<view class="u-p-l-20 u-p-r-20 form-item-box">
+					</view> -->
+					<!-- 				<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementsummaryList-otherExpenses')"
 							:required="requiredList['cwsettlementsummaryList-otherExpenses']" label="其他费用">
 							<u-input v-model="dataForm.cwsettlementsummaryList[i].otherExpenses"
@@ -907,7 +948,7 @@
 								clearable placeholder="请输入" :style='{"width":"100%"}'>
 							</u-input>
 						</u-form-item>
-					</view>
+					</view> -->
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementsummaryList-settlementTotal')"
 							:required="requiredList['cwsettlementsummaryList-settlementTotal']" label="结算合计（含税）">
@@ -1142,13 +1183,135 @@
 					"fullName": "付款",
 					"id": "2"
 				}],
+				paymentMethodOptions: [{
+					"fullName": "无",
+					"id": "1"
+				}, {
+					"fullName": "现金",
+					"id": "2"
+				}, {
+					"fullName": "银行转账",
+					"id": "3"
+				}, {
+					"fullName": "承兑汇票",
+					"id": "4"
+				}, {
+					"fullName": "支付宝",
+					"id": "5"
+				}, {
+					"fullName": "微信",
+					"id": "6"
+				}],
+				paymentMethodProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+
+				collaborationMethodOptions: [{
+					"fullName": "买断",
+					"id": "1"
+				}, {
+					"fullName": "联营",
+					"id": "2"
+				}],
+				collaborationMethodProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				procurementModelOptions: [{
+					"fullName": "以销定采",
+					"id": "1"
+				}, {
+					"fullName": "以采定销",
+					"id": "2"
+				}],
+				procurementModelProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+
+				pricingModelOptions: [{
+					"fullName": "锁价模式",
+					"id": "1"
+				}, {
+					"fullName": "后结算模式",
+					"id": "2"
+				}],
+				pricingModelProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+
+				deliveryModelOptions: [{
+					"fullName": "快递交货",
+					"id": "1"
+				}, {
+					"fullName": "送货上门",
+					"id": "2"
+				}, {
+					"fullName": "上门提货",
+					"id": "3"
+				}],
+				deliveryModelProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+
+				modeTransportOptions: [{
+					"fullName": "公路",
+					"id": "1"
+				}, {
+					"fullName": "铁路",
+					"id": "2"
+				}, {
+					"fullName": "轮船",
+					"id": "3"
+				}, {
+					"fullName": "空运",
+					"id": "4"
+				}, {
+					"fullName": "无",
+					"id": "5"
+				}],
+				modeTransportProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				
+				 costBearingMianOptions: [{
+				          "fullName": "甲方",
+				          "id": "1"
+				        }, {
+				          "fullName": "乙方",
+				          "id": "2"
+				        }],
+				        costBearingMianProps: {
+				          "label": "fullName",
+				          "value": "id"
+				        },
+
+
+
+
+				settlementMethodOptions: [{
+					"fullName": "先货后款",
+					"id": "1"
+				}, {
+					"fullName": "先款后货",
+					"id": "2"
+				}],
+				settlementMethodProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+
 				cwsettlementcosttypeProps: {
 					"label": "fullName",
 					"value": "id",
 					"multiple": false,
 					"children": ""
 				},
-				cwsettlementcostwayTypeOptions: [{
+				settlementcostwayTypeOptions: [{
 					"fullName": "单独收款",
 					"id": "1"
 				}, {
@@ -1161,7 +1324,7 @@
 					"fullName": "账扣",
 					"id": "4"
 				}],
-				cwsettlementcostwayTypeProps: {
+				settlementcostwayTypeProps: {
 					"label": "fullName",
 					"value": "id",
 					"multiple": false,