aike/emis-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uu

Browse Source
This commit is contained in:
aihe 2024-06-11 01:07:56 +08:00
parent a5c5426283
commit c15dbd1b5d
9 changed files with 98 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/api/user.js
View File

@ -9,5 +9,5 @@ export const getInfoByApp = (data = {})=> {
return coreRequest(url.getInfoByApp, data, {}, 'GET') return coreRequest(url.getInfoByApp, data, {}, 'GET')
} }
export const updatePwdByApp = (data = {})=> { export const updatePwdByApp = (data = {})=> {
return coreRequest(url.updatePwdByApp, data, {}) return coreRequest(url.updatePwdByApp, data, {}, 'GET')
} }

42
components/buns-post-edit-templates/bpe-cost-tmp.vue
View File

@ -32,31 +32,39 @@
<!-- 手动添加的才能删除 --> <!-- 手动添加的才能删除 -->
<u-row justify="between"> <u-row justify="between">
<view > <view >
<text class="">应收:</text> {{item.fee || 0}} <text class="font-weight font-30">{{item.feeName}}</text>
</view> </view>
<view v-if="item.blAutoGen == 0" @click="handleDelFee(index)" class="delicon"> <view v-if="item.blAutoGen == 0" @click="handleDelFee(index)" class="delicon">
<u-icon name="trash" size="32"></u-icon> <u-icon name="trash" size="32"></u-icon>
</view> </view>
</u-row> </u-row>
<u-row style="width:450rpx;margin-top:10rpx;">
<text class="font-26 pr-20">{{item.feeName}}</text>
<tpx-input v-model:value="item.realFee" @change="(val)=> { handleRlFeeChange(item, val) }" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
:disabled="modelInfo.blSpecialQuote != 1" suffix="CNY"></tpx-input>
</u-row>
<u-row custom-style="gap: 20rpx;margin-top:10rpx;"> <u-row custom-style="gap: 20rpx;margin-top:10rpx;">
<u-row custom-style="flex: 1">
<text class="font-26 pr-10">续重单价</text>
<tpx-input v-model:value="item.addWeightPrice" @change="(val)=> { handleAwPriceChange(item, val) }" _digit="5" :isWhite="true"
:disabled="modelInfo.blSpecialQuote != 1" custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
</u-row>
<u-row custom-style="flex: 1"> <u-row custom-style="flex: 1">
<text class="font-26 pr-10">首重费</text> <text class="font-26 pr-10">首重费</text>
<tpx-input v-model:value="item.initialWeightFee" @change="(val)=> { handleIwFeeChange(item, val) }" _digit="5" :isWhite="true" <tpx-input v-model:value="item.initialWeightFee" @change="(val)=> { handleIwFeeChange(item, val) }" _digit="5" :isWhite="true"
:disabled="modelInfo.blSpecialQuote != 1" custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input> :disabled="modelInfo.blSpecialQuote != 1" custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
</u-row> </u-row>
<u-row custom-style="flex: 1">
<text class="font-26 pr-10">续重单价</text>
<tpx-input v-model:value="item.addWeightPrice" @change="(val)=> { handleAwPriceChange(item, val) }" _digit="5" :isWhite="true"
:disabled="modelInfo.blSpecialQuote != 1" custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
</u-row>
</u-row> </u-row>
<view v-if="item.calcExp" class="mt-10"> <u-row style="margin-top:10rpx;" justify="between">
<view>
<text class="">应收:</text> {{item.fee || 0}}
</view>
<u-row custom-style="width:360rpx;">
<text class="font-26 pr-20">实收</text>
<tpx-input v-model:value="item.realFee" @change="(val)=> { handleRlFeeChange(item, val) }" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
:disabled="modelInfo.blSpecialQuote != 1" suffix="CNY"></tpx-input>
</u-row>
</u-row>
<!-- <view v-if="item.calcExp" class="mt-10">
<text class="">计算公式:</text> {{item.calcExp}} <text class="">计算公式:</text> {{item.calcExp}}
</view> -->
<view class="mt-20">
<tpx-input v-model:value="item.remark" :disabled="modelInfo.blSpecialQuote != 1" placeholder="费用描述" isWhite="true"></tpx-input>
</view> </view>
</view> </view>
@ -71,14 +79,12 @@
</tpx-select> </tpx-select>
<view class="pt-20"> <view class="pt-20">
<u-row custom-style="flex: 1" justify="between"> <u-row custom-style="flex:1;" justify="between">
<text class="font-26 pr-10">总费用</text> <text class="font-26 pr-10">总费用</text>
<view v-if="modelInfo.calcFeeType==3"> <view style="width: 360rpx;">
<tpx-input v-model:value="modelInfo.freight" :isWhite="true" _digit="5" <tpx-input v-model:value="modelInfo.freight" :isWhite="true" _digit="5"
inputAlign="right" custom-style="width: 460rpx;height: 46rpx;" suffix="CNY"></tpx-input> :disabled="modelInfo.calcFeeType!=3"
</view> inputAlign="right" custom-style="height: 46rpx;" suffix="CNY"></tpx-input>
<view v-else>
{{modelInfo.freight || 0}}<text class="clr-sub pl-10">CNY</text>
</view> </view>
</u-row> </u-row>
</view> </view>

