Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-02-10 2ed98bc1fc4ad46ff746ff82b92bcd199706cc76

 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"