north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -8,6 +8,7 @@ import useUserInfoStore from '@/stores/userInfo' import companyInfo from "@/stores/sd/companyInfo" import SelectProduct from "@/views/sd/product/SelectProduct.vue" import CreateProduct from "@/views/sd/product/CreateProduct.vue" import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue" import OrderSizeCheck from "@/components/sd/order/OrderSizeCheck.vue" import {changeFilterEvent,filterChanged} from "@/hook" @@ -1449,6 +1450,18 @@ xGrid.value.clearSelected() } //切换产品界面 const productFlag = ref(true) const changeProduct = (val)=>{ productFlag.value = val } const closeProductDialog = ()=>{ productFlag.value = true } //改变产品页面切换 const changePage = () => { productFlag.value = true } </script> <template> @@ -1625,8 +1638,22 @@ :autosize="{ minRows: 2, maxRows: 20 }" /> </el-dialog> <el-dialog id="product" v-model="productVisible" style="width: 80%;height:75% "> <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" /> <el-dialog id="product" class="product1" v-model="productVisible" @closed="closeProductDialog" style="width: 80%;height:75%; "> <template #header > <div class="my-header"> <el-button @click="changeProduct(true)">查询</el-button> <el-button @click="changeProduct(false)">创建</el-button> </div> </template> <select-product v-if="productFlag" :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" /> <create-product v-else :productFlag="productFlag" @changePage="changePage" style="text-align: left;background-color: #D5EAFF;"/> </el-dialog> <!--误差结算--> <el-dialog v-model="errorAreaVisible" style="width: 300px;height:150px "> @@ -1692,7 +1719,7 @@ .el-col{ border: #181818 1px solid; } :deep(.el-input__wrapper) { :deep(:not(class='product') .el-input__wrapper) { box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset; cursor: default; border: none !important; @@ -1722,5 +1749,9 @@ height: 90%; width: 100%; } .my-header { display: flex; /*flex-direction : row; justify-content: space-between;*/ } </style> north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
@@ -14,6 +14,14 @@ const router = useRouter() const route = useRoute() let userInfo = useUserInfo() let props = defineProps({ productFlag:null }) let emit = defineEmits([ 'getProductRow' ]) const disposeList = $ref([ t('product.coloredGlaze'), t('product.frostedSand'), @@ -162,10 +170,17 @@ } const saveProducts=(product)=>{ if(props.productFlag===false){ product.title.state = 1 } request.post(`/product/saveProduct`,product).then((res) =>{ if(res.code==200){ ElMessage.success(t('product.msg.saveSuccess')) router.push("/main/product/selectProduct") if(props.productFlag===false){ emit('changePage') }else{ router.push("/main/product/selectProduct") } } }) } north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
@@ -280,7 +280,7 @@ } let emit = defineEmits([ 'getProductRow' 'changePage' ]) const emitParent = (row,type) => { @@ -310,7 +310,12 @@ onUnmounted(() => { clearTimeout(initTime) if (sortable2) { sortable2.destroy() try{ sortable2.destroy() } catch (e){ } } }) north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
@@ -6,8 +6,6 @@ import com.example.erp.service.sd.ProductService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.example.erp.common.Constants; import com.example.erp.entity.sd.Order; import com.example.erp.entity.sd.Product; import com.example.erp.entity.sd.ProductDetail; import com.example.erp.exception.ServiceException;