From 5596cc695d444d9ef13661148d6e227f8ed3171e Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 28 七月 2022 20:25:37 +0800
Subject: [PATCH] '冲突解决'

---
 pages/edit-my-application/edit-my-application.vue | 3095 +++++++++++++++-------------------------------------------
 1 files changed, 823 insertions(+), 2,272 deletions(-)

diff --git a/pages/edit-my-application/edit-my-application.vue b/pages/edit-my-application/edit-my-application.vue
index f566b64..2a88362 100644
--- a/pages/edit-my-application/edit-my-application.vue
+++ b/pages/edit-my-application/edit-my-application.vue
@@ -1,514 +1,478 @@
 <template>
-  <!-- 鏂板鐢宠琛ㄥ崟 -->
-  <view class="new-application-form-data">
-    <!-- page-mete鐨刾age-style灞炴�х浉褰撲簬HTML鐨刡ody灞炴�� -->
-    <!-- <page-meta :page-style="spanStyle"></page-meta> -->
-    <!-- 琛ㄥ崟 -->
+	<!-- 鏂板鐢宠琛ㄥ崟 -->
+	<view class="new-application-form-data">
+		<!-- 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"  ref="formRef">
-        <u-form-item labelWidth="20%" label="缁撶畻瀹㈡埛"  borderBottom ref="customerNameRef">
-          <u--input v-model="newFormData.customerName" disabled disabledColor="#ffffff" border="none"></u--input>
-        </u-form-item>
-        <u-form-item labelWidth="20%" label="鍚堝悓缂栧彿"  borderBottom ref="contractNumRef">
-          <u--input v-model="newFormData.contractNum" disabled disabledColor="#ffffff" 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 labelWidth="20%" label="浠樻鏂瑰紡" borderBottom ref="payTypeRef">
-          <u--input :value="newFormData.payType == '0' ? '鐜版眹':'鎵垮厬'" 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-icon slot="right" name="arrow-right"></u-icon>
-        </u-form-item>
-        <u-form-item labelWidth="20%" label="缂栧彿"  borderBottom>
-          <u--input border="none" disabled disabledColor="#ffffff" v-model="newFormData.number" placeholder="璇疯緭鍏ョ紪鍙�"></u--input>
-        </u-form-item>
-      </u--form>
-    </view>
+		<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="缁撶畻瀹㈡埛" prop="customerName" borderBottom ref="customerNameRef">
+					<u--input v-model="newFormData.customerName" disabled disabledColor="#ffffff" border="none"></u--input>
+				</u-form-item>
+				<u-form-item  labelWidth="20%" label="鍚堝悓缂栧彿" prop="contractNum" borderBottom ref="contractNumRef">
+					<u--input v-model="newFormData.contractNum" disabled disabledColor="#ffffff" 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 labelWidth="20%" label="浠樻鏂瑰紡" borderBottom ref="payTypeRef">
+					<u--input :value="newFormData.payType == '0' ? '鐜版眹':'鎵垮厬'" 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" prop="startDate" labelWidth="20%" label="鏃ユ湡" borderBottom ref="timeDataRef">
+					<u--input v-model="timeDataStr" border="none" placeholder="璇烽�夋嫨鑼冨洿鏃ユ湡"></u--input>
+					<u-icon slot="right" name="arrow-right"></u-icon>
+				</u-form-item>
+				<u-form-item labelWidth="20%" label="缂栧彿" borderBottom>
+					<u--input border="none" disabled disabledColor="#ffffff" value="鑷姩鐢熸垚" placeholder="璇疯緭鍏ョ紪鍙�"></u--input>
+				</u-form-item>
+			</u--form>
+		</view>
 
-    <!-- 鐢宠鏃ュ巻銆佽寖鍥存椂闂� -->
-    <u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110"
-                :maxDate="maxDate"></u-calendar>
-    <!-- 鐢宠浠樻鏂瑰紡寮瑰嚭鑿滃崟 -->
-    <!-- <u-action-sheet :show="showPayType" :actions="actions" title="璇烽�夋嫨浠樻鏂瑰紡" @close="showPayType = false" @select="sexSelect"></u-action-sheet> -->
+		<!-- 鐢宠鏃ュ巻銆佽寖鍥存椂闂� -->
+		<u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110" :maxDate="maxDate"></u-calendar>
+		<!-- 鐢宠浠樻鏂瑰紡寮瑰嚭鑿滃崟 -->
+		<!-- <u-action-sheet :show="showPayType" :actions="actions" title="璇烽�夋嫨浠樻鏂瑰紡" @close="showPayType = false" @select="sexSelect"></u-action-sheet> -->
 
-    <!-- 閫夋嫨瀹㈡埛寮规 -->
-    <!--  @touchmove.stop.prevent="moveHandleCustomer":闃叉鍥惧眰绌块�� -->
-    <!-- <view class="selectCustomerPopup">
-      <u-popup :show="selectCustomerShow" @close="selectCustomerClose" @open="selectCustomerOpen" 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-show="searchCustomerForm.compName != ''" @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-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>
-              </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">
-          <text 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="selectCustomerOkClick(item)"
-            >
-              閫夋嫨
-            </button>
-          </text>
-        </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> -->
+		<!-- 閫夋嫨瀹㈡埛寮规 -->
+		<!--  @touchmove.stop.prevent="moveHandleCustomer":闃叉鍥惧眰绌块�� -->
+		<!-- <view class="selectCustomerPopup">
+			<u-popup :show="selectCustomerShow" @close="selectCustomerClose" @open="selectCustomerOpen" 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-show="searchCustomerForm.compName != ''" @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-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>
+							</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">
+									<text 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="selectCustomerOkClick(item)"
+										>
+											閫夋嫨
+										</button>
+									</text>
+								</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="selectLevelSheet">
+							<u-action-sheet :show="selectLevelShow" :actions="levelList" title="璇烽�夋嫨绾у埆" @close="selectLevelShow = false" @select="selectLevelSelect"></u-action-sheet>
+						</view>
+					</view>
+				</scroll-view>
+			</u-popup>
+		</view> -->
 
