| App.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| api/global.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| components/common/data-select-box/data-select-box.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| components/common/popup-menu/popup-menu.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/edit-my-application/edit-my-application.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/home/home.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/my-application/my-application.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/my-have-todo/my-have-todo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/my-todo/my-todo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/new-application-form-data/new-application-form-data.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| static/iconfont/iconfont.css | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| utils/request.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
App.vue
@@ -15,5 +15,5 @@ <style lang="scss"> /*每个页面公共css */ @import '@/uni_modules/uview-ui/index.scss'; @import "./static/iconfont/iconfont.css"; @import "@/static/iconfont/iconfont.css"; </style> api/global.js
@@ -27,6 +27,8 @@ }); } const baseUrl = 'http://192.168.3.159:9999' // POST请求 function apiLogin({ username, @@ -38,7 +40,7 @@ return new Promise((resolve, reject) => { uni.request({ url: "/auth/oauth/token?grant_type=password&scope=server", url: baseUrl + "/auth/oauth/token?grant_type=password&scope=server", method: "POST", data: { username, @@ -55,6 +57,7 @@ resolve(res); }, fail: (err) => { console.log('错误',err); uni.hideLoading(); uni.showToast({ icon: 'none', components/common/data-select-box/data-select-box.vue
@@ -1,7 +1,7 @@ <template> <view class="data-selet" > <view class="data-selet-content"> <view class="uni-select__icon" :class="{'activeIcon':isActive}"><uni-icons type="bottom" size="20" color="#dddddd"></uni-icons></image></view> <view class="uni-select__icon" :class="{'activeIcon':isActive}"><uni-icons type="bottom" size="20" color="#dddddd"></uni-icons></view> <view class="content" @tap="clickHandler"> <input :placeholder="placeholder" :disabled="true" type="text" :value="value" @input="inputChange" style="font-size: 14px;" placeholder-style="color:#cccccc"> </view> components/common/popup-menu/popup-menu.vue
@@ -49,6 +49,7 @@ <script> import { redirectLogin } from '@/utils/status.js'; export default { name: 'PopupMenu', // props:{ @@ -93,10 +94,7 @@ Authorization: 'Bearer ' + uni.getStorageSync('access_token'), VERSION: 'zzl' } }).then(res=>{ redirectLogin(); }).catch(err=>{ }).then(redirectLogin()).catch(err => { uni.showToast({ title:'退出失败！', }) @@ -117,6 +115,7 @@ height:vww(40); margin-bottom:vww(40); } // cell单元格 .u-cell-group{ @@ -124,27 +123,33 @@ .u-cell{ width:vww(270); height:vww(48); .u-cell__body{ height:vww(48); .u-cell__body__content{ .u-cell__left-icon-wrap{ margin-right: vww(8); image{ width:vww(16); height:vww(16); } } .u-cell__title{ .u-cell__title-text{ font-size:vww(14); } } } .u-cell__right-icon-wrap{ .u-icon{ .u-icon__icon{ width:vww(7.27); height:vww(12); span{ color:#007AFF; @@ -156,7 +161,6 @@ } } } } pages/edit-my-application/edit-my-application.vue
@@ -10,32 +10,35 @@ <!-- <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 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-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" 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-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110" :maxDate="maxDate"></u-calendar> <u-calendar :show="timeShow" :mode="mode" @confirm="confirmTime" @close="timeClose" rowHeight="110" :maxDate="maxDate"></u-calendar> <!-- 申请付款方式弹出菜单 --> <!-- <u-action-sheet :show="showPayType" :actions="actions" title="请选择付款方式" @close="showPayType = false" @select="sexSelect"></u-action-sheet> --> @@ -242,11 +245,6 @@ --> <!-- 添加合同子项 --> <view class="addContractContainer"> <u-popup :show="addContractShow" @close="addContractClose" @open="addContractOpen" mode="bottom" round="22"> @@ -257,7 +255,8 @@ <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--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> @@ -276,19 +275,24 @@ <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--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--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--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--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--input v-model="currentCoal.quotePrice" disabled disabledColor="#ffffff" border="none"></u--input> </u-form-item> </u--form> </view> @@ -298,32 +302,42 @@ <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--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"> <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--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> <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--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> <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--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> <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--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> <u-radio shape="square" size="30" :customStyle="{ marginBottom: '8px' }" name="3" @change="changePriceMode"></u-radio> </view> </u-radio-group> </u--form> @@ -368,15 +382,22 @@ </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"></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--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--input :disabled="addContractFormdata.trainType == 1" @input="jisuanAmount" v-model="addContractFormdata.quant"></u--input> </u-form-item> </view> @@ -386,12 +407,15 @@ <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 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"> <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> @@ -423,11 +447,16 @@ <view class="TableUtilBtn"> <uni-table border emptyText="暂无更多数据"> <uni-tr><uni-th align="center">操作</uni-th></uni-tr> <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> <view class="TableUtilBtnContainer"> <u-button type="primary" @click="coalFiledSelectClick(item)" icon="checkbox-mark" size="mini"></u-button> </view> </uni-td> </uni-tr> </uni-table> @@ -439,23 +468,30 @@ <!-- 选择收货人 --> <view class="selectCustomerPopup"> <u-popup :show="addContractConsigneeShow" @close="addContractConsigneeClose" @open="addContractConsigneeOpen" mode="bottom" round="22"> <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--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--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--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> @@ -489,7 +525,8 @@ </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"> @@ -503,7 +540,8 @@ </view> <!-- 级别菜单项 --> <view class="selectLevelSheet"> <u-action-sheet :show="selectLevelShow" :actions="levelList" title="请选择级别" @close="selectLevelShow = false" @select="selectLevelSelect"></u-action-sheet> <u-action-sheet :show="selectLevelShow" :actions="levelList" title="请选择级别" @close="selectLevelShow = false" @select="selectLevelSelect"></u-action-sheet> </view> </view> </scroll-view> @@ -560,13 +598,19 @@ </uni-td> </uni-tr> </uni-table> --> <view class="balanceNo" v-if="accountDetails.balanceTotal < 0"><text style="color:red;">客户账户当前处于欠款状态</text></view> <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.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"> <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> @@ -616,7 +660,9 @@ </u-swipe-action> <view class="addCard" @click="addContractClick"> <view class="addCard-icon"><u-icon name="plus" size="100"></u-icon></view> <view class="addCard-icon"> <u-icon name="plus" size="100"></u-icon> </view> </view> </view> @@ -644,30 +690,29 @@ 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: '外销' // 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: {}, // 时间 @@ -680,34 +725,34 @@ 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'] } ] // 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, @@ -737,7 +782,10 @@ selectCustomerActions: [], // 级别 selectLevelShow: false, levelList: [{ name: '一星级', value: 'A' }, { name: '二星级', value: 'B' }, { name: '三星级', value: 'C' }, { name: '四星级', value: 'D' }, { name: '五星级', value: 'E' }], levelList: [{name: '一星级', value: 'A'}, {name: '二星级', value: 'B'}, {name: '三星级', value: 'C'}, { name: '四星级', value: 'D' }, {name: '五星级', value: 'E'}], // 选择合同 // selectContractShow: false, // searchContractForm: { @@ -761,31 +809,41 @@ // 添加合同 addContractShow: false, // 添加合同表单 addContractRules: {}, addContractRules: { // compName: [ // { // required: true, // message: '请选择煤厂', // trigger: ['blur', 'change'] // } // ], }, 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: '' // 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: [], // 选择的合同详情 @@ -872,11 +930,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 +948,6 @@ this.addContractFormdata.favouredpolicyIds = favouredpolicyIds; } } console.log(temp,'quotePrice1111111111111111======111111111111111111111111') return temp; }, showPrice() { @@ -927,46 +983,34 @@ return true; }, async currentRowComputed() { console.log('进入计算，currentRowComputed'); console.log('路运-------------进来',this.addContractFormdata,'this.addContractFormdata-----'); //变价格用的 this.changePriceMode(this.addContractFormdata.priceMode); //变订单量 if (this.addContractFormdata.id != null) { 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); } } } 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() { @@ -1018,7 +1062,6 @@ }, methods: { async jisuanAmount() { console.log('进入计算'); if (this.addContractFormdata.trainType == 2) { let price = this.addContractFormdata.price; //如果路运价格增加抑尘费和运费 @@ -1042,17 +1085,33 @@ this.getFavouredPolicyItem(); this.editApplicationFormData(); // 修改申请表单详情 }, editApplicationFormData(){ this.$reqGet('formData',{},this.editApplicationTableId).then(res=>{ // 初始化申请表单 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;// 待修改订单index this.addContractFormdata = this.newFormData.contractOrders[index]; console.log('修改的订单详情1',this.addContractFormdata,index,this.newFormData.contractOrders); 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){ @@ -1064,12 +1123,18 @@ // 获取价格 // 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(); @@ -1097,14 +1162,11 @@ break; } // 获取合同详情，煤种 this.getContractDetails(); this.$nextTick(()=>{ this.addContractShow = true; }) console.log('修改的订单详情',this.addContractFormdata); }, getContractDetails(){ uni.showLoading({ @@ -1375,9 +1437,9 @@ // 添加订单按钮 addContractClick() { // 打印true或false this.$refs.formRef .validate() .then(res => { // this.$refs.formRef // .validate() // .then(res => { if (this.accountDetails.balanceType == '贷') { uni.showToast({ title: '客户账户余额当前处于欠款状态！', @@ -1441,23 +1503,22 @@ // 获取合同详情，煤种 this.getContractDetails(); // console.log('this.addContractFormdata',this.addContractFormdata); this.multipleSelection = []; } } }) .catch(err => { uni.$u.toast('效验失败'); }); // }) // .catch(err => { // uni.$u.toast('效验失败'); // }); }, // 添加合同弹出框 addContractClose() { this.addContractFormdata = {}; this.addContractShow = false; this.addContractFormdata = {}; this.applicationOrderIndex = null; }, addContractOpen() { console.log('添加申请子项窗口打开this.addContractFormdata',this.addContractFormdata); // console.log('添加订单打开'); console.log('添加订单打开'); }, // 选择煤厂 coalFiledSelectOpen(e) { @@ -1558,7 +1619,7 @@ 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 +1634,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){ 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 +1652,6 @@ break; case '3': this.addContractFormdata.price = this.afterPrice.quotePrice; console.log('进入单选框',this.addContractFormdata,'this.addContractFormdata===444'); break; } }, @@ -1660,8 +1711,6 @@ this.applicationOrderIndex = null; // 初始化修改订单index this.$u.toast('修改成功'); } } else { uni.$u.toast('请规范输入所有信息'); } @@ -1738,6 +1787,7 @@ // }, // 新建发运申请 newApplicationFormDataClick() { console.log('提交申请按钮'); this.$refs.formRef .validate() .then(res => { @@ -1757,6 +1807,9 @@ duration: 2000 }); } else { uni.showLoading({ title:'加载中...' }); this.editShenQing(); // this.xswaybill(); } @@ -1772,8 +1825,10 @@ duration: 2000 }); } else { uni.showLoading({ title:'加载中...' }); this.editShenQing(); // this.xswaybill(); } } @@ -1792,21 +1847,15 @@ 'TENANT-ID': 5, Authorization: 'Bearer ' + uni.getStorageSync('access_token'), VERSION: 'zzl' }, }).then(res=>{ // console.log(res); if(res.code == 0){ uni.showToast({ title:'修改成功', icon:'success', duration:2000 }) this.$u.toast('修改成功') } }).then(res => { uni.hideLoading(); this.$u.toast('修改成功'); this.$nextTick(() => { uni.navigateBack({ delta: 1 }); }) }) }, // 删除订单卡片 @@ -1855,11 +1904,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 +1919,7 @@ } } } .u-form-item__body__right { .u-form-item__body__right__content { .u-form-item__body__right__content__slot { @@ -1884,11 +1936,14 @@ .u-popup { .u-transition { height: 95%; .u-popup__content { overflow: scroll !important; .selectCustomerTitle { margin-bottom: 0; } .selectCustomerContainer { padding: 0 4%; // .loadmoreClass{ @@ -1901,13 +1956,16 @@ // } .searchContainer { } .searchCustomerBtn { margin-top: vww(10); display: flex; .u-button { width: 30%; } } // 数据列表 .searchResultList { margin-top: vww(16); @@ -1918,12 +1976,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 +2003,19 @@ } } } .tableBody { width: 80%; } .TableUtilBtn { width: 20%; overflow: hidden; .uni-table { min-width: 0 !important; } .TableUtilBtnContainer { .u-button { width: vww(20); @@ -1992,6 +2057,7 @@ } } } .selectContractEndTime { .u-popup { .u-transition { @@ -2010,8 +2076,10 @@ .u-popup { .u-transition { height: 95%; .u-popup__content { overflow: scroll !important; .addContractFormTitle { margin-bottom: 0; } @@ -2019,11 +2087,13 @@ // 搜索 .coalFiledSelectSearch { } // 选择煤种 .coalFiledSelectPopup { .u-popup { .u-transition { height: 80%; .u-popup__content { overflow: scroll !important; // 表格 @@ -2032,12 +2102,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 +2129,19 @@ } } } .tableBody { width: 80%; } .TableUtilBtn { width: 20%; overflow: hidden; .uni-table { min-width: 0 !important; } .TableUtilBtnContainer { .u-button { width: vww(20); @@ -2086,9 +2163,11 @@ .u-popup { .u-transition { height: 95%; .u-popup__content { // background-color: rgb(247, 247, 247); overflow: scroll !important; .addContractForm { width: 92%; margin: 0 auto; @@ -2125,16 +2204,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 +2225,7 @@ } } } .formDownCard { border-radius: vww(4); padding: vww(10); @@ -2175,10 +2258,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 +2273,28 @@ } } } .cardList { height: vww(130); border-radius: vww(4); padding: vww(10); position: relative; .cardListIcon{ position:absolute; right: vww(20); top:vww(20); 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 +2302,7 @@ } } } .addCard { width: 100%; height: vww(130); pages/home/home.vue
@@ -3,8 +3,8 @@ <!-- 轮播图 --> <view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view> <!-- 我的申请 --> <combined-title title="我的申请" detailsPath="/pages/my-application/my-application"></combined-title> <combination-card v-for="(item, index) in shenqingData" index="index"> <combined-title title="我的申请" detailsPath="/pages/my-application/my-application" v-if="$store.state.shenqingMenu"></combined-title> <combination-card v-for="(item, index) in shenqingData" index="index" v-if="$store.state.shenqingMenu"> <template v-slot:top> <view> <text>{{ item.title }}</text> @@ -52,7 +52,7 @@ </view> <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2"> <image src="@/static/home/biaodan.png" mode=""></image> <view>表单数据</view> <view>申请详情</view> </view> <view @click="apply(item)" v-if="item.status == 3"> <image src="@/static/home/history.png" mode=""></image> @@ -110,10 +110,10 @@ <view class="bottom-container"> <!-- 待办按钮 --> <view class="bottom-content__item"> <!-- <view @click="theFormDataClick"> <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'"> <image src="@/static/home/jindu.png" mode=""></image> <view>申请详情</view> </view> --> </view> <view @click="adopClick(item)"> <image src="@/static/home/tongguo.png" mode=""></image> <view>通过</view> @@ -182,7 +182,7 @@ <view class="bottom-container"> <!-- 已办按钮 --> <view class="bottom-content__item"> <view @click="theFormDataClick(item.tableId)"> <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'"> <image src="@/static/home/biaodan.png" mode=""></image> <view>表单数据</view> </view> @@ -324,7 +324,6 @@ // data shenqingData: [], daibanData: [], daibanData: [], yibanData: [], menuShow: false, // 申请 @@ -354,11 +353,18 @@ console.log(e); this.$refs.menuRef.menuClick(); }, onLoad(){ console.log('加载页面'); wx.hideShareMenu({ menus: ['shareAppMessage', 'shareTimeline'] }) }, onShow() { if (this.menuShow == true) { this.$refs.menuRef.menuClick(); } this.init(); }, components: { combinedTitle, @@ -685,7 +691,7 @@ justify-content: center; align-content: center; margin-right: vww(10); &:nth-last-child() { &:nth-last-child(1) { margin-right: 0; } view { pages/login/login.vue
@@ -24,11 +24,14 @@ formData:{ username:'fyy', password:'123456!@#' // username:'anjianwei', // password:'123456' } }; }, methods:{ loginSubmit(){ console.log('点击登录'); // console.log('login'); uni.showLoading({ title:'登录中...' pages/my-application/my-application.vue
@@ -3,6 +3,15 @@ <view class="my-application" > <!-- 搜索区域 --> <view class="searchBox"> <u-collapse :border="true" @change="searchChange" @close="searchClose" @open="searchOpen" > <u-collapse-item :border="false" title="搜索框" name="Docs guide" > <view class="topRow"> <view class="search"> <u-search @@ -16,15 +25,25 @@ ></u-search> </view> <data-select-box ref="dataSelectBox" class="data-select-box" placeholder="请选择条件" v-model="selectText" :clearabled="true" @click="dataSelectClick"></data-select-box> <data-select-box ref="dataSelectBox" class="data-select-box" placeholder="请选择条件" v-model="selectText" :clearabled="true" @click="dataSelectClick"></data-select-box> </view> <!-- 时间选择器 --> <view class="example-body"><uni-datetime-picker v-model="range" type="daterange" @maskClick="maskClick" /></view> <view class="searchBtn"><u-button type="primary" text="搜索" @click="searchClick"></u-button> <u-button type="primary" :plain="true" text="清空" @click="emptyButtonClick"></u-button></view> <view class="example-body"> <uni-datetime-picker v-model="range" type="daterange" @maskClick="maskClick"/> </view> <view class="searchBtn"> <u-button type="primary" text="搜索" @click="searchClick"></u-button> <u-button type="primary" :plain="true" text="清空" @click="emptyButtonClick"></u-button> </view> </u-collapse-item> </u-collapse> </view> <!-- 选择器 --> <u-picker @cancel="dataSelectCancel" @confirm="selectConfirm" :show="selectPickerShow" :columns="selectList"></u-picker> <u-picker @cancel="dataSelectCancel" @confirm="selectConfirm" :show="selectPickerShow" :columns="selectList"></u-picker> <!-- 我的申请卡片区域 --> <!-- <u-checkbox-group v-model="checkBoxValue" placement="column" @change="checkboxChange" style="margin-bottom:150px"> --> @@ -77,7 +96,7 @@ </view> <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2"> <image src="@/static/home/biaodan.png" mode=""></image> <view>表单数据</view> <view>申请详情</view> </view> <view v-if="item.status == 3" @click="apply(item)"> <image src="@/static/home/history.png" mode=""></image> @@ -99,8 +118,11 @@ <!-- 撤回模态框 --> <view class="wodeshenqingMotai"> <u-modal width="684rpx" :show="withDrawShow" title="撤回原因" :showCancelButton="true" @confirm="withDrawConfirm" @cancel="withDrawCancel"> <view class="slot-content"><u--textarea v-model="withDrawData.reason" placeholder="请输入撤回原因"></u--textarea></view> <u-modal width="684rpx" :show="withDrawShow" title="撤回原因" :showCancelButton="true" @confirm="withDrawConfirm" @cancel="withDrawCancel"> <view class="slot-content"> <u--textarea v-model="withDrawData.reason" placeholder="请输入撤回原因"></u--textarea> </view> </u-modal> </view> @@ -115,6 +137,9 @@ @cancel="batchDeleteModalCancel" ></u-modal> </view> <!--返回顶部--> <u-back-top :scroll-top="scrollTop"></u-back-top> <view class="" style="height:50px;"> @@ -133,6 +158,8 @@ </view> </view> <!-- 菜单栏 --> <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu> </view> @@ -142,10 +169,12 @@ import popupMenu from '@/components/common/popup-menu/popup-menu.vue'; import combinationCard from '@/components/common/combination-card/combination-card.vue'; import dataSelectBox from '@/components/common/data-select-box/data-select-box.vue'; export default { name: 'MyApplication', data() { return { scrollTop: 0, status: ['草稿', '处理中', '已结束', '已撤回'], statusColor: ['#dd8b8c', '#FF9900', '#007AFF', '#06BE00'], result: ['未提交', '处理中', '通过', '驳回'], @@ -210,11 +239,15 @@ } }; }, // 返回顶部 onPageScroll(e) { // console.log('页面滑动', this.scrollTop); this.scrollTop = e.scrollTop; }, onShow() { if (this.menuShow == true) { this.$refs.menuRef.menuClick(); } this.myApplication.pageNumber = 1; this.init(); }, // 点击导航栏菜单后 @@ -235,6 +268,11 @@ this.myApplication.status = ''; this.myApplication.result = ''; } }, scrollTop(nVal){ if(nVal){ // console.log('页面滑动变化'); } } }, components: { @@ -254,9 +292,7 @@ // 下拉加载 onPullDownRefresh() { console.log('refresh'); this.myApplication.pageNumber = 1; this.loadingType = 0; this.shenqingData = []; setTimeout(()=> { uni.stopPullDownRefresh(); }, 1000); @@ -264,6 +300,9 @@ }, methods: { init() { this.myApplication.pageNumber = 1; this.loadingType = 0; this.shenqingData = []; this.getMoreNews(); }, // getProcessDataList() { @@ -279,9 +318,13 @@ //loadingType!=0;直接返回 return false; } uni.showLoading({ title: '加载中...' }) this.loadingType = 1; uni.showNavigationBarLoading(); //显示加载动画 this.$reqGet('getProcessDataList', this.myApplication).then(response => { uni.hideLoading(); console.log('response', response); this.myApplication.pageNumber++; // 得到数据之后 page+1 if (response.data.records.length < 1) { @@ -296,8 +339,15 @@ } // this.myApplication.pageNumber++; // 每触底一次 page +1 if(this.myApplication.title||this.myApplication.status||this.myApplication.result||this.myApplication.startTime||this.myApplication.endTime){ if(this.myApplication.pageNumber == 1){ this.shenqingData = response.data.records } else{ this.shenqingData = this.shenqingData.concat(response.data.records); } } else { if(this.myApplication.pageNumber == 1){ this.shenqingData = []; } this.shenqingData = this.shenqingData.concat(response.data.records); } //将数据拼接在一起 @@ -327,6 +377,15 @@ maskClick(e) { console.log('maskClick事件:', e); }, searchChange(e){ console.log('e', e); }, searchClose(e){ console.log('e', e); }, searchOpen(e){ console.log('e', e); }, searchClick() { console.log('this.myApplication', this.myApplication); this.myApplication.pageNumber = 1; @@ -334,6 +393,8 @@ this.getMoreNews(); }, emptyButtonClick(){ this.loadingType == 0; this.myApplication.pageNumber = 1; this.myApplication.title = ''; this.selectText = ''; this.range = []; @@ -522,47 +583,62 @@ ::v-deep.my-application { width: 100%; height: 100%; .searchBox { width: 94%; margin: vww(16) auto; .u-collapse{ .u-collapse-item{ .u-collapse-item__content{ .topRow { display: flex; justify-content: space-between; flex-wrap: nowrap; .search { // width: vww(160); width: 48%; .u-search { border: 1px solid #d1d1d1; border-radius: vww(4); .u-search__content { height: 38px; height: vww(38); background-color: #ffffff !important; .u-search__content__icon { width: 10px; height: 5.5px; .u-icon { .u-icon__icon { font-size: 20px !important; } } } .u-search__content__close { width: 16px !important; height: 16px !important; background-color: #cccccc !important; .u-icon { .u-icon__icon { font-size: 10px !important; } } } .u-search__content__input { margin-left: vww(10); background-color: #ffffff !important; .uni-input-placeholder { color: #cccccc !important; } .u-search__content__input--placeholder { // color:#CCCCCC; } @@ -570,9 +646,11 @@ } } } .data-select-box { width: 48%; } // 下拉菜单 // .data-selet { // border: 1px solid #d1d1d1; @@ -611,6 +689,7 @@ width: 100%; display: flex; align-items: center; .u-button { width: vww(90); height: vww(32); @@ -618,17 +697,25 @@ } } } } } } // 卡片中间 .center-container { display: flex; flex-direction: column; .center-content__one { display: flex; view { width: 50%; } } .center-content__two { display: flex; // margin: vww(10) 0; @@ -636,15 +723,19 @@ width: 50%; } } .center-content__three { display: flex; view { width: 50%; } } .center-content__four { } } // 中间部分样式 .center-margin { margin-bottom: vww(16); @@ -655,17 +746,21 @@ .bottom-content__item { display: flex; justify-content: space-around; view { display: flex; justify-content: center; align-content: center; margin-right: vww(10); &:nth-last-child() { &:nth-last-child(1) { margin-right: 0; } view { display: inline-block; } image { width: vww(16); height: vww(16); @@ -683,6 +778,7 @@ .u-textarea { width: vww(280); height: vww(90) !important; .uni-textarea-wrapper { height: vww(90) !important; } @@ -700,15 +796,19 @@ align-items: center; justify-content: space-between; background-color: #f5f5f5; .bottomTabbar_checkBox { margin-left: vww(16); .u-checkbox-group { .u-checkbox { } } } .bottomTabbar_button { display: flex; .u-button { font-size: 13px; margin-right: vww(14); pages/my-have-todo/my-have-todo.vue
@@ -3,10 +3,19 @@ <!-- 搜索区域 --> <view class="searchContainer"> <u-collapse :border="true" @change="searchChange" @close="searchClose" @open="searchOpen" > <u-collapse-item :border="false" title="搜索框" name="Docs guide" > <view class="searchBox"> <view class="search"> <u-search :clearabled="true" :showAction="false" placeholder="请输入标题" v-model="haveTodoParams.title" shape="square"></u-search> <u-search :clearabled="true" :showAction="false" placeholder="请输入标题" v-model="haveTodoParams.title" shape="square"></u-search> </view> <!-- 状态选择器 --> <!-- <view class="data-selet" @click="statusSeletShow = true"> @@ -16,20 +25,26 @@ <view class="uni-select__icon"><image src="@/static/icon/select.png" mode="加载失败"></image></view> </view> --> <view class="search"> <u-search :clearabled="true" :showAction="false" placeholder="请输入任务名称" v-model="haveTodoParams.name" shape="square"></u-search> <u-search :clearabled="true" :showAction="false" placeholder="请输入任务名称" v-model="haveTodoParams.name" shape="square"></u-search> </view> </view> <!-- 时间搜索区域 --> <view class="timeContiner"> <uni-datetime-picker class="time-picker" type="date" :clear-icon="true" v-model="haveTodoParams.startDate" @change="startDateChange" placeholder="开始时间" /> <uni-datetime-picker class="time-picker" type="date" :clear-icon="true" v-model="haveTodoParams.endDate" @change="endDateChange" placeholder="结束时间" /> <uni-datetime-picker class="time-picker" type="date" :clear-icon="true" v-model="haveTodoParams.startDate" @change="startDateChange" placeholder="开始时间"/> <uni-datetime-picker class="time-picker" type="date" :clear-icon="true" v-model="haveTodoParams.endDate" @change="endDateChange" placeholder="结束时间"/> </view> <view class="searchButton"> <u-button type="primary" text="搜索" @click="searchButtonClick"></u-button> <u-button type="primary" :plain="true" text="清空" @click="emptyButtonClick"></u-button> </view> </u-collapse-item> </u-collapse> </view> <!-- 我的已办卡片区域 --> <u-checkbox-group v-model="checkBoxValue" placement="column" @change="checkboxChange" style="margin-bottom:50px"> @@ -69,7 +84,8 @@ : item.duration >= 3600000 ? parseInt(item.duration / 3600000) + '时' + parseInt(item.duration / 3600000 % 3600000) + '分' : parseInt(item.duration / 60000) + '分' }}</text> }} </text> </view> </view> <view class="center-content__four"> @@ -81,9 +97,9 @@ <view class="bottom-container"> <!-- 已办按钮 --> <view class="bottom-content__item"> <view @click="theFormDataClick(item.tableId)"> <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'"> <image src="@/static/home/biaodan.png" mode=""></image> <view>表单数据</view> <view>申请详情</view> </view> <view @click="approvalHistoryClick(item.procInstId)"> <image src="@/static/home/history.png" mode=""></image> @@ -102,7 +118,9 @@ <!-- 底部全选 --> <view class="bottomTabbar"> <view class="bottomTabbar_checkBox"> <u-checkbox-group size="35" v-model="totalSelectValue" placement="column" @change="totalSelectChange"><u-checkbox labelSize="13px" label="全选" name="tatalSelect"></u-checkbox></u-checkbox-group> <u-checkbox-group size="35" v-model="totalSelectValue" placement="column" @change="totalSelectChange"> <u-checkbox labelSize="13px" label="全选" name="tatalSelect"></u-checkbox> </u-checkbox-group> </view> <view class="bottomTabbar_button"> <u-button :plain="true" type="primary" text="批量删除" @click="deleteApplicationClickAll()"></u-button> @@ -124,6 +142,9 @@ <!-- 选择器 --> <!-- <u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker> --> <!--返回顶部--> <u-back-top :scroll-top="scrollTop"></u-back-top> <!-- 菜单栏 --> <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu> </view> @@ -132,9 +153,11 @@ <script> import popupMenu from '@/components/common/popup-menu/popup-menu.vue'; import combinationCard from '@/components/common/combination-card/combination-card.vue'; export default { data() { return { scrollTop: 0, // 条件搜索 // searchData: '', // dataSeletText: '请选择状态', @@ -160,8 +183,39 @@ title: '', startDate: '', endDate: '' }, // 上拉加载更多 timer: {}, load: 0, loadingText: '加载中...', loadingType: 0, contentText: { contentDown: '上拉显示更多', contentRefresh: '正在加载...', contentNomore: '没有更多数据了' } }; }, // 上拉加载更多 onReachBottom() { if (this.timer != null) { clearTimeout(this.timer); } this.timer = setTimeout(() => { this.getMoreNews(); }, 1000); }, // 返回顶部 onPageScroll(e) { this.scrollTop = e.scrollTop; }, // 下拉加载 onPullDownRefresh() { console.log('refresh'); setTimeout(() => { uni.stopPullDownRefresh(); }, 1000); this.init(); }, onShow(){ if(this.menuShow == true){ @@ -180,27 +234,85 @@ }, methods: { init(){ this.doneList(); this.haveTodoParams.pageNumber = 1; this.loadingType = 0; this.yibanData = []; // this.doneList(); this.getMoreNews(); }, // 已办 doneList() { getMoreNews() { if (this.loadingType !== 0) { //loadingType!=0;直接返回 return false; } uni.showLoading({ title:'加载中...' }) this.$reqGet('doneList', this.haveTodoParams).then(res => { this.loadingType = 1; uni.showNavigationBarLoading(); //显示加载动画 this.$reqGet('doneList', this.haveTodoParams).then(response => { uni.hideLoading(); if (res.code === 0) { // console.log('已办', res); this.yibanData = res.data.content; } this.haveTodoParams.pageNumber++; // 得到数据之后 page+1 if (response.data.content.length < 1) { // 没有数据 this.loadingType = 2; uni.hideNavigationBarLoading(); // 关闭加载动画 uni.showToast({ title: '没有更多数据了！', icon: 'error' }); return; } // this.myApplication.pageNumber++; // 每触底一次 page +1 if (this.haveTodoParams.name || this.haveTodoParams.title || this.haveTodoParams.startDate || this.haveTodoParams.endTime ) { if(this.haveTodoParams.pageNumber == 1){ this.yibanData = response.data.content } else{ this.yibanData = this.yibanData.concat(response.data.content); } } else { if(this.haveTodoParams.pageNumber ==1){ this.yibanData = []; } this.yibanData = this.yibanData.concat(response.data.content); } //将数据拼接在一起 this.loadingType = 0; // 将loadingType归0重置 uni.hideNavigationBarLoading(); // 关闭加载动画 }); }, // 已办 // doneList() { // uni.showLoading({ // title:'加载中...' // }) // this.$reqGet('doneList', this.haveTodoParams).then(res => { // uni.hideLoading(); // if (res.code === 0) { // // console.log('已办', res); // this.yibanData = res.data.content; // } // }); // }, searchChange(e){ console.log('e', e); }, searchClose(e){ console.log('e', e); }, searchOpen(e){ console.log('e', e); }, // 搜索 searchButtonClick(){ this.loadingType == 0; this.haveTodoParams.pageNumber = 1; this.init(); }, // 清空 emptyButtonClick(){ this.loadingType == 0; this.haveTodoParams.pageNumber = 1; this.haveTodoParams.name = ''; this.haveTodoParams.title = ''; this.haveTodoParams.startDate = ''; @@ -294,35 +406,58 @@ ::v-deep.my-have-todo { // 搜索区域 .searchContainer{ .searchButton{ width: 91%; margin: vww(16) auto; .u-collapse { .u-collapse-item { .u-collapse-item__content { .searchButton { width: 100%; margin: 0 auto; display: flex; .u-button{ width:30%; } } .searchBox { width: 91%; width: 100%; display: flex; justify-content: space-between; margin: vww(16) auto; margin:0 auto vww(16); .search { width: vww(160); width: vww(150); border: 1px solid #d1d1d1; border-radius: vww(4); .u-search { .u-search__content { height: 40px; background-color: #ffffff !important; .u-search__content__icon { width: 10px; height: 5.5px; } .u-search__content__close { width: 16px !important; height: 16px !important; background-color: #cccccc !important; .u-icon { .u-icon__icon { font-size: 10px !important; } } } .u-search__content__input { background-color: #ffffff !important; .uni-input-placeholder{ color:#CCCCCC!important; } @@ -330,26 +465,30 @@ } } } // 下拉菜单 .data-selet { border: 1px solid #d1d1d1; border-radius: 4px; width: vww(160); width: vww(150); // width: 100%; height: 40px; display: flex; align-items: center; font-size: 13px; color: #CCCCCC; .uni-select__icon { display: flex; align-content: center; margin: 0 10px; image { width: 10px; height: 5.5px; } } .content { margin-left: vww(8); width: vww(150); @@ -359,13 +498,15 @@ // 时间搜索 .timeContiner { width: 91%; width: 100%; margin: 0 auto vww(16); display: flex; flex-direction: row; justify-content: space-between; .uni-date { width: vww(160); width: vww(150); .uni-date-editor { .uni-date-editor--x { .uni-date-x { @@ -379,28 +520,32 @@ } } } .uni-date-x--border{ border: 1px solid #d1d1d1!important; } } } } } } } } // 卡片中间 .center-container { display: flex; flex-direction: column; .center-content__one { display: flex; view { width: 50%; } } .center-content__two { display: flex; // margin: vww(10) 0; @@ -408,15 +553,19 @@ width: 50%; } } .center-content__three { display: flex; view { width: 50%; } } .center-content__four { } } // 中间部分样式 .center-margin { margin-bottom: vww(16); @@ -427,17 +576,21 @@ .bottom-content__item { display: flex; justify-content: space-around; view { display: flex; justify-content: center; align-content: center; margin-right: vww(10); &:nth-last-child() { &:nth-last-child(1) { margin-right: 0; } view { display: inline-block; } image { width: vww(16); height: vww(16); @@ -457,15 +610,19 @@ align-items: center; justify-content: space-between; background-color:#F5F5F5; .bottomTabbar_checkBox{ margin-left:vww(16); .u-checkbox-group{ .u-checkbox{ } } } .bottomTabbar_button{ display:flex; .u-button{ font-size:13px; margin-right:vww(14); pages/my-todo/my-todo.vue
@@ -2,10 +2,21 @@ <!-- 我的待办 --> <view class="my-todo"> <!-- 搜索区域 --> <view class="searchContainer"> <u-collapse :border="true" @change="searchChange" @close="searchChange" @open="searchOpen" > <u-collapse-item :border="false" title="搜索框" name="Docs guide" > <view class="searchBox"> <view class="search"> <u-search @clickIcon="searchIconClick" :clearabled="true" :showAction="false" placeholder="请输入标题" v-model="todoParams.title" shape="square"></u-search> <u-search @clickIcon="searchIconClick" :clearabled="true" :showAction="false" placeholder="请输入标题" v-model="todoParams.title" shape="square"></u-search> </view> <!-- 状态选择器 --> <!-- <view class="data-selet" @click="statusSeletShow = true"> @@ -15,21 +26,27 @@ <view class="uni-select__icon"><image src="@/static/icon/select.png" mode="加载失败"></image></view> </view> --> <view class="search"> <u-search @clickIcon="searchIconClick" :clearabled="true" :showAction="false" placeholder="请输入任务名称" v-model="todoParams.name" shape="square"></u-search> <u-search @clickIcon="searchIconClick" :clearabled="true" :showAction="false" placeholder="请输入任务名称" v-model="todoParams.name" shape="square"></u-search> </view> </view> <!-- 时间搜索区域 --> <view class="timeContiner"> <uni-datetime-picker class="time-picker" type="date" :clear-icon="true" v-model="todoParams.startDate" @change="startDateChange" placeholder="开始时间" /> <uni-datetime-picker class="time-picker" type="date" :clear-icon="true" v-model="todoParams.endDate" @change="endDateChange" placeholder="结束时间" /> <uni-datetime-picker class="time-picker" type="date" :clear-icon="true" v-model="todoParams.startDate" @change="startDateChange" placeholder="开始时间"/> <uni-datetime-picker class="time-picker" type="date" :clear-icon="true" v-model="todoParams.endDate" @change="endDateChange" placeholder="结束时间"/> </view> <view class="searchButton"> <u-button type="primary" text="搜索" @click="searchButtonClick"></u-button> <u-button type="primary" text="清空" :plain="true" @click="emptyButtonClick"></u-button> </view> </u-collapse-item> </u-collapse> </view> <!-- 我的待办卡片区域 --> <u-checkbox-group v-model="checkBoxValue" placement="column" @change="checkboxChange" style="margin-bottom:50px"> @@ -63,10 +80,10 @@ <view class="bottom-container"> <!-- 待办按钮 --> <view class="bottom-content__item"> <!-- <view @click="theFormDataClick"> <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'"> <image src="@/static/home/jindu.png" mode=""></image> <view>申请详情</view> </view> --> </view> <view @click="adopClick(item)"> <image src="@/static/home/tongguo.png" mode=""></image> <view>通过</view> @@ -100,17 +117,22 @@ <!-- 通过模态框 --> <view class="adoptModal"> <u-modal width="684rpx" :show="adoptModalShow" title="审批通过" :showCancelButton="true" @confirm="adoptModalConfirm" @cancel="adoptModalCancel"> <view class="slot-content"><view class="rejectMesaage"> <u-modal width="684rpx" :show="adoptModalShow" title="审批通过" :showCancelButton="true" @confirm="adoptModalConfirm" @cancel="adoptModalCancel"> <view class="slot-content"> <view class="rejectMesaage"> <u-icon name="info-circle-fill" color="#0307ff"></u-icon> <text>{{ modalType == 0 ? '注意：将默认分配给节点设定的所有可审批用户' : '注意：所有流程将驳回至发起人' }}</text> </view><u--textarea v-model="adoptForm.comment" placeholder="请输入审批意见"></u--textarea></view> </view> <u--textarea v-model="adoptForm.comment" placeholder="请输入审批意见"></u--textarea> </view> </u-modal> </view> <!-- 驳回模态框 --> <view class="rejectModal"> <u-modal width="684rpx" :show="rejectModalShow" title="驳回" :showCancelButton="true" @confirm="rejectModalConfirm" @cancel="rejectModalCancel"> <u-modal width="684rpx" :show="rejectModalShow" title="驳回" :showCancelButton="true" @confirm="rejectModalConfirm" @cancel="rejectModalCancel"> <view class="slot-content"> <view class="rejectMesaage"> <u-icon name="info-circle-fill" color="#0307ff"></u-icon> @@ -155,6 +177,9 @@ </u-modal> </view> --> <!--返回顶部--> <u-back-top :scroll-top="scrollTop"></u-back-top> <!-- 菜单栏 --> <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu> </view> @@ -163,9 +188,11 @@ <script> import popupMenu from '@/components/common/popup-menu/popup-menu.vue'; import combinationCard from '@/components/common/combination-card/combination-card.vue'; export default { data() { return { scrollTop: 0, // 复选框 checkBoxValue:[], totalSelectValue:[], @@ -212,11 +239,15 @@ } }; }, // 返回顶部 onPageScroll(e) { this.scrollTop = e.scrollTop; }, onShow(){ if(this.menuShow == true){ this.$refs.menuRef.menuClick() } this.myApplication.pageNumber = 1; this.todoParams.pageNumber = 1; this.init(); }, // 点击导航栏菜单后 @@ -240,9 +271,6 @@ // 下拉加载 onPullDownRefresh() { console.log('refresh'); this.todoParams.pageNumber = 1; this.loadingType = 0; this.daibanData = []; setTimeout(()=> { uni.stopPullDownRefresh(); }, 1000); @@ -250,6 +278,9 @@ }, methods: { init(){ this.todoParams.pageNumber = 1; this.loadingType = 0; this.daibanData = []; // this.todoList(); this.getMoreNews(); }, @@ -262,13 +293,17 @@ // }); // }, getMoreNews() { if (this.loadingType !== 0) { if (this.loadingType != 0) { //loadingType!=0;直接返回 return false; } uni.showLoading({ title: "加载中..." }) this.loadingType = 1; uni.showNavigationBarLoading(); //显示加载动画 this.$reqGet('todoList', this.todoParams).then(res => { uni.hideLoading(); // if (res.code === 0) { // this.daibanData = res.data.content; // } @@ -284,9 +319,16 @@ return; } if(this.todoParams.name||this.todoParams.startTime||this.todoParams.endTime||this.todoParams.title){ this.daibanData = res.data.content if (this.todoParams.name != '' || this.todoParams.startDate != '' || this.todoParams.endDate != '' || this.todoParams.title != '') { if(this.todoParams.pageNumber == 1){ this.daibanData = res.data.content; } else{ this.daibanData = this.daibanData.concat(res.data.content); } } else { if(this.todoParams.pageNumber == 1){ this.daibanData = []; } this.daibanData = this.daibanData.concat(res.data.content); } //将数据拼接在一起 @@ -296,11 +338,14 @@ }, // 搜索点击 searchButtonClick(){ this.loadingType == 0; this.todoParams.pageNumber = 1; this.init(); }, // 清空 emptyButtonClick(){ this.loadingType == 0; this.todoParams.pageNumber = 1; this.todoParams.name = ''; this.todoParams.title = ''; this.todoParams.startDate = ''; @@ -324,6 +369,15 @@ // console.log(this.queryRealTimeShippingData); // this.realTimeShipping(); // }); }, searchChange(e){ console.log('e', e); }, searchClose(e){ console.log('e', e); }, searchOpen(e){ console.log('e', e); }, // 搜索 searchIconClick() { @@ -351,9 +405,9 @@ console.log('totalSelect',n); }, // 表单数据 theFormDataClick() { theFormDataClick(v) { uni.navigateTo({ url: '/pages/the-form-data/the-form-data' url: `/pages/the-form-data/the-form-data?index=${v}` }); }, // 审批历史 @@ -437,34 +491,58 @@ ::v-deep.my-todo { // 搜索区域 .searchContainer{ .searchButton{ width:91%; margin: vww(16) auto; .u-collapse { .u-collapse-item { .u-collapse-item__content { .searchButton { width: 100%; margin: 0 auto; display:flex; .u-button{ width:30%; } } // 条件搜索 .searchBox { width: 91%; width: 100%; display: flex; justify-content: space-between; margin: vww(16) auto; margin: 0 auto vww(16); .search { width: vww(160); width: vww(150); border: 1px solid #d1d1d1; border-radius: vww(4); .u-search { .u-search__content { height: 38px; background-color: #ffffff !important; .u-search__content__icon { width: 10px; height: 5.5px; } .u-search__content__close { width: 16px !important; height: 16px !important; background-color: #cccccc !important; .u-icon { .u-icon__icon { font-size: 10px !important; } } } .u-search__content__input { background-color: #ffffff !important; .uni-input-placeholder{ color:#CCCCCC!important; } @@ -472,41 +550,48 @@ } } } // 下拉菜单 .data-selet { border: 1px solid #d1d1d1; border-radius: 4px; width: vww(160); width: vww(150); // width: 100%; height: 40px; display: flex; align-items: center; font-size: 13px; color: #CCCCCC; .uni-select__icon { display: flex; align-content: center; margin: 0 10px; image { width: 10px; height: 5.5px; } } .content { margin-left: vww(8); width: vww(150); } } } // 时间搜索 .timeContiner { width: 91%; width: 100%; margin: 0 auto vww(16); display: flex; flex-direction: row; justify-content: space-between; .uni-date { width: vww(160); width: vww(150); .uni-date-editor { .uni-date-editor--x { .uni-date-x { @@ -520,29 +605,34 @@ } } } .uni-date-x--border{ border: 1px solid #d1d1d1!important; } } } } } } } } // 卡片中间 .center-container { display: flex; flex-direction: column; .center-content__one { display: flex; view { width: 50%; } } .center-content__two { display: flex; // margin: vww(10) 0; @@ -550,15 +640,19 @@ width: 50%; } } .center-content__three { display: flex; view { width: 50%; } } .center-content__four { } } // 中间部分样式 .center-margin { margin-bottom: vww(16); @@ -569,17 +663,21 @@ .bottom-content__item { display: flex; justify-content: space-around; view { display: flex; justify-content: center; align-content: center; margin-right: vww(10); &:nth-last-child() { &:nth-last-child(1) { margin-right: 0; } view { display: inline-block; } image { width: vww(16); height: vww(16); @@ -599,15 +697,19 @@ align-items: center; justify-content: space-between; background-color: #f5f5f5; .bottomTabbar_checkBox { margin-left: vww(16); .u-checkbox-group { .u-checkbox { } } } .bottomTabbar_button { display: flex; .u-button { font-size: 13px; margin-right: vww(14); @@ -628,14 +730,17 @@ border: 1px solid #0307ff; border-radius: vww(4); font-size: 13px; text { margin-left: vww(5); } } .u-textarea { margin-top:vww(10); width: vww(280); height: vww(90) !important; .uni-textarea-wrapper { height: vww(90) !important; } @@ -647,20 +752,24 @@ .rejectModal { .slot-content { display: inline-block; .rejectMesaage { display: flex; padding: vww(3); border: 1px solid #0307ff; border-radius: vww(4); font-size: 13px; text { margin-left: vww(5); } } .u-textarea { margin-top:vww(10); width: vww(280); height: vww(90) !important; .uni-textarea-wrapper { height: vww(90) !important; } @@ -668,9 +777,11 @@ .rejectBack { margin-top:vww(24); .rejectBack-title { font-size: vww(13); } // 下拉菜单 .data-selet { border: 1px solid #d1d1d1; @@ -682,15 +793,18 @@ font-size: 13px; color: #666; margin-top:vww(8); .uni-select__icon { display: flex; align-content: center; margin: 0 10px; image { width: 10px; height: 5.5px; } } .content { margin-left: vww(8); width: vww(280); pages/new-application-form-data/new-application-form-data.vue
@@ -363,7 +363,7 @@ <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 class="addContractConfirm"><u-button :text="editApplicationIndex != null ? '添加修改':'添加'" type="primary" @click="addContractSanConfirm"></u-button></view> </view> <!-- 选择煤厂 --> @@ -540,12 +540,12 @@ <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.balanceTotal == null ? 0 :accountDetails.balanceTotal.toFixed(2) }},承兑余额：{{ 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"><u-icon name="edit-pen" color="#2979ff" size="35"></u-icon></view> <view class="cardListIcon" @click="editApplicationClick(index)"><u-icon name="edit-pen" color="#2979ff" size="35"></u-icon></view> <view class="cardList-container"> <view class="cardList_item"> 收货人： @@ -785,25 +785,25 @@ 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 // 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 }, dust: null, // 抑尘费 trainfreight: {}, //路运运费 @@ -825,7 +825,8 @@ { text: '删除' } ] ], editApplicationIndex:null }; }, onShow() { @@ -1304,6 +1305,8 @@ // 添加合同弹出框 addContractClose() { this.addContractShow = false; this.addContractFormdata = {}; this.editApplicationIndex = null; }, addContractOpen() { console.log('添加订单打开'); @@ -1317,6 +1320,7 @@ }, // 选择的煤厂 coalFiledSelectClick(e) { console.log('选择的煤厂',e); this.addContractFormdata.compName = e.compName; this.addContractFormdata.filedName = e.name; this.addContractFormdata.compId = e.compId; @@ -1324,6 +1328,13 @@ this.addContractFormdata.fromStation = e.toStation; this.selectCoalFiledData = e; // 获取价格参数 this.getNewPriceData.compId = e.compId; this.getNewPriceData.compName = e.compName; this.getNewPriceData.filedId = e.id; this.getNewPriceData.filedName = e.name; this.coalFiledSelectShow = false; }, @@ -1405,7 +1416,7 @@ // this.currentCoal.type = 1; // } this.addContractFormdata.modifyId = data.modifyId; this.addContractFormdata.id = data.id; // this.addContractFormdata.id = data.id; } else { uni.$u.toast('煤种价格未设置'); } @@ -1477,11 +1488,14 @@ }, addContractSanConfirm() { if (this.addContractFormdata.compId && this.addContractFormdata.customerId && this.addContractFormdata.filedId) { if(this.editApplicationIndex != null){ this.newFormData.contractOrders[this.editApplicationIndex] = this.addContractFormdata; } else { this.newFormData.contractOrders.push(this.addContractFormdata); console.log('添加子订单',this.addContractFormdata); this.$nextTick(() => { this.addContractShow = false; }); } this.addContractShow = false;// 关闭弹出框 console.log('this.newFormData.contractOrders当前关闭后',this.newFormData.contractOrders) } else { uni.$u.toast('请规范输入所有信息'); } @@ -1607,6 +1621,11 @@ console.log('删除订单卡片', e); this.newFormData.contractOrders.splice(e, 1); }, editApplicationClick(index){ this.editApplicationIndex = index; this.addContractFormdata = this.newFormData.contractOrders[index]; this.addContractShow = true; }, xswaybill() { console.log('新建发运申请', this.newFormData); uni.showLoading({ @@ -1616,17 +1635,19 @@ uni.hideLoading(); console.log('新建发运申请', res); if (res.code == 0) { uni.showToast({ title: '添加成功！', icon: 'success', duration: 2000 }); this.$nextTick(() => { // uni.showToast({ // title: '添加成功！', // icon: 'success', // duration: 1000 // }); this.$u.toast('添加成功，即将返回申请页！！！') setTimeout(() => { uni.navigateBack({ // url: '/pages/my-application/my-application' delta: 2 }); }); },2000) } }); }, static/iconfont/iconfont.css
@@ -3,7 +3,7 @@ /* src: url('iconfont.woff2?t=1655880761622') format('woff2'), url('iconfont.woff?t=1655880761622') format('woff'), url('iconfont.ttf?t=1655880761622') format('truetype'); */ src:url('/static/iconfont.ttf')format('truetype'); src:url('@/static/iconfont/iconfont.ttf')format('truetype'); }
@@ -90,17 +90,19 @@ // 请求拦截 const fetch = (url, opt ,urlParam) => { let baseUrl = 'http://192.168.3.159:9999'; let urls = (api[opt.url]?.url || api[url]?.url || jihua[opt.url]?.url || jihua[url]?.url); let params = opt.params ? ('?' + Object.keys(opt.params).map(key => key + '=' + opt.params[key]).join('&')) : ''; opt.url = urlParam ? urls + `/${urlParam}` + params : urls + params opt.url = urlParam ? baseUrl + urls + `/${urlParam}` + params : baseUrl + urls + params opt.method = opt.method || "GET"; var header = {} if (uni.getStorageSync('access_token')) { header = { "TENANT-ID": 5, Authorization: 'Bearer ' + uni.getStorageSync('access_token'), VERSION: "zzl" VERSION: "zzl", Accept:'application/json, text/plain, */*' // 客户端所能接受的数据类型 } }
