parent: c23dcbc8 | 补丁 | 提交 | ignore whitespace
guoyuji
2024-07-22 d31338a4c758d7aae3b1bd7a89577922662d50af 
Merge branch 'master' of http://bore.pub:10439/r/ERP_override
3个文件已修改
114 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue


@@ -7,8 +7,8 @@


import {ElMessage} from "element-plus";


const company = companyInfo()


let produceList = ref([])


let otherMoney = ref([])


let otherMoney1 = ref([])


let otherMoney = []


let otherMoney1 = []


let delivery = ref([])


let money = ref("")


let otherMoneys = 0


@@ -35,33 +35,31 @@


      delivery.value=deepClone(res.data.delivery)


      money.value=deepClone(res.data.money)


      otherMoney.value=deepClone(res.data.otherMoney)


      console.log(otherMoney.value)


      otherMoney.value.forEach(item => {


        if(item.DeliveryDetailOtherMoney.monery!=null){


          otherMoneys+=item.DeliveryDetailOtherMoney.monery


          console.log(otherMoney1.value)


          if(otherMoney1.value.length===0){


            otherMoney1.value.push(item)


      otherMoney1=[]


      otherMoney=deepClone(res.data.otherMoney)


      for(let i=0;i<otherMoney.length;i++){


        if(otherMoney[i].DeliveryDetailOtherMoney.monery!=null){


          otherMoneys+=otherMoney[i].DeliveryDetailOtherMoney.monery


          if(otherMoney1.length===0){


            otherMoney1.push(otherMoney[i])


          }


          console.log(otherMoney1.value)


          otherMoney1.value.forEach(items=>{




              if(item.DeliveryDetailOtherMoney.alias===items.DeliveryDetailOtherMoney.alias){


                items.DeliveryDetailOtherMoney.count+=item.DeliveryDetailOtherMoney.count


                items.DeliveryDetailOtherMoney.monery +=item.DeliveryDetailOtherMoney.monery


                otherMoney1.value.push(items)


              }else{


                otherMoney1.value.push(item)


          else{


            for(let s=0;s<otherMoney1.length;s++){


              if(otherMoney[i].DeliveryDetailOtherMoney.alias===otherMoney1[s].DeliveryDetailOtherMoney.alias){


                otherMoney1[s].DeliveryDetailOtherMoney.count=otherMoney[i].DeliveryDetailOtherMoney.count+otherMoney1[s].DeliveryDetailOtherMoney.count


                otherMoney1[s].DeliveryDetailOtherMoney.monery =otherMoney[i].DeliveryDetailOtherMoney.monery+otherMoney1[s].DeliveryDetailOtherMoney.monery


                break


              }


              if(s+1===otherMoney1.length){


                otherMoney1.push(otherMoney[i])


                break


              }


            }




            console.log(otherMoney1.value)






          })




          }


        }




      })


      }


    }else{


      ElMessage.warning(res.msg)


      router.push("/login")


@@ -212,7 +210,7 @@


            </tr>


            <tr class="day-in">


              <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >


                <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney" :key="index2">


                <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney1" :key="index2">


                  <div style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</div>


                  <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</div>


                  <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</div>




 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue


@@ -8,7 +8,8 @@


const company = companyInfo()


let produceList = ref([])


let delivery = ref([])


let otherMoney = ref([])


let otherMoney = []


let otherMoney1 = []


let money = ref("")


let otherMoneys = 0


let takeCare = "注意:请妥善保管好我司的玻璃架，如有丢失或损坏，按1500元只赔偿。谢谢配合!"


@@ -33,10 +34,64 @@


      produceList.value = deepClone(res.data.data)


      delivery.value=deepClone(res.data.delivery)


      money.value=deepClone(res.data.money)


      otherMoney.value=deepClone(res.data.otherMoney)


      otherMoney1=[]


      otherMoney=deepClone(res.data.otherMoney)


      for(let i=0;i<otherMoney.length;i++){


        if(otherMoney[i].DeliveryDetailOtherMoney.monery!=null){


          otherMoneys+=otherMoney[i].DeliveryDetailOtherMoney.monery


          if(otherMoney1.length===0){


            otherMoney1.push(otherMoney[i])


          }


          else{


            for(let s=0;s<otherMoney1.length;s++){


              if(otherMoney[i].DeliveryDetailOtherMoney.alias===otherMoney1[s].DeliveryDetailOtherMoney.alias){


                otherMoney1[s].DeliveryDetailOtherMoney.count=otherMoney[i].DeliveryDetailOtherMoney.count+otherMoney1[s].DeliveryDetailOtherMoney.count


                otherMoney1[s].DeliveryDetailOtherMoney.monery =otherMoney[i].DeliveryDetailOtherMoney.monery+otherMoney1[s].DeliveryDetailOtherMoney.monery


                break


              }


              if(s+1===otherMoney1.length){


                otherMoney1.push(otherMoney[i])


                break


              }


            }




          }


        }




      }


      /*let otherMoney2=[]


      otherMoney.value.forEach(item => {


        otherMoneys+=item.DeliveryDetailOtherMoney.monery


      })


        if(item.DeliveryDetailOtherMoney.monery!=null){


          otherMoneys+=item.DeliveryDetailOtherMoney.monery


          let otherMoney3


          if(otherMoney2.length===0){


            console.log(item)


            otherMoney3=item


            console.log(otherMoney3)


            otherMoney2.push(otherMoney3)


            console.log(otherMoney2)


          }else{


            console.log(otherMoney2)


            otherMoney2.forEach(items=>{




              if(item.DeliveryDetailOtherMoney.alias===items.DeliveryDetailOtherMoney.alias){


                items.DeliveryDetailOtherMoney.count+=item.DeliveryDetailOtherMoney.count


                items.DeliveryDetailOtherMoney.monery +=item.DeliveryDetailOtherMoney.monery


                otherMoney2.push(items)


                console.log(11)


              }else{


                otherMoney2.push(item)


                console.log(22)


              }




            })


            console.log(otherMoney2)


          }






        }




      })*/


    }else{


      ElMessage.warning(res.msg)


      router.push("/login")


@@ -143,7 +198,7 @@


      </tr>


      <tr class="day-in">


        <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >


          <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney" :key="index2">


          <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney1" :key="index2">


            <div style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</div>


            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</div>


            <div  style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</div>




 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue


@@ -1492,6 +1492,7 @@


    <el-dialog


        id="sizeCheck"


        v-model="sizeCheckVisible"


        :draggable="true"


       :title="$t('basicData.sizeReview')"


       :close-on-click-modal="false"


       :close-on-press-escape="false"