-    <!-- 閫夋嫨鍚堝悓 -->
-    <!-- @touchmove.stop.prevent="moveHandleContract" -->
-    <!-- <view class="selectCustomerPopup">
-      <u-popup :show="selectContractShow" @close="selectContractClose" @open="selectContractOpen" 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="searchContractForm" ref="selectformRef">
-                <u-form-item labelWidth="18%" 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--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>
-                <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>
-                <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>
-              </u--form>
-            </view>
-            <view class="searchCustomerBtn">
-              <u-button text="鎼滅储" type="primary" @click="selectContractOpen()"></u-button>
-              <u-button text="娓呯┖" @click="selectContractResetFields"></u-button>
-            </view> -->
-    <!-- 鍚堝悓鍒楄〃 -->
-    <!-- <view class="tableContract">
-      <view class="tableBody">
-        <uni-table border emptyText="鏆傛棤鏇村鏁版嵁">
-          <uni-tr>
-            <uni-th width="100" align="center">缁勭粐缁撴瀯</uni-th>
-            <uni-th width="250" align="center">瀹㈡埛鍚嶇О</uni-th>
-            <uni-th width="180" align="center">鐓ょ鍚嶇О</uni-th>
-            <uni-th width="220" 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-tr>
-          <uni-tr v-for="(item, index) in contractData" :key="index">
-            <uni-td align="center">
-              <view :style="tdStyle">{{ item.compName }}</view>
-            </uni-td>
-            <uni-td align="left">
-              <view :style="tdStyle">{{ item.customerName }}</view>
-            </uni-td>
-            <uni-td align="center">
-              <view :style="tdStyle">{{ item.coalNames }}</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-tr>
-        </uni-table>
-      </view>
+		<!-- 閫夋嫨鍚堝悓 -->
+		<!-- @touchmove.stop.prevent="moveHandleContract" -->
+		<!-- <view class="selectCustomerPopup">
+			<u-popup :show="selectContractShow" @close="selectContractClose" @open="selectContractOpen" 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="searchContractForm" ref="selectformRef">
+								<u-form-item labelWidth="18%" 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--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>
+								<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>
+								<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>
+							</u--form>
+						</view>
+						<view class="searchCustomerBtn">
+							<u-button text="鎼滅储" type="primary" @click="selectContractOpen()"></u-button>
+							<u-button text="娓呯┖" @click="selectContractResetFields"></u-button>
+						</view> -->
+						<!-- 鍚堝悓鍒楄〃 -->
+						<!-- <view class="tableContract">
+							<view class="tableBody">
+								<uni-table border emptyText="鏆傛棤鏇村鏁版嵁">
+									<uni-tr>
+										<uni-th width="100" align="center">缁勭粐缁撴瀯</uni-th>
+										<uni-th width="250" align="center">瀹㈡埛鍚嶇О</uni-th>
+										<uni-th width="180" align="center">鐓ょ鍚嶇О</uni-th>
+										<uni-th width="220" 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-tr>
+									<uni-tr v-for="(item, index) in contractData" :key="index">
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.compName }}</view>
+										</uni-td>
+										<uni-td align="left">
+											<view :style="tdStyle">{{ item.customerName }}</view>
+										</uni-td>
+										<uni-td align="center">
+											<view :style="tdStyle">{{ item.coalNames }}</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-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="selectContractTypePicker">
-      <u-picker
-        :closeOnClickOverlay="true"
-        @close="selectContractTypeClose"
-        @cancel="selectContractTypeShow = false"
-        @confirm="selectContractTypeConfirm"
-        :show="selectContractTypeShow"
-        :columns="selectContractTypeData"
-      ></u-picker>
-    </view> -->
-    <!-- 鏃堕棿閫夋嫨鍣� -->
-    <!-- <view class="selectContractStartTime">
-      <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>
-    </view>
-  </view>
-</scroll-view>
-</u-popup>
-</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="selectContractTypePicker">
+							<u-picker
+								:closeOnClickOverlay="true"
+								@close="selectContractTypeClose"
+								@cancel="selectContractTypeShow = false"
+								@confirm="selectContractTypeConfirm"
+								:show="selectContractTypeShow"
+								:columns="selectContractTypeData"
+							></u-picker>
+						</view> -->
+						<!-- 鏃堕棿閫夋嫨鍣� -->
+						<!-- <view class="selectContractStartTime">
+							<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>
+						</view>
+					</view>
+				</scroll-view>
+			</u-popup>
+		</view>
+ -->
 
 
-    <!-- 娣诲姞鍚堝悓瀛愰」 -->
-    <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">
-                        <u-checkbox-group
-                            v-model="selectOKfavouredpolicyValue"
-                            placement="column"
-                            @change="checkboxChangeFavouredpolicy"
-                        >
-                          <uni-table ref="priceTableRef" :loading="loading" border stripe emptyText="鏆傛棤鏇村鏁版嵁">
-                            <uni-tr>
-                              <uni-th width="10" align="center">閫夐」</uni-th>
-                              <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 align="center">
-                                <view class="">
-                                  <u-checkbox
-                                      :customStyle="{marginBottom: '8px'}"
-                                      :key="index"
-                                      :name="item.id" size="30"
-                                  >
-                                  </u-checkbox>
-                                </view>
-                              </uni-td>
-                              <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>
-                        </u-checkbox-group>
-                      </view>
-                    </view>
-                  </view>
-                </template>
-                <u-form-item @click="addContractTransportShow = true" label="杩愯緭" labelWidth="20%" ref="item1">
-                  <u--input v-model="addContractTransport"></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="娣诲姞" 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 }}</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="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">
+												<u-checkbox-group
+												           v-model="selectOKfavouredpolicyValue"
+												           placement="column"
+												           @change="checkboxChangeFavouredpolicy"
+												       >
+												<uni-table ref="priceTableRef" :loading="loading" border stripe  emptyText="鏆傛棤鏇村鏁版嵁">
+													<uni-tr>
+														<uni-th width="10" align="center" >閫夐」</uni-th>
+														<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 align="center">
+															<view class="">
+																<u-checkbox
+																            :customStyle="{marginBottom: '8px'}"
+																            :key="index"
+																            :name="item.id" size="30"
+																        >
+																        </u-checkbox>
+															</view>
+															</uni-td>
+														<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>
+												</u-checkbox-group>
+											</view>
+										</view>
+									</view>
+								</template>
+								<u-form-item @click="addContractTransportShow = true" label="杩愯緭" labelWidth="20%" ref="item1"><u--input v-model="addContractTransport"></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>
 