2
components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
View File

@ -119,7 +119,7 @@
.yditem{ .yditem{
padding: 20rpx 20rpx; padding: 20rpx 20rpx;
// background-color: #F6F6F6; // background-color: #F6F6F6;
background-color: #e1e1e1; background-color: #F6F6F6;
border-radius: 10rpx; border-radius: 10rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }

63
components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
View File

@ -6,12 +6,7 @@
<!-- <view class="pt-10"> <!-- <view class="pt-10">
<text class="clr-sub pr-10">货物大类</text> {{modelInfo.goodsType}} <text class="clr-sub pr-10">货物大类</text> {{modelInfo.goodsType}}
</view> --> </view> -->
<view class="pt-10">
<u-row justify="">
<text class="clr-sub pr-10">包装类型</text>
<tpx-text-dic :value="modelInfo.packType" :list="dicData.emis_tab_packing_type"></tpx-text-dic>
</u-row>
</view>
</view> </view>
<view v-for="(item) in modelInfo.cargoList" class="yditem"> <view v-for="(item) in modelInfo.cargoList" class="yditem">
@ -20,21 +15,6 @@
</view> </view>
<u-row justify="between" custom-style="flex-wrap: wrap;"> <u-row justify="between" custom-style="flex-wrap: wrap;">
<u-col v-if="item.nationArea" span="6">
<view class="pt-5">
<text class="clr-sub pr-10">产地</text>{{item.nationArea}}
</view>
</u-col>
<u-col span="6">
<view class="pt-5">
<text class="clr-sub pr-10">件数</text> {{item.cargoQty}}
</view>
</u-col>
<u-col v-if="item.price" span="6">
<view class="pt-5">
<text class="clr-sub pr-10">单价</text>{{item.price}} CNY
</view>
</u-col>
<u-col span="12"> <u-col span="12">
<view class="pt-5"> <view class="pt-5">
<text class="clr-sub pr-10">尺寸</text> <text class="clr-sub pr-10">尺寸</text>
@ -43,12 +23,29 @@
{{item.length || '0'}}cm {{item.length || '0'}}cm
</view> </view>
</u-col> </u-col>
<u-col span="12"> <u-col v-if="item.nationArea" span="6">
<view class="pt-5"> <view class="pt-5">
<text class="clr-sub pr-10">体积</text> <text class="clr-sub pr-10">产地</text>{{item.nationArea}}
{{item.volume || '0'}}m³
</view> </view>
</u-col> </u-col>
<u-col span="12">
<u-row justify="between">
<view class="pt-5">
<text class="clr-sub pr-10">件数</text> {{item.cargoQty}}
</view>
<view class="pt-5">
<text class="clr-sub pr-10">体积</text>
{{item.volume || '0'}}m³
</view>
</u-row>
</u-col>
<u-col v-if="item.price" span="6">
<view class="pt-5">
<text class="clr-sub pr-10">单价</text>{{item.price}} CNY
</view>
</u-col>
</u-row> </u-row>
</view> </view>
@ -71,29 +68,29 @@
</view> </view>
<view class="sta-t-item"> <view class="sta-t-item">
<view class=""> <view class="">
<text class="font-weight">{{modelInfo.billWeight || '-'}}</text> <text class="font-weight">{{modelInfo.volumeWeight || '-'}}</text>
<text class="clr-sub">kg</text> <text class="clr-sub">kg</text>
</view> </view>
<view class="sta-lbl clr-sub">实际重量</view> <view class="sta-lbl clr-sub">体积重量</view>
</view> </view>
</u-row> </u-row>
</view> </view>
<view class="font-28 mt-20"> <view class="font-28 mt-20">
<u-row justify="space-between"> <u-row justify="space-between">
<view class="sta-t-item"> <!-- <view class="sta-t-item">
<view class=""> <view class="">
<text class="font-weight">{{modelInfo.totalWeight || '-'}}</text> <text class="font-weight">{{modelInfo.totalWeight || '-'}}</text>
<text class="clr-sub">kg</text> <text class="clr-sub">kg</text>
</view> </view>
<view class="sta-lbl clr-sub">总重量</view> <view class="sta-lbl clr-sub">总重量</view>
</view> </view> -->
<view class="sta-t-item"> <view class="sta-t-item">
<view class=""> <view class="">
<text class="font-weight">{{modelInfo.volumeWeight || '-'}}</text> <text class="font-weight">{{modelInfo.billWeight || '-'}}</text>
<text class="clr-sub">kg</text> <text class="clr-sub">kg</text>
</view> </view>
<view class="sta-lbl clr-sub">体积重量</view> <view class="sta-lbl clr-sub">实际重量</view>
</view> </view>
<view class="sta-t-item"> <view class="sta-t-item">
@ -105,6 +102,12 @@
</view> </view>
</u-row> </u-row>
</view> </view>
<view class="pt-30">
<u-row justify="">
<text class="clr-sub pr-10">包装类型</text>
<tpx-text-dic :value="modelInfo.packType" :list="dicData.emis_tab_packing_type"></tpx-text-dic>
</u-row>
</view>
</view> </view>
</template> </template>

6
components/tpx-input/tpx-input.vue
View File

@ -17,7 +17,11 @@
inputStyle(){ inputStyle(){
let bgColor = '#F6F6F6' let bgColor = '#F6F6F6'
let sty1 = 'border:0;border-radius: 10rpx;padding: 11rpx 20rpx;' let sty1 = 'border:0;border-radius: 10rpx;padding: 11rpx 20rpx;'
if(this.isWhite) { // if(this.isWhite) {
// bgColor = '#fff'
// sty1 += 'border: 1rpx solid #dadbde;'
// }
if(true) {
bgColor = '#fff' bgColor = '#fff'
sty1 += 'border: 1rpx solid #dadbde;' sty1 += 'border: 1rpx solid #dadbde;'
} }

10
pages/login/login.vue
View File

@ -56,7 +56,7 @@
data() { data() {
return { return {
submitParams: { submitParams: {
// isEncrypt: true, isEncrypt: true,
username: '', username: '',
password: '', password: '',
remberPassport: [] remberPassport: []
@ -80,8 +80,12 @@
const { submitParams } = this const { submitParams } = this
this.showLoading() this.showLoading()
try{ try{
await this.$store.dispatch(USERKEY.LOGIN, { ...submitParams, await this.$store.dispatch(USERKEY.LOGIN, {
// password: encrypt(submitParams.password) ...submitParams,
...(submitParams.isEncrypt ? {
password: encrypt(submitParams.password),
username: encrypt(submitParams.username),
} : {})
}) })
await this.$store.dispatch(USERKEY.GETUSERINFO) await this.$store.dispatch(USERKEY.GETUSERINFO)
setSessionLoginInfo(submitParams) setSessionLoginInfo(submitParams)

4
pages/post/model.js
View File

@ -154,5 +154,9 @@ export const getOrderModels = () => {
blSpecialQuote: 0, // 特殊报价 blSpecialQuote: 0, // 特殊报价
blSpecialGoods: 0, // 敏感物 blSpecialGoods: 0, // 敏感物
blGenSubbill: '1', // 生成子单
custOrderId: '', // 合同号
} }
} }

16
pages/post/openorder.vue
View File

@ -177,6 +177,22 @@
</tpx-select> </tpx-select>
</view> </view>
<view class="yunf-input-item">
<tpx-text-item label="生成子单">
<template v-slot:right>
<u-switch v-model="submitParam.blGenSubbill" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
</template>
</tpx-text-item>
</view>
<view class="yunf-input-item">
<tpx-text-item label="合同号">
<template v-slot:right>
<tpx-input v-model:value="submitParam.custOrderId" inputAlign="right"></tpx-input>
</template>
</tpx-text-item>
</view>
<view class="yunf-input-item"> <view class="yunf-input-item">
<tpx-text-item label="寄件短信"> <tpx-text-item label="寄件短信">
<template v-slot:right> <template v-slot:right>

8
pages/user/updatePassword.vue
View File

@ -35,9 +35,11 @@
<script> <script>
import { USERKEY } from "@/store/actionKey" import { USERKEY } from "@/store/actionKey"
import { encrypt } from "@/common/libs/jsencrypt_utils"
import * as apiService from "@/common/api" import * as apiService from "@/common/api"
import { checkParams } from "@/common/validate" import { checkParams } from "@/common/validate"
import { getSessionLoginInfo, setSessionLoginInfo } from "@/session" import { getSessionLoginInfo, setSessionLoginInfo } from "@/session"
export default { export default {
props: { props: {
}, },
@ -88,7 +90,11 @@
}, },
async handleSubmit() { async handleSubmit() {
let params = { ...this.submitParam } let params = {
...this.submitParam,
// oldPassword: encrypt(this.submitParam.oldPassword),
// newPassword: encrypt(this.submitParam.newPassword),
}
await checkParams(this.submitParam, this.submitValidConfig) await checkParams(this.submitParam, this.submitValidConfig)
await apiService.updatePwdByApp(params) await apiService.updatePwdByApp(params)
this.showToast("修改成功，请重新登录") this.showToast("修改成功，请重新登录")