Skip to content

M
mes-ui
Commit e150de93 authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 82b10685 ebd7f1d8
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 85 deletions
src/views/mes/md/color/index.vue
View file @ e150de93
......@@ -31,7 +31,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:color:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -42,7 +41,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:color:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -53,7 +51,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:color:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -63,7 +60,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:color:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -85,14 +81,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:color:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:color:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/mes/md/factory/index.vue
View file @ e150de93
......@@ -41,7 +41,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:factory:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -52,7 +51,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:factory:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -63,7 +61,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:factory:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -73,7 +70,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:factory:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -97,14 +93,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:factory:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:factory:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/mes/md/product/components/backFaceColor.vue
View file @ e150de93
<!--产品正反面颜色-->
<template>
<!-- v-hasPermi="['mes:md:faceColor:add']"
v-hasPermi="['mes:md:faceColor:remove']"
v-hasPermi="['mes:md:faceColor:remove']"
v-hasPermi="['mes:md:faceColor:edit']"-->
<div class="app-container">
<el-row :gutter="10" class="mb8" v-if="optType !='view'">
<el-col :span="1.5">
......@@ -9,7 +13,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:faceColor:add']"
>新增</el-button>
<ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect>
</el-col>
......@@ -21,7 +25,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -48,14 +52,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:faceColor:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/mes/md/product/components/customerLoss.vue
View file @ e150de93
......@@ -9,7 +9,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:loss:add']"
>新增</el-button
>
</el-col>
......@@ -21,7 +20,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:loss:edit']"
>修改</el-button
>
</el-col>
......@@ -33,7 +31,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:loss:remove']"
>删除</el-button
>
</el-col>
......@@ -72,7 +69,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:loss:edit']"
>修改</el-button
>
<el-button
......@@ -80,7 +76,6 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:loss:remove']"
>删除</el-button
>
</template>
......
src/views/mes/md/product/components/faceColor.vue
View file @ e150de93
......@@ -9,7 +9,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:faceColor:add']"
>新增</el-button>
<ColorSelect ref="colorSelect" @onSelected="onColorSelected" > </ColorSelect>
</el-col>
......@@ -21,7 +20,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -48,14 +46,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:faceColor:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:md:faceColor:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/mes/md/product/components/factory.vue
View file @ e150de93
......@@ -9,7 +9,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:factory:add']"
>新增</el-button
>
<FactorySelect ref="FactorySelectRef" @onSelected="onFactorySelect" />
......@@ -22,7 +21,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:factory:remove']"
>删除</el-button
>
</el-col>
......@@ -33,7 +31,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:factory:export']"
>导出</el-button
>
</el-col>
......@@ -100,7 +97,6 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:factory:remove']"
>删除</el-button
>
</template>
......
src/views/mes/md/product/components/productionPlan.vue
View file @ e150de93
......@@ -6,12 +6,12 @@
:data="productionPlanList"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="生产方案编码" align="center" prop="customerName" />
<el-table-column label="生产方案名称" align="center" prop="segmentCount" />
<el-table-column label="工艺路线编码" align="center" prop="segmentCount" />
<el-table-column label="工艺路线名称" align="center" prop="segmentCount" />
<el-table-column label="用途编码" align="center" prop="segmentCount" />
<el-table-column label="用途名称" align="center" prop="segmentCount" />
<el-table-column label="生产方案编码" align="center" prop="productionSolutionCode" />
<el-table-column label="生产方案名称" align="center" prop="productionSolutionName" />
<el-table-column label="工艺路线编码" align="center" prop="routeCode" />
<el-table-column label="工艺路线名称" align="center" prop="routeName" />
<el-table-column label="用途编码" align="center" prop="usageCode" />
<el-table-column label="用途名称" align="center" prop="usageName" />
</el-table>
<pagination
v-show="total > 0"
......
src/views/mes/md/product/components/saleUnitCon.vue
View file @ e150de93
......@@ -9,7 +9,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:unit:add']"
>新增</el-button>
<UnitmeasureSelect ref="unitmeasureSelect" @onSelected="onUnitmeasureSelect" > </UnitmeasureSelect>
</el-col>
......@@ -21,7 +20,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:unit:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -32,7 +30,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:unit:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -42,7 +39,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:unit:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -60,14 +56,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:unit:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:unit:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/mes/md/product/components/sop.vue
View file @ e150de93
......@@ -8,7 +8,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:mditem:add']"
>新增</el-button>
</el-col>
</el-row>
......
src/views/mes/md/product/components/specProperty.vue
View file @ e150de93
......@@ -38,7 +38,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:spec:add']"
>新增</el-button
>
</el-col>
......@@ -50,7 +49,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:spec:edit']"
>修改</el-button
>
</el-col>
......@@ -62,7 +60,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:spec:remove']"
>删除</el-button
>
</el-col>
......@@ -73,7 +70,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:spec:export']"
>导出</el-button
>
</el-col>
......@@ -102,7 +98,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:spec:edit']"
>修改</el-button
>
<el-button
......@@ -110,7 +105,6 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:spec:remove']"
>删除</el-button
>
</template>
......
src/views/mes/md/product/index.vue
View file @ e150de93
......@@ -75,7 +75,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:md:mditem:add']"
>新增</el-button
>
</el-col>
......@@ -87,7 +86,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:md:mditem:edit']"
>修改</el-button
>
</el-col>
......@@ -99,7 +97,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:md:mditem:remove']"
>删除</el-button
>
</el-col>
......@@ -111,7 +108,6 @@
size="mini"
:disabled="multiple"
@click="handBecomeFormalProduct"
v-hasPermi="['mes:md:mditem:becomeFormalProduct']"
>转正式产品</el-button
>
</el-col>
......@@ -161,7 +157,6 @@
size="mini"
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:md:mditem:query']"
>{{ scope.row.itemCode }}</el-button
>
</template>
......@@ -265,7 +260,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:md:mditem:edit']"
>修改</el-button
>
<el-button
......@@ -273,7 +267,6 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:md:mditem:remove']"
>删除</el-button
>
</template>
......
src/views/mes/md/saleOrder/group/index.vue
View file @ e150de93
......@@ -31,7 +31,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:group:add']"
v-hasPermi="['md:ordergroup:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -42,7 +42,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:group:edit']"
v-hasPermi="['md:ordergroup:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -53,7 +53,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:group:remove']"
v-hasPermi="['md:ordergroup:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -63,7 +63,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:group:export']"
v-hasPermi="['md:ordergroup:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -86,14 +86,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:group:edit']"
v-hasPermi="['md:ordergroup:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:group:remove']"
v-hasPermi="['md:ordergroup:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/mes/md/sizegroup/index.vue
View file @ e150de93
......@@ -44,7 +44,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:group:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -55,7 +54,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:group:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
......@@ -66,7 +64,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:group:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
......@@ -76,7 +73,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:group:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -104,14 +100,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:group:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:group:remove']"
>删除</el-button>
</template>
</el-table-column>
......
src/views/mes/md/sizegroup/item/index.vue
View file @ e150de93
......@@ -62,7 +62,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['md:item:add']"
>新增</el-button
>
</el-col>
......@@ -74,7 +73,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['md:item:edit']"
>修改</el-button
>
</el-col>
......@@ -86,7 +84,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['md:item:remove']"
>删除</el-button
>
</el-col>
......@@ -97,7 +94,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['md:item:export']"
>导出</el-button
>
</el-col>
......@@ -136,7 +132,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['md:item:edit']"
>修改</el-button
>
<el-button
......@@ -144,7 +139,6 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['md:item:remove']"
>删除</el-button
>
</template>
......
src/views/mes/md/workunit/index.vue
View file @ e150de93
......@@ -82,15 +82,7 @@
<el-table v-loading="loading" :data="workunitList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="工作单元ID" align="center" prop="workunitId" />-->
<el-table-column label="工作单元编码" align="center" prop="workunitCode" >
<template slot-scope="scope">
<el-button
type="text"
@click="handleView(scope.row)"
v-hasPermi="['mes:md:workunit:query']"
>{{scope.row.workunitCode}}</el-button>
</template>
</el-table-column>
<el-table-column label="工作单元编码" align="center" prop="workunitCode" />
<el-table-column label="工作站" align="center" prop="workstationName" />
<el-table-column label="工作单元名称" align="center" prop="workunitName" />
<el-table-column label="是否启用" align="center" prop="enableFlag" >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment