diff --git a/jnpf-app/pages/scm/form/cwsettlement/index.vue b/jnpf-app/pages/scm/form/cwsettlement/index.vue
index d4d347a9..a6fec678 100644
--- a/jnpf-app/pages/scm/form/cwsettlement/index.vue
+++ b/jnpf-app/pages/scm/form/cwsettlement/index.vue
@@ -5,7 +5,7 @@
 			<view class="u-p-l-20 u-p-r-20 ">
 				<u-form-item>
 					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
-					</view>单据类型
+					</view>账单类型
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
@@ -17,8 +17,8 @@
 				</u-form-item>
 			</view>
 			<view class="u-p-l-20 u-p-r-20 form-item-box">
-				<u-form-item v-if="judgeShow('type')" :required="requiredList.type" label="类型" prop="type">
-					<jnpf-radio v-model="dataForm.type" :disabled="judgeWrite('type')" @change="changeData('type',-1)"
+				<u-form-item v-if="judgeShow('type')" :required="requiredList.type" label="单据类型" prop="type">
+					<jnpf-radio v-model="dataForm.type" :disabled="judgeWrite('type')" @change="typeChangeData"
 						optionType="button" direction="horizontal" :props="typeProps" :options="typeOptions">
 					</jnpf-radio>
 				</u-form-item>
@@ -26,7 +26,7 @@
 			<view class="u-p-l-20 u-p-r-20 ">
 				<u-form-item>
 					<view style="float: left; width:8px; height: 16px;background-color: cadetblue;margin-right: 8px;">
-					</view>基础配置
+					</view>基础信息
 
 				</u-form-item>
 			</view>
@@ -134,7 +134,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('currentMarginAmount')" :required="requiredList.currentMarginAmount"
 					label="本次抵扣保证金金额" prop="currentMarginAmount">
 					<u-input v-model="dataForm.currentMarginAmount" :disabled="judgeWrite('currentMarginAmount')"
@@ -142,8 +142,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('currentUnderpaymentAmount')"
 					:required="requiredList.currentUnderpaymentAmount" label="本次抵扣压款金额"
 					prop="currentUnderpaymentAmount">
@@ -153,7 +153,7 @@
 						clearable placeholder="请输入" :style='{"width":"100%"}'>
 					</u-input>
 				</u-form-item>
-			</view>
+			</view> -->
 			<!-- 	<view class="u-p-l-20 u-p-r-20 ">
 				<u-form-item>
 					<jnpf-group value="结算调整" content="结算调整" contentPosition="left">
@@ -191,7 +191,7 @@
 			<view class="jnpf-table" v-if="judgeShow('cwsettlementsubjectList')">
 				<view class="jnpf-table-item" v-for="(item,i) in dataForm.cwsettlementsubjectList" :key="i">
 					<view class="jnpf-table-item-title u-flex u-row-between">
-						<text class="jnpf-table-item-title-num">供应商名称({{i+1}})</text>
+						<text class="jnpf-table-item-title-num">供应商/客户({{i+1}})</text>
 						<view class="jnpf-table-item-title-action"
 							v-if=" !judgeWrite('cwsettlementsubjectList') && dataForm.cwsettlementsubjectList.length>0"
 							@click="delcwsettlementsubjectList(i)">删除</view>
@@ -201,7 +201,9 @@
 							:required="requiredList['cwsettlementsubjectList-subjectId']" label="客户/供应商名称">
 							<jnpf-popup-select v-model="dataForm.cwsettlementsubjectList[i].subjectId"
 								:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-subjectId')"
-								@change="changeData('cwsettlementsubject-subjectId',i)" :rowIndex="i"
+								:rowIndex="i"
+								
+								@change="subjectChangeData" 
 								:formData="dataForm" :templateJson="interfaceRes.cwsettlementsubjectsubjectId" clearable
 								propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
 								relationField='name' :vModel="'subjectId'+i"
@@ -324,18 +326,27 @@
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementcontractList-contractId')"
 							:required="requiredList['cwsettlementcontractList-contractId']" label="合同名称">
-							<jnpf-popup-select v-model="dataForm.cwsettlementcontractList[i].contractId"
+							<!-- <jnpf-popup-select v-model="dataForm.cwsettlementcontractList[i].contractId"
 								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-contractId')"
