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

廖井涛

78 分钟以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue

@@ -46,9 +46,9 @@
  columns:[
    {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
    {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},
    {field:'operateTypeName',title: t('mainBasicData.operateTypeName')},
    {field:'operateType',title: t('mainBasicData.operateType')},
    {field:'type',title: t('mainBasicData.type')},
    {field:'operateTypeName',title: t('warehouseBasicData.operateTypeName')},
    {field:'operateType',title: t('warehouseBasicData.operateType')},
    {field:'type',title: t('warehouseBasicData.type')},
    {field:'createTime',title: t('basicData.creationTime')},


@@ -107,7 +107,13 @@
  }
}

request.get('/BasicWarehouse/getBasicWarehouse').then(res => {
const options = ref({
      originalFilm: t('ingredients.originalFilm'),
      accessories: t('ingredients.accessories')
    })


request.post(`/BasicWarehouse/getBasicWarehouse`,options.value).then(res => {
  if(res.code==='200'){
    xGrid.value.reloadData(res.data)
  }
@@ -156,27 +162,28 @@
</script>

<template>
  <div>
    <vxe-grid
        style="width: 40vw;"
        class="mytable-scrollbar"
        max-height="500px"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')"
                   v-if="userStore.user.permissions.indexOf('warehouseSearchBasicData.edit') > -1"
                   link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
        <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
          <template #reference>
            <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
          </template>
        </el-popconfirm>
      </template>
  <div style="width: 100%;height: 100%">
    <div class="main-table">
      <vxe-grid
          class="mytable-scrollbar"
          height="100%"
          ref="xGrid"
          v-bind="gridOptions"
          v-on="gridEvents"
      >
        <template #button_slot="{ row }">
          <el-button @click="getTableRow(row,'edit')"
                     v-if="userStore.user.permissions.indexOf('warehouseSearchBasicData.edit') > -1"
                     link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
          <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
            <template #reference>
              <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
            </template>
          </el-popconfirm>
        </template>

    </vxe-grid>
      </vxe-grid>
    </div>
    <el-dialog
        v-model="dialogTableVisible"
        destroy-on-close
@@ -187,5 +194,13 @@
</template>

<style scoped>
.head{
  width: 100%;
  height: 70px;
}

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