-          <!-- 閫夋嫨鏀惰揣浜� -->
-          <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-show="searchCustomerForm.compName != ''"
-                                @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-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>
-                    </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">
-                        <text slot="value" class="u-slot-value">
-                          <button
-                              class="mini-btn"
-                              type="default"
-                              size="mini"
-                              style="background: #007aff;
+							<!-- <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="娣诲姞" 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 }}</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-show="searchCustomerForm.compName != ''" @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-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>
+										</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">
+												<text slot="value" class="u-slot-value">
+													<button
+														class="mini-btn"
+														type="default"
+														size="mini"
+														style="background: #007aff;
 														color: #ffffff;
 														margin: auto 0;
 														height: 20px;
@@ -516,166 +480,6 @@
 														width: 43px;
 														font-size: 10px;
 														padding: 0;"
-<<<<<<< Updated upstream
-                              @click="addContractConsigneeConfirm(item)"
-                          >
-                            閫夋嫨
-                          </button>
-                        </text>
-                      </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.balanceTotal
-          }},鎵垮厬浣欓锛歿{ accountDetails.balance2 == null ? 0 : customerChengdui }}
-        </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="" 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>
-    </view>
-
-    <!-- 鑿滃崟鏍� -->
-    <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
-  </view>
-=======
 														@click="addContractConsigneeConfirm(item)"
 													>
 														閫夋嫨
@@ -824,7 +628,6 @@
 		<!-- 鑿滃崟鏍� -->
 		<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
 	</view>
->>>>>>> Stashed changes
 </template>
 
 <script>
