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

guoyuji

2024-03-27 baeae530bc5dfdd23359f34b047f449c1541359f

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -107,6 +107,7 @@

  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
    console.log(titleSelectJson.value)
    const today = new Date
    today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
    titleUploadData.value.deliveryDate = today.getFullYear() +
@@ -572,6 +573,8 @@
          <el-date-picker
              v-model="titleUploadData.payDate"
              type="date"
              format="YYYY-MM-DD"
              value-format="YYYY-MM-DD"
              :placeholder="$t('delivery.selectDate')"/>
        </el-col>

@@ -604,6 +607,8 @@
          <el-date-picker
              v-model="titleUploadData.deliveryDate"
              type="date"
              format="YYYY-MM-DD"
              value-format="YYYY-MM-DD"
              :placeholder="$t('delivery.selectDate')"/>
        </el-col>
      </el-row>