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

guoyuji

2024-08-22 06a2a4f6eb715c1be9ab548028122e891cd6b749

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

 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue

@@ -295,7 +295,7 @@


  <div class="main-div-customer">
    <div>
    <div class="head">
      <el-row>
        <el-col :span="4">
          <el-select v-model="value" :placeholder="$t('mainIngredient.pleaseSelectACategory')" @change="getWork">
@@ -310,7 +310,7 @@
      </el-row>
    </div>


    <div class="main-table">
    <vxe-grid
        max-height="100%"
        class="mytable-scrollbar"
@@ -318,6 +318,8 @@
        v-bind="gridOptions"

    >


      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
      <template #content="{ row }">
        <ul class="expand-wrapper">
@@ -365,6 +367,7 @@

    </vxe-grid>
  </div>
  </div>
</template>

<style scoped>
@@ -372,4 +375,13 @@
  width: 99%;
  height: 100%;
}
.head{
  width: 100%;
  height: 35px;
}

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

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue

@@ -609,6 +609,7 @@

<template>
  <div class="main-div-customer">
    <div class="head">
    <el-date-picker
        v-model="selectDate"
        type="daterange"
@@ -631,7 +632,9 @@
        </el-select>
      </el-row>
    </div>
    </div>

    <div class="main-table">
    <vxe-grid
        max-height="100%"
        class="mytable-scrollbar"
@@ -682,6 +685,7 @@


    </vxe-grid>
    </div>

    <el-dialog v-model="dialogTableVisible" :title="$t('mainIngredient.materialAddition')" style="width: 70%;height:75% ">
      <div class="order-primary" >
@@ -773,4 +777,13 @@
.order-primary{
  width: 100%;
}
.head{
  width: 100%;
  height: 35px;
}

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