修改订单发货界面行数显示以及其他的列

廖井涛

2024-12-02 e6b3d7f32ca8cff5a809efe6537e46385289a0b9

修改订单发货界面行数显示以及其他的列

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue

@@ -511,8 +511,8 @@
</script>

<template>
  <div class="main-div">
  <div class="order-primary" style="background-color: white">
  <div style="width: 100%;height: 100%">
  <div class="head" style="background-color: white">
    <el-row>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.materialRequisitionDate')}}:</el-text></el-col>
      <el-col  :span="3"><el-input  v-model="titleUploadData.materialRequisitionDate" :readonly="true" ></el-input></el-col>
@@ -544,9 +544,9 @@



  <div class="main-div-customer">
    <div class="main-table">
    <vxe-grid
        max-height="100%"
        height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
@@ -599,13 +599,7 @@
  border: none !important;
  background-color: transparent;
}
.order-primary{
  width: 100%;
}
.main-div-customer{
  width: 100%;
  height: 70%;
}

.vxe-grid {
  /* 禁用浏览器默认选中 */
  -webkit-user-select: none;
@@ -613,4 +607,14 @@
  -ms-user-select: none;
  user-select: none;
}

.head{
  width: 100%;
  height: 70px;
}

.main-table{
  width: 100%;
  height: calc(100% - 70px);
}
</style>

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue

@@ -520,9 +520,8 @@
</script>

<template>
  <div class="main-div">

    <div class="order-primary" style="background-color: white">
  <div style="width: 100%;height: 100%">
    <div class="head" style="background-color: white">
      <el-row>
        <el-col  :span="2"><el-text>{{$t('ingredientsStock.createTime')}}:</el-text></el-col>
        <el-col  :span="3"><el-input  v-model="titleUploadData.createTime" :readonly="true" ></el-input></el-col>
@@ -569,10 +568,10 @@
    </div>


    <div class="order-detail">
    <div class="main-table">

      <vxe-grid
          max-height="97%"
          height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
@@ -614,12 +613,14 @@
  border: none !important;
  background-color: transparent;
}
.order-primary{
.head{
  width: 100%;
  height: 70px;
}
.order-detail{

.main-table{
  width: 100%;
  height: 80%;
  height: calc(100% - 70px);
}

</style>

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectSurplusMaterials.vue

@@ -312,7 +312,8 @@
</script>

<template>
  <div class="main-div-customer">
  <div style="width: 100%;height: 100%">
    <div class="head" style="background-color: white">
    <el-date-picker
        v-model="selectDate"
        type="daterange"
@@ -323,9 +324,10 @@

    />
    <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>

    </div>
    <div class="main-table">
    <vxe-grid
        max-height="100%"
          height="100%"
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
@@ -375,6 +377,7 @@


    </vxe-grid>
    </div>

    <el-dialog v-model="dialogTableVisible" :title="$t('ingredientsStock.additionOfSurplusMaterials')" style="width: 70%;height:75% ">
      <div class="order-primary" >
@@ -438,4 +441,14 @@
.order-primary{
  width: 100%;
}

.head{
  width: 100%;
  height: 35px;
}

.main-table{
  width: 100%;
  height: calc(100% - 35px);
}
</style>

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

@@ -647,8 +647,8 @@
</script>

<template>
  <div class="main-div">
    <div class="order-primary" style="background-color: white">
  <div style="width: 100%;height: 100%">
    <div class="head" style="background-color: white">
      <el-row>
        <el-col  :span="2"><el-text>{{$t('customer.customerNumber')}}:</el-text></el-col>
        <el-col  :span="3"><el-input style="font-size: large;color: #181818" v-model="titleUploadData.customerId" :readonly="true" ></el-input></el-col>
@@ -728,9 +728,9 @@
        <el-col  :span="2"><el-input v-model="titleUploadData.freight" :readonly="true"/></el-col>
      </el-row>
    </div>
    <div class="order-detail">
    <div class="main-table">
      <vxe-grid
          max-height="97%"
          max-height="100%"
          class="mytable-scrollbar"
          ref="xGrid"
          v-bind="gridOptions"
@@ -818,4 +818,14 @@
  height: 90%;
  width: 100%;
}

.head{
  width: 100%;
  height: 170px;
}

.main-table{
  width: 100%;
  height: calc(100% - 170px);
}
</style>

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java

@@ -95,7 +95,7 @@
            //将数据放入List中
            BasicDataMap.get(item.getBasicCategory()).add(item);
        }
        BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
        BasicDataMap.put("deliveryOtherMoney", Collections.singletonList( basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))));
        return BasicDataMap;
    }


 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml

@@ -274,7 +274,6 @@

        </where>
        order by dd.id
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectShippingOrderDetailPageTotal">
@@ -356,7 +355,6 @@
                and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectShippingOrderDetails" resultMap="selectDeliveryFinishedGoodsInventoryOrderDetail">
@@ -452,7 +450,6 @@
                and od.perimeter regexp #{orderDetail.perimeter}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectShippingOrderDetailsPageTotal">
@@ -525,7 +522,6 @@
                and od.perimeter regexp #{orderDetail.perimeter}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>