|
|
@@ -421,7 +421,6 @@
|
|
|
<el-form :model="formData.data" :rules="rulesShippingPackage" ref="shippingPackage">
|
|
|
<div style="font-weight: 700; margin: 20px 0 10px 0">发货包装</div>
|
|
|
<div style="margin-bottom: 10px">
|
|
|
- <el-button type="primary" size="small" @click="clickSelectAssembly()">选择常用组合</el-button>
|
|
|
<el-button type="primary" size="small" @click="clickExpressPacking()">选择快递物流包材</el-button>
|
|
|
</div>
|
|
|
<el-table :data="formData.data.orderPackageBomList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
|
|
|
@@ -489,33 +488,13 @@
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<template #footer>
|
|
|
- <el-button type="primary" @click="clickSaveAssembly" v-preReClick>保存常用组合</el-button>
|
|
|
<el-button @click="openShippingPackage = false" v-preReClick>关 闭</el-button>
|
|
|
<el-button type="primary" @click="clickSaveShippingPackage" v-preReClick>提交订单</el-button>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog title="保存常用组合" v-if="openAssembly" v-model="openAssembly" width="500">
|
|
|
- <el-form :model="formShippingPackage.data" :rules="rulesAssembly" ref="assembly">
|
|
|
- <el-form-item label="组合名称" prop="assemblyName">
|
|
|
- <el-input v-model="formShippingPackage.data.assemblyName" placeholder="请输入组合名称" />
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- <template #footer>
|
|
|
- <el-button @click="openAssembly = false">关 闭</el-button>
|
|
|
- <el-button type="primary" @click="submitAssembly" v-preReClick>保 存</el-button>
|
|
|
- </template>
|
|
|
- </el-dialog>
|
|
|
-
|
|
|
- <el-dialog title="选择常用组合" v-if="openSelectAssembly" v-model="openSelectAssembly" width="700">
|
|
|
- <SelectAssembly @selectAssembly="selectAssembly"></SelectAssembly>
|
|
|
- <template #footer>
|
|
|
- <el-button @click="openSelectAssembly = false">关 闭</el-button>
|
|
|
- </template>
|
|
|
- </el-dialog>
|
|
|
-
|
|
|
<el-dialog title="选择快递包装" v-if="openExpressPacking" v-model="openExpressPacking" width="90%">
|
|
|
- <SelectBOM :selectStatus="true" :expressStatus="true" @selectBOM="selectExpressPacking"></SelectBOM>
|
|
|
+ <SelectBOM :selectStatus="true" :bomClassifyIdList="[2, 3]" @selectBOM="selectExpressPacking"></SelectBOM>
|
|
|
<template #footer>
|
|
|
<el-button @click="openExpressPacking = false">关 闭</el-button>
|
|
|
</template>
|
|
|
@@ -565,7 +544,6 @@ import SelectBOM from "/src/views/group/BOM/management/index";
|
|
|
import useTagsViewStore from "/src/store/modules/tagsView";
|
|
|
import SelectPicture from "/src/components/select-picture/index.vue";
|
|
|
import refreshStore from "/src/store/modules/refresh";
|
|
|
-import SelectAssembly from "/src/components/selectAssembly/index";
|
|
|
|
|
|
const { proxy } = getCurrentInstance();
|
|
|
const router = useRouter();
|
|
|
@@ -1324,55 +1302,6 @@ const clickSaveShippingPackage = () => {
|
|
|
}
|
|
|
});
|
|
|
};
|
|
|
-const openAssembly = ref(false);
|
|
|
-const rulesAssembly = ref({
|
|
|
- assemblyName: [{ required: true, message: "请输入组合名称", trigger: "blur" }],
|
|
|
-});
|
|
|
-const clickSaveAssembly = () => {
|
|
|
- if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
|
|
|
- formData.data.assemblyName = "";
|
|
|
- openAssembly.value = true;
|
|
|
- } else {
|
|
|
- return ElMessage("请添加快递物流包材");
|
|
|
- }
|
|
|
-};
|
|
|
-const submitAssembly = () => {
|
|
|
- proxy.$refs.assembly.validate((valid) => {
|
|
|
- if (valid) {
|
|
|
- proxy
|
|
|
- .post("/packagingAssembly/add", { name: formShippingPackage.data.assemblyName, packagingAssemblyBomList: formData.data.orderPackageBomList })
|
|
|
- .then(() => {
|
|
|
- ElMessage({ message: "保存成功!", type: "success" });
|
|
|
- openAssembly.value = false;
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
-};
|
|
|
-const openSelectAssembly = ref(false);
|
|
|
-const clickSelectAssembly = () => {
|
|
|
- openSelectAssembly.value = true;
|
|
|
-};
|
|
|
-const selectAssembly = (item) => {
|
|
|
- if (item.id) {
|
|
|
- proxy.post("/packagingAssembly/getPackagingBomList", { id: item.id }).then((res) => {
|
|
|
- if (res && res.length > 0) {
|
|
|
- formData.data.orderPackageBomList = res.map((resItem) => {
|
|
|
- return {
|
|
|
- bomSpecId: resItem.id,
|
|
|
- code: resItem.code,
|
|
|
- name: resItem.name,
|
|
|
- internalSellingPrice: resItem.internalSellingPrice,
|
|
|
- quantity: undefined,
|
|
|
- };
|
|
|
- });
|
|
|
- }
|
|
|
- ElMessage({ message: "选择完成", type: "success" });
|
|
|
- openSelectAssembly.value = false;
|
|
|
- });
|
|
|
- } else {
|
|
|
- return ElMessage("选择失败,请重新选择");
|
|
|
- }
|
|
|
-};
|
|
|
const openExpressPacking = ref(false);
|
|
|
const clickExpressPacking = () => {
|
|
|
openExpressPacking.value = true;
|
lxf