Merge pull request 'develop-virtualRecord' (#2) from develop-virtualRecord into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-app/pulls/2
This commit is contained in:
wuteng
commit
17812e7aac
@ -100,43 +100,43 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure" :okCloseModal="false">
|
<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure" :okCloseModal="false">
|
||||||
<view v-if="costModal.show">
|
<view v-if="costModal.show">
|
||||||
<tpx-select v-model:value="tempObject.value.currency" :list="costRateList"
|
<tpx-select v-model:value="tempObject.value.currency" :list="costRateList"
|
||||||
@onChange="handleCurrencyChange" mode="drop"
|
@onChange="handleCurrencyChange" mode="drop"
|
||||||
>
|
>
|
||||||
<u-row custom-style="gap: 20rpx;margin-top:10rpx;" justify="between">
|
<u-row custom-style="gap: 20rpx;margin-top:10rpx;" justify="between">
|
||||||
<text class="font-26 label-text">币种</text>
|
<text class="font-26 label-text">币种</text>
|
||||||
<tpx-text-dic :value="tempObject.value.currency" :list="costRateList"></tpx-text-dic>
|
<tpx-text-dic :value="tempObject.value.currency" :list="costRateList"></tpx-text-dic>
|
||||||
</u-row>
|
</u-row>
|
||||||
</tpx-select>
|
</tpx-select>
|
||||||
<u-row custom-style="gap: 20rpx;margin-top:30rpx;">
|
<u-row custom-style="gap: 20rpx;margin-top:30rpx;">
|
||||||
<u-row custom-style="flex: 1">
|
<u-row custom-style="flex: 1">
|
||||||
<text class="font-26 label-text">首重费</text>
|
<text class="font-26 label-text">首重费</text>
|
||||||
<tpx-input v-model:value="tempObject.value.initialWeightFee" _digit="4" :isWhite="true"
|
<tpx-input v-model:value="tempObject.value.initialWeightFee" _digit="4" :isWhite="true"
|
||||||
custom-style="width: 120rpx;height: 46rpx;" :suffix="tempObject.value.currency"></tpx-input>
|
custom-style="width: 120rpx;height: 46rpx;" :suffix="tempObject.value.currency"></tpx-input>
|
||||||
</u-row>
|
</u-row>
|
||||||
<u-row custom-style="flex: 1">
|
<u-row custom-style="flex: 1">
|
||||||
<text class="font-26 label-text">续重单价</text>
|
<text class="font-26 label-text">续重单价</text>
|
||||||
<tpx-input v-model:value="tempObject.value.addWeightPrice" _digit="4" :isWhite="true"
|
<tpx-input v-model:value="tempObject.value.addWeightPrice" _digit="4" :isWhite="true"
|
||||||
custom-style="width: 120rpx;height: 46rpx;" :suffix="tempObject.value.currency"></tpx-input>
|
custom-style="width: 120rpx;height: 46rpx;" :suffix="tempObject.value.currency"></tpx-input>
|
||||||
</u-row>
|
</u-row>
|
||||||
</u-row>
|
</u-row>
|
||||||
<u-row style="margin-top:30rpx;" justify="between">
|
<u-row style="margin-top:30rpx;" justify="between">
|
||||||
<u-row custom-style="width:300rpx;">
|
<u-row custom-style="width:300rpx;">
|
||||||
<text class="label-text">应收</text>
|
<text class="label-text">应收</text>
|
||||||
<tpx-input v-model:value="tempObject.value.fee" _digit="4" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
|
<tpx-input v-model:value="tempObject.value.fee" _digit="4" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
|
||||||
:suffix="tempObject.value.currency"></tpx-input>
|
:suffix="tempObject.value.currency"></tpx-input>
|
||||||
</u-row>
|
</u-row>
|
||||||
<u-row custom-style="width:300rpx;">
|
<u-row custom-style="width:300rpx;">
|
||||||
<text :class="`font-26 label-text label-text-required `">实收</text>
|
<text :class="`font-26 label-text label-text-required `">实收</text>
|
||||||
<tpx-input v-model:value="tempObject.value.realFee" _digit="4" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
|
<tpx-input v-model:value="tempObject.value.realFee" _digit="4" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
|
||||||
:suffix="tempObject.value.currency"></tpx-input>
|
:suffix="tempObject.value.currency"></tpx-input>
|
||||||
</u-row>
|
</u-row>
|
||||||
</u-row>
|
</u-row>
|
||||||
<view class="mt-30">
|
<view class="mt-30">
|
||||||
<tpx-input v-model:value="tempObject.value.remark" placeholder="费用描述" isWhite="true"></tpx-input>
|
<tpx-input v-model:value="tempObject.value.remark" placeholder="费用描述" isWhite="true"></tpx-input>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</buns-edit-sheet>
|
</buns-edit-sheet>
|
||||||
</template>
|
</template>
|
||||||
@ -174,6 +174,7 @@
|
|||||||
sendSiteCode: this.$store.getters.userInfo.ownerSiteCode,
|
sendSiteCode: this.$store.getters.userInfo.ownerSiteCode,
|
||||||
dispatchUnderlingSiteCode: info.dispatchUnderlingSiteCode,
|
dispatchUnderlingSiteCode: info.dispatchUnderlingSiteCode,
|
||||||
custNo: info.custNo,
|
custNo: info.custNo,
|
||||||
|
startSiteCode: info.startSiteCode,
|
||||||
}
|
}
|
||||||
return param
|
return param
|
||||||
}
|
}
|
||||||
|
|||||||
@ -97,13 +97,13 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view v-show="submitParam.pickupMethod == 1" class="yunf-input-item">
|
<view v-show="submitParam.pickupMethod == 1" class="yunf-input-item">
|
||||||
<tpx-select v-model:value="submitParam.operateEmployeeCode" v-model:resObject="caozuoRes" v-model:text="submitParam.operateEmployeeName" :getListFun="getOpStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" placeholder="请选择操作员">
|
<tpx-select v-model:value="submitParam.operateEmployeeCode" v-model:resObject="caozuoRes" v-model:text="submitParam.operateEmployeeName" :getListFun="getOpStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" :searchParam="operateEmployeeSearchParam" placeholder="请选择操作员">
|
||||||
<tpx-text-item label="操作员" :value="submitParam.operateEmployeeName"></tpx-text-item>
|
<tpx-text-item label="操作员" :value="submitParam.operateEmployeeName"></tpx-text-item>
|
||||||
</tpx-select>
|
</tpx-select>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view v-show="submitParam.pickupMethod == 2" class="yunf-input-item">
|
<view v-show="submitParam.pickupMethod == 2" class="yunf-input-item">
|
||||||
<tpx-select v-model:value="submitParam.takePieceEmployeeCode" v-model:resObject="shoupaiRes" v-model:text="submitParam.takePieceEmployeeName" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" placeholder="请选择收派员">
|
<tpx-select v-model:value="submitParam.takePieceEmployeeCode" v-model:resObject="shoupaiRes" v-model:text="submitParam.takePieceEmployeeName" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" :searchParam="takePieceEmployeeSearchParam" placeholder="请选择收派员">
|
||||||
<tpx-text-item label="收派员" :value="submitParam.takePieceEmployeeName"></tpx-text-item>
|
<tpx-text-item label="收派员" :value="submitParam.takePieceEmployeeName"></tpx-text-item>
|
||||||
</tpx-select>
|
</tpx-select>
|
||||||
</view>
|
</view>
|
||||||
@ -368,6 +368,16 @@
|
|||||||
sendSiteCode: this.submitParam.sendSiteCode,
|
sendSiteCode: this.submitParam.sendSiteCode,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
operateEmployeeSearchParam(){
|
||||||
|
return {
|
||||||
|
ownerSiteCode: this.submitParam.startSiteCode,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
takePieceEmployeeSearchParam(){
|
||||||
|
return {
|
||||||
|
ownerSiteCode: this.submitParam.startSiteCode,
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return this.getDefaultData()
|
return this.getDefaultData()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user