north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -311,7 +311,7 @@ if ($grid) { switch (code) { case 'transferOrder': { if (checkedList.length !== 1) { if (checkedList.length == 0) { ElMessage.warning(t('workOrder.msgSelect')) return } north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -755,6 +755,8 @@ request.post(`/order/getOrderById/${str}`).then((res) => { if(res.code==200){ titleUploadData.value = res.data.order const customer = titleSelectJson.value.customer.filter(item => item.id === titleUploadData.value.customerId) projects.value = customer[0].projectList newOrderId.value=titleUploadData.value.orderId if(history.state.orderId!=null){ titleUploadData.value.orderId='' @@ -891,6 +893,7 @@ await request.get(`/basicData/orderBasicData`).then((res) => { if(res.code==200){ titleSelectJson.value=deepClone(res.data) console.log(res.data) if(val===0){ //其他金额 otherMoney.value = titleSelectJson.value.orderOtherMoney[0] @@ -1116,6 +1119,13 @@ reviewOrder(2) } let projects = ref([]) /*const changeProject = (val) => { titleUploadData.value.salesmanId = null titleUploadData.value.salesman = null }*/ const changeCustomer = () => { const changedCustomerId = titleUploadData.value.customerId const customer = titleSelectJson.value.customer.filter(item => item.id === changedCustomerId) @@ -1123,6 +1133,7 @@ titleUploadData.value.project = customer[0].project titleUploadData.value.salesmanId = customer[0].salesmanId titleUploadData.value.salesman = customer[0].salesman projects.value = customer[0].projectList } const changeSaleMan = () => { @@ -1480,7 +1491,18 @@ <div class="order-primary" style="background-color: white"> <el-row> <el-col :span="2"><el-text>*{{$t('order.project')}}：</el-text></el-col> <el-col :span="2"><el-input v-model.trim="titleUploadData.project"/></el-col> <el-col :span="2"> <!-- <el-input v-model.trim="titleUploadData.project"/>--> <el-select v-model.trim="titleUploadData.project" @change="changeProject" clearable placeholder=" " allow-create filterable > <el-option v-for="item in projects" :label="item.project" :value="item.project"/> </el-select> </el-col> <el-col :span="2"><el-text>*{{$t('order.customers')}}：</el-text></el-col> <el-col :span="2"> <el-select v-model="titleUploadData.customerId" north-glass-erp/src/main/java/com/example/erp/entity/sd/Customer.java
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.List; import java.util.Map; @Data public class Customer { @TableId(type = IdType.AUTO) @@ -24,4 +27,7 @@ private Integer salesmanId; @TableField(select = false,exist = false) private String salesman; @TableField(select = false,exist = false) private List<Map<String,Object>> projectList; } north-glass-erp/src/main/java/com/example/erp/mapper/sd/CustomerMapper.java
@@ -46,4 +46,6 @@ List<CustomerDTO> exportSelectCustomerDeliveryDate(String startDate, String endDate, @Param("orderDetail") OrderDetail orderDetail); List<Map<String,Object>> getProjectList(Long id); } north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
@@ -41,6 +41,7 @@ orderBasicDataMap.put("customer",orderBasicDataList); List<Customer> customerList = customerMapper.getCustomerList(); for (Customer customer : customerList){ customer.setProjectList(customerMapper.getProjectList(customer.getId())); orderBasicDataMap.get("customer").add(customer); }
@@ -137,6 +137,14 @@ on a.id = b.customer_id </select> <select id="getProjectList"> select * from(select project,salesman_id,salesman,id from sd.`order` where customer_id = #{id} group by project ) as a order by id desc </select> <select id="getSelectCustomer"> select *