@@ -838,1213 +641,6 @@
 month = month < 10 ? `0${month}` : month;
 const date = d.getDate();
 export default {
-<<<<<<< Updated upstream
-  data() {
-    return {
-      applicationOrderIndex: null,
-      tdStyle: 'max-height: 30px;overflow: scroll;',
-      spanStyle: 'overflow:auto',
-      newFormData: {
-        // amount: null,
-        // coalId: '',
-        // coalName: '',
-        // contractId: 169,
-        // contractName: '',
-        // contractNum: '',
-        // contractOrders: [],
-        // customerAddressId: '',
-        // customerId: 236,
-        // customerName: '',
-        // endDate: '',
-        // executiveQuant: null,
-        // id: null,
-        // number: '',
-        // payType: '',
-        // price: null,
-        // quant: null,
-        // remark: '',
-        // startDate: '',
-        // type: '澶栭攢'
-      },
-      accountDetails: {},
-      // 鏃堕棿
-      timeDataStr: '',
-      menuShow: false,
-      // 琛ㄥ崟
-      // selectCustomerShow: false, // 閫夋嫨鐢ㄦ埛寮规
-      showPayType: false, // 浠樻鏂瑰紡寮规
-      payData: [],
-      actions: [],
-      selectValue: '',
-      rules: {
-        // 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 + 70}`,
-      // 閫夋嫨瀹㈡埛
-      selectCustomerData: {
-        compIds: '',
-        customerName: '',
-        level: '',
-        current: 1,
-        size: 10
-      },
-      status: 'loadmore',
-      customerDataAllNum: 0,//瀹㈡埛鍒楄〃鎬绘潯鏁�
-      account: null, //瀹㈡埛璐︽埛淇℃伅
-      // 鎼滅储瀛楁
-      selectCompsData: [],
-      selectCustomerLevel: [],
-      searchCustomerForm: {
-        compName: '',
-        levelText: ''
-      },
-      customerData: [],
-      // 閫夋嫨鍗曚綅
-      selectCustomerCompShow: false,
-      selectCustomerActions: [],
-      // 绾у埆
-      selectLevelShow: false,
-      levelList: [{name: '涓�鏄熺骇', value: 'A'}, {name: '浜屾槦绾�', value: 'B'}, {name: '涓夋槦绾�', value: 'C'}, {
-        name: '鍥涙槦绾�',
-        value: 'D'
-      }, {name: '浜旀槦绾�', value: 'E'}],
-      // 閫夋嫨鍚堝悓
-      // selectContractShow: false,
-      // searchContractForm: {
-      // 	current: 1,
-      // 	size: 10,
-      // 	num: '',
-      // 	startDate: '',
-      // 	endDate: '',
-      // 	result: 2,
-      // 	type: '',
-      // 	customerName: ''
-      // },
-      // contractData: [],
-      // 绫诲瀷
-      // selectContractTypeShow: false,
-      // selectContractTypeData: [[]],
-      // 鏃堕棿
-      // selectContractTimeMode: 'single',
-      // selectContractStartTimeShow: false,
-      // selectContractEndTimeShow: false,
-      // 娣诲姞鍚堝悓
-      addContractShow: false,
-      // 娣诲姞鍚堝悓琛ㄥ崟
-      addContractRules: {
-        // compName: [
-        //   {
-        //     required: true,
-        //     message: '璇烽�夋嫨鐓ゅ巶',
-        //     trigger: ['blur', 'change']
-        //   }
-        // ],
-
-      },
-      addContractFormdata: {
-        // id:null,
-        // 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: '',
-        // quant: '',
-        // toStation: '',
-        // trainType: 1,
-        // type: ''
-
-      },
-      contractDetails: [], // 閫夋嫨鐨勫悎鍚岃鎯�
-      // 閫夋嫨鐓ゅ巶
-      coalFiledSelectShow: false,
-      coalfiledData: [],
-      coalfiledParams: {current: 1, size: 10},
-      selectCoalFiledData: {},
-      // 閫夋嫨鏀惰揣浜�
-      addContractConsigneeShow: false,
-      // 鍝佺閫夋嫨鍣�
-      addContractCoalShow: false,
-      addContractCoalData: [[]],
-      // 杩愯緭绫诲瀷
-
-      // 浼樻儬
-      favouredpolicyListAll: [], //浼樻儬鏀跨瓥鍒楄〃鎵�鏈夌殑
-      favouredpolicyList: [], // 浼樻儬鏀跨瓥鍒楄〃
-      multipleSelection: [], //閫変腑鐨勪紭鎯犳斂绛�
-      selectOKfavouredpolicyValue: [],//澶嶉�夋閫変腑
-      // 鍗曢�夋
-      addContractTransport: '',
-      // 鍝佺浠锋牸琛ㄦ牸
-      loading: false,
-      // 浠锋牸璇锋眰鍙傛暟
-      getNewPriceData: {
-        // compId: 133,
-        // compName: '閭㈠彴鐭�',
-        // customerAddressName: '閭㈠彴鍥芥嘲鍙戠數鏈夐檺璐d换鍏徃',
-        // customerAddressId: 236,
-        // coalId: 45,
-        // coalName: '',
-        // trainType: 1,
-        // fromStation: '灏忓悍搴�',
-        // toStation: '灏忓悍搴�',
-        // quant: '',
-        // price: '',
-        // amount: '',
-        // priceMode: null,
-        // filedName: '閭㈠彴鐭夸富鐓ゅ満',
-        // filedId: 4,
-        // type: '',
-        // cost1: '',
-        // cost2: '',
-        // edit: true
-      },
-      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: '鍒犻櫎'
-        }
-      ],
-      editApplicationTableId: ''
-    };
-  },
-  onLoad(options) {
-    this.editApplicationTableId = JSON.parse(options.index);
-
-  },
-  onShow() {
-    if (this.menuShow == true) {
-      this.$refs.menuRef.menuClick();
-    }
-    this.init();
-  },
-  // 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
-  onNavigationBarButtonTap(e) {
-    this.$refs.menuRef.menuClick();
-  },
-  computed: {
-    afterPrice() {
-      let temp = Object.assign({},this.currentCoal);
-      let favouredpolicyIds = '';
-      if (this.favouredpolicyList.length > 0) {
-        console.log('鍙樺悗鐨勪环鏍�',this.multipleSelection,temp,this.currentCoal);
-        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) {
-          // 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.id != null) {
-        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);
-            this.addContractFormdata.amount = amount.toFixed(2);
-          }
-        }
-      } else {
-        this.addContractFormdata.quant = null;
-      }
-      return true;
-    }
-    // accountMsg() {
-    // 	this.accountMsgType = 'error';
-    // 	if (this.accountDetails) {
-    // 		if (this.accountDetails.balanceType == '璐�') {
-    // 			return '瀹㈡埛璐︽埛浣欓褰撳墠澶勪簬娆犳鐘舵�侊紒';
-    // 		} else {
-    // 			let amount = 0;
-    // 			this.newFormData.contractOrders.forEach(e => {
-    // 				amount += Number(e.amount);
-    // 			});
-    // 			if (this.newFormData.payType == '0') {
-    // 				if (this.accountDetails.balance < amount) {
-    // 					return '瀹㈡埛璐︽埛鐜版眹浣欓涓嶈冻锛岀幇姹囦綑棰�:' + this.accountDetails.balance;
-    // 				}
-    // 			} else {
-    // 				if (this.accountDetails.balance2 < amount) {
-    // 					return '瀹㈡埛璐︽埛鎵垮厬浣欓涓嶈冻锛屾壙鍏戜綑棰�:' + this.accountDetails.balance2;
-    // 				}
-    // 			}
-    // 		}
-    // 		this.accountMsgType = 'warning';
-    // 		return '瀹㈡埛璐︽埛鐜版眹浣欓:' + this.accountDetails.balance + '锛屾壙鍏戜綑棰�:' + (this.accountDetails.balance2 ? this.accountDetails.balance2 : 0);
-    // 	}
-    // 	return null;
-    // }
-  },
-  watch: {
-    // 绔嬪嵆澶勭悊 杩涘叆椤甸潰灏辫Е鍙� // immediate: true,
-    // 娣卞害鐩戝惉 灞炴�х殑鍙樺寲// deep: true
-    // 閫夋嫨瀹㈡埛鏌ヨ鏉′欢
-    'searchCustomerForm.compName'(newV, oldV) {
-      if (newV == '') {
-        this.selectCustomerData.compIds = '';
-      }
-    },
-    'searchCustomerForm.levelText'(newV, oldV) {
-      if (newV == '') {
-        this.selectCustomerData.level = '';
-      }
-    },
-    // 'selectOKfavouredpolicyValue'(newV,oleV){
-    // }
-  },
-  components: {
-    popupMenu,
-    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);
-        this.addContractFormdata.amount = amount.toFixed(2);
-      }
-    },
-    init() {
-      this.jcfavouredpolicyitem();
-      this.coalfiled();
-      this.coalprice();
-      this.operato();
-      this.pay_type();
-      this.others_params();
-      this.fetchCompTree();
-      this.getFavouredPolicyItem();
-      this.editApplicationFormData(); // 淇敼鐢宠琛ㄥ崟璇︽儏
-    },
-    // 鍒濆鍖栫敵璇疯〃鍗�
-    async editApplicationFormData() {
-      uni.showLoading({
-        title:'鍔犺浇涓�...'
-      })
-      // 閫氳繃鐢宠id鑾峰彇琛ㄥ崟
-      await this.$reqGet('formData', {}, this.editApplicationTableId).then(res => {
-        uni.hideLoading();
-        console.log('鏁翠綋璇︽儏', res.data);
-        this.newFormData = res.data;
-        this.timeDataStr = this.newFormData.startDate;
-      })
-
-      // 鑾峰彇鍚堝悓璇︽儏锛岀叅绉�
-      await this.getContractDetails();
-
-      // 鍒濆鍖栧綋鍓嶇敵璇峰鎴疯处鎴锋儏鍐�
-      if(this.newFormData.customerId){
-        await this.$reqGet('getAccount', {customerId: this.newFormData.customerId}).then(res => {
-          this.accountDetails = res.data;
-        });
-      }
-    },
-    editApplicationClick(index) {
-      this.applicationOrderIndex = index;// 寰呬慨鏀硅鍗昳ndex
-      this.addContractFormdata = Object.assign({},this.newFormData.contractOrders[index]);
-      console.log('淇敼鎸囧畾璁㈠崟琛ㄥ崟----------',this.addContractFormdata.id,this.addContractFormdata);
-      this.addContractFormdata.priceMode = this.newFormData.contractOrders[this.applicationOrderIndex].priceMode.toString();
-      // 淇敼璁㈠崟浼樻儬鍒濆鍖�
-      if (this.newFormData.contractOrders[index].favouredpolicyIds) {
-        this.newFormData.contractOrders[index].favouredpolicyIds.split(',').map(item => {
-          this.selectOKfavouredpolicyValue.push(Number(item));
-        });
-      }
-
-
-      // 鑾峰彇浠锋牸
-      // this.getNewPriceData = this.addContractFormdata;
-      this.getNewPriceData.compName = this.newFormData.contractOrders[this.applicationOrderIndex].compName;
-      this.getNewPriceData.traninType = this.newFormData.contractOrders[this.applicationOrderIndex].traninType;
-      this.getNewPriceData.compId = this.newFormData.contractOrders[this.applicationOrderIndex].compId;
-      this.getNewPriceData.fromStation = this.newFormData.contractOrders[this.applicationOrderIndex].fromStation;
-      this.getNewPriceData.toStation = this.newFormData.contractOrders[this.applicationOrderIndex].toStation;
-      this.getNewPriceData.filedId = this.newFormData.contractOrders[this.applicationOrderIndex].filedId;
-      this.getNewPriceData.filedName = this.newFormData.contractOrders[this.applicationOrderIndex].filedName;
-      this.getNewPriceData.customerAddressName = this.newFormData.contractOrders[this.applicationOrderIndex].customerAddressName;
-      this.getNewPriceData.customerAddressId = this.newFormData.contractOrders[this.applicationOrderIndex].customerAddressId;
-      this.getNewPriceData.toStation = this.newFormData.contractOrders[this.applicationOrderIndex].toStation;
-      this.getNewPriceData.coalId = this.newFormData.contractOrders[this.applicationOrderIndex].coalId;
-      this.getNewPriceData.coalName = this.newFormData.contractOrders[this.applicationOrderIndex].coalName;
-      // 鑾峰彇鍚堝悓鐓ょ浠锋牸
-      this.getNewPrice();
-
-      // 鍒濆鍖栫涓�娆′紭鎯犱环鏍艰绠�
-      // this.$nextTick(()=>{
-      if (this.selectOKfavouredpolicyValue.length == 0) {
-        this.multipleSelection = [];
-      } else {
-        this.multipleSelection = [];
-        this.favouredpolicyList.forEach((item) => {
-          if (this.selectOKfavouredpolicyValue.indexOf(item.id) != -1) {
-            this.multipleSelection.push(item);
-          }
-        })
-      }
-      // })
-
-      // 璁㈠崟杩愯緭绫诲瀷
-      switch (this.addContractFormdata.trainType) {
-        case 1:
-          this.addContractTransport = '鍦伴攢';
-          break;
-        case 2:
-          this.addContractTransport = '璺繍';
-          break;
-      }
-
-
-      this.$nextTick(() => {
-        this.addContractShow = true;
-      })
-
-    },
-    getContractDetails() {
-      uni.showLoading({
-        title: '鍔犺浇涓�...'
-      })
-      this.$reqGet('getByContractId', {}, this.newFormData.contractId).then(res => {
-        uni.hideLoading();
-        if (res.code == 0) {
-          this.contractDetails = res.data;
-        }
-      })
-      this.$nextTick(() => {
-        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);
-        });
-      })
-    },
-    checkboxChangeFavouredpolicy(e) {
-      // this.selectOKfavouredpolicyValue = e;
-      if (e.length == 0) {
-        this.multipleSelection = [];
-      } else {
-        this.multipleSelection = [];
-        this.favouredpolicyList.forEach((item, i) => {
-          if (e.indexOf(item.id) != -1) {
-            this.multipleSelection.push(item);
-          }
-        })
-      }
-
-    },
-    // 閫夋嫨瀹㈡埛
-    selectCustomer() {
-      this.selectLevelShow = false;
-      this.selectCustomerCompShow = false;
-      uni.showLoading({
-        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() {
-    // 	// this.spanStyle = 'overflow:hidden'; //褰撹挋灞傚脊璧锋椂锛屽浐瀹氱晫闈㈢姝㈡粴鍔紝褰撹挋灞傚叧闂椂锛屽厑璁告粴鍔�
-    // },
-    // selectCustomerClose() {
-    // 	// this.spanStyle = 'overflow:auto'; // 璁﹉tml鐨刡ody鍙粦鍔�
-    // 	// this.selectCustomerShow = false;
-    // },
-    // 鑾峰彇鍗曚綅鏍�
-    fetchCompTree() {
-      this.selectCustomerActions = [];
-      this.$reqGet('fetchCompTree').then(res => {
-        if (res.code == 0) {
-          let a = {name: '', id: ''};
-          a.name = res.data[0].name;
-          a.id = res.data[0].id;
-          this.selectCustomerActions.push(a);
-          res.data[0].children.forEach(item => {
-            let a = {name: '', id: ''};
-            a.name = item.name;
-            a.id = item.id;
-            this.selectCustomerActions.push(a);
-          });
-        }
-      });
-    },
-    // 瀹㈡埛閫夋嫨妗嗗崟浣嶉�夋嫨鑿滃崟
-    selectCustomerSelect(v) {
-      uni.hideKeyboard();
-      this.selectCustomerData.compIds = v.id;
-      this.searchCustomerForm.compName = v.name;
-    },
-    // 绾у埆
-    selectLevelSelect(v) {
-      uni.hideKeyboard();
-      this.selectCustomerData.level = v.value;
-      this.searchCustomerForm.levelText = v.name;
-    },
-    // 浠樻绫诲瀷
-    sexSelect(v) {
-      uni.hideKeyboard();
-      this.selectValue = v.name;
-      this.newFormData.payType = v.value;
-      // this.newFormData.payType = e.name;
-      // this.$refs.form1.validateField('userInfo.sex');
-    },
-    // 娓呯┖閫夋嫨瀹㈡埛琛ㄥ崟
-    selectCustomerResetFields() {
-      this.$refs.selectformRef.resetFields(); // 涓嶈捣鏁堟灉
-      this.selectCustomerData.customerName = '';
-      this.searchCustomerForm.compName = '';
-      this.searchCustomerForm.levelText = '';
-      this.selectCustomer();
-    },
-    selectCustomerOkClick(v) {
-      this.newFormData.customerName = v.customerName;
-      this.newFormData.customerId = v.id;
-      this.$reqGet('getAccount', {customerId: v.id}).then(res => {
-        this.accountDetails = res.data;
-
-        this.searchContractForm.customerName = res.data.customerName;
-      });
-      this.$nextTick(() => {
-        // this.selectCustomerShow = false;
-      });
-    },
-    loadingCustomer() {
-      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';
-        }
-      });
-    },
-    // 鏃堕棿
-    confirmTime(v) {
-      this.timeShow = false;
-      v.forEach(e => {
-        this.newFormData.startDate = v[0];
-        this.newFormData.endDate = v[v.lenght - 1];
-        this.timeDataStr = v[0] + ' 鑷� ' + v[v.length - 1];
-      });
-    },
-
-    // 閫夋嫨鍚堝悓
-    // selectContract() {
-    // 	if (this.newFormData.customerName != '') {
-    // 		if (this.newFormData.contractOrders != []) {
-    // 			uni.showToast({
-    // 				title: '娣诲姞璁㈠崟鍚庯紝涓嶈兘淇敼鍚堝悓锛�',
-    // 				icon: 'error',
-    // 				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 => {
-    // 			res.data.forEach(item => {
-    // 				this.selectContractTypeData[0].push(item.value);
-    // 			});
-    // 		});
-    // 	});
-    // },
-    // 閫夋嫨鍚堝悓寮规
-    // selectContractOpen() {
-    // 	uni.showLoading({
-    // 		title: '鍔犺浇涓�...'
-    // 	});
-    // 	this.$reqGet('contract_status').then(res => {
-    // 		// console.log('鐘舵��', res);
-    // 	});
-    // 	this.$reqGet('contract', this.searchContractForm).then(res => {
-    // 		uni.hideLoading();
-    // 		if (res.code == 0) {
-    // 			// console.log('鍚堝悓', res);
-    // 			this.contractData = res.data.records;
-    // 		}
-    // 	});
-    // },
-    // selectContractClose() {
-    // 	this.selectContractShow = false;
-    // },
-    // 鍚堝悓绫诲瀷閫夋嫨鍣�
-    // selectContractTypeConfirm(v) {
-    // 	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(e) {
-    // 	this.selectContractStartTimeShow = false;
-    // 	this.searchContractForm.startDate = e[0];
-    // },
-    // selectContractStartTimeClose() {
-    // 	this.selectContractStartTimeShow = false;
-    // },
-    // 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.selectContractShow = false;
-
-    // 	// 浠锋牸鍙傛暟璧嬪��
-    // 	this.getNewPriceData.type = e.type;
-    // 	// 閫夊畾鍚堝悓璇︽儏
-    // 	uni
-    // 		.request({
-    // 			url: `/yunxiao/contractitem/getByContractId/${e.id}`,
-    // 			method: 'GET',
-    // 			header: {
-    // 				'TENANT-ID': 5,
-    // 				Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
-    // 				VERSION: 'zzl'
-    // 			}
-    // 		})
-    // 		.then(res => {
-    // 			this.contractDetails = res[1].data.data;
-    // 			console.log('鍚堝悓璇︽儏', res, this.contractDetails);
-    // 		})
-    // 		.catch(err => {
-    // 			console.log(err);
-    // 		});
-    // },
-    // 娣诲姞璁㈠崟鎸夐挳
-    addContractClick() {
-      // 鎵撳嵃true鎴杅alse
-      // this.$refs.formRef
-      //     .validate()
-      //     .then(res => {
-            if (this.accountDetails.balanceType == '璐�') {
-              uni.showToast({
-                title: '瀹㈡埛璐︽埛浣欓褰撳墠澶勪簬娆犳鐘舵�侊紒',
-                icon: 'error',
-                duration: 2000
-              });
-            } else {
-              if (this.accountDetails.balance == 0 || (null && this.accountDetails.balance2 == 0) || null) {
-                uni.showToast({
-                  title: '璐︽埛浣欓涓嶈冻锛�',
-                  icon: 'error',
-                  duration: 2000
-                });
-              } else {
-                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.getNewPriceData.type = this.newFormData.type;
-                // this.getNewPriceData.customerAddressName = this.addContractFormdata.customerFullName;
-                // this.getNewPriceData.customerAddressId = this.addContractFormdata.id;
-                // this.getNewPriceData.toStation = this.addContractFormdata.toStation;
-                // this.getNewPriceData.coalId = this.addContractFormdata.coalId;
-                // this.getNewPriceData.coalName =this.addContractFormdata.coalName;
-                // 鑾峰彇鍚堝悓鐓ょ浠锋牸
-                // this.getNewPrice();
-
-                // 杩愯緭绫诲瀷鍒濆鍖�
-                switch (this.addContractFormdata.trainType) {
-                  case 1:
-                    this.addContractTransport = '鍦伴攢';
-                    break;
-                  case 2:
-                    this.addContractTransport = '璺繍';
-                    break;
-                }
-
-                // 鑾峰彇鍚堝悓璇︽儏锛岀叅绉�
-                this.getContractDetails();
-
-                this.multipleSelection = [];
-              }
-            }
-          // })
-          // .catch(err => {
-          //   uni.$u.toast('鏁堥獙澶辫触');
-          // });
-    },
-    // 娣诲姞鍚堝悓寮瑰嚭妗�
-    addContractClose() {
-      this.addContractShow = false;
-      this.addContractFormdata = {};
-      this.applicationOrderIndex = null;
-    },
-    addContractOpen() {
-      console.log('娣诲姞璁㈠崟鎵撳紑');
-    },
-    // 閫夋嫨鐓ゅ巶
-    coalFiledSelectOpen(e) {
-      // console.log('coalfiledSelect: ', e);
-    },
-    coalFiledSelectClose() {
-      this.coalFiledSelectShow = false;
-    },
-    // 閫夋嫨鐨勭叅鍘�
-    coalFiledSelectClick(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.coalFiledSelectShow = false;
-    },
-    // 鏀惰揣浜�
-    addContractConsigneeClose() {
-      this.addContractConsigneeShow = false;
-    },
-    // 娣诲姞鍚堝悓瀛愰」鏀惰揣浜烘墦寮�
-    addContractConsigneeOpen() {
-      this.selectCustomer()
-    },
-    addContractConsignee() {
-      this.addContractConsigneeShow = true;
-    },
-    addContractConsigneeConfirm(v) {
-      // console.log('鏀惰揣浜�', v);
-      this.addContractFormdata.toStation = v.toStation;
-      this.addContractFormdata.customerName = v.customerName;
-      this.addContractFormdata.customerId = v.id;
-      this.$reqGet('getAccount', {customerId: v.id}).then(res => {
-        // console.log('鑾峰彇鏀惰揣浜鸿处鍙�', res);
-        // this.accountDetails = res.data;
-        // this.newFormData.customerName = res.data.customerName;
-        // this.newFormData.customerId = res.data.id;
-        // this.searchContractForm.customerName = res.data.customerName;
-      });
-      this.$nextTick(() => {
-        this.addContractConsigneeShow = false;
-      });
-
-      // 璧嬪�肩粰鍙栦环鏍艰姹傚弬鏁�
-      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.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);
-      });
-
-    },
-    // 鍝佺閫夋嫨鍣�
-    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.getNewPrice();
-    },
-    getNewPrice() {
-      this.$reqGet('getNewPrice', this.getNewPriceData).then(res => {
-        if (res.code == 0) {
-          // console.log('鑾峰彇浠锋牸',res);
-          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;
-            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;
-      if (e) {
-        this.addContractFormdata.priceMode = e;
-      }
-
-      this.addContractFormdata.price = this.afterPrice.quotePrice;
-      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) {
-      // console.log('浼樻儬閫夋嫨',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.applicationOrderIndex == null) {
-          this.newFormData.contractOrders.push(this.addContractFormdata);
-          this.$nextTick(() => {
-            this.addContractShow = false;
-          });
-          this.$u.toast('娣诲姞鎴愬姛');
-        } else {
-          // this.newFormData.contractOrders.map(i => {
-          // 	return this.newformData.contractOrders[]
-          // })
-          this.newFormData.contractOrders[this.applicationOrderIndex] = this.addContractFormdata;
-          this.addContractShow = false; // 闅愯棌寮瑰嚭妗�
-          this.applicationOrderIndex = null; // 鍒濆鍖栦慨鏀硅鍗昳ndex
-          this.$u.toast('淇敼鎴愬姛');
-        }
-      } else {
-        uni.$u.toast('璇疯鑼冭緭鍏ユ墍鏈変俊鎭�');
-      }
-    },
-    // 鍒濆鏁版嵁璇锋眰
-    operato() {
-      this.$reqGet('operator').then(res => {
-        this.operator = res.data;
-      });
-    },
-    pay_type() {
-      this.actions = [];
-      this.$reqGet('pay_type').then(res => {
-        // console.log('paytype', res);
-        this.payData = res.data;
-        res.data.forEach(e => {
-          let a = {name: '', value: ''};
-          a.name = e.label;
-          a.value = e.value;
-          this.actions.push(a);
-        });
-      });
-      // console.log(this.actions);
-    },
-    // 鎶戝皹璐�
-    others_params() {
-      this.$reqGet('others_params').then(res => {
-        // console.log('others_params', res);
-        res.data.forEach(e => {
-          if (e.label == 'dust') {
-            this.dust = parseFloat(e.value);
-          }
-        });
-      });
-    },
-    coalprice() {
-      this.$reqGet('coalprice', {current: 1, size: 1000}).then(res => {
-        // console.log('coalprice', res);
-      });
-    },
-    // 绾у埆璺濅紭鎯�
-    jcfavouredpolicyitem() {
-      this.$reqGet('jcfavouredpolicyitem', {current: 1, size: 1000, status: 0}).then(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', this.coalfiledParams).then(res => {
-        this.coalfiledData = res.data.records;
-      });
-    },
-    // 鏃堕棿
-    timeClose() {
-      this.timeShow = false;
-    },
-    menushow(e) {
-      this.menuShow = e;
-    },
-    // 閫夋嫨瀹㈡埛
-    // moveHandleCustomer() {
-    // 	return true;
-    // },
-    // 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: 'error',
-                  duration: 2000
-                });
-              } else {
-                uni.showLoading({
-                  title:'鍔犺浇涓�...'
-                });
-                this.editShenQing();
-                // 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: 'error',
-                  duration: 2000
-                });
-              } else {
-                uni.showLoading({
-                  title:'鍔犺浇涓�...'
-                });
-                this.editShenQing();
-                // this.xswaybill();
-              }
-            }
-          })
-          .catch(err => {
-            uni.$u.toast('鏍¢獙澶辫触');
-          });
-    },
-    // 淇敼鐢宠淇℃伅
-    editShenQing() {
-      uni.request({
-        url: '/yunxiao/xswaybill',
-        method: "PUT",
-        data: this.newFormData,
-        header: {
-          'TENANT-ID': 5,
-          Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
-          VERSION: 'zzl'
-        }
-      }).then(res => {
-        uni.hideLoading();
-        this.$u.toast('淇敼鎴愬姛');
-        this.$nextTick(() => {
-          uni.navigateBack({
-            delta: 1
-          });
-        })
-      })
-    },
-    // 鍒犻櫎璁㈠崟鍗$墖
-    deleteContractCardClick(e) {
-      // console.log('鍒犻櫎璁㈠崟鍗$墖', e);
-      this.newFormData.contractOrders.splice(e, 1);
-    },
-    xswaybill() {
-      console.log('鏂板缓鍙戣繍鐢宠', this.newFormData);
-      uni.showLoading({
-        title: '鍔犺浇涓�...'
-      });
-      this.$reqPost('xswaybill', this.newFormData).then(res => {
-        uni.hideLoading();
-        console.log('鏂板缓鍙戣繍鐢宠', res);
-        if (res.code == 0) {
-          uni.showToast({
-            title: '娣诲姞鎴愬姛锛�',
-            icon: 'success',
-            duration: 2000
-          });
-          // this.$nextTick(() => {
-          // 	uni.navigateBack({
-          // 		// url: '/pages/my-application/my-application'
-          // 		delta: 2
-          // 	});
-          // });
-        }
-      });
-    },
-    backPage() {
-      uni.navigateBack({
-        delta: 1
-      });
-    }
-  }
-=======
 	data() {
 		return {
 			applicationOrderIndex:null,
@@ -3253,438 +1849,393 @@
 			});
 		}
 	}
