java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'pre-production'

master
pref_mail@163.com 5 months ago
parent
0a4a74a1e7 32dac02441
commit
6e8eedb54d
3 changed files with 32 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/views/distribution/inventory/BookingNote.vue
  2. 18
      src/views/distribution/inventory/CreateOrder.vue
  3. 44
      src/views/waybill/CreateZeroOrder.vue

8
src/views/distribution/inventory/BookingNote.vue
Unescape View File

@ -666,7 +666,10 @@
v-model="query.claimingValue"
></el-input-number>
</el-form-item>
<el-form-item label="回扣:">
</el-row>
<el-row>
<el-form-item label="回扣:" style="flex: none !important">
<el-input-number
readonly
:controls="false"
@ -677,9 +680,6 @@
v-model="query.rebate"
></el-input-number>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="安装费:">
<el-input-number
readonly

18
src/views/distribution/inventory/CreateOrder.vue
Unescape View File

@ -373,7 +373,7 @@
<el-input
v-model="query.consigneeAddress"
@change="e => handleRefreshText('consigneeAddress', e, '')"
placeholder="发货地址"
placeholder="收货地址"
></el-input>
</el-form-item>
</el-row>
@ -2362,9 +2362,6 @@ const onEditLoad = async () => {
val.goodsListOptions = [];
// 计算运费小计
// if (!val.subtotalFreight) handleComputed(val);
// 计算件数最大值
info.value.maxNum += val.num;
details.deepCloneGoodsList.push({ ...val });
@ -2453,7 +2450,6 @@ const initPageInfo = async (idsArr = []) => {
for (let index = 0; index < details.goodsList.length; index++) {
const element = details.goodsList[index];
// handleComputed(element);
handleFindGoods(element.goodsName, element);
}
@ -2772,7 +2768,7 @@ const handleComputed = (row: any, onlyComputedTrunline = false) => {
const { template, trunkLine } = details.priceTemplate;
if (Boolean(isDisabled.value && template && trunkLine))
handleSpecialBrandPrice(row, trunkLine, template);
handleSpecialBrandPrice(row, trunkLine, template, !onlyComputedTrunline);
details.query.goodsCode = '-' + details.totalObj.totalCount;
@ -4070,15 +4066,13 @@ const handleAssignmentItemPriceTrunkline = (value, trunkLine, template, chargeTy
};
/** 金牌 -- 干线特殊处理 */
const handleSpecialBrandPrice = (value, trunkLine, template) => {
const handleSpecialBrandPrice = (value, trunkLine, template, isInit) => {
if (!isDisabled.value) return;
console.log('isDisabled.value :>> ', isDisabled.value);
// 总件数小于15件 && 总方数小于0.8 && 总方数 / 总件数小于0.11 则按件计费, 否则以按方计费
const { totalCount, totalVolume } = details.totalObj;
if (totalCount < 15 && totalVolume < 0.8 && totalVolume / (totalCount || 1) < 0.11) {
if (value.chargeType === 1) return;
if (value.chargeType === 1 && !isInit) return;
value.chargeType = 1;
value.systemChargeType = 1;
@ -4126,7 +4120,7 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => {
value.freightPrice = _price;
}
} else {
if (value.chargeType === 2) return;
if (value.chargeType === 2 && !isInit) return;
value.chargeType = 2;
value.systemChargeType = 2;
@ -4410,7 +4404,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
if (!isOnload) {
if (trunkLine && template) {
// 如果品牌为金牌, 切模板选择为特殊计费则特殊处理
if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template);
if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template, true);
else handleAssignmentItemPriceTrunkline(value, trunkLine, template, chargeType);
// 是否为区分品类
} else {

44
src/views/waybill/CreateZeroOrder.vue
Unescape View File

@ -269,10 +269,10 @@
"
v-loading="details.loadingObj.consignerLoading"
>
<el-table-column prop="clientName" label="发货单位" width="130" />
<el-table-column prop="linkMan" label="发货人" width="130" />
<el-table-column prop="linkPhone" label="发货联系电话" width="130" />
<el-table-column prop="linkAddress" label="发货地址" width="200" />
<el-table-column prop="clientName" label="收货单位" width="130" />
<el-table-column prop="linkMan" label="收货人" width="130" />
<el-table-column prop="linkPhone" label="收货联系电话" width="130" />
<el-table-column prop="linkAddress" label="收货地址" width="200" />
</el-table>
</SelectBox>
</el-form-item>
@ -296,10 +296,10 @@
"
v-loading="details.loadingObj.consignerLoading"
>
<el-table-column prop="clientName" label="发货单位" width="130" />
<el-table-column prop="linkMan" label="发货人" width="130" />
<el-table-column prop="linkPhone" label="发货联系电话" width="130" />
<el-table-column prop="linkAddress" label="发货地址" width="200" />
<el-table-column prop="clientName" label="收货单位" width="130" />
<el-table-column prop="linkMan" label="收货人" width="130" />
<el-table-column prop="linkPhone" label="收货联系电话" width="130" />
<el-table-column prop="linkAddress" label="收货地址" width="200" />
</el-table>
</SelectBox>
</el-form-item>
@ -325,10 +325,10 @@
"
v-loading="details.loadingObj.consignerLoading"
>
<el-table-column prop="clientName" label="发货单位" width="130" />
<el-table-column prop="linkMan" label="发货人" width="130" />
<el-table-column prop="linkPhone" label="发货联系电话" width="130" />
<el-table-column prop="linkAddress" label="发货地址" width="200" />
<el-table-column prop="clientName" label="收货单位" width="130" />
<el-table-column prop="linkMan" label="收货人" width="130" />
<el-table-column prop="linkPhone" label="收货联系电话" width="130" />
<el-table-column prop="linkAddress" label="收货地址" width="200" />
</el-table>
</SelectBox>
</el-form-item>
@ -339,7 +339,7 @@
<el-input
@change="e => handleRefreshText('consigneeAddress', e, '')"
v-model="query.consigneeAddress"
placeholder="发货地址"
placeholder="收货地址"
></el-input>
</el-form-item>
</el-row>
@ -770,7 +770,10 @@
v-model="query.claimingValue"
></el-input-number>
</el-form-item>
<el-form-item label="回扣:">
</el-row>
<el-row>
<el-form-item label="回扣:" style="flex: none !important">
<el-input-number
:value-on-clear="0"
:controls="false"
@ -780,9 +783,6 @@
v-model="query.rebate"
></el-input-number>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="安装费:">
<el-input-number
:value-on-clear="0"
@ -2099,7 +2099,7 @@ const handleComputed = (row: any, onlyComputedTrunline = false) => {
const { template, trunkLine } = details.priceTemplate;
if (Boolean(isDisabled.value && template && trunkLine))
handleSpecialBrandPrice(row, trunkLine, template);
handleSpecialBrandPrice(row, trunkLine, template, !onlyComputedTrunline);
details.query.goodsCode = '-' + details.totalObj.totalCount;
@ -3193,14 +3193,14 @@ const handleAssignmentItemPriceTrunkline = (value, trunkLine, template, chargeTy
};
/** 金牌 -- 干线特殊处理 */
const handleSpecialBrandPrice = (value, trunkLine, template) => {
const handleSpecialBrandPrice = (value, trunkLine, template, isInit) => {
if (!isDisabled.value) return;
// 总件数小于15件 && 总方数小于0.8 && 总方数 / 总件数小于0.11 则按件计费, 否则以按方计费
const { totalCount, totalVolume } = details.totalObj;
if (totalCount < 15 && totalVolume < 0.8 && totalVolume / (totalCount || 1) < 0.11) {
if (value.chargeType === 1) return;
if (value.chargeType === 1 && !isInit) return;
value.chargeType = 1;
value.systemChargeType = 1;
@ -3251,7 +3251,7 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => {
value.freightPrice = _price;
}
} else {
if (value.chargeType === 2) return;
if (value.chargeType === 2 && !isInit) return;
value.chargeType = 2;
value.systemChargeType = 2;
@ -3540,7 +3540,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
if (!isOnload) {
if (trunkLine && template) {
// 如果品牌为金牌, 切模板选择为特殊计费则特殊处理
if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template);
if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template, true);
else handleAssignmentItemPriceTrunkline(value, trunkLine, template, chargeType);
// 是否为区分品类

Write Preview
Loading…
Cancel
Save