From c56e67c77e2a36c894346830c1ab1e6df36fe935 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 01 十二月 2023 16:55:02 +0800
Subject: [PATCH] 测试bug调整
---
pages/edit-my-application/edit-my-application.vue | 1369 +++++++++++++++++++----------------------------------------
1 files changed, 448 insertions(+), 921 deletions(-)
diff --git a/pages/edit-my-application/edit-my-application.vue b/pages/edit-my-application/edit-my-application.vue
index dd12d24..8d27101 100644
--- a/pages/edit-my-application/edit-my-application.vue
+++ b/pages/edit-my-application/edit-my-application.vue
@@ -1,252 +1,48 @@
<template>
<!-- 鏂板鐢宠琛ㄥ崟 -->
<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" :rules="rules" ref="formRef">
- <u-form-item labelWidth="20%" label="缁撶畻瀹㈡埛" prop="customerName" borderBottom ref="customerNameRef">
+ <u--form labelPosition="left" :model="newFormData" ref="formRef">
+ <u-form-item @click="selectLedger" labelWidth="20%" label="璐﹀" borderBottom>
+ <u--input disabled disabledColor="#ffffff" v-model="ledgerName" border="none"></u--input>
+ </u-form-item>
+ <u-form-item labelWidth="20%" label="缁撶畻瀹㈡埛" borderBottom ref="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-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--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-form-item @click="timeShow = true" labelWidth="20%" label="鏃ユ湡" borderBottom ref="timeDataRef">
+ <u--input v-model="timeDataStr" disabled disabledColor="#ffffff" 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--input border="none" disabled disabledColor="#ffffff" v-model="newFormData.number" placeholder="璇疯緭鍏ョ紪鍙�"></u--input>
</u-form-item>
</u--form>
</view>
+ <!-- 閫夋嫨璐﹀ -->
+ <u-picker
+ @change="selectLedgerChange"
+ @confirm="selectLedgerConfirm"
+ @cancel="selectLedgerCancel"
+ @close="selectLedgerClose"
+ :show="selectLedgerShow"
+ :columns="ledgerList"
+ keyName="name"
+ ></u-picker>
+
<!-- 鐢宠鏃ュ巻銆佽寖鍥存椂闂� -->
- <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> -->
-
- <!-- 绾у埆鑿滃崟椤� -->
- <!-- <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>
-
- <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>
- -->
-
-
-
-
-
-
-
+ <u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110"></u-calendar>
<!-- 娣诲姞鍚堝悓瀛愰」 -->
<view class="addContractContainer">
<u-popup :show="addContractShow" @close="addContractClose" @open="addContractOpen" mode="bottom" round="22">
@@ -269,7 +65,7 @@
<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>
@@ -332,58 +128,45 @@
<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>
+ <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>
+ <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>
+ <u-form-item @click="addContractTransportShow = true" label="杩愯緭" labelWidth="20%" ref="item1">
+ <u--input v-model="addContractTransport" disabled disabledColor="#ffffff"></u--input>
+ </u-form-item>
</view>
<view class="formDownCard">
<u-form-item label="鍗曚环" labelWidth="20%" ref="item1">
<u--input v-model="addContractFormdata.price" disabled disabledColor="#ffffff" border="none"></u--input>
</u-form-item>
- <u-form-item label="璁㈠崟閲戦" labelWidth="20%" ref="item1"><u--input :disabled="addContractFormdata.trainType == 2" v-show="currentRowComputed" v-model="addContractFormdata.amount"></u--input></u-form-item>
+ <u-form-item label="璁㈠崟閲戦" labelWidth="20%" ref="item1">
+ <u--input :disabled="addContractFormdata.trainType == 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>
@@ -450,8 +233,8 @@
<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--input v-model="selectCustomerData.customerFullName" border="none" placeholder="杈撳叆瀹㈡埛鍚嶇О"></u--input>
+ <u-icon slot="right" name="close-circle-fill" v-show="selectCustomerData.customerFullName != ''" @click="selectCustomerData.customerFullName = ''"></u-icon>
</u-form-item>
<u-form-item labelWidth="20%" label="瀹㈡埛绾у埆" borderBottom>
<u--input @focus="selectLevelShow = true" border="none" v-model="searchCustomerForm.levelText" placeholder="鐐瑰嚮閫夋嫨绾у埆"></u--input>
@@ -467,29 +250,29 @@
<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">
+ <view slot="value" class="u-slot-value">
<button
class="mini-btn"
type="default"
size="mini"
style="background: #007aff;
- color: #ffffff;
- margin: auto 0;
- height: 20px;
- line-height:20px;
- width: 43px;
- font-size: 10px;
- padding: 0;"
+ color: #ffffff;
+ margin: auto 0;
+ height: 20px;
+ line-height:20px;
+ width: 43px;
+ font-size: 10px;
+ padding: 0;"
@click="addContractConsigneeConfirm(item)"
>
閫夋嫨
</button>
- </text>
+ </view>
</u-cell>
</u-cell-group>
</view>
<view class="loadmoreClass">
- <u-loadmore loadmoreText="鐐瑰嚮鍔犺浇鏇村" nomoreText="鏃犳洿澶氭暟鎹�!!!" :status="status" @loadmore="loadingCustomer" fontSize="20" height="30px"/>
+ <u-loadmore loadmoreText="鐐瑰嚮鍔犺浇鏇村" nomoreText="鏃犳洿澶氭暟鎹�!!!" :status="status" @loadmore="loadingCustomer" fontSize="20" height="30px" />
</view>
<!-- 閫夋嫨鐢ㄦ埛鑿滃崟椤� -->
<view class="selectCustomerCompSheet">
@@ -542,35 +325,17 @@
<!-- 鐢宠琛ㄦ牸 -->
<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>
+ <text style="color: #FFA500;;">
+ 瀹㈡埛璐︽埛鐜版眹浣欓:{{ accountDetails.balance == null ? 0 : accountDetails.balance }},鎵垮厬浣欓锛歿{ accountDetails.balance2 == null ? 0 : accountDetails.balance2 }}
+ </text>
</view>
<u-swipe-action>
<u-swipe-action-item @click="deleteContractCardClick" :options="options1" v-for="(item, index) in newFormData.contractOrders" :key="index">
<view class="cardList">
- <view class="" class="cardListIcon" @click="editApplicationClick(index)">
- <u-icon name="edit-pen" color="#2979ff" size="35"></u-icon>
- </view>
+ <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">
鏀惰揣浜猴細
@@ -594,7 +359,7 @@
</view>
<view class="">
杩愯緭锛�
- <text>{{ item.trainType == 1 ? '鍦伴攢':'璺繍' }}</text>
+ <text>{{ item.trainType == 1 ? '鍦伴攢' : '璺繍' }}</text>
</view>
</view>
<view class="cardList_item">
@@ -606,9 +371,6 @@
璁㈠崟閲戦锛�
<text>{{ item.amount }}</text>
</view>
- <!-- <view class="">
- 璁㈠崟鏁伴噺锛�<text>218.899</text>
- </view> -->
</view>
</view>
</view>
@@ -633,6 +395,7 @@
<script>
import combinationTitle from '@/components/common/combined-title/combined-title.vue';
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
+import { BaseUrl } from '@/utils/request.js';
// 鏈�澶ф樉绀虹殑鏃ユ湡
const d = new Date();
@@ -643,86 +406,37 @@
export default {
data() {
return {
- applicationOrderIndex:null,
-
+ // 璐﹀閫夋嫨鍣�
+ selectLedgerShow: false,
+ ledgerList: [],
+ ledgerName: '',
+ 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: '澶栭攢'
- },
+ newFormData: {},
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']
- }
- ]
- },
+ rules: {},
// 鏃堕棿
timeShow: false,
mode: 'range',
- maxDate: `${year}-${month}-${date + 70}`,
// 閫夋嫨瀹㈡埛
selectCustomerData: {
compIds: '',
- customerName: '',
+ customerFullName: '',
level: '',
current: 1,
size: 10
},
- status:'loadmore',
- customerDataAllNum:0,//瀹㈡埛鍒楄〃鎬绘潯鏁�
+ status: 'loadmore',
+ customerDataAllNum: 0, //瀹㈡埛鍒楄〃鎬绘潯鏁�
account: null, //瀹㈡埛璐︽埛淇℃伅
// 鎼滅储瀛楁
selectCompsData: [],
@@ -737,57 +451,29 @@
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,
+ levelList: [
+ { name: '涓�鏄熺骇', value: 'A' },
+ { name: '浜屾槦绾�', value: 'B' },
+ { name: '涓夋槦绾�', value: 'C' },
+ {
+ name: '鍥涙槦绾�',
+ value: 'D'
+ },
+ { name: '浜旀槦绾�', value: 'E' }
+ ],
// 娣诲姞鍚堝悓
addContractShow: false,
// 娣诲姞鍚堝悓琛ㄥ崟
- addContractRules: {},
- 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: ''
-
+ addContractRules: {
+ // compName: [
+ // {
+ // required: true,
+ // message: '璇烽�夋嫨鐓ゅ巶',
+ // trigger: ['blur', 'change']
+ // }
+ // ],
},
+ addContractFormdata: {},
contractDetails: [], // 閫夋嫨鐨勫悎鍚岃鎯�
// 閫夋嫨鐓ゅ巶
coalFiledSelectShow: false,
@@ -805,33 +491,13 @@
favouredpolicyListAll: [], //浼樻儬鏀跨瓥鍒楄〃鎵�鏈夌殑
favouredpolicyList: [], // 浼樻儬鏀跨瓥鍒楄〃
multipleSelection: [], //閫変腑鐨勪紭鎯犳斂绛�
- selectOKfavouredpolicyValue:[],//澶嶉�夋閫変腑
+ selectOKfavouredpolicyValue: [], //澶嶉�夋閫変腑
// 鍗曢�夋
addContractTransport: '',
// 鍝佺浠锋牸琛ㄦ牸
loading: false,
// 浠锋牸璇锋眰鍙傛暟
- getNewPriceData: {
- // compId: 133,
- // compName: '閭㈠彴鐭�',
- // customerAddressName: '閭㈠彴鍥芥嘲鍙戠數鏈夐檺璐ｄ换鍏徃',
- // customerAddressId: 236,
- // coalId: 45,
- // coalName: '',
- // trainType: 1,
- // fromStation: '灏忓悍搴�',
- // toStation: '灏忓悍搴�',
- // quant: '',
- // price: '',
- // amount: '',
- // priceMode: null,
- // filedName: '閭㈠彴鐭夸富鐓ゅ満',
- // filedId: 4,
- // type: '',
- // cost1: '',
- // cost2: '',
- // edit: true
- },
+ getNewPriceData: {},
dust: null, // 鎶戝皹璐�
trainfreight: {}, //璺繍杩愯垂
// 杩愯緭绫诲瀷
@@ -853,12 +519,11 @@
text: '鍒犻櫎'
}
],
- editApplicationTableId:''
+ editApplicationTableId: ''
};
},
- onLoad(options){
+ onLoad(options) {
this.editApplicationTableId = JSON.parse(options.index);
-
},
onShow() {
if (this.menuShow == true) {
@@ -872,11 +537,10 @@
},
computed: {
afterPrice() {
- console.log(this.currentCoal,'this.currentCoal---computed')
- let temp = this.currentCoal;
- console.log(temp,'temp======================')
+ 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 += ',';
@@ -891,7 +555,6 @@
this.addContractFormdata.favouredpolicyIds = favouredpolicyIds;
}
}
- console.log(temp,'quotePrice1111111111111111======111111111111111111111111')
return temp;
},
showPrice() {
@@ -927,73 +590,36 @@
return true;
},
async currentRowComputed() {
- console.log('杩涘叆璁＄畻锛宑urrentRowComputed');
- console.log('璺繍-------------杩涙潵',this.addContractFormdata,'this.addContractFormdata-----');
-
//鍙樹环鏍肩敤鐨�
this.changePriceMode(this.addContractFormdata.priceMode);
//鍙樿鍗曢噺
- if (this.addContractFormdata.price > 0 && (this.addContractFormdata.amount > 0 || this.addContractFormdata.quant > 0)) {
- console.log('璺繍-------------杩涙潵',this.addContractFormdata,'this.addContractFormdata-----222222222222222222222');
- let price = this.addContractFormdata.price;
- if (this.addContractFormdata.trainType == 1) {
- console.log('鍦伴攢');
- 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) {
- console.log('璺繍',this.addContractFormdata,'this.addContractFormdata-----');
- //濡傛灉璺繍浠锋牸澧炲姞鎶戝皹璐瑰拰杩愯垂
- let cost1Price = await this.getFreight(this.addContractFormdata.fromStation, this.addContractFormdata.toStation, this.addContractFormdata.customerAddressId); //璺繍杩愯垂
- console.log('杩愯垂',cost1Price);
- price += cost1Price;
- console.log(price,'price======')
- price += this.dust;
- console.log(this.addContractFormdata.quant,'this.addContractFormdata.quant===')
- this.addContractFormdata.cost1 = (this.addContractFormdata.quant * cost1Price).toFixed(2); //杩愯垂
- this.addContractFormdata.cost2 = (this.addContractFormdata.quant * this.dust).toFixed(2); //鎶戝皹璐�
-
- let amount = Number(price * this.addContractFormdata.quant) + Number(this.addContractFormdata.cost1) + Number(this.addContractFormdata.cost2);
- console.log('閲戦',amount,price,Number(price * this.addContractFormdata.quant),Number(this.addContractFormdata.cost1),Number(this.addContractFormdata.cost2));
- console.log('quant:'+this.addContractFormdata.quant,'cost1:'+this.addContractFormdata.cost1,'cost2:'+this.addContractFormdata.cost2);
- this.addContractFormdata.amount = amount.toFixed(2);
+ if (this.addContractFormdata.id != null) {
+ console.log('杩涘叆璁＄畻涔嬪墠', this.addContractFormdata);
+ 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);
+ console.log('杈撳叆閲戦', this.addContractFormdata.quant);
+ 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;
}
- // if (this.currentRow.quant > 0 && this.currentRow.price > 0) {
- // this.currentRow.amount = this.currentRow.quant * this.currentRow.price;
- // return true;
- // }
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,
@@ -1008,9 +634,7 @@
if (newV == '') {
this.selectCustomerData.level = '';
}
- },
- // 'selectOKfavouredpolicyValue'(newV,oleV){
- // }
+ }
},
components: {
popupMenu,
@@ -1018,7 +642,6 @@
},
methods: {
async jisuanAmount() {
- console.log('杩涘叆璁＄畻');
if (this.addContractFormdata.trainType == 2) {
let price = this.addContractFormdata.price;
//濡傛灉璺繍浠锋牸澧炲姞鎶戝皹璐瑰拰杩愯垂
@@ -1032,6 +655,7 @@
}
},
init() {
+ this.getLedgerList(); // 璐﹀鍒楄〃
this.jcfavouredpolicyitem();
this.coalfiled();
this.coalprice();
@@ -1042,81 +666,164 @@
this.getFavouredPolicyItem();
this.editApplicationFormData(); // 淇敼鐢宠琛ㄥ崟璇︽儏
},
- editApplicationFormData(){
- this.$reqGet('formData',{},this.editApplicationTableId).then(res=>{
- console.log('鏁翠綋璇︽儏',res.data);
+ /**
+ * 鑾峰彇鍒嗙被璐﹀
+ */
+ getLedgerList() {
+ this.$reqGet('zhaccountledger', { compId: uni.getStorageSync('userInfo').compId }).then(res => {
+ this.ledgerList.push(res.data.records);
+ // console.log('璐﹀鍒楄〃',this.ledgerList);
+ // if (res.data.records) {
+ // this.newFormData.ledgerId = res.data.records[0].id;
+ // this.ledgerName = res.data.records[0].name;
+ // }
+ });
+ },
+ selectLedger() {
+ this.selectLedgerShow = true;
+ },
+ selectLedgerChange(index) {
+ console.log('璐﹀閫夋嫨鍣�', index);
+
+
+
+ // if(this.newFormData.customerName||this.newFormData.contractNum||this.newFormData.contractName){
+ // this.newFormData.customerName = '';
+ // this.newFormData.contractNum = '';
+ // this.newFormData.contractName = '';
+ // }
+ },
+ async selectLedgerConfirm(index) {
+ console.log('閫夋嫨璐﹀鐐瑰嚮纭畾', index);
+ this.selectLedgerShow = false;
+
+ await this.$reqGet('getAccount', { customerId: this.newFormData.customerId, ledgerId: index.value[0].id }).then(res => {
+ let accountReq = res.data;
+ let amountPrice = 0;
+ this.newFormData.contractOrders.forEach(item => {
+ amountPrice += Number(item.amount);
+ });
+ console.log('浠锋牸鍚堣', amountPrice);
+ if (this.newFormData.payType == 0) {
+ if (accountReq.balance > amountPrice) {
+ this.ledgerName = index.value[0].name;
+ this.newFormData.ledgerId = index.value[0].id;
+ this.accountDetails = accountReq;
+ } else {
+ uni.showToast({
+ title: '璐︽埛鍐呯幇姹囦綑棰濓細' + accountReq.balance +'锛屼笉瓒虫敮浠樼幇鍦ㄨ鍗�',
+ icon: 'none'
+ });
+ }
+ } else if (this.newFormData.payType == 1) {
+ if (accountReq.balance2 > amountPrice) {
+ this.ledgerName = index.value[0].name;
+ this.newFormData.ledgerId = index.value[0].id;
+ this.accountDetails = accountReq;
+ } else {
+ uni.showToast({
+ title: '璐︽埛鍐呮壙鍏戜綑棰濓細'+accountReq.balance2+'锛屼笉瓒虫敮浠樼幇鍦ㄨ鍗�',
+ icon: 'none'
+ });
+ }
+ }
+ });
+
+ },
+ selectLedgerCancel() {
+ this.selectLedgerShow = false;
+ },
+ selectLedgerClose() {
+ this.selectLedgerShow = false;
+ },
+ // 鍒濆鍖栫敵璇疯〃鍗�
+ 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;
- })
+ this.ledgerName = res.data.ledgerName;
+ });
+
+ // 鑾峰彇鍚堝悓璇︽儏锛岀叅绉�
+ await this.getContractDetails();
+
+ // 鍒濆鍖栧綋鍓嶇敵璇峰鎴疯处鎴锋儏鍐�
+ if (this.newFormData.customerId) {
+ await this.$reqGet('getAccount', { customerId: this.newFormData.customerId, ledgerId: this.newFormData.ledgerId }).then(res => {
+ this.accountDetails = res.data;
+ });
+ }
},
- editApplicationClick(index){
- this.applicationOrderIndex = index;// 寰呬慨鏀硅鍗昳ndex
- this.addContractFormdata = this.newFormData.contractOrders[index];
- console.log('淇敼鐨勮鍗曡鎯�1',this.addContractFormdata,index,this.newFormData.contractOrders);
+ 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=>{
+ 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.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.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;
+ 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);
+ }
+ });
}
-
- // 鑾峰彇鍚堝悓璇︽儏锛岀叅绉�
- this.getContractDetails();
-
- this.$nextTick(()=>{
- this.addContractShow = true;
- })
-
- console.log('淇敼鐨勮鍗曡鎯�',this.addContractFormdata);
+ // 璁㈠崟杩愯緭绫诲瀷
+ switch (this.addContractFormdata.trainType) {
+ case 1:
+ this.addContractTransport = '鍦伴攢';
+ break;
+ case 2:
+ this.addContractTransport = '璺繍';
+ break;
+ }
+
+ this.$nextTick(() => {
+ this.addContractShow = true;
+ });
},
- getContractDetails(){
+ getContractDetails() {
uni.showLoading({
- title:'鍔犺浇涓�...'
- })
- this.$reqGet('getByContractId',{},this.newFormData.contractId).then(res=>{
+ title: '鍔犺浇涓�...'
+ });
+ this.$reqGet('getByContractId', {}, this.newFormData.contractId).then(res => {
uni.hideLoading();
- if(res.code == 0){
+ if (res.code == 0) {
this.contractDetails = res.data;
}
- })
- this.$nextTick(()=>{
+ });
+ this.$nextTick(() => {
this.contractDetails.forEach(item => {
let a = [{ label: '', id: '' }];
a[0].label = item.coalName;
@@ -1126,21 +833,19 @@
}
this.addContractCoalData.push(a);
});
- })
+ });
},
- checkboxChangeFavouredpolicy(e){
- // this.selectOKfavouredpolicyValue = e;
- if(e.length == 0){
+ checkboxChangeFavouredpolicy(e) {
+ if (e.length == 0) {
this.multipleSelection = [];
} else {
this.multipleSelection = [];
- this.favouredpolicyList.forEach((item,i)=>{
- if(e.indexOf(item.id) != -1){
+ this.favouredpolicyList.forEach((item, i) => {
+ if (e.indexOf(item.id) != -1) {
this.multipleSelection.push(item);
}
- })
+ });
}
-
},
// 閫夋嫨瀹㈡埛
selectCustomer() {
@@ -1159,14 +864,6 @@
}
});
},
- // 瀹㈡埛閫夋嫨寮规鎵撳紑浜�
- // selectCustomerOpen() {
- // // this.spanStyle = 'overflow:hidden'; //褰撹挋灞傚脊璧锋椂锛屽浐瀹氱晫闈㈢姝㈡粴鍔紝褰撹挋灞傚叧闂椂锛屽厑璁告粴鍔�
- // },
- // selectCustomerClose() {
- // // this.spanStyle = 'overflow:auto'; // 璁﹉tml鐨刡ody鍙粦鍔�
- // // this.selectCustomerShow = false;
- // },
// 鑾峰彇鍗曚綅鏍�
fetchCompTree() {
this.selectCustomerActions = [];
@@ -1202,13 +899,11 @@
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.selectCustomerData.customerFullName = '';
this.searchCustomerForm.compName = '';
this.searchCustomerForm.levelText = '';
this.selectCustomer();
@@ -1216,23 +911,20 @@
selectCustomerOkClick(v) {
this.newFormData.customerName = v.customerName;
this.newFormData.customerId = v.id;
- this.$reqGet('getAccount', { customerId: v.id }).then(res => {
+ this.$reqGet('getAccount', { customerId: v.id,ledgerId: this.newFormData.ledgerId }).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;
+ 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){
+ if (this.selectCustomerData.current >= this.customerDataAllNum / 10) {
this.status = 'nomore';
- this.$u.toast('娌℃湁鏇村鏁版嵁浜嗭紒')
+ this.$u.toast('娌℃湁鏇村鏁版嵁浜嗭紒');
}
uni.hideLoading();
if (res.code == 0) {
@@ -1251,218 +943,78 @@
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();
-
- // console.log('this.addContractFormdata',this.addContractFormdata);
- this.multipleSelection = [];
- }
- }
- })
- .catch(err => {
- uni.$u.toast('鏁堥獙澶辫触');
+ 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: '',
+ ledgerId:null,
+ ledgerName:''
+ };
+ // 杩愯緭绫诲瀷鍒濆鍖�
+ switch (this.addContractFormdata.trainType) {
+ case 1:
+ this.addContractTransport = '鍦伴攢';
+ break;
+ case 2:
+ this.addContractTransport = '璺繍';
+ break;
+ }
+
+ // 鑾峰彇鍚堝悓璇︽儏锛岀叅绉�
+ this.getContractDetails();
+
+ this.multipleSelection = [];
+ }
+ }
},
// 娣诲姞鍚堝悓寮瑰嚭妗�
addContractClose() {
- this.addContractFormdata = {};
this.addContractShow = false;
+ this.addContractFormdata = {};
+ this.applicationOrderIndex = null;
},
addContractOpen() {
- console.log('娣诲姞鐢宠瀛愰」绐楀彛鎵撳紑this.addContractFormdata',this.addContractFormdata);
- // console.log('娣诲姞璁㈠崟鎵撳紑');
+ console.log('娣诲姞璁㈠崟鎵撳紑');
},
// 閫夋嫨鐓ゅ巶
- coalFiledSelectOpen(e) {
- // console.log('coalfiledSelect: ', e);
- },
+ coalFiledSelectOpen(e) {},
coalFiledSelectClose() {
this.coalFiledSelectShow = false;
},
@@ -1484,26 +1036,16 @@
},
// 娣诲姞鍚堝悓瀛愰」鏀惰揣浜烘墦寮�
addContractConsigneeOpen() {
- this.selectCustomer()
+ 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;
@@ -1523,7 +1065,7 @@
}
this.addContractCoalData.push(a);
});
-
+ this.addContractConsigneeShow = false;
},
// 鍝佺閫夋嫨鍣�
addContractCoalConfirm(e) {
@@ -1539,10 +1081,10 @@
// this.selectCoalFiledData.compId = e.compId;
// this.selectCoalFiledData.compName = e.compName;
// this.selectCoalFiledData.toStation = e.fromStation;
-
+
this.getNewPrice();
},
- getNewPrice(){
+ getNewPrice() {
this.$reqGet('getNewPrice', this.getNewPriceData).then(res => {
if (res.code == 0) {
// console.log('鑾峰彇浠锋牸',res);
@@ -1555,10 +1097,10 @@
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;
+ // this.addContractFormdata.id = data.id;
} else {
uni.$u.toast('鐓ょ浠锋牸鏈缃�');
}
@@ -1573,23 +1115,14 @@
// console.log('鍗曢�夋灏忕粍', e);
},
changePriceMode(e) {
- console.log('杩涘叆鍗曢�夋',this.addContractFormdata,'this.addContractFormdata===111');
if (!this.currentCoal) return;
- console.log('鍗曢�夋鏁板瓧',e,this.addContractFormdata.priceMode);
- console.log('杩涘叆鍗曢�夋',this.addContractFormdata,'this.addContractFormdata===2222');
- if(e){
+ if (e) {
this.addContractFormdata.priceMode = e;
- console.log('杩涘叆鍗曢�夋',this.addContractFormdata,'this.addContractFormdata===3333');
- console.log(typeof this.addContractFormdata.priceMode,this.addContractFormdata.priceMode,'this.addContractFormdata.priceMode=======瀛楃涓�')
}
- console.log(this.afterPrice,'this.afterPrice.quotePrice=======afterPrice222222');
- console.log(this.afterPrice.cokingPrice,'this.afterPrice.quotePrice=======afterPrice222222------------');
- console.log(this.afterPrice.quotePrice,'this.afterPrice.quotePrice=======afterPrice222222------------')
+
this.addContractFormdata.price = this.afterPrice.quotePrice;
- console.log(this.addContractFormdata.price,'this.addContractFormdata.price=====afterPrice333333333333')
switch (this.addContractFormdata.priceMode) {
case '0':
- console.log('浠锋牸',this.afterPrice.steelMillPrice);
this.addContractFormdata.price = this.afterPrice.steelMillPrice;
break;
case '1':
@@ -1600,7 +1133,6 @@
break;
case '3':
this.addContractFormdata.price = this.afterPrice.quotePrice;
- console.log('杩涘叆鍗曢�夋',this.addContractFormdata,'this.addContractFormdata===444');
break;
}
},
@@ -1645,7 +1177,7 @@
},
addContractSanConfirm() {
if (this.addContractFormdata.compId && this.addContractFormdata.customerId && this.addContractFormdata.filedId) {
- if(this.applicationOrderIndex == null){
+ if (this.applicationOrderIndex == null) {
this.newFormData.contractOrders.push(this.addContractFormdata);
this.$nextTick(() => {
this.addContractShow = false;
@@ -1653,15 +1185,13 @@
this.$u.toast('娣诲姞鎴愬姛');
} else {
// this.newFormData.contractOrders.map(i => {
- // return this.newformData.contractOrders[]
+ // return this.newformData.contractOrders[]
// })
this.newFormData.contractOrders[this.applicationOrderIndex] = this.addContractFormdata;
this.addContractShow = false; // 闅愯棌寮瑰嚭妗�
this.applicationOrderIndex = null; // 鍒濆鍖栦慨鏀硅鍗昳ndex
- this.$u.toast('淇敼鎴愬姛');
+ this.$u.toast('淇敼鎴愬姛');
}
-
-
} else {
uni.$u.toast('璇疯鑼冭緭鍏ユ墍鏈変俊鎭�');
}
@@ -1729,89 +1259,74 @@
menushow(e) {
this.menuShow = e;
},
- // 閫夋嫨瀹㈡埛
- // moveHandleCustomer() {
- // return true;
- // },
- // moveHandleContract(){
- // return true;
- // },
// 鏂板缓鍙戣繍鐢宠
newApplicationFormDataClick() {
- 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 {
- this.editShenQing();
- // this.xswaybill();
- }
+ console.log('鎻愪氦鐢宠鎸夐挳');
+ let amount = 0;
+ this.newFormData.contractOrders.forEach(e => {
+ amount += Number(e.amount);
+ });
+ console.log(typeof this.newFormData.payType);
+ if (this.newFormData.contractOrders.length > 0) {
+ if (this.newFormData.payType == 0) {
+ if (this.accountDetails.balance < amount) {
+ let msg = this.accountDetails.balance == null ? 0 : this.accountDetails.balance;
+ this.$u.toast('瀹㈡埛璐︽埛鐜版眹浣欓涓嶈冻锛屾壙鍏戜綑棰�:' + msg);
} 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 {
- this.editShenQing();
-
- // this.xswaybill();
- }
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
+ this.editShenQing();
+ // this.xswaybill();
}
- })
- .catch(err => {
- uni.$u.toast('鏍￠獙澶辫触');
+ } else if (this.newFormData.payType == 1) {
+ if (this.accountDetails.balance2 < amount) {
+ let msg = this.accountDetails.balance2 == null ? 0 : this.accountDetails.balance2;
+ this.$u.toast('瀹㈡埛璐︽埛鎵垮厬浣欓涓嶈冻锛屾壙鍏戜綑棰�:' + msg);
+ } else {
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
+ this.editShenQing();
+ }
+ }
+ } else {
+ uni.showToast({
+ title: '璇锋坊鍔犺鍗曞瓙椤癸紒',
+ icon: 'none'
});
+ }
},
// 淇敼鐢宠淇℃伅
- 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=>{
- // console.log(res);
- if(res.code == 0){
+ editShenQing() {
+ console.log('editApp-------');
+ uni
+ .request({
+ url: BaseUrl + '/yunxiao/xswaybill',
+ method: 'PUT',
+ data: this.newFormData,
+ header: {
+ 'TENANT-ID': 5,
+ Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
+ VERSION: 'zzl'
+ }
+ })
+ .then(res => {
+ uni.hideLoading();
uni.showToast({
- title:'淇敼鎴愬姛',
- icon:'success',
- duration:2000
+ title:'淇敼鎴愬姛!',
+ icon:'none',
+ duration:1500
})
- this.$u.toast('淇敼鎴愬姛')
- }
- uni.navigateBack({
- delta: 1
+ this.$nextTick(() => {
+ uni.navigateBack({
+ delta: 1
+ });
});
- })
+ });
},
// 鍒犻櫎璁㈠崟鍗＄墖
deleteContractCardClick(e) {
- // console.log('鍒犻櫎璁㈠崟鍗＄墖', e);
this.newFormData.contractOrders.splice(e, 1);
},
xswaybill() {
@@ -1828,12 +1343,6 @@
icon: 'success',
duration: 2000
});
- // this.$nextTick(() => {
- // uni.navigateBack({
- // // url: '/pages/my-application/my-application'
- // delta: 2
- // });
- // });
}
});
},
@@ -1855,11 +1364,13 @@
.newApplicationTitle {
margin-bottom: 0;
}
+
// 琛ㄥ崟
.formDataContaniner {
.u-form {
width: 91%;
margin: 0 auto 0;
+
.u-form-item {
.u-form-item__body {
.u-form-item__body__left {
@@ -1868,6 +1379,7 @@
}
}
}
+
.u-form-item__body__right {
.u-form-item__body__right__content {
.u-form-item__body__right__content__slot {
@@ -1884,30 +1396,28 @@
.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);
@@ -1918,12 +1428,15 @@
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);
@@ -1942,15 +1455,19 @@
}
}
}
+
.tableBody {
width: 80%;
}
+
.TableUtilBtn {
width: 20%;
overflow: hidden;
+
.uni-table {
min-width: 0 !important;
}
+
.TableUtilBtnContainer {
.u-button {
width: vww(20);
@@ -1992,6 +1509,7 @@
}
}
}
+
.selectContractEndTime {
.u-popup {
.u-transition {
@@ -2010,8 +1528,10 @@
.u-popup {
.u-transition {
height: 95%;
+
.u-popup__content {
overflow: scroll !important;
+
.addContractFormTitle {
margin-bottom: 0;
}
@@ -2019,11 +1539,13 @@
// 鎼滅储
.coalFiledSelectSearch {
}
+
// 閫夋嫨鐓ょ
.coalFiledSelectPopup {
.u-popup {
.u-transition {
height: 80%;
+
.u-popup__content {
overflow: scroll !important;
// 琛ㄦ牸
@@ -2032,12 +1554,15 @@
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);
@@ -2056,15 +1581,19 @@
}
}
}
+
.tableBody {
width: 80%;
}
+
.TableUtilBtn {
width: 20%;
overflow: hidden;
+
.uni-table {
min-width: 0 !important;
}
+
.TableUtilBtnContainer {
.u-button {
width: vww(20);
@@ -2086,30 +1615,14 @@
.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);
@@ -2125,16 +1638,19 @@
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;
@@ -2143,6 +1659,7 @@
}
}
}
+
.formDownCard {
border-radius: vww(4);
padding: vww(10);
@@ -2175,10 +1692,12 @@
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 {
@@ -2188,21 +1707,28 @@
}
}
}
+
.cardList {
height: vww(130);
border-radius: vww(4);
padding: vww(10);
position: relative;
- .cardListIcon{
- position:absolute; right: vww(20); top:vww(20);
+
+ .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);
}
@@ -2210,6 +1736,7 @@
}
}
}
+
.addCard {
width: 100%;
height: vww(130);
--
Gitblit v1.9.1