->>>>>>> Stashed changes
 };
 </script>
 
 <style lang="scss" scoped>
 @include tableMainStyle();
 ::v-deep.new-application-form-data {
-  width: 100%;
-  padding-bottom: vww(40);
-  // 鏍囬
-  .newApplicationTitle {
-    margin-bottom: 0;
-  }
+	width: 100%;
+	padding-bottom: vww(40);
+	// 鏍囬
+	.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 {
+						.u-form-item__body__left__content {
+							.u-form-item__body__left__content__label {
+							}
+						}
+					}
+					.u-form-item__body__right {
+						.u-form-item__body__right__content {
+							.u-form-item__body__right__content__slot {
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
-  // 琛ㄥ崟
-  .formDataContaniner {
-    .u-form {
-      width: 91%;
-      margin: 0 auto 0;
+	// 閫夋嫨瀹㈡埛寮规
+	.selectCustomerPopup {
+		.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 {
+						}
+						.searchCustomerBtn {
+							margin-top: vww(10);
+							display: flex;
+							.u-button {
+								width: 30%;
+							}
+						}
+						// 鏁版嵁鍒楄〃
+						.searchResultList {
+							margin-top: vww(16);
+						}
 
-      .u-form-item {
-        .u-form-item__body {
-          .u-form-item__body__left {
-            .u-form-item__body__left__content {
-              .u-form-item__body__left__content__label {
-              }
-            }
-          }
+						// 鍚堝悓琛ㄦ牸
+						.tableContract {
+							margin-top: vww(30);
+							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;
+										}
 
-          .u-form-item__body__right {
-            .u-form-item__body__right__content {
-              .u-form-item__body__right__content__slot {
-              }
-            }
-          }
-        }
-      }
-    }
-  }
+										.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);
+									}
+								}
+							}
+						}
 