-								@change="changeData('cwsettlementcontract-contractId',i)" :rowIndex="i"
+								 @change="contractChangeData"
 								:formData="dataForm" :templateJson="interfaceRes.cwsettlementcontractcontractId" hasPage
-								clearable propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-								relationField='contract_name' :vModel="'contractId'+i"
-								:columnOptions="cwsettlementcontractcontractIdColumnOptions"
-								interfaceId="545203391626777029" :pageSize="20" placeholder="请选择" type="popup"
+								clearable propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" :innerName="dataForm.cwsettlementcontractList[i].contractName"
+								relationField='contract_name' :vModel="'contractId'+i" 
+								:columnOptions="cwsettlementcontractcontractIdColumnOptions" 
+								:field="'contractId'"
+								
+								interfaceId="545203391626777029" :pageSize="20" placeholder="请选择" type="popup" 
 								:style='{"width":"100%"}'>
-							</jnpf-popup-select>
+							</jnpf-popup-select> -->
+							<u-input v-model="dataForm.cwsettlementcontractList[i].contractName"
+								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-contractName')"
+								@change="changeData('cwsettlementcontract-contractNamee',i)" input-align='right'
+								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-contractPeriodTime')"
 							:required="requiredList['cwsettlementcontractList-contractPeriodTime']" label="合同期限开始 ">
@@ -408,13 +419,30 @@
 						</u-form-item>
 					</view>
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						
+					
+						
 						<u-form-item v-if="judgeShow('cwsettlementcontractList-subject')"
 							:required="requiredList['cwsettlementcontractList-subject']" label="乙方主体">
-							<u-input v-model="dataForm.cwsettlementcontractList[i].subject"
+							<!-- <u-input v-model="dataForm.cwsettlementcontractList[i].subject"
 								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-subject')"
 								@change="changeData('cwsettlementcontract-subject',i)" input-align='right' clearable
 								placeholder="请输入" :style='{"width":"100%"}'>
-							</u-input>
+							</u-input> -->
+							
+							<jnpf-popup-select v-model="dataForm.cwsettlementcontractList[i].subject"
+								:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontract-subject')"
+								:rowIndex="i"
+									@change="changeData('cwsettlementcontract-subject',i)"
+								:formData="dataForm" :templateJson="interfaceRes.cwsettlementcontractsubject" clearable
+								propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+								relationField='name' :vModel="'subjectId'+i"
+								:columnOptions="cwsettlementcontractsubjectcolumnOptions"
+								interfaceId="545224980988727749" :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">
@@ -517,7 +545,7 @@
 							v-if=" !judgeWrite('cwsettlementaccountList') && dataForm.cwsettlementaccountList.length>0"
 							@click="delcwsettlementaccountList(i)">删除</view>
 					</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('cwsettlementaccountList-accountId')"
 							:required="requiredList['cwsettlementaccountList-accountId']" label="对账单">
 							<u-input v-model="dataForm.cwsettlementaccountList[i].accountId"
@@ -526,7 +554,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('cwsettlementaccountList-code')"
 							:required="requiredList['cwsettlementaccountList-code']" label="单据编号">
@@ -852,11 +880,24 @@
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementsummaryList-productId')"
 							:required="requiredList['cwsettlementsummaryList-productId']" label="商品名称">
-							<u-input v-model="dataForm.cwsettlementsummaryList[i].productId"
+							<!-- <u-input v-model="dataForm.cwsettlementsummaryList[i].productId"
 								:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-productId')"
 								@change="changeData('cwsettlementsummary-productId',i)" input-align='right' clearable
 								placeholder="请输入" :style='{"width":"100%"}'>
-							</u-input>
+							</u-input> -->
+							
+							<jnpf-popup-select v-model="dataForm.cwsettlementsummaryList[i].productId"
+								:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-productId')"
+								:rowIndex="i"
+									@change="changeData('cwsettlementsummaryList-productId',i)"
+								:formData="dataForm" :templateJson="interfaceRes.voucherproductproductId" clearable
+								propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+								relationField='name' :vModel="'subjectId'+i"
+								:columnOptions="voucherproductproductIdcolumnOptions"
+								interfaceId="529919666429100229" :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">
@@ -1129,9 +1170,6 @@
 				}, {
 					"fullName": "销售结算",
 					"id": "2"
-				}, {
-					"fullName": "其他结算",
-					"id": "3"
 				}],
 				typeProps: {
 					"label": "fullName",
@@ -1156,10 +1194,19 @@
 					"label": "名称",
 					"value": "name"
 				}, ],
-				cwsettlementcontractcontractIdColumnOptions: [{
-					"label": "合同名称",
-					"value": "contract_name"
-				}, ],
+			 cwsettlementcontractcontractIdcolumnOptions: [{
+			          "label": "合同编码",
+			          "value": "contract_number"
+			        }, {
+			          "label": "合同名称",
+			          "value": "contract_name"
+			        }, {
+			          "label": "类型",
+			          "value": "contractTypeName"
+			        }, {
+			          "label": "名称",
+			          "value": "subjectName"
+			        }, ],
 				cwsettlementaccounttypeOptions: [{
 					"fullName": "采购对账",
 					"id": "1"
@@ -1289,8 +1336,14 @@
 				          "label": "fullName",
 				          "value": "id"
 				        },
+						
+						      voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "规格", "value": "spec" },],
 
 
+   cwsettlementcontractsubjectcolumnOptions: [{
+        "label": "主体名称",
+        "value": "name"
+      },],
 
 
 				settlementMethodOptions: [{
@@ -1413,27 +1466,31 @@
 					cwsettlementsubjectunderpaymentMethod: [],
 					cwsettlementsubjectmarginMethod: [],
 					cwsettlementsubjectoverdueInterestRate: [],
-					cwsettlementcontractcontractId: [{
-							fieldName: "",
-							field: "subjectId",
-							defaultValue: "",
-							jnpfKey: "billRule",
-							dataType: "varchar",
-							id: "HmoSU22",
-							required: "1",
-							relationField: "code",
-						},
-						{
-							fieldName: "",
-							field: "contractType",
-							defaultValue: "",
-							jnpfKey: "createTime",
-							dataType: "varchar",
-							id: "QnvSU22",
-							required: "1",
-							relationField: "creatorTime",
-						},
-					],
+					// cwsettlementcontractcontractId: [{
+					// 		fieldName: "",
+					// 		field: "subjectId",
+					// 		defaultValue: "",
+					// 		jnpfKey: "billRule",
+					// 		dataType: "varchar",
+					// 		id: "HmoSU22",
+					// 		required: "1",
+					// 		relationField: "code",
+					// 	},
+					// 	{
+					// 		fieldName: "",
+					// 		field: "contractType",
+					// 		defaultValue: "",
+					// 		jnpfKey: "createTime",
+					// 		dataType: "varchar",
+					// 		id: "QnvSU22",
+					// 		required: "1",
+					// 		relationField: "creatorTime",
+					// 	},
+					// ],
+					    cwsettlementcontractcontractId: [{"fieldName":"","field":"subjectId","defaultValue":"","jnpfKey":"subjectId","dataType":"varchar","id":"HmoSU22","relationField":"subjectId","required":"1"},
+					            {"fieldName":"","field":"contractType","defaultValue":"","jnpfKey":"contractType","dataType":"varchar","id":"QnvSU22","relationField":"contractType","required":"1"}],
+
+
 					cwsettlementcontractcontractPeriodTime: [],
 					cwsettlementcontractcontractPeriodTimeEnd: [],
 					cwsettlementcontractcurrency: [],
@@ -1783,6 +1840,153 @@
 					return title[0]
 				}
 			},
+			
+			    contractChangeData(model, row){
+			        this.dataForm.cwsettlementcontractList[0].contractName = row.contract_name
+			        this.dataForm.cwsettlementcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : '';
+			        this.dataForm.cwsettlementcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : '';
+			        //this.dataForm.cwsettlementcontractList[0].currency = row.currency;
+			        this.dataForm.cwsettlementcontractList[0].procurementModel = row.procurement_model;
+			        this.dataForm.cwsettlementcontractList[0].pricingModel = row.pricing_model;
+			        this.dataForm.cwsettlementcontractList[0].relatedContractId = row.related_contract_id;
+			        this.dataForm.cwsettlementcontractList[0].subject = row.subject;
+			        this.dataForm.cwsettlementcontractList[0].subject2 = row.subject2;
+			        this.dataForm.cwsettlementcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : '';
+			        this.dataForm.cwsettlementcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : '';
+			        this.dataForm.cwsettlementcontractList[0].deliveryModel = row.delivery_model;
+			        this.dataForm.cwsettlementcontractList[0].deliveryMethod = row.delivery_method;
+			        this.dataForm.cwsettlementcontractList[0].modeTransport = row.mode_transport;
+			        this.dataForm.cwsettlementcontractList[0].costBearingMian = row.cost_bearing_mian;
+			      },
+				      subjectChangeData(model, row){
+				          let aaa = {};
+				          let companyName = '';
+				          this.dataForm.cwsettlementsubjectList[0].subjectName = row.name;
+				          request({
+				            url: `/api/permission/Organize/currentOrg/getCurrentOrg`,
+				            method: 'get',
+				            data: {}
+				          }).then(res => {
+				            aaa = JSON.parse(res.data.propertyJson)
+				            companyName = res.data.fullName
+				            if('供应商' == row.subjectBasicTypes || '服务商' == row.subjectBasicTypes){
+				              this.dataForm.cwsettlementpaymentreceiptList[0].name = companyName
+				              this.dataForm.cwsettlementpaymentreceiptList[0].accountName = aaa.accountName
+				              this.dataForm.cwsettlementpaymentreceiptList[0].bankAccount = aaa.bankAccount
+				              this.dataForm.cwsettlementpaymentreceiptList[0].depositBank = aaa.bankName
+				              //this.dataForm.cwsettlementpaymentreceiptList[0].depositArea = aaa.depositArea
+				              this.dataForm.cwsettlementpaymentreceiptList[0].bankBranchName = aaa.bankBranchName
+				              this.dataForm.cwsettlementpaymentreceiptList[0].companyTaxNumber = aaa.enyerpriseTaxNum
+				              this.dataForm.cwsettlementpaymentreceiptList[0].address = aaa.address
+				              this.dataForm.cwsettlementpaymentreceiptList[0].phone = aaa.telePhone
+				  
+				              this.dataForm.cwsettlementpaymentreceiptList[1].name = row.name
+				              this.dataForm.cwsettlementpaymentreceiptList[1].accountName = row.account_name
+				              this.dataForm.cwsettlementpaymentreceiptList[1].bankAccount = row.bank_account
+				              this.dataForm.cwsettlementpaymentreceiptList[1].depositBank = row.deposit_bank
+				              //this.dataForm.cwsettlementpaymentreceiptList[1].depositArea = JSON.parse(row.deposit_area)
+				              this.dataForm.cwsettlementpaymentreceiptList[1].bankBranchName = row.bank_branch_name
+				              this.dataForm.cwsettlementpaymentreceiptList[1].companyTaxNumber = row.company_tax_number
+				              this.dataForm.cwsettlementpaymentreceiptList[1].address = row.address
+				              this.dataForm.cwsettlementpaymentreceiptList[1].phone = row.phone
+				            }else if('客户' == row.subjectBasicTypes){
+				              this.dataForm.cwsettlementpaymentreceiptList[0].name = row.name
+				              this.dataForm.cwsettlementpaymentreceiptList[0].accountName = row.account_name
+				              this.dataForm.cwsettlementpaymentreceiptList[0].bankAccount = row.bank_account
+				              this.dataForm.cwsettlementpaymentreceiptList[0].depositBank = row.deposit_bank
+				              //this.dataForm.cwsettlementpaymentreceiptList[0].depositArea = JSON.parse(row.deposit_area)
+				              this.dataForm.cwsettlementpaymentreceiptList[0].bankBranchName = row.bank_branch_name
+				              this.dataForm.cwsettlementpaymentreceiptList[0].companyTaxNumber = row.company_tax_number
+				              this.dataForm.cwsettlementpaymentreceiptList[0].address = row.address
+				              this.dataForm.cwsettlementpaymentreceiptList[0].phone = row.phone
+				  
+				              this.dataForm.cwsettlementpaymentreceiptList[1].name = companyName
+				              this.dataForm.cwsettlementpaymentreceiptList[1].accountName = aaa.accountName
+				              this.dataForm.cwsettlementpaymentreceiptList[1].bankAccount = aaa.bankAccount
+				              this.dataForm.cwsettlementpaymentreceiptList[1].depositBank = aaa.bankName
+				              //this.dataForm.cwsettlementpaymentreceiptList[1].depositArea = aaa.depositArea
+				              this.dataForm.cwsettlementpaymentreceiptList[1].bankBranchName = aaa.bankBranchName
+				              this.dataForm.cwsettlementpaymentreceiptList[1].companyTaxNumber = aaa.enyerpriseTaxNum
+				              this.dataForm.cwsettlementpaymentreceiptList[1].address = aaa.address
+				              this.dataForm.cwsettlementpaymentreceiptList[1].phone = aaa.telePhone
+				            }
+				          })
+				          this.dataForm.subjectId = row.id;
+				          if(this.dataForm.type == '1'){
+				            this.dataForm.contractType = '1';
+				          }else if(this.dataForm.type == '2'){
+				            this.dataForm.contractType = '2';
+				          }else if(this.dataForm.type == '3'){
+				            this.dataForm.contractType = '5';
+				          }
+				          this.dataForm.settlementSubjectName = row.name;
+				          this.dataForm.cwsettlementsubjectList[0].paymentMethod = row.payment_method;
+				          this.dataForm.cwsettlementsubjectList[0].collaborationMethod = row.collaboration_method;
+				          this.dataForm.cwsettlementsubjectList[0].settlementMethod = row.settlement_method;
+				          this.dataForm.cwsettlementsubjectList[0].advanceRatio = row.advance_ratio;
+				          this.dataForm.cwsettlementsubjectList[0].accountPeriod = row.account_period;
+				          if(row.underpayment_method == 0){
+				            this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '无';
+				          }else if(row.underpayment_method == 1){
+				            this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按金额(' + row.apply_for_underpayment_ratio + '元)';
+				          }else if(row.underpayment_method == 2){
+				            this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按比例(' + row.apply_for_underpayment_ratio + '%)';
+				          }
+				          if(row.margin_method == 0){
+				            this.dataForm.cwsettlementsubjectList[0].marginMethod = '无';
+				          }else if(row.margin_method == 1){
+				            this.dataForm.cwsettlementsubjectList[0].marginMethod = '按金额(' + row.apply_for_margin_ratio + '元)';
+				          }else if(row.margin_method == 2){
+				            this.dataForm.cwsettlementsubjectList[0].marginMethod = '按比例(' + row.apply_for_margin_ratio + '%)';
+				          }
+				          if(row.overdue_interest_rate == 0){
+				            this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '无';
+				          }else if(row.overdue_interest_rate == 1){
+				            this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按年化(' + row.apply_for_overdue_ratio + '%)';
+				          }else if(row.overdue_interest_rate == 2){
+				            this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按月化(' + row.apply_for_overdue_ratio + '%)';
+				          }
+				        },
+						
+						      typeChangeData(){
+						        this.dataForm.cwsettlementsubjectList = [];
+						        this.dataForm.cwsettlementcontractList = [];
+						        this.dataForm.cwsettlementaccountList = [];
+						        this.dataForm.cwsettlementcostList = [];
+						        this.dataForm.cwsettlementpaymentreceiptList = [{
+						              type: '1',
+						              name: undefined,
+						              accountName: undefined,
+						              bankAccount: undefined,
+						              depositBank: undefined,
+						              depositArea: undefined,
+						              bankBranchName: undefined,
+						              companyTaxNumber: undefined,
+						              address: undefined,
+						              phone: undefined,
+						            },{
+						              type: '2',
+						              name: undefined,
+						              accountName: undefined,
+						              bankAccount: undefined,
+						              depositBank: undefined,
+						              depositArea: undefined,
+						              bankBranchName: undefined,
+						              companyTaxNumber: undefined,
+						              address: undefined,
+						              phone: undefined,
+						          }];
+						        this.dataForm.cwsettlementsummaryList = [];
+						        this.dataForm.subjectId = '';
+						        this.dataForm.contractType = '';
+						        if(this.dataForm.type == '1'){
+						          this.dataForm.businessType = '1'
+						        }else{
+						          this.dataForm.businessType = '3'
+						        }
+						      },
+							  
+						
 			resetForm() {
 				uni.navigateBack()
 			},