Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

spring

8 天以前 af7fa041da9f063ca49f1f1126ec01616f14cd85

 src/views/warehouseManagement/index.vue

@@ -77,6 +77,11 @@
            align="center"
          />
          <el-table-column
              prop="code"
              label="编号"
              width="180"
          />
          <el-table-column
            prop="supplierName"
            label="供货商名称"
            width="180"
@@ -84,7 +89,7 @@
          />
          <el-table-column prop="type" label="煤料类型">
            <template #default="scope">
              {{scope.row.type === 1 ? '成品' : '原料'}}
              {{scope.row.type == 1 ? '成品' : '原料'}}
            </template>
          </el-table-column>
          <el-table-column prop="coal" label="煤种" sortable />