-  // 閫夋嫨瀹㈡埛寮规
-  .selectCustomerPopup {
-    .u-popup {
-      .u-transition {
-        height: 95%;
+						// 鍚堝悓绫诲瀷閫夋嫨鍣�
+						.selectContractTypePicker {
+							.u-popup {
+								.u-transition {
+									height: auto;
+								}
+							}
+						}
 
-        .u-popup__content {
-          overflow: scroll !important;
+						.selectCustomerCompSheet {
+							.u-popup {
+								.u-transition {
+									height: auto;
+								}
+							}
+						}
 
-          .selectCustomerTitle {
-            margin-bottom: 0;
-          }
+						.selectLevelSheet {
+							.u-popup {
+								.u-transition {
+									height: auto;
+								}
+							}
+						}
 
-          .selectCustomerContainer {
-            padding: 0 4%;
-            // .loadmoreClass{
-            // 	.u-loadmore{
-            // 		.u-loadmore__content{
-            // 			.u-loadmore__content__text{
-            // 			}
-            // 		}
-            // 	}
-            // }
-            .searchContainer {
-            }
+						// 鏃堕棿閫夋嫨鍣�
+						.selectContractStartTime {
+							.u-popup {
+								.u-transition {
+									height: auto;
+								}
+							}
+						}
+						.selectContractEndTime {
+							.u-popup {
+								.u-transition {
+									height: auto;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
-            .searchCustomerBtn {
-              margin-top: vww(10);
-              display: flex;
+	// 鐓ゅ巶
+	.addContractContainer {
+		.u-popup {
+			.u-transition {
+				height: 95%;
+				.u-popup__content {
+					overflow: scroll !important;
+					.addContractFormTitle {
+						margin-bottom: 0;
+					}
 
-              .u-button {
-                width: 30%;
-              }
-            }
+					// 鎼滅储
+					.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;
+													}
 
-            // 鏁版嵁鍒楄〃
-            .searchResultList {
-              margin-top: vww(16);
-            }
+													.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);
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
-            // 鍚堝悓琛ㄦ牸
-            .tableContract {
-              margin-top: vww(30);
-              display: flex;
-              justify-content: center;
+	// 娣诲姞鍚堝悓
+	.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;
 
-              .uni-table-scroll {
-                min-width: 0 !important;
+						// 琛ㄥ崟
+						// .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{
 
-                .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;
-                    }
+						.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;
+						}
 
-                    .uni-table-td {
-                      line-height: vww(20);
-                      padding: vww(5) vww(10);
-                      color: #111111;
-                    }
-                  }
-                }
-              }
+						.addContractConfirm {
+							margin-top: vww(30);
+						}
+					}
 
-              .tableBody {
-                width: 80%;
-              }
+					// 鍝佺閫夋嫨鍣�
+					.addContractCoalPicker {
+						.u-popup {
+							.u-transition {
+								height: auto;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
-              .TableUtilBtn {
-                width: 20%;
-                overflow: hidden;
+	// 琛ㄦ牸
+	.newApplicationTable {
+		margin: vww(40) auto;
+		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;
+						}
+					}
+				}
+			}
+		}
+		.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;
+		}
+	}
 
-                .uni-table {
-                  min-width: 0 !important;
-                }
+	// button
+	.new-application-button {
+		display: flex;
 
-                .TableUtilBtnContainer {
-                  .u-button {
-                    width: vww(20);
-                  }
-                }
-              }
-            }
-
-            // 鍚堝悓绫诲瀷閫夋嫨鍣�
-            .selectContractTypePicker {
-              .u-popup {
-                .u-transition {
-                  height: auto;
-                }
-              }
-            }
-
-            .selectCustomerCompSheet {
-              .u-popup {
-                .u-transition {
-                  height: auto;
-                }
-              }
-            }
-
-            .selectLevelSheet {
-              .u-popup {
-                .u-transition {
-                  height: auto;
-                }
-              }
-            }
-
-            // 鏃堕棿閫夋嫨鍣�
-            .selectContractStartTime {
-              .u-popup {
-                .u-transition {
-                  height: auto;
-                }
-              }
-            }
-
-            .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;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // 琛ㄦ牸
-  .newApplicationTable {
-    margin: vww(40) auto;
-    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;
-            }
-          }
-        }
-      }
-    }
-
-    .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
-  .new-application-button {
-    display: flex;
-
-    .u-button {
-      width: vww(120);
-      height: vww(40);
-    }
-  }
+		.u-button {
+			width: vww(120);
+			height: vww(40);
+		}
+	}
 }
 </style>

--
Gitblit v1.9.1