From 2c11814ecf148a5fe5a80d03e29481476e47f34d Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期一, 19 十二月 2022 16:13:34 +0800
Subject: [PATCH] test push two

---
 pages/new-application-form-data/new-application-form-data.vue | 1828 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 1,569 insertions(+), 259 deletions(-)

diff --git a/pages/new-application-form-data/new-application-form-data.vue b/pages/new-application-form-data/new-application-form-data.vue
index c37eef4..0760daa 100644
--- a/pages/new-application-form-data/new-application-form-data.vue
+++ b/pages/new-application-form-data/new-application-form-data.vue
@@ -4,23 +4,31 @@
 		<!-- page-mete鐨刾age-style灞炴�х浉褰撲簬HTML鐨刡ody灞炴�� -->
 		<!-- <page-meta :page-style="spanStyle"></page-meta> -->
 		<!-- 琛ㄥ崟 -->
+
 		<combination-title class="newApplicationTitle" title="鏂板"></combination-title>
 		<!-- 娉ㄦ剰锛屽鏋滈渶瑕佸吋瀹瑰井淇″皬绋嬪簭锛屾渶濂介�氳繃setRules鏂规硶璁剧疆rules瑙勫垯 -->
+		<!-- <u-notify :message="accountMsg" :show="trueMsg" :type="accountMsgType"></u-notify> -->
+		<!-- <u-alert :title="accountMsg" :type="accountMsgType" :description="accountMsgType"></u-alert> -->
 		<view class="formDataContaniner">
 			<u--form labelPosition="left" :model="newFormData" :rules="rules" ref="formRef">
-				<u-form-item labelWidth="20%" label="缁撶畻瀹㈡埛" borderBottom ref="customerNameRef" @click="selectCustomer">
-					<u--input v-model="newFormData.customerName" border="none"></u--input>
+				<u-form-item @click="selectLedger" labelWidth="20%" label="璐﹀" borderBottom>
+					<u--input disabled disabledColor="#ffffff" v-model="ledgerName" border="none"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth="20%" label="鍚堝悓缂栧彿" borderBottom ref="contractNumRef" @click="selectContract">
-					<u--input v-model="newFormData.contractNum" border="none"></u--input>
+				<u-form-item @click="selectCustomer" labelWidth="20%" label="缁撶畻瀹㈡埛" prop="customerName" borderBottom ref="customerNameRef">
+					<u--input disabled disabledColor="#ffffff" v-model="newFormData.customerName" border="none"></u--input>
 				</u-form-item>
-				<u-form-item labelWidth="20%" label="鍚堝悓鍚嶇О" borderBottom ref="contractNameRef"><u--input v-model="newFormData.contractName" border="none"></u--input></u-form-item>
-				<u-form-item labelWidth="20%" label="浠樻鏂瑰紡" borderBottom @click="showPayType = true" ref="payTypeRef">
+				<u-form-item @click="selectContract" labelWidth="20%" label="鍚堝悓缂栧彿" prop="contractNum" borderBottom ref="contractNumRef">
+					<u--input disabled disabledColor="#ffffff" v-model="newFormData.contractNum" border="none"></u--input>
+				</u-form-item>
+				<u-form-item labelWidth="20%" label="鍚堝悓鍚嶇О" borderBottom ref="contractNameRef">
+					<u--input disabled disabledColor="#ffffff" v-model="newFormData.contractName" border="none"></u--input>
+				</u-form-item>
+				<u-form-item @click="showPayType = true" prop="payType" labelWidth="20%" label="浠樻鏂瑰紡" borderBottom ref="payTypeRef">
 					<u--input v-model="selectValue" disabled disabledColor="#ffffff" placeholder="璇烽�夋嫨浠樻鏂瑰紡" border="none"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
-				<u-form-item @click="timeShow = true" labelWidth="20%" label="鏃ユ湡" borderBottom ref="timeDataRef">
-					<u--input v-model="timeDataStr" border="none" placeholder="璇烽�夋嫨鑼冨洿鏃ユ湡"></u--input>
+				<u-form-item @click="timeShow = true" prop="startDate" labelWidth="20%" label="鏃ユ湡" borderBottom ref="timeDataRef">
+					<u--input v-model="timeDataStr" border="none" disabled disabledColor="#ffffff" placeholder="璇烽�夋嫨鑼冨洿鏃ユ湡"></u--input>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 				<u-form-item labelWidth="20%" label="缂栧彿" borderBottom>
@@ -29,8 +37,20 @@
 			</u--form>
 		</view>
 
+		<!-- 閫夋嫨璐﹀ -->
+		<u-picker
+			@change="selectLedgerChange"
+			@confirm="selectLedgerConfirm"
+			@cancel="selectLedgerCancel"
+			@close="selectLedgerClose"
+			:show="selectLedgerShow"
+			:columns="ledgerList"
+			keyName="name"
+			:closeOnClickOverlay="true"
+		></u-picker>
+
 		<!-- 鐢宠鏃ュ巻銆佽寖鍥存椂闂� -->
-		<u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110" :maxDate="maxDate"></u-calendar>
+		<u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110" ></u-calendar>
 		<!-- 鐢宠浠樻鏂瑰紡寮瑰嚭鑿滃崟 -->
 		<u-action-sheet :show="showPayType" :actions="actions" title="璇烽�夋嫨浠樻鏂瑰紡" @close="showPayType = false" @select="sexSelect"></u-action-sheet>
 
@@ -43,17 +63,34 @@
 					<view class="selectCustomerContainer">
 						<view class="searchContainer">
 							<u--form labelPosition="left" :model="searchCustomerForm" ref="selectformRef">
-								<u-form-item labelWidth="12%" label="鍗曚綅" borderBottom ref="compRef">
-									<u--input @focus="selectCustomerCompShow = true" v-model="searchCustomerForm.compName" placeholder="鐐瑰嚮閫夋嫨鍗曚綅" border="none"></u--input>
-									<u-icon slot="right" name="close-circle-fill" v-show="searchCustomerForm.compName != ''" @click="searchCustomerForm.compName = ''"></u-icon>
+								<u-form-item
+									@click="
+										selectCustomerCompShow = true;
+										hideKeyboard();
+									"
+									labelWidth="12%"
+									label="鍗曚綅"
+									borderBottom
+									ref="compRef"
+								>
+									<u--input v-model="searchCustomerForm.compName" disabled disabledColor="#ffffff" placeholder="鐐瑰嚮閫夋嫨鍗曚綅" border="none"></u--input>
+									<!--									<u-icon slot="right" name="close-circle-fill" @click="searchCustomerForm.compName = ''"></u-icon>-->
 								</u-form-item>
 								<u-form-item labelWidth="20%" label="瀹㈡埛鍚嶇О" borderBottom ref="timeDataRef">
-									<u--input v-model="selectCustomerData.customerName" border="none" placeholder="杈撳叆瀹㈡埛鍚嶇О"></u--input>
-									<u-icon slot="right" name="close-circle-fill" v-show="selectCustomerData.customerName != ''" @click="selectCustomerData.customerName = ''"></u-icon>
+									<u--input v-model="selectCustomerData.customerFullName" border="none" placeholder="杈撳叆瀹㈡埛鍚嶇О"></u--input>
+									<u-icon slot="right" name="close-circle-fill" @click="selectCustomerData.customerFullName = ''"></u-icon>
 								</u-form-item>
-								<u-form-item labelWidth="20%" label="瀹㈡埛绾у埆" borderBottom>
-									<u--input @focus="selectLevelShow = true" border="none" v-model="searchCustomerForm.levelText" placeholder="鐐瑰嚮閫夋嫨绾у埆"></u--input>
-									<u-icon slot="right" name="close-circle-fill" v-show="searchCustomerForm.levelText != ''" @click="searchCustomerForm.levelText = ''"></u-icon>
+								<u-form-item
+									@click="
+										selectLevelShow = true;
+										hideKeyboard();
+									"
+									labelWidth="20%"
+									label="瀹㈡埛绾у埆"
+									borderBottom
+								>
+									<u--input border="none" v-model="searchCustomerForm.levelText" disabled disabledColor="#ffffff" placeholder="鐐瑰嚮閫夋嫨绾у埆"></u--input>
+									<!--									<u-icon slot="right" name="close-circle-fill" @click="searchCustomerForm.levelText = ''"></u-icon>-->
 								</u-form-item>
 							</u--form>
 						</view>
@@ -63,49 +100,31 @@
 						</view>
 						<!-- 瀹㈡埛鍒楄〃 -->
 						<view class="searchResultList">
-							<u-collapse accordion>
-								<u-collapse-item :title="item.customerFullName" v-for="(item, index) in customerData">
-									<view class="customerDetails">
-										<view class="table-head">
-											<text class="titleText">{{ item.customerNumber }}</text>
-											<template>
-												<button
-													class="mini-btn"
-													type="default"
-													size="mini"
-													style="background: #007aff;
-													color: #ffffff;
-													margin: auto 0;
-													height: 20px;
-													line-height:20px;
-													width: 86px;
-													font-size: 10px;
-													padding: 0;"
-													@click="selectCustomerOkClick(item.id)"
-												>
-													閫夋嫨璇ョ敤鎴�
-												</button>
-											</template>
-										</view>
-										<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" style="min-width:420px;">
-											<uni-tr>
-												<uni-th align="center">绾у埆</uni-th>
-												<uni-td align="center">{{ item.level }}</uni-td>
-											</uni-tr>
-											<uni-tr>
-												<uni-th align="center">鎵�灞為儴闂ㄥ悕绉�</uni-th>
-												<uni-td align="center">{{ item.compNames }}</uni-td>
-											</uni-tr>
-											<uni-tr>
-												<uni-th align="center">鐢佃瘽鍙风爜</uni-th>
-												<uni-td align="center">{{ item.customerPhoneNumber }}</uni-td>
-											</uni-tr>
-										</uni-table>
+							<u-cell-group :right-icon="false">
+								<u-cell v-for="(item, index) in customerData" :title="item.customerFullName" :arrow="false">
+									<view slot="value" class="u-slot-value">
+										<button
+											type="default"
+											size="mini"
+											style="background: #007aff;
+											color: #ffffff;
+											margin: auto 0;
+											height: 20px;
+											line-height:20px;
+											width: 43px;
+											font-size: 10px;
+											padding: 0;"
+											@click="selectCustomerOkClick(item)"
+										>
+											閫夋嫨
+										</button>
 									</view>
-								</u-collapse-item>
-							</u-collapse>
+								</u-cell>
+							</u-cell-group>
 						</view>
-
+						<view class="loadmoreClass">
+							<u-loadmore loadmoreText="鐐瑰嚮鍔犺浇鏇村" nomoreText="鏃犳洿澶氭暟鎹�!!!" :status="status" @loadmore="loadingCustomer" fontSize="20" height="30px" />
+						</view>
 						<!-- 閫夋嫨鐢ㄦ埛鑿滃崟椤� -->
 						<view class="selectCustomerCompSheet">
 							<u-action-sheet
@@ -135,64 +154,102 @@
 					<view class="selectCustomerContainer">
 						<view class="searchContainer">
 							<u--form labelPosition="left" :model="searchContractForm" ref="selectformRef">
-								<u-form-item labelWidth="18%" label="鍚堝悓缂栧彿" borderBottom ref="compRef">
+								<u-form-item labelWidth="20%" label="鍚堝悓缂栧彿" borderBottom ref="compRef">
 									<u--input v-model="searchContractForm.num" placeholder="璇疯緭鍏ュ悎鍚岀紪鍙�" border="none"></u--input>
 									<u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.num != ''" @click="searchContractForm.num = ''"></u-icon>
 								</u-form-item>
-								<u-form-item labelWidth="18%" label="瀹㈡埛鍚嶇О" borderBottom ref="compRef">
+								<u-form-item labelWidth="20%" label="瀹㈡埛鍚嶇О" borderBottom ref="compRef">
 									<u--input v-model="searchContractForm.customerName" placeholder="璇疯緭鍏ュ鎴峰悕绉�" border="none"></u--input>
 									<u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.customerName != ''" @click="searchContractForm.customerName = ''"></u-icon>
 								</u-form-item>
-								<u-form-item labelWidth="18%" label="鍚堝悓绫诲瀷" borderBottom ref="compRef">
-									<u--input v-model="searchContractForm.type" placeholder="璇疯緭鍏ュ悎鍚岀被鍨�" border="none" @focus="searchContractFormTypeFocus"></u--input>
-									<u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.type != ''" @click="searchContractForm.type = ''"></u-icon>
+								<u-form-item labelWidth="20%" label="鍚堝悓绫诲瀷" borderBottom ref="compRef" @click="searchContractFormTypeFocus">
+									<u--input v-model="searchContractForm.type" disabled disabledColor="#ffffff" placeholder="璇疯緭鍏ュ悎鍚岀被鍨�" border="none"></u--input>
+									<!--									<u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.type != ''" @click="searchContractForm.type = ''"></u-icon>-->
 								</u-form-item>
-								<u-form-item labelWidth="18%" label="绛捐鏃ユ湡" borderBottom ref="compRef">
-									<u--input @focus="selectContractStartTimeShow = true" v-model="searchContractForm.startDate" placeholder="鐐瑰嚮閫夋嫨绛捐鏃ユ湡" border="none"></u--input>
-									<u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.startDate != ''" @click="searchContractForm.startDate = ''"></u-icon>
+								<u-form-item labelWidth="20%" label="绛捐鏃ユ湡" borderBottom ref="compRef" @click="selectContractStartTimeShow = true">
+									<u--input v-model="searchContractForm.startDate" disabled disabledColor="#ffffff" placeholder="鐐瑰嚮閫夋嫨绛捐鏃ユ湡" border="none"></u--input>
+									<!--									<u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.startDate != ''" @click="searchContractForm.startDate = ''"></u-icon>-->
 								</u-form-item>
-								<u-form-item labelWidth="18%" label="缁撴潫鏃ユ湡" borderBottom ref="compRef">
-									<u--input @focus="selectContractEndTimeShow = true" v-model="searchContractForm.endDate" placeholder="鐐瑰嚮閫夋嫨缁撴潫鏃ユ湡" border="none"></u--input>
-									<u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.endDate != ''" @click="searchContractForm.endDate = ''"></u-icon>
+								<u-form-item labelWidth="20%" label="缁撴潫鏃ユ湡" borderBottom ref="compRef" @click="selectContractEndTimeShow = true">
+									<u--input v-model="searchContractForm.endDate" disabled disabledColor="#ffffff" placeholder="鐐瑰嚮閫夋嫨缁撴潫鏃ユ湡" border="none"></u--input>
+									<!--									<u-icon slot="right" name="close-circle-fill" v-show="searchContractForm.endDate != ''" @click="searchContractForm.endDate = ''"></u-icon>-->
 								</u-form-item>
 							</u--form>
 						</view>
 						<view class="searchCustomerBtn">
 							<u-button text="鎼滅储" type="primary" @click="selectContractOpen()"></u-button>
-							<u-button text="娓呯┖" @click="selectCustomerResetFields"></u-button>
+							<u-button text="娓呯┖" @click="selectContractResetFields"></u-button>
 						</view>
 						<!-- 鍚堝悓鍒楄〃 -->
-						<view class="searchResultList">
-							<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
-								<uni-tr>
-									<uni-th width="220" align="center">鍚堝悓缂栧彿</uni-th>
-									<uni-th width="80" align="center">缁勭粐缁撴瀯</uni-th>
-									<uni-th width="200" align="center">瀹㈡埛鍚嶇О</uni-th>
-									<uni-th width="140" align="center">鐓ょ鍚嶇О</uni-th>
-									<uni-th width="90" align="center">鍚堝悓绫诲瀷</uni-th>
-									<uni-th width="130" align="center">绛捐鏃ユ湡</uni-th>
-									<uni-th width="130" align="center">缁堟鏃ユ湡</uni-th>
-									<uni-th width="100" align="center">鍚堝悓鎬婚噺</uni-th>
-									<uni-th width="100" align="center">鍚堝悓閲戦</uni-th>
-									<uni-th width="70" align="center">鐘舵��</uni-th>
-									<uni-th width="150" align="center" style="position:relative;right:0;">鎿嶄綔</uni-th>
-								</uni-tr>
-								<uni-tr v-for="(item, index) in contractData" :key="index">
-									<uni-td align="left">{{ item.num }}</uni-td>
-									<uni-td align="center">{{ item.compName }}</uni-td>
-									<uni-td align="left">{{ item.customerName }}</uni-td>
-									<uni-td align="center">{{ item.coalNames }}</uni-td>
-									<uni-td align="center">{{ item.type }}</uni-td>
-									<uni-td align="center">{{ item.startDate }}</uni-td>
-									<uni-td align="center">{{ item.endDate }}</uni-td>
-									<uni-td align="center">{{ item.countExecutive }}</uni-td>
-									<uni-td align="center">{{ item.executive }}</uni-td>
-									<uni-td align="center">{{ item.status }}</uni-td>
-									<uni-td align="center" style="position:relative;right:0;">
-										<view class="uni-group"><button class="uni-button" size="mini" type="primary">閫夋嫨璇ュ悎鍚�</button></view>
-									</uni-td>
-								</uni-tr>
-							</uni-table>
+						<!-- 婊氬姩閫氱煡 -->
+						<view class="tapStyle">
+						  <u-notice-bar :text="noticeText" fontSize="24"></u-notice-bar>
+						</view>
+						<view class="tableContract">
+							<view class="tableBody">
+								<uni-table border emptyText="鏆傛棤鏇村鏁版嵁">
+									<uni-tr>
+										<uni-th width="130" align="center">鐓ょ鍚嶇О</uni-th>
+										<uni-th width="250" align="center">瀹㈡埛鍚嶇О</uni-th>
+										<uni-th width="230" align="center">鍚堝悓缂栧彿</uni-th>
+										<uni-th width="100" align="center">鍚堝悓绫诲瀷</uni-th>
+										<uni-th width="130" align="center">绛捐鏃ユ湡</uni-th>
+										<uni-th width="130" align="center">缁堟鏃ユ湡</uni-th>
+										<uni-th width="100" align="center">鍚堝悓鎬婚噺</uni-th>
+										<uni-th width="120" align="center">鍚堝悓閲戦</uni-th>
+										<uni-th width="70" align="center">鐘舵��</uni-th>
+										<uni-th width="130" align="center">缁勭粐缁撴瀯</uni-th>
+									</uni-tr>
+									<uni-tr v-for="(item, index) in contractData" :key="index">
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.coalNames }}</view>
+										</uni-td>
+										<uni-td align="left">
+											<view class="contractTableTd">{{ item.customerName }}</view>
+										</uni-td>
+										<uni-td align="left">
+											<view :style="tdStyle">{{ item.num }}</view>
+										</uni-td>
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.type }}</view>
+										</uni-td>
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.startDate }}</view>
+										</uni-td>
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.endDate }}</view>
+										</uni-td>
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.countExecutive }}</view>
+										</uni-td>
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.executive }}</view>
+										</uni-td>
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.status }}</view>
+										</uni-td>
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.compName }}</view>
+										</uni-td>
+									</uni-tr>
+								</uni-table>
+							</view>
+
+							<view class="TableUtilBtn">
+								<uni-table border emptyText="鏆傛棤鏇村鏁版嵁">
+									<uni-tr><uni-th align="center">鎿嶄綔</uni-th></uni-tr>
+									<uni-tr v-for="(item, index) in contractData" :key="index">
+										<uni-td align="center">
+											<!-- 閫夋嫨鍚堝悓 -->
+											<view class="TableUtilBtnContainer"><u-button type="primary" @click="selectContractClick(item)" icon="checkbox-mark" size="mini"></u-button></view>
+										</uni-td>
+									</uni-tr>
+								</uni-table>
+							</view>
+						</view>
+						<!-- 鍚堝悓鍔犺浇鏇村 -->
+						<view class="loadmoreClass">
+							<u-loadmore loadmoreText="鐐瑰嚮鍔犺浇鏇村" nomoreText="鏃犳洿澶氭暟鎹�!!!" :status="statusContractLoading" @loadmore="loadingContract" fontSize="20" height="30px" />
 						</view>
 						<!-- 鍚堝悓绫诲瀷閫夋嫨鍣� -->
 						<view class="selectContractTypePicker">
@@ -207,7 +264,12 @@
 						</view>
 						<!-- 鏃堕棿閫夋嫨鍣� -->
 						<view class="selectContractStartTime">
-							<u-calendar :show="selectContractStartTimeShow" @close="selectContractStartTimeClose" :mode="selectContractTimeMode" @confirm="selectContractStartTimeConfirm"></u-calendar>
+							<u-calendar
+								:show="selectContractStartTimeShow"
+								@close="selectContractStartTimeClose"
+								:mode="selectContractTimeMode"
+								@confirm="selectContractStartTimeConfirm"
+							></u-calendar>
 						</view>
 						<view class="selectContractEndTime">
 							<u-calendar :show="selectContractEndTimeShow" @close="selectContractEndTimeClose" :mode="selectContractTimeMode" @confirm="selectContractEndTimeConfirm"></u-calendar>
@@ -217,19 +279,367 @@
 			</u-popup>
 		</view>
 
-		<!-- 鐢宠琛ㄦ牸 -->
-		<view class="newApplicationTable">
-			<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
-				<!-- 琛ㄦ牸鏁版嵁琛� -->
-				<uni-tr v-for="(item, index) in 8" :key="index">
-					<uni-th align="center">瀛楁鏍囬</uni-th>
-					<uni-td>
-						<view class="text">杈撳叆/閫夋嫨鍐呭</view>
-						<view class="icon"><image src="@/static/icon/select.png" mode=""></image></view>
-					</uni-td>
-				</uni-tr>
-			</uni-table>
+		<!-- 娣诲姞鍚堝悓瀛愰」 -->
+		<view class="addContractContainer">
+			<u-popup :show="addContractShow" @close="addContractClose" @open="addContractOpen" mode="bottom" round="22">
+				<scroll-view scroll-y="true" style="height:100%;">
+					<combination-title class="addContractFormTitle" title="娣诲姞璁㈠崟"></combination-title>
+					<!-- 娣诲姞鐢ㄦ埛琛ㄥ崟 -->
+					<view class="addContractForm">
+						<u--form labelPosition="left" :model="addContractFormdata" :rules="addContractRules" ref="form1">
+							<view class="formUpCard">
+								<u-form-item label="鐭垮巶" labelWidth="20%" ref="item1">
+									<u--input v-model="addContractFormdata.filedName" disabled disabledColor="#ffffff" border="none"></u--input>
+								</u-form-item>
+								<u-form-item @click="coalFiledSelectShow = true" label="鐓ゅ巶" labelWidth="20%" ref="item1">
+									<u--input v-model="addContractFormdata.compName" disabled disabledColor="#ffffff"></u--input>
+								</u-form-item>
+								<u-form-item label="鏀惰揣浜�" labelWidth="20%" ref="item1" @click="addContractConsignee">
+									<u--input v-model="addContractFormdata.customerName" disabled disabledColor="#ffffff"></u--input>
+								</u-form-item>
+								<u-form-item @click="addContractCoalShow = true" label="鍝佺" labelWidth="20%" ref="item1">
+									<u--input v-model="addContractFormdata.coalName" disabled disabledColor="#ffffff"></u--input>
+								</u-form-item>
+								<template>
+									<!-- 	浠锋牸鍗$墖 -->
+									<view class="priceList" v-if="showPrice && favouredpolicyListcomputed">
+										<view class="currentPriceContainer">
+											<u-divider text="褰撳墠浠锋牸"></u-divider>
+											<view class="currentPriceBox">
+												<u--form :model="currentCoal" labelPosition="left">
+													<u-form-item label="鐓ょ" labelWidth="35%">
+														<u--input v-model="currentCoal.coalName" disabled disabledColor="#ffffff" border="none"></u--input>
+													</u-form-item>
+													<u-form-item :label="currentCoal.type == 1 ? '閽㈠巶闀垮崗' : '鍩哄噯浠�'" labelWidth="35%">
+														<u--input v-model="currentCoal.steelMillPrice" disabled disabledColor="#ffffff" border="none"></u--input>
+													</u-form-item>
+													<u-form-item :label="currentCoal.type == 1 ? '鐒﹀寲闀垮崗' : '鐢靛巶鍩哄噯'" labelWidth="35%">
+														<u--input v-model="currentCoal.cokingPrice" disabled disabledColor="#ffffff" border="none"></u--input>
+													</u-form-item>
+													<u-form-item :label="currentCoal.type == 1 ? '闈為暱鍗�' : '鍖哄煙澶栫數鍘備环'" labelWidth="35%">
+														<u--input v-model="currentCoal.noImportantPrice" disabled disabledColor="#ffffff" border="none"></u--input>
+													</u-form-item>
+													<u-form-item label="鎸傜墝浠�" labelWidth="35%">
+														<u--input v-model="currentCoal.quotePrice" disabled disabledColor="#ffffff" border="none"></u--input>
+													</u-form-item>
+												</u--form>
+											</view>
+										</view>
+										<view class="selectPriceContainer">
+											<u-divider text="閫夋嫨浠锋牸"></u-divider>
+											<view class="selectPricebox">
+												<u--form labelPosition="left">
+													<u-form-item label="鐓ょ" labelWidth="35%">
+														<u--input v-model="currentCoal.coalName" disabled disabledColor="#ffffff" border="none"></u--input>
+													</u-form-item>
+													<u-radio-group v-model="addContractFormdata.priceMode" placement="column" @change="groupChange">
+														<view class="selectPriceboxItem">
+															<u-form-item :label="currentCoal.type == 1 ? '閽㈠巶闀垮崗' : '鍩哄噯浠�'" labelWidth="35%">
+																<u--input v-model="afterPrice.steelMillPrice" disabled disabledColor="#ffffff" border="none"></u--input>
+															</u-form-item>
+															<u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="0" @change="changePriceMode"></u-radio>
+														</view>
+														<view class="selectPriceboxItem">
+															<u-form-item :label="currentCoal.type == 1 ? '鐒﹀寲闀垮崗' : '鐢靛巶鍩哄噯'" labelWidth="35%">
+																<u--input v-model="afterPrice.cokingPrice" disabled disabledColor="#ffffff" border="none"></u--input>
+															</u-form-item>
+															<u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="1" @change="changePriceMode"></u-radio>
+														</view>
+														<view class="selectPriceboxItem">
+															<u-form-item :label="currentCoal.type == 1 ? '闈為暱鍗�' : '鍖哄煙澶栫數鍘備环'" labelWidth="35%">
+																<u--input v-model="afterPrice.noImportantPrice" disabled disabledColor="#ffffff" border="none"></u--input>
+															</u-form-item>
+															<u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="2" @change="changePriceMode"></u-radio>
+														</view>
+														<view class="selectPriceboxItem">
+															<u-form-item label="鎸傜墝浠�" labelWidth="35%">
+																<u--input v-model="afterPrice.quotePrice" disabled disabledColor="#ffffff" border="none"></u--input>
+															</u-form-item>
+															<u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="3" @change="changePriceMode"></u-radio>
+														</view>
+													</u-radio-group>
+												</u--form>
+											</view>
+										</view>
+										<view class="selectFavouredPolicy">
+											<u-divider text="閫夋嫨浼樻儬鏀跨瓥"></u-divider>
+											<view class="selectFavouredPolicyBox">
+												<uni-table ref="priceTableRef" :loading="loading" border stripe type="selection" emptyText="鏆傛棤鏇村鏁版嵁" @selection-change="selectionChange">
+													<uni-tr>
+														<uni-th width="150" align="center">浼樻儬鏂瑰紡</uni-th>
+														<uni-th width="60" align="center">绗﹀彿</uni-th>
+														<uni-th width="60" align="center">鍊�</uni-th>
+														<uni-th width="60" align="center">浠锋牸浼樻儬</uni-th>
+													</uni-tr>
+													<uni-tr v-for="(item, index) in favouredpolicyList" :key="index">
+														<uni-td>{{ item.type }}</uni-td>
+														<uni-td align="center">{{ operator[item.method].label }}</uni-td>
+														<uni-td align="center">{{ item.val }}</uni-td>
+														<uni-td align="center">{{ item.price }}</uni-td>
+													</uni-tr>
+												</uni-table>
+											</view>
+										</view>
+									</view>
+								</template>
+								<u-form-item @click="addContractTransportShow = true" label="杩愯緭" labelWidth="20%" ref="item1">
+									<u--input v-model="addContractTransport" disabled disabledColor="#ffffff"></u--input>
+								</u-form-item>
+							</view>
+							<view class="formDownCard">
+								<u-form-item label="鍗曚环" labelWidth="20%" ref="item1">
+									<u--input v-model="addContractFormdata.price" disabled disabledColor="#ffffff" border="none"></u--input>
+								</u-form-item>
+								<u-form-item label="璁㈠崟閲戦" labelWidth="20%" ref="item1">
+									<u--input :disabled="addContractFormdata.trainType == 2" v-show="currentRowComputed" v-model="addContractFormdata.amount"></u--input>
+								</u-form-item>
+								<u-form-item label="璁㈠崟鏁伴噺" labelWidth="20%" ref="item1">
+									<u--input :disabled="addContractFormdata.trainType == 1" @input="jisuanAmount" v-model="addContractFormdata.quant"></u--input>
+								</u-form-item>
+							</view>
+
+							<!-- <u-form-item label="鍙戠珯" labelWidth="18%" borderBottom ref="item1"><u--input v-model="addContractFormdata.fromStation" border="none"></u--input></u-form-item>
+              <u-form-item label="鍒扮珯" labelWidth="18%" borderBottom ref="item1"><u--input v-model="addContractFormdata.toStation" border="none"></u--input></u-form-item>
+              <u-form-item label="杩愯垂" labelWidth="18%" borderBottom ref="item1"><u--input v-model="addContractFormdata.cost1" border="none"></u--input></u-form-item>
+              <u-form-item label="鎶戝皹璐�" labelWidth="18%" borderBottom ref="item1"><u--input v-model="addContractFormdata.cost2" border="none"></u--input></u-form-item> -->
+						</u--form>
+
+						<view class="addContractConfirm"><u-button :text="editApplicationIndex != null ? '娣诲姞淇敼' : '娣诲姞'" type="primary" @click="addContractSanConfirm"></u-button></view>
+					</view>
+
+					<!-- 閫夋嫨鐓ゅ巶 -->
+					<view class="coalFiledSelectPopup">
+						<u-popup :show="coalFiledSelectShow" @close="coalFiledSelectClose" @open="coalFiledSelectOpen" mode="bottom" round="22">
+							<scroll-view scroll-y="true" style="height:100%;">
+								<combination-title class="selectCustomerTitle" title="閫夋嫨鐓ゅ巶"></combination-title>
+								<view class="coalFiledSelectSearch"></view>
+								<view class="coalFiledTable">
+									<view class="tableBody">
+										<uni-table border emptyText="鏆傛棤鏇村鏁版嵁">
+											<uni-tr>
+												<uni-th width="120" align="center">鐓ゅ巶鍚嶇О</uni-th>
+												<uni-th width="120" align="center">鐓ゅ巶缂栧彿</uni-th>
+												<uni-th width="120" align="center">鎵�灞炵熆</uni-th>
+												<uni-th width="120" align="center">澶囨敞</uni-th>
+											</uni-tr>
+											<uni-tr v-for="(item, index) in coalfiledData" :key="index">
+												<uni-td align="center">
+													<view :style="tdStyle">{{ item.name }}</view>
+												</uni-td>
+												<uni-td align="center">
+													<view :style="tdStyle">{{ item.num }}</view>
+												</uni-td>
+												<uni-td align="center">
+													<view :style="tdStyle">{{ item.compName }}</view>
+												</uni-td>
+												<uni-td align="left">
+													<view :style="tdStyle">{{ item.remark == null ? '' : item.remark }}</view>
+												</uni-td>
+											</uni-tr>
+										</uni-table>
+									</view>
+
+									<view class="TableUtilBtn">
+										<uni-table border emptyText="鏆傛棤鏇村鏁版嵁">
+											<uni-tr><uni-th align="center">鎿嶄綔</uni-th></uni-tr>
+											<uni-tr v-for="(item, index) in coalfiledData" :key="index">
+												<uni-td align="center">
+													<!-- 閫夋嫨鍚堝悓 -->
+													<view class="TableUtilBtnContainer"><u-button type="primary" @click="coalFiledSelectClick(item)" icon="checkbox-mark" size="mini"></u-button></view>
+												</uni-td>
+											</uni-tr>
+										</uni-table>
+									</view>
+								</view>
+							</scroll-view>
+						</u-popup>
+					</view>
+
+					<!-- 閫夋嫨鏀惰揣浜� -->
+					<view class="selectCustomerPopup">
+						<u-popup :show="addContractConsigneeShow" @close="addContractConsigneeClose" @open="addContractConsigneeOpen" mode="bottom" round="22">
+							<scroll-view scroll-y="true" style="height:100%;">
+								<combination-title class="selectCustomerTitle" title="閫夋嫨鏀惰揣浜�"></combination-title>
+								<view class="selectCustomerContainer">
+									<view class="searchContainer">
+										<u--form labelPosition="left" :model="searchCustomerForm" ref="selectformRef">
+											<u-form-item labelWidth="12%" label="鍗曚綅" borderBottom ref="compRef">
+												<u--input @focus="selectCustomerCompShow = true" v-model="searchCustomerForm.compName" placeholder="鐐瑰嚮閫夋嫨鍗曚綅" border="none"></u--input>
+												<u-icon slot="right" name="close-circle-fill" v-if="searchCustomerForm.compName != ''" @click="searchCustomerForm.compName = ''"></u-icon>
+											</u-form-item>
+											<u-form-item labelWidth="20%" label="瀹㈡埛鍚嶇О" borderBottom ref="timeDataRef">
+												<u--input v-model="selectCustomerData.customerFullName" border="none" placeholder="杈撳叆瀹㈡埛鍚嶇О"></u--input>
+												<u-icon slot="right" name="close-circle-fill" v-if="selectCustomerData.customerFullName != ''" @click="selectCustomerData.customerName = ''"></u-icon>
+											</u-form-item>
+											<u-form-item labelWidth="20%" label="瀹㈡埛绾у埆" borderBottom>
+												<u--input @focus="selectLevelShow = true" border="none" v-model="searchCustomerForm.levelText" placeholder="鐐瑰嚮閫夋嫨绾у埆"></u--input>
+												<u-icon slot="right" name="close-circle-fill" v-if="searchCustomerForm.levelText != ''" @click="searchCustomerForm.levelText = ''"></u-icon>
+											</u-form-item>
+										</u--form>
+									</view>
+									<view class="searchCustomerBtn">
+										<u-button text="鎼滅储" type="primary" @click="selectCustomer()"></u-button>
+										<u-button text="娓呯┖" @click="selectCustomerResetFields"></u-button>
+									</view>
+									<!-- 瀹㈡埛鍒楄〃 -->
+									<view class="searchResultList">
+										<u-cell-group :right-icon="false">
+											<u-cell v-for="(item, index) in customerData" :title="item.customerFullName" :arrow="false">
+												<view slot="value" class="u-slot-value">
+													<button
+														class="mini-btn"
+														type="default"
+														size="mini"
+														style="background: #007aff;
+														color: #ffffff;
+														margin: auto 0;
+														height: 20px;
+														line-height:20px;
+														width: 43px;
+														font-size: 10px;
+														padding: 0;"
+														@click="addContractConsigneeConfirm(item)"
+													>
+														閫夋嫨
+													</button>
+												</view>
+											</u-cell>
+										</u-cell-group>
+									</view>
+									<view class="loadmoreClass">
+										<u-loadmore loadmoreText="鐐瑰嚮鍔犺浇鏇村" nomoreText="鏃犳洿澶氭暟鎹�!!!" :status="status" @loadmore="loadingCustomer" fontSize="20" height="30px" />
+									</view>
+									<!-- 閫夋嫨鐢ㄦ埛鑿滃崟椤� -->
+									<view class="selectCustomerCompSheet">
+										<u-action-sheet
+											:show="selectCustomerCompShow"
+											:actions="selectCustomerActions"
+											title="璇烽�夋嫨鍗曚綅"
+											@close="selectCustomerCompShow = false"
+											@select="selectCustomerSelect"
+										></u-action-sheet>
+									</view>
+									<!-- 绾у埆鑿滃崟椤� -->
+									<view class="selectLevelSheet">
+										<u-action-sheet :show="selectLevelShow" :actions="levelList" title="璇烽�夋嫨绾у埆" @close="selectLevelShow = false" @select="selectLevelSelect"></u-action-sheet>
+									</view>
+								</view>
+							</scroll-view>
+						</u-popup>
+					</view>
+
+					<!-- 鍝佺閫夋嫨鍣� -->
+					<view class="addContractCoalPicker">
+						<u-picker
+							:show="addContractCoalShow"
+							:columns="addContractCoalData"
+							@close="addContractCoalClose"
+							@cancel="addContractCoalShow = false"
+							@confirm="addContractCoalConfirm"
+							:closeOnClickOverlay="true"
+							keyName="label"
+						></u-picker>
+					</view>
+
+					<!-- 杩愯緭閫夋嫨鍣� -->
+					<view class="addContractCoalPicker">
+						<u-picker
+							:show="addContractTransportShow"
+							:columns="addContractTransportData"
+							@close="addContractTransportClose"
+							@cancel="addContractTransportShow = false"
+							@confirm="addContractTransportConfirm"
+							:closeOnClickOverlay="true"
+							keyName="label"
+						></u-picker>
+					</view>
+				</scroll-view>
+			</u-popup>
 		</view>
+
+		<!-- 鐢宠琛ㄦ牸 -->
+
+		<view class="newApplicationTable">
+			<!-- <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
+        <uni-tr v-for="(item, index) in 12" :key="index">
+          <uni-th align="center">瀛楁鏍囬</uni-th>
+          <uni-td>
+            <view class="text">杈撳叆/閫夋嫨鍐呭</view>
+            <view class="icon"><image src="@/static/icon/select.png" mode=""></image></view>
+          </uni-td>
+        </uni-tr>
+        <uni-tr>
+          <uni-th align="center">鎿嶄綔</uni-th>
+          <uni-td>
+            <view class="newApplicationTableUtil">
+              <u-button type="primary" text="淇敼" size="mini"></u-button>
+              <u-button type="error" text="鍒犻櫎" size="mini"></u-button>
+            </view>
+          </uni-td>
+        </uni-tr>
+      </uni-table> -->
+			<view class="balanceNo" v-if="accountDetails.balanceTotal < 0"><text style="color:red;">瀹㈡埛璐︽埛褰撳墠澶勪簬娆犳鐘舵��</text></view>
+
+			<view class="messageCustomerBalance" v-if="accountDetails.balanceTotal >= 0">
+				<text style="color: #FFA500;">
+					瀹㈡埛璐︽埛鐜版眹浣欓:{{ accountDetails.balance == null || undefined ? 0 : accountDetails.balance.toFixed(2) }},鎵垮厬浣欓锛歿{
+						accountDetails.balance2 == null || undefined ? 0 : accountDetails.balance2
+					}}
+				</text>
+			</view>
+			<u-swipe-action>
+				<u-swipe-action-item @click="deleteContractCardClick" :options="options1" v-for="(item, index) in newFormData.contractOrders" :key="index">
+					<view class="cardList">
+						<view class="cardListIcon" @click="editApplicationClick(index)"><u-icon name="edit-pen" color="#2979ff" size="35"></u-icon></view>
+						<view class="cardList-container">
+							<view class="cardList_item">
+								鏀惰揣浜猴細
+								<text>{{ item.customerName }}</text>
+							</view>
+							<view class="cardList_item">
+								<view class="">
+									鐭垮巶锛�
+									<text>{{ item.filedName }}</text>
+								</view>
+								<view class="">
+									鐓ゅ巶锛�
+									<text>{{ item.compName }}</text>
+								</view>
+							</view>
+
+							<view class="cardList_item">
+								<view class="">
+									鍝佺锛�
+									<text>{{ item.coalName }}</text>
+								</view>
+								<view class="">
+									杩愯緭锛�
+									<text>{{ item.trainType == 1 ? '璺繍' : '鍦伴攢' }}</text>
+								</view>
+							</view>
+							<view class="cardList_item">
+								<view class="">
+									鍗曚环锛�
+									<text>{{ item.price }}</text>
+								</view>
+								<view class="">
+									璁㈠崟閲戦锛�
+									<text>{{ item.amount }}</text>
+								</view>
+								<!-- <view class="">
+                      璁㈠崟鏁伴噺锛�<text>218.899</text>
+                    </view> -->
+							</view>
+						</view>
+					</view>
+				</u-swipe-action-item>
+			</u-swipe-action>
+
+			<view class="addCard" @click="addContractClick">
+				<view class="addCard-icon"><u-icon name="plus" size="100"></u-icon></view>
+			</view>
+		</view>
+
 		<view class="new-application-button">
 			<u-button text="鍙栨秷" :plain="true" type="primary" @click="backPage"></u-button>
 			<u-button text="纭畾" type="primary" @click="newApplicationFormDataClick"></u-button>
@@ -243,6 +653,7 @@
 <script>
 import combinationTitle from '@/components/common/combined-title/combined-title.vue';
 import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
+import { callWithErrorHandling } from 'vue';
 
 // 鏈�澶ф樉绀虹殑鏃ユ湡
 const d = new Date();
@@ -253,29 +664,39 @@
 export default {
 	data() {
 		return {
+			noticeText:'宸﹀彸婊戝姩琛ㄦ牸鍙煡鐪嬫洿澶氳鎯�',
+			// 璐﹀閫夋嫨鍣�
+			selectLedgerShow: false,
+			ledgerList: [],
+			ledgerName: '',
+			// accountMsgType: 'error',
+			tdStyle: 'max-height: 30px;overflow: auto;',
 			spanStyle: 'overflow:auto',
 			newFormData: {
-				amount: 0,
+				amount: null,
 				coalId: '',
 				coalName: '',
 				contractId: 169,
-				contractName: '鍥芥嘲娲椾腑鐓ゅ悎鍚�',
+				contractName: '',
 				contractNum: '',
 				contractOrders: [],
 				customerAddressId: '',
 				customerId: 236,
-				customerName: '閭㈠彴鍥芥嘲鍙戠數鏈夐檺璐d换鍏徃',
-				endDate: '2022-07-12',
-				executiveQuant: 0,
-				id: 0,
+				customerName: '',
+				endDate: '',
+				executiveQuant: null,
+				id: null,
 				number: '',
-				payType: '0',
-				price: 0,
-				quant: 0,
+				payType: '',
+				price: null,
+				quant: null,
 				remark: '',
-				startDate: '2022-07-05',
-				type: '澶栭攢'
+				startDate: '',
+				type: '',
+				ledgerId: null
+				// ledgerName:''
 			},
+			accountDetails: {},
 			// 鏃堕棿
 			timeDataStr: '',
 			menuShow: false,
@@ -286,32 +707,49 @@
 			actions: [],
 			selectValue: '',
 			rules: {
-				'newData.name': {
-					type: 'string',
-					required: true,
-					message: '璇峰~鍐欏鎴峰悕绉�',
-					trigger: ['blur', 'change']
-				},
-				'newData.num': {
-					type: 'string',
-					max: 2,
-					required: true,
-					message: '璇烽�夋嫨鍚堝悓缂栧彿',
-					trigger: ['blur', 'change']
-				}
+				customerName: [
+					{
+						required: true,
+						message: '璇烽�夋嫨缁撶畻瀹㈡埛',
+						trigger: ['blur', 'change']
+					}
+				],
+				contractNum: [
+					{
+						required: true,
+						message: '璇烽�夋嫨鍚堝悓缂栧彿',
+						trigger: ['blur', 'change']
+					}
+				],
+				payType: [
+					{
+						required: true,
+						message: '璇烽�夋嫨浠樻鏂瑰紡',
+						trigger: ['blur', 'change']
+					}
+				],
+				startDate: [
+					{
+						required: true,
+						message: '璇烽�夋嫨鏃堕棿',
+						trigger: ['blur', 'change']
+					}
+				]
 			},
 			// 鏃堕棿
 			timeShow: false,
 			mode: 'range',
-			maxDate: `${year}-${month}-${date + 10}`,
 			// 閫夋嫨瀹㈡埛
 			selectCustomerData: {
 				compIds: '',
-				customerName: '',
+				customerFullName: '',
 				level: '',
 				current: 1,
 				size: 10
 			},
+			status: 'loadmore',
+			customerDataAllNum: 0, //瀹㈡埛鍒楄〃鎬绘潯鏁�
+			account: null, //瀹㈡埛璐︽埛淇℃伅
 			// 鎼滅储瀛楁
 			selectCompsData: [],
 			selectCustomerLevel: [],
@@ -325,21 +763,32 @@
 			selectCustomerActions: [],
 			// 绾у埆
 			selectLevelShow: false,
-			levelList: [{ name: '涓�鏄熺骇', value: 'A' }, { name: '浜屾槦绾�', value: 'B' }, { name: '涓夋槦绾�', value: 'C' }, { name: '鍥涙槦绾�', value: 'D' }, { name: '浜旀槦绾�', value: 'E' }],
-
+			levelList: [
+				{ name: '涓�鏄熺骇', value: 'A' },
+				{ name: '浜屾槦绾�', value: 'B' },
+				{ name: '涓夋槦绾�', value: 'C' },
+				{
+					name: '鍥涙槦绾�',
+					value: 'D'
+				},
+				{ name: '浜旀槦绾�', value: 'E' }
+			],
 			// 閫夋嫨鍚堝悓
 			selectContractShow: false,
 			searchContractForm: {
 				current: 1,
-				size: 10,
+				size: 50,
 				num: '',
 				startDate: '',
 				endDate: '',
 				result: 2,
-				type: '澶栭攢',
+				type: '',
 				customerName: ''
 			},
+			statusContractLoading: 'loadmore',
+			contractDataAllNum: 0, // 鍚堝悓鎬绘暟
 			contractData: [],
+			contractNumList: [],
 			// 绫诲瀷
 			selectContractTypeShow: false,
 			selectContractTypeData: [[]],
@@ -347,6 +796,56 @@
 			selectContractTimeMode: 'single',
 			selectContractStartTimeShow: false,
 			selectContractEndTimeShow: false,
+			// 娣诲姞鍚堝悓
+			addContractShow: false,
+			// 娣诲姞鍚堝悓琛ㄥ崟
+			addContractRules: {},
+			addContractFormdata: {},
+			contractDetails: [], // 閫夋嫨鐨勫悎鍚岃鎯�
+			// 閫夋嫨鐓ゅ巶
+			coalFiledSelectShow: false,
+			coalfiledData: [],
+			coalfiledParams: { current: 1, size: 10 },
+			selectCoalFiledData: {},
+			// 閫夋嫨鏀惰揣浜�
+			addContractConsigneeShow: false,
+			// 鍝佺閫夋嫨鍣�
+			addContractCoalShow: false,
+			addContractCoalData: [[]],
+			// 杩愯緭绫诲瀷
+
+			// 浼樻儬
+			favouredpolicyListAll: [], //浼樻儬鏀跨瓥鍒楄〃鎵�鏈夌殑
+			favouredpolicyList: [], // 浼樻儬鏀跨瓥鍒楄〃
+			multipleSelection: [], //閫変腑鐨勪紭鎯犳斂绛�
+			// 鍗曢�夋
+			addContractTransport: '鍦伴攢',
+			// 鍝佺浠锋牸琛ㄦ牸
+			loading: false,
+			// 浠锋牸璇锋眰鍙傛暟
+			getNewPriceData: {},
+			dust: null, // 鎶戝皹璐�
+			trainfreight: {}, //璺繍杩愯垂
+			// 杩愯緭绫诲瀷
+			addContractTransportShow: false,
+			addContractTransportData: [[{ label: '鍦伴攢', value: 1 }, { label: '璺繍', value: 2 }]],
+			currentCoal: {
+				coalName: '',
+				cokingPrice: null,
+				modifyId: null,
+				modifyInfoId: null,
+				noImportantPrice: null,
+				quotePrice: null,
+				steelMillPrice: null,
+				type: null
+			},
+			// 婊戝姩鍗曞厓鏍�
+			options1: [
+				{
+					text: '鍒犻櫎'
+				}
+			],
+			editApplicationIndex: null
 		};
 	},
 	onShow() {
@@ -359,6 +858,87 @@
 	onNavigationBarButtonTap(e) {
 		// console.log(e);
 		this.$refs.menuRef.menuClick();
+	},
+	computed: {
+		afterPrice() {
+			let temp = Object.assign({}, this.currentCoal);
+			let favouredpolicyIds = '';
+			if (this.favouredpolicyList.length > 0) {
+				this.multipleSelection.forEach(e => {
+					if (favouredpolicyIds.length > 0) {
+						favouredpolicyIds += ',';
+					}
+					favouredpolicyIds += e.id;
+					temp.steelMillPrice -= e.price;
+					temp.cokingPrice -= e.price;
+					temp.noImportantPrice -= e.price;
+					temp.quotePrice -= e.price;
+				});
+				if (this.multipleSelection.length > 0) {
+					this.addContractFormdata.favouredpolicyIds = favouredpolicyIds;
+				}
+			}
+			return temp;
+		},
+		showPrice() {
+			if (this.addContractFormdata) {
+				let row = this.addContractFormdata;
+				if (row.compId && row.customerAddressId && row.coalId) {
+					// console.log('鐪嬭浠锋牸', this.showPrice);
+					// this.rowClik(this.currentRow);
+					return true;
+				}
+			}
+			return false;
+		},
+		//浼樻儬鏀跨瓥
+		favouredpolicyListcomputed() {
+			let list = [];
+			this.favouredpolicyListAll.forEach(e => {
+				//鏀粯鏂瑰紡
+				if (e.type.indexOf('B') != -1 && e.coalIds) {
+					if (e.coalIds.indexOf(this.addContractFormdata.coalId) != -1) {
+						list.push(e);
+					}
+				}
+				//杩愯窛
+				if (this.addContractFormdata.trainType == 2) {
+					if (e.type.indexOf('A') != -1) {
+						list.push(e); //鏍规嵁鍙戠珯鍒扮珯鑾峰彇杩愯窛
+					}
+				}
+			});
+			this.favouredpolicyList = list;
+			return true;
+		},
+		async currentRowComputed() {
+			this.changePriceMode(this.addContractFormdata.priceMode); //鍙樹环鏍肩敤鐨�
+			//鍙樿鍗曢噺
+			if (this.addContractFormdata.price > 0 && (this.addContractFormdata.amount > 0 || this.addContractFormdata.quant > 0)) {
+				let price = this.addContractFormdata.price;
+				if (this.addContractFormdata.trainType == 1) {
+					let q = this.addContractFormdata.amount / price;
+					this.addContractFormdata.quant = q.toFixed(2);
+					this.addContractFormdata.cost1 = null; //杩愯垂
+					this.addContractFormdata.cost2 = null; //鎶戝皹璐�
+				} else if (this.addContractFormdata.trainType == 2) {
+					//濡傛灉璺繍浠锋牸澧炲姞,鎶戝皹璐瑰拰杩愯垂
+					let cost1Price = await this.getFreight(this.addContractFormdata.fromStation, this.addContractFormdata.toStation, this.addContractFormdata.customerAddressId); //璺繍杩愯垂
+					price += cost1Price;
+					price += this.dust;
+					this.addContractFormdata.cost1 = (this.addContractFormdata.quant * cost1Price).toFixed(2); //杩愯垂
+					this.addContractFormdata.cost2 = (this.addContractFormdata.quant * this.dust).toFixed(2); //鎶戝皹璐�
+
+					let amount = Number(price * this.addContractFormdata.quant) + Number(this.addContractFormdata.cost1) + Number(this.addContractFormdata.cost2);
+					console.log(amount);
+					this.addContractFormdata.amount = amount.toFixed(2);
+					// console.log('杩愯垂锛屾姂灏樿垂锛�', this.addContractFormdata.cost1, this.addContractFormdata.cost2);
+				}
+			} else {
+				this.addContractFormdata.quant = null;
+			}
+			return true;
+		}
 	},
 	watch: {
 		// 绔嬪嵆澶勭悊 杩涘叆椤甸潰灏辫Е鍙� // immediate: true,
@@ -380,7 +960,22 @@
 		combinationTitle
 	},
 	methods: {
+		async jisuanAmount() {
+			if (this.addContractFormdata.trainType == 2) {
+				let price = this.addContractFormdata.price;
+				//濡傛灉璺繍浠锋牸澧炲姞鎶戝皹璐瑰拰杩愯垂
+				let cost1Price = await this.getFreight(this.addContractFormdata.fromStation, this.addContractFormdata.toStation, this.addContractFormdata.customerAddressId); //璺繍杩愯垂
+				price += cost1Price;
+				price += this.dust;
+				this.addContractFormdata.cost1 = (this.addContractFormdata.quant * cost1Price).toFixed(2); //杩愯垂
+				this.addContractFormdata.cost2 = (this.addContractFormdata.quant * this.dust).toFixed(2); //鎶戝皹璐�
+				let amount = Number(price * this.addContractFormdata.quant) + Number(this.addContractFormdata.cost1) + Number(this.addContractFormdata.cost2);
+				console.log(amount);
+				this.addContractFormdata.amount = amount.toFixed(2);
+			}
+		},
 		init() {
+			this.getLedgerList();
 			this.jcfavouredpolicyitem();
 			this.coalfiled();
 			this.coalprice();
@@ -388,6 +983,51 @@
 			this.pay_type();
 			this.others_params();
 			this.fetchCompTree();
+			this.getFavouredPolicyItem();
+			this.$reqGet('contract_type').then(res => {
+				console.log('鍚堝悓绫诲瀷', res);
+				res.data.forEach(item => {
+					this.selectContractTypeData[0].push(item.value);
+				});
+			});
+		},
+		/**
+		 * 鑾峰彇鍒嗙被璐﹀
+		 */
+		getLedgerList() {
+			this.$reqGet('zhaccountledger', { compId: uni.getStorageSync('userInfo').compId }).then(res => {
+				this.ledgerList.push(res.data.records);
+				console.log('璐﹀鍒楄〃', this.ledgerList);
+				if (res.data.records) {
+					this.newFormData.ledgerId = res.data.records[0].id;
+					// this.newFormData.ledgerName = res.data.records[0].name;
+					this.ledgerName = res.data.records[0].name;
+				}
+			});
+		},
+		selectLedger() {
+			this.selectLedgerShow = true;
+		},
+		selectLedgerChange(index) {
+			console.log('璐﹀閫夋嫨鍣�', index);
+			this.ledgerName = index.value[0].name;
+			this.newFormData.ledgerId = index.value[0].id;
+			// this.newFormData.ledgerName = index.value[0].name;
+			if (this.newFormData.customerName || this.newFormData.contractNum || this.newFormData.contractName) {
+				this.newFormData.customerName = '';
+				this.newFormData.contractNum = '';
+				this.newFormData.contractName = '';
+			}
+		},
+		selectLedgerConfirm(index) {
+			console.log('閫夋嫨璐﹀鐐瑰嚮纭畾', index);
+			this.selectLedgerShow = false;
+		},
+		selectLedgerCancel() {
+			this.selectLedgerShow = false;
+		},
+		selectLedgerClose() {
+			this.selectLedgerShow = false;
 		},
 		// 閫夋嫨瀹㈡埛
 		selectCustomer() {
@@ -397,15 +1037,17 @@
 				title: '鍔犺浇涓�...'
 			});
 			this.selectCustomerShow = true;
+			this.selectCustomerData.current = 1;
 			this.$reqGet('customer', this.selectCustomerData).then(res => {
 				uni.hideLoading();
 				if (res.code == 0) {
 					this.customerData = res.data.records;
+					this.customerDataAllNum = res.data.total;
 				}
 			});
 		},
+		// 瀹㈡埛閫夋嫨寮规鎵撳紑浜�
 		selectCustomerOpen() {
-			console.log('瀹㈡埛閫夋嫨寮规鎵撳紑浜�');
 			// this.spanStyle = 'overflow:hidden'; //褰撹挋灞傚脊璧锋椂锛屽浐瀹氱晫闈㈢姝㈡粴鍔紝褰撹挋灞傚叧闂椂锛屽厑璁告粴鍔�
 		},
 		selectCustomerClose() {
@@ -453,51 +1095,93 @@
 		// 娓呯┖閫夋嫨瀹㈡埛琛ㄥ崟
 		selectCustomerResetFields() {
 			this.$refs.selectformRef.resetFields(); // 涓嶈捣鏁堟灉
-			this.selectCustomerData.customerName = '';
+			this.selectCustomerData.customerFullName = '';
 			this.searchCustomerForm.compName = '';
 			this.searchCustomerForm.levelText = '';
 			this.selectCustomer();
 		},
 		selectCustomerOkClick(v) {
-			console.log('id', v);
-			this.$reqGet('getAccount', { customerId: v }).then(res => {
-				console.log('鑾峰彇璐﹀彿', res);
-				this.newFormData.customerName = res.data.customerName;
-				this.newFormData.customerId = res.data.id;
+			console.log('澶栧眰瀹㈡埛閫夋嫨', v);
+			this.newFormData.customerName = v.customerName;
+			this.newFormData.customerId = v.id;
+			this.$reqGet('getAccount', { customerId: v.id, ledgerId: this.newFormData.ledgerId }).then(res => {
+				console.log('瀹㈡埛閫夋嫨璐︽埛', res);
+				this.accountDetails = res.data;
 				this.searchContractForm.customerName = res.data.customerName;
+				this.reqContract();
+				this.$nextTick(() => {
+					console.log('zhezhezhe');
+					this.contractData.forEach(item => {
+						this.contractNumList.push(item.num);
+					});
+					console.log('鍚堝悓鍙风爜鍒楄〃', this.contractNumList);
+					// 妫�鏌ユ崲瀹㈡埛鍚庡搴旂殑鍚堝悓
+					if (this.contractNumList.indexOf(this.newFormData.contractNum) > -1) {
+						this.newFormData.contractNum = '';
+						this.newFormData.contractName = '';
+					}
+				});
 			});
 			this.$nextTick(() => {
 				this.selectCustomerShow = false;
 			});
 		},
+		loadingCustomer() {
+			console.log('鍔犺浇鏇村浜嬩欢');
+			if (this.selectCustomerData.current >= this.customerDataAllNum / 10) return;
+			this.status = 'loading';
+			this.selectCustomerData.current = ++this.selectCustomerData.current;
+			this.$reqGet('customer', this.selectCustomerData).then(res => {
+				if (this.selectCustomerData.current >= this.customerDataAllNum / 10) {
+					this.status = 'nomore';
+					this.$u.toast('娌℃湁鏇村鏁版嵁浜嗭紒');
+				}
+				uni.hideLoading();
+				if (res.code == 0) {
+					this.customerDataAllNum = res.data.total;
+					this.customerData = this.customerData.concat(res.data.records);
+					this.status = 'loadmore';
+					console.log(this.selectCustomerData);
+				}
+			});
+		},
 		// 鏃堕棿
 		confirmTime(v) {
 			this.timeShow = false;
-			console.log(v);
+			console.log('鏃堕棿', v);
 			v.forEach(e => {
 				this.newFormData.startDate = v[0];
-				this.newFormData.endDate = v[v.lenght - 1];
+				this.newFormData.endDate = v[v.length - 1];
 				this.timeDataStr = v[0] + ' 鑷� ' + v[v.length - 1];
 			});
 		},
 
 		// 閫夋嫨鍚堝悓
 		selectContract() {
-			this.selectContractShow = true;
+			if (this.newFormData.customerName != '') {
+				if (this.newFormData.contractOrders != []) {
+					uni.showToast({
+						title: '娣诲姞璁㈠崟鍚庯紝涓嶈兘淇敼鍚堝悓锛�',
+						icon: 'none',
+						duration: 2000
+					});
+				}
+				this.selectContractShow = true;
+			} else {
+				this.$refs.formRef
+					.validate()
+					.then(res => {
+						uni.$u.toast('鏍¢獙鎴愬姛');
+					})
+					.catch(err => {
+						uni.$u.toast('璇烽�夋嫨缁撶畻瀹㈡埛');
+					});
+			}
 		},
 		// 閫夋嫨鍚堝悓绫诲瀷杈撳叆妗嗚幏鍙栫劍鐐硅Е鍙�
-		searchContractFormTypeFocus(){
-			// 绫诲瀷寮瑰嚭妗�   
-			this.selectContractTypeShow = true
-			// 寮瑰嚭妗嗙被鍨嬭姹�
-			this.$nextTick(()=>{
-				this.$reqGet('contract_type').then(res => {
-					console.log('contract_type', res);
-					res.data.forEach(item => {
-						this.selectContractTypeData[0].push(item.value);
-					});
-				});
-			});
+		searchContractFormTypeFocus() {
+			// 绫诲瀷寮瑰嚭妗�
+			this.selectContractTypeShow = true;
 		},
 		// 閫夋嫨鍚堝悓寮规
 		selectContractOpen() {
@@ -508,11 +1192,40 @@
 			this.$reqGet('contract_status').then(res => {
 				console.log('鐘舵��', res);
 			});
+			this.reqContract();
+		},
+		// 鍚堝悓璇锋眰
+		reqContract() {
+			this.searchContractForm.current = 1;
 			this.$reqGet('contract', this.searchContractForm).then(res => {
 				uni.hideLoading();
 				if (res.code == 0) {
 					console.log('鍚堝悓', res);
 					this.contractData = res.data.records;
+					this.contractDataAllNum = res.data.total;
+				}
+			});
+		},
+		// 鍚堝悓鍔犺浇鏇村
+		loadingContract() {
+			uni.showLoading({
+				title: '鍔犺浇涓�...'
+			});
+			console.log('鍚堝悓鍔犺浇鏇村浜嬩欢', this.statusContractLoading);
+			if (this.searchContractForm.current >= this.contractDataAllNum / 50) return;
+			this.statusContractLoading = 'loading';
+			this.searchContractForm.current = ++this.searchContractForm.current;
+			this.$reqGet('contract', this.searchContractForm).then(res => {
+				if (this.searchContractForm.current >= this.contractDataAllNum / 50) {
+					this.statusContractLoading = 'nomore';
+					this.$u.toast('娌℃湁鏇村鏁版嵁浜嗭紒');
+				}
+				uni.hideLoading();
+				if (res.code == 0) {
+					this.contractDataAllNum = res.data.total;
+					this.contractData = this.contractData.concat(res.data.records);
+					this.statusContractLoading = 'loadmore';
+					console.log(this.searchContractForm);
 				}
 			});
 		},
@@ -524,28 +1237,311 @@
 			this.searchContractForm.type = v.value[0];
 			this.selectContractTypeShow = false;
 			console.log('閫夋嫨鍣ㄧ‘瀹氬悗鐨勫��', v, this.searchContractForm.type);
-			
 		},
 		selectContractTypeClose(v) {
 			// 鍒濆鍖栧悎鍚岀被鍨嬮�夋嫨鍣�
 			this.selectContractTypeData[0] = [];
-			
+
 			this.selectContractTypeShow = false;
 			if (v) {
 				this.searchContractForm.type = v.value[0];
 			}
 		},
 		// 鍚堝悓鏃堕棿閫夋嫨鍣�
-		selectContractStartTimeConfirm(){
+		selectContractStartTimeConfirm(e) {
+			this.selectContractStartTimeShow = false;
+			this.searchContractForm.startDate = e[0];
+		},
+		selectContractStartTimeClose() {
 			this.selectContractStartTimeShow = false;
 		},
-		selectContractEndTimeConfirm(){
+		selectContractEndTimeConfirm(e) {
 			this.selectContractEndTimeShow = false;
+			this.searchContractForm.endDate = e[0];
+		},
+		selectContractEndTimeClose() {
+			this.selectContractEndTimeShow = false;
+		},
+		// 閲嶇疆琛ㄥ崟鎵�鏈夊瓧娈�
+		selectContractResetFields() {
+			this.searchContractForm.num = '';
+			this.searchContractForm.startDate = '';
+			this.searchContractForm.endDate = '';
+			this.searchContractForm.customerName = '';
+			this.searchContractForm.type = '';
+		},
+		selectContractClick(e) {
+			console.log('閫夋嫨鍚堝悓', e);
+			this.newFormData.contractName = e.contractName;
+			this.newFormData.contractNum = e.num;
+			this.newFormData.contractId = e.id;
+			this.newFormData.type = e.type;
+			this.selectContractShow = false;
+
+			// 浠锋牸鍙傛暟璧嬪��
+			this.getNewPriceData.type = e.type;
+			// 閫夊畾鍚堝悓璇︽儏
+			uni.showLoading({
+				title: '鍔犺浇涓�...'
+			});
+			this.$reqGet('getByContractId', {}, e.id)
+				.then(res => {
+					uni.hideLoading();
+					this.contractDetails = res.data;
+					this.contractDetails.forEach(item => {
+						let a = [{ label: '', id: '' }];
+						a[0].label = item.coalName;
+						a[0].id = item.coalId;
+						if (this.addContractCoalData[0]) {
+							this.addContractCoalData = [];
+						}
+						this.addContractCoalData.push(a);
+					});
+				})
+				.catch(err => {
+					console.log(err);
+				});
+
+			// 娣诲姞鐓ょ閫夐」
+		},
+		// 娣诲姞鍚堝悓鎸夐挳
+		addContractClick() {
+			// 鎵撳嵃true鎴杅alse
+			this.$refs.formRef
+				.validate()
+				.then(res => {
+					if (this.accountDetails.balanceType == '璐�') {
+						uni.showToast({
+							title: '瀹㈡埛璐︽埛浣欓褰撳墠澶勪簬娆犳鐘舵�侊紒',
+							icon: 'none',
+							duration: 2000
+						});
+					} else {
+						if (this.accountDetails.balance == 0 || (null && this.accountDetails.balance2 == 0) || null) {
+							uni.showToast({
+								title: '璐︽埛浣欓涓嶈冻锛�',
+								icon: 'error',
+								duration: 2000
+							});
+						} else {
+							console.log('娣诲姞鍚堝悓鎸夐挳鐐瑰嚮', res);
+							this.addContractShow = true;
+							this.addContractFormdata = {
+								amount: null,
+								coalId: null,
+								coalName: '',
+								compId: null,
+								compName: '',
+								cost1: '',
+								cost2: '',
+								customerId: null,
+								customerName: '',
+								edit: true,
+								favouredpolicyIds: '',
+								filedId: null,
+								filedName: '',
+								fromStation: '',
+								modifyId: null,
+								modifyInfoId: null,
+								customerAddressId: null,
+								price: null,
+								priceMode: '0',
+								quant: '',
+								toStation: '',
+								trainType: 1,
+								type: ''
+							};
+							this.multipleSelection = [];
+							console.log('鏂板缓鍙戣繍鐢宠璁㈠崟', this.addContractFormdata);
+						}
+					}
+				})
+				.catch(err => {
+					uni.$u.toast('鏁堥獙澶辫触');
+				});
+		},
+		// 娣诲姞鍚堝悓寮瑰嚭妗�
+		addContractClose() {
+			this.addContractShow = false;
+			this.addContractFormdata = {};
+			this.editApplicationIndex = null;
+		},
+		addContractOpen() {
+			console.log('娣诲姞璁㈠崟鎵撳紑');
+		},
+		// 閫夋嫨鐓ゅ巶
+		coalFiledSelectOpen(e) {
+			console.log('coalfiledSelect: ', e);
+		},
+		coalFiledSelectClose() {
+			this.coalFiledSelectShow = false;
+		},
+		// 閫夋嫨鐨勭叅鍘�
+		coalFiledSelectClick(e) {
+			console.log('閫夋嫨鐨勭叅鍘�', e);
+			this.addContractFormdata.compName = e.compName;
+			this.addContractFormdata.filedName = e.name;
+			this.addContractFormdata.compId = e.compId;
+			this.addContractFormdata.filedId = e.id;
+			this.addContractFormdata.fromStation = e.toStation;
+
+			this.selectCoalFiledData = e;
+
+			// 鑾峰彇浠锋牸鍙傛暟
+			this.getNewPriceData.compId = e.compId;
+			this.getNewPriceData.compName = e.compName;
+			this.getNewPriceData.filedId = e.id;
+			this.getNewPriceData.filedName = e.name;
+
+			this.coalFiledSelectShow = false;
+		},
+		// 鏀惰揣浜�
+		addContractConsigneeClose() {
+			this.addContractConsigneeShow = false;
+		},
+		// 娣诲姞鍚堝悓瀛愰」鏀惰揣浜烘墦寮�
+		addContractConsigneeOpen() {},
+		addContractConsignee() {
+			this.addContractConsigneeShow = true;
+		},
+		addContractConsigneeConfirm(v) {
+			this.addContractFormdata.toStation = v.toStation;
+			this.addContractFormdata.customerName = v.customerName;
+			this.addContractFormdata.customerId = v.id;
+
+			// 璧嬪�肩粰鍙栦环鏍艰姹傚弬鏁�
+			this.getNewPriceData.customerAddressName = v.customerFullName;
+			this.getNewPriceData.customerAddressId = v.id;
+			this.getNewPriceData.toStation = v.toStation;
+
+			this.addContractFormdata.toStation = v.toStation;
+			this.addContractFormdata.customerAddressId = v.id;
+			this.addContractConsigneeShow = false;
+		},
+		// 鍝佺閫夋嫨鍣�
+		addContractCoalConfirm(e) {
+			console.log('鍝佺閫夋嫨鍣�', e);
+
+			this.addContractCoalShow = false; // 鍏抽棴閫夋嫨鍣�
+			this.addContractFormdata.coalId = e.value[0].id;
+			this.addContractFormdata.coalName = e.value[0].label;
+			// 鐓ょ浠锋牸璇锋眰(鐓ゅ巶=>浠锋牸鍙傛暟)
+			this.getNewPriceData.coalId = e.value[0].id;
+			this.getNewPriceData.coalName = e.value[0].label;
+
+			// this.selectCoalFiledData.compId = e.compId;
+			// this.selectCoalFiledData.compName = e.compName;
+			// this.selectCoalFiledData.toStation = e.fromStation;
+
+			this.$reqGet('getNewPrice', this.getNewPriceData).then(res => {
+				if (res.code == 0) {
+					let data = res.data;
+					if (data) {
+						this.currentCoal.coalName = data.coalName;
+						this.currentCoal.cokingPrice = data.cokingPrice; //鐒﹀寲浠锋牸
+						this.currentCoal.noImportantPrice = data.noImportantPrice; //涓嶉噸瑕佷环鏍�
+						this.currentCoal.quotePrice = data.quotePrice; // 鎸傜墝浠锋牸
+						this.currentCoal.steelMillPrice = data.steelMillPrice; // 閽㈠巶浠锋牸
+						this.currentCoal.modifyId = data.modifyId; //淇敼id
+						this.currentCoal.modifyInfoId = data.id;
+
+						this.addContractFormdata.price = data.steelMillPrice;
+						// if (data.coalPath && data.coalPath.indexOf('鍔ㄥ姏鐓�') > -1) {
+						// 	this.currentCoal.type = 0;
+						// } else {
+						// 	this.currentCoal.type = 1;
+						// }
+						this.addContractFormdata.modifyId = data.modifyId;
+						// this.addContractFormdata.id = data.id;
+					} else {
+						uni.$u.toast('鐓ょ浠锋牸鏈缃�');
+					}
+				}
+			});
+		},
+		addContractCoalClose() {
+			this.addContractCoalShow = false;
+		},
+		// 鐓ゅ搧绉嶄环鏍�
+		groupChange(e) {
+			console.log('鍗曢�夋灏忕粍', e);
+		},
+		changePriceMode(e) {
+			if (!this.currentCoal) return;
+			this.addContractFormdata.priceMode = e;
+			switch (this.addContractFormdata.priceMode) {
+				case '0':
+					this.addContractFormdata.price = this.afterPrice.steelMillPrice;
+					break;
+				case '1':
+					this.addContractFormdata.price = this.afterPrice.cokingPrice;
+					break;
+				case '2':
+					this.addContractFormdata.price = this.afterPrice.noImportantPrice;
+					break;
+				case '3':
+					this.addContractFormdata.price = this.afterPrice.quotePrice;
+					break;
+			}
+		},
+		// 浼樻儬閫夋嫨
+		selectionChange(e) {
+			this.multipleSelection = [];
+			this.favouredpolicyList.forEach((item, i) => {
+				if (e.detail.index.indexOf(i) != -1) {
+					this.multipleSelection.push(item);
+				}
+			});
+		},
+		// 杩愯緭閫夋嫨鍣�
+		addContractTransportConfirm(e) {
+			this.addContractTransportShow = false;
+			this.addContractFormdata.trainType = e.value[0].value;
+			switch (this.addContractFormdata.trainType) {
+				case 1:
+					this.addContractTransport = '鍦伴攢';
+					break;
+				case 2:
+					this.addContractTransport = '璺繍';
+					break;
+			}
+		},
+		addContractTransportClose() {
+			this.addContractTransportShow = false;
+		},
+		// 鑾峰彇杩愯垂
+		async getFreight(from, to, customerId) {
+			let key = from + to + customerId;
+			let price = this.trainfreight[key];
+			price = await this.$reqGet('trainFreightFind', { from, to, customerId }).then(res => {
+				let resPrice = 10; //榛樿浠锋牸涓�10
+				if (res.data) {
+					resPrice = res.data.price;
+				}
+				return resPrice;
+			});
+			return price;
+		},
+		addContractSanConfirm() {
+			if (this.addContractFormdata.compId && this.addContractFormdata.customerId && this.addContractFormdata.filedId) {
+				if (this.editApplicationIndex != null) {
+					this.newFormData.contractOrders[this.editApplicationIndex] = this.addContractFormdata;
+				} else {
+					this.addContractFormdata.type = this.newFormData.type;
+					this.newFormData.contractOrders.push(this.addContractFormdata);
+					console.log('娣诲姞瀛愯鍗�', this.addContractFormdata);
+				}
+				this.addContractShow = false; // 鍏抽棴寮瑰嚭妗�
+				console.log('this.newFormData.contractOrders褰撳墠鍏抽棴鍚�', this.newFormData.contractOrders);
+			} else {
+				uni.$u.toast('璇疯鑼冭緭鍏ユ墍鏈変俊鎭�');
+			}
 		},
 		// 鍒濆鏁版嵁璇锋眰
 		operato() {
 			this.$reqGet('operator').then(res => {
 				// console.log('operator', res);
+				this.operator = res.data;
 			});
 		},
 		pay_type() {
@@ -562,9 +1558,15 @@
 			});
 			// console.log(this.actions);
 		},
+		// 鎶戝皹璐�
 		others_params() {
 			this.$reqGet('others_params').then(res => {
-				// console.log('others_params', res);
+				console.log('others_params', res);
+				res.data.forEach(e => {
+					if (e.label == 'dust') {
+						this.dust = parseFloat(e.value);
+					}
+				});
 			});
 		},
 		coalprice() {
@@ -572,14 +1574,24 @@
 				// console.log('coalprice', res);
 			});
 		},
+		// 绾у埆璺濅紭鎯�
 		jcfavouredpolicyitem() {
 			this.$reqGet('jcfavouredpolicyitem', { current: 1, size: 1000, status: 0 }).then(res => {
-				// console.log('jcfavouredpolicyitem', res);
+				console.log('绾у埆璺濅紭鎯�', res);
+				// this.favouredpolicyListAll = res.data.records;
 			});
 		},
+		// 鑾峰彇鎵�鏈夌殑浼樻儬鏀跨瓥
+		getFavouredPolicyItem() {
+			this.$reqGet('getFavouredPolicyItem', { current: 1, size: 1000, status: 0 }).then(res => {
+				console.log('鎵�鏈変紭鎯犳斂绛�', res.data.records);
+				this.favouredpolicyListAll = res.data.records;
+			});
+		},
+		// 鐓ゅ満
 		coalfiled() {
-			this.$reqGet('coalfiled', { current: 1, size: 10 }).then(res => {
-				// console.log('coalfiled', res);
+			this.$reqGet('coalfiled', this.coalfiledParams).then(res => {
+				this.coalfiledData = res.data.records;
 			});
 		},
 		// 鏃堕棿
@@ -596,8 +1608,79 @@
 		// moveHandleContract(){
 		// 	return true;
 		// },
+		// 鏂板缓鍙戣繍鐢宠
 		newApplicationFormDataClick() {
-			console.log('纭鏂板鐢宠琛ㄥ崟');
+			this.$refs.formRef
+				.validate()
+				.then(res => {
+					let amount = 0;
+					this.newFormData.contractOrders.forEach(e => {
+						amount += Number(e.amount);
+					});
+					if (this.newFormData.payType == '0') {
+						if (this.newFormData.contractOrders.length <= 0) {
+							this.$u.toast('璇锋坊鍔犺鍗曞瓙椤癸紒');
+							return false;
+						} else if (this.accountDetails.balance < amount) {
+							let msg = this.accountDetails.balance == null ? 0 : this.accountDetails.balance;
+							uni.showToast({
+								title: '瀹㈡埛璐︽埛鐜版眹浣欓涓嶈冻锛岀幇姹囦綑棰�:' + msg,
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							console.log('鎻愪氦鏁翠綋', this.newFormData);
+							this.xswaybill();
+						}
+					} else {
+						if (this.newFormData.contractOrders.length <= 0) {
+							this.$u.toast('璇锋坊鍔犺鍗曞瓙椤癸紒');
+							return false;
+						} else if (this.accountDetails.balance2 < amount) {
+							let msg = this.accountDetails.balance2 == null ? 0 : this.accountDetails.balance2;
+							uni.showToast({
+								title: '瀹㈡埛璐︽埛鎵垮厬浣欓涓嶈冻锛屾壙鍏戜綑棰�:' + msg,
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							console.log('鎻愪氦鏁翠綋', this.newFormData);
+							this.xswaybill();
+						}
+					}
+				})
+				.catch(err => {
+					uni.$u.toast('鏍¢獙澶辫触');
+				});
+		},
+		// 鍒犻櫎璁㈠崟鍗$墖
+		deleteContractCardClick(e) {
+			console.log('鍒犻櫎璁㈠崟鍗$墖', e);
+			this.newFormData.contractOrders.splice(e, 1);
+		},
+		editApplicationClick(index) {
+			this.editApplicationIndex = index;
+			this.addContractFormdata = this.newFormData.contractOrders[index];
+			this.addContractShow = true;
+		},
+		xswaybill() {
+			console.log('鏂板缓鍙戣繍鐢宠', this.newFormData);
+			uni.showLoading({
+				title: '鍔犺浇涓�...'
+			});
+			this.$reqPost('xswaybill', this.newFormData).then(res => {
+				uni.hideLoading();
+				console.log('鏂板缓鍙戣繍鐢宠', res);
+				if (res.code == 0) {
+					this.$u.toast('娣诲姞鎴愬姛锛屽嵆灏嗚繑鍥炵敵璇烽〉锛侊紒锛�');
+					setTimeout(() => {
+						uni.navigateBack({
+							// url: '/pages/my-application/my-application'
+							delta: 2
+						});
+					}, 1500);
+				}
+			});
 		},
 		backPage() {
 			uni.navigateBack({
@@ -617,11 +1700,13 @@
 	.newApplicationTitle {
 		margin-bottom: 0;
 	}
+
 	// 琛ㄥ崟
 	.formDataContaniner {
 		.u-form {
 			width: 91%;
 			margin: 0 auto 0;
+
 			.u-form-item {
 				.u-form-item__body {
 					.u-form-item__body__left {
@@ -630,6 +1715,7 @@
 							}
 						}
 					}
+
 					.u-form-item__body__right {
 						.u-form-item__body__right__content {
 							.u-form-item__body__right__content__slot {
@@ -646,78 +1732,102 @@
 		.u-popup {
 			.u-transition {
 				height: 95%;
+
 				.u-popup__content {
 					overflow: scroll !important;
+
 					.selectCustomerTitle {
 						margin-bottom: 0;
 					}
+
 					.selectCustomerContainer {
 						padding: 0 4%;
+						// .loadmoreClass{
+						// 	.u-loadmore{
+						// 		.u-loadmore__content{
+						// 			.u-loadmore__content__text{
+						// 			}
+						// 		}
+						// 	}
+						// }
 						.searchContainer {
+							.u-input {
+								width: 90%;
+							}
 						}
+
 						.searchCustomerBtn {
 							margin-top: vww(10);
 							display: flex;
+
 							.u-button {
 								width: 30%;
 							}
 						}
+
 						// 鏁版嵁鍒楄〃
 						.searchResultList {
 							margin-top: vww(16);
-							.u-collapse {
-								.u-collapse-item {
-									.u-collapse-item__content {
-										.u-collapse-item__content__text {
-											padding: 0;
+						}
+						
+						// 婊氬姩閫氱煡
+						.tapStyle{
+							margin-top: vww(30);
+						}
+
+						// 鍚堝悓琛ㄦ牸
+						.tableContract {
+							display: flex;
+							justify-content: center;
+
+							.uni-table-scroll {
+								min-width: 0 !important;
+
+								.uni-table {
+									.uni-table-tr {
+										padding: 0;
+										font-size: vww(13);
+
+										.uni-table-th {
+											width: vww(100);
+											height: vww(32);
+											line-height: vww(20);
+											padding: vww(5) vww(10);
+											color: #111111;
+											font-weight: 400;
+											background: #f5f5f5;
+										}
+
+										.uni-table-td {
+											line-height: vww(20);
+											padding: vww(5) vww(10);
+											color: #111111;
 										}
 									}
 								}
 							}
-							.customerDetails {
-								.uni-table-scroll {
-									min-width: 0 !important;
-									// overflow-x: hidden;
-									.uni-table {
-										.uni-table-tr {
-											padding: 0;
-											font-size: vww(13);
-											.uni-table-th {
-												width: vww(100);
-												height: vww(32);
-												line-height: vww(20);
-												padding: vww(5) vww(10);
-												color: #111111;
-												font-weight: 400;
-												background: #f5f5f5;
-											}
 
-											.uni-table-td {
-												height: vww(32);
-												line-height: vww(20);
-												padding: vww(5) vww(10);
-												color: #111111;
-											}
-										}
-									}
+							.tableBody {
+								width: 80%;
+								.contractTableTd {
+									width: vww(200);
+									white-space: nowrap;
+									text-overflow: ellipsis;
+									overflow: hidden;
+								}
+							}
+
+							.TableUtilBtn {
+								width: 20%;
+								overflow: hidden;
+
+								.uni-table {
+									min-width: 0 !important;
 								}
 
-								.table-head {
-									height: vww(32);
-									border: vww(1) solid #dddddd;
-									display: flex;
-									justify-content: space-between;
-									font-size: vww(13);
-									line-height: vww(32);
-									padding: 0 vww(8);
-									background: #f5f5f5;
-
-									.titleText {
-										font-weight: 550;
-									}
-
-									.timeText {
-										color: #999999;
+								.TableUtilBtnContainer {
+									.u-button {
+										width: vww(20);
 									}
 								}
 							}
@@ -747,24 +1857,204 @@
 								}
 							}
 						}
-						
+
 						// 鏃堕棿閫夋嫨鍣�
-						.selectContractStartTime{
+						.selectContractStartTime {
 							.u-popup {
 								.u-transition {
 									height: auto;
 								}
 							}
 						}
-						.selectContractEndTime{
+
+						.selectContractEndTime {
 							.u-popup {
 								.u-transition {
 									height: auto;
 								}
 							}
 						}
-						
-						
+					}
+				}
+			}
+		}
+	}
+
+	// 鐓ゅ巶
+	.addContractContainer {
+		.u-popup {
+			.u-transition {
+				height: 95%;
+
+				.u-popup__content {
+					overflow: scroll !important;
+
+					.addContractFormTitle {
+						margin-bottom: 0;
+					}
+
+					// 鎼滅储
+					.coalFiledSelectSearch {
+					}
+
+					// 閫夋嫨鐓ょ
+					.coalFiledSelectPopup {
+						.u-popup {
+							.u-transition {
+								height: 80%;
+
+								.u-popup__content {
+									overflow: scroll !important;
+									// 琛ㄦ牸
+									.coalFiledTable {
+										width: 92%;
+										display: flex;
+										justify-content: center;
+										margin: 0 auto;
+
+										.uni-table-scroll {
+											min-width: 0 !important;
+
+											.uni-table {
+												.uni-table-tr {
+													padding: 0;
+													font-size: vww(13);
+
+													.uni-table-th {
+														width: vww(100);
+														height: vww(32);
+														line-height: vww(20);
+														padding: vww(5) vww(10);
+														color: #111111;
+														font-weight: 400;
+														background: #f5f5f5;
+													}
+
+													.uni-table-td {
+														line-height: vww(20);
+														padding: vww(5) vww(10);
+														color: #111111;
+													}
+												}
+											}
+										}
+
+										.tableBody {
+											width: 80%;
+										}
+
+										.TableUtilBtn {
+											width: 20%;
+											overflow: hidden;
+
+											.uni-table {
+												min-width: 0 !important;
+											}
+
+											.TableUtilBtnContainer {
+												.u-button {
+													width: vww(20);
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// 娣诲姞鍚堝悓
+	.addContractContainer {
+		.u-popup {
+			.u-transition {
+				height: 95%;
+
+				.u-popup__content {
+					// background-color: rgb(247, 247, 247);
+					overflow: scroll !important;
+
+					.addContractForm {
+						width: 92%;
+						margin: 0 auto;
+
+						// 琛ㄥ崟
+						// .u-form{
+						// 	.u-form-item{
+						// 		.u-form-item__body{
+						// 			.u-form-item__body__right{
+						// 				.u-form-item__body__right__content__slot{
+						// 					.u-input{
+						// 						border:1px solid #dddddd;
+						// 						.u-input__content{
+
+						// 						}
+						// 					}
+						// 				}
+						// 			}
+						// 		}
+						// 	}
+						// }
+
+						.formUpCard {
+							margin-top: vww(10);
+							padding: vww(10);
+							border-radius: vww(4);
+							box-shadow: 0 2px 16px #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+							background-color: #ffffff;
+							// 浠锋牸鍗$墖
+							.priceList {
+								min-height: vww(20);
+								border-radius: vww(4);
+								padding: vww(10) 0;
+								box-shadow: 0 2px 16px #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+								// margin-top:vww(10);
+								background-color: #ffffff;
+
+								.currentPriceContainer {
+									.currentPriceBox {
+										width: 92%;
+										margin: 0 auto;
+									}
+								}
+
+								.selectPriceContainer {
+									.selectPricebox {
+										width: 92%;
+										margin: 0 auto;
+
+										.selectPriceboxItem {
+											display: flex;
+											justify-content: space-between;
+										}
+									}
+								}
+							}
+						}
+
+						.formDownCard {
+							border-radius: vww(4);
+							padding: vww(10);
+							box-shadow: 0 2px 16px #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+							margin-top: vww(10);
+							background-color: #ffffff;
+						}
+
+						.addContractConfirm {
+							margin-top: vww(30);
+						}
+					}
+
+					// 鍝佺閫夋嫨鍣�
+					.addContractCoalPicker {
+						.u-popup {
+							.u-transition {
+								height: auto;
+							}
+						}
 					}
 				}
 			}
@@ -774,44 +2064,64 @@
 	// 琛ㄦ牸
 	.newApplicationTable {
 		margin: vww(40) auto;
-		width: 91%;
-		.uni-table {
-			.uni-table-tr {
-				.uni-table-th {
-					padding: 0;
-					width: vww(88);
-					height: vww(40);
-					background-color: #f5f5f5;
-					color: #111111;
-					font-size: vww(13);
-					font-weight: 500;
-				}
-				.uni-table-td {
-					width: vww(253);
-					height: vww(40);
-					background-color: #ffffff;
-					color: #111111;
-					font-size: vww(13);
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					.text {
-					}
-					.icon {
-						display: flex;
-						align-items: center;
-						image {
-							width: vww(10);
-							height: vww(5.5);
+		width: 100%;
+		padding: vww(0) vww(10) vww(60) vww(10);
+		box-sizing: border-box;
+
+		.u-swipe-action {
+			.u-swipe-action-item {
+				box-shadow: 0 2px 16px #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+				margin-top: vww(10);
+
+				.u-swipe-action-item__right {
+					.u-swipe-action-item__right__button {
+						.u-swipe-action-item__right__button__wrapper {
+							background-color: #ee336b !important;
 						}
 					}
 				}
 			}
 		}
-		// 杈规
-		// .table--border{
-		// 	border:1px solid #DDDDDD;
-		// }
+
+		.cardList {
+			height: vww(130);
+			border-radius: vww(4);
+			padding: vww(10);
+			position: relative;
+
+			.cardListIcon {
+				position: absolute;
+				right: vww(20);
+				top: vww(20);
+			}
+
+			.cardList-container {
+				.cardList_item {
+					margin-top: vww(12);
+					font-size: 14px;
+					display: flex;
+
+					view {
+						width: 50%;
+
+						&:nth-child(2) {
+							margin-left: vww(20);
+						}
+					}
+				}
+			}
+		}
+
+		.addCard {
+			width: 100%;
+			height: vww(130);
+			margin-top: vww(10);
+			border-radius: vww(4);
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			box-shadow: 0 2px 16px #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+		}
 	}
 
 	// button

--
Gitblit v1.9.1