yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改列表

Browse Source
jg-waiwang-pro
CJYXTX\27961 7 months ago
parent 0649bb7053
commit c8047f9db8
3 changed files with 72 additions and 114 deletions
Show Stats Download Patch File Download Diff File

82
jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -22,8 +15,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="BOM状态">
<JnpfSelect v-model="query.bomStatus" placeholder="请选择" clearable
:options="bomStatusOptions" :props="bomStatusProps">
<JnpfSelect v-model="query.bomStatus" placeholder="请选择" clearable :options="bomStatusOptions"
:props="bomStatusProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -45,11 +38,10 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -63,8 +55,7 @@
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -76,15 +67,14 @@
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="bomCode" label="BOM编号" align="left" min-width="200">
<el-table-column prop="bomCode" label="BOM编号" align="center" min-width="200" fixed="left" sortable>
<template #default="scope">
<el-row>
<el-col>
@ -98,7 +88,7 @@
</el-table-column>
<el-table-column prop="bomName" label="商品名称" align="left" min-width="120">
<el-table-column prop="bomName" label="商品名称" align="center" min-width="120" fixed="left" sortable>
<template #default="scope">
<el-row>
<el-col>
@ -110,80 +100,76 @@
</el-row>
</template>
</el-table-column>
<el-table-column prop="productTypeId" label="类型" align="left" min-width="120">
<el-table-column prop="productTypeId" label="类型" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.productTypeId}}
{{ scope.row.productTypeId }}
</template>
</el-table-column>
、
<el-table-column label="状态" prop="bomStatus" algin="left">
<el-table-column label="状态" prop="bomStatus" align="center">
<template slot-scope="scope">
{{ scope.row.bomStatus}}
{{ scope.row.bomStatus }}
</template>
</el-table-column>
<el-table-column prop="inventoryUnitId" label="库存单位" align="left" min-width="120">
<el-table-column prop="inventoryUnitId" label="库存单位" align="center" min-width="120">
</el-table-column>
<el-table-column prop="productSpec" label="规格" align="left" min-width="120">
<el-table-column prop="productSpec" label="规格" align="center" min-width="120">
</el-table-column>
<el-table-column prop="categoryName" label="商品分类" align="left" min-width="120">
<el-table-column prop="categoryName" label="商品分类" align="center" min-width="120">
</el-table-column>
<!-- <el-table-column prop="bomCode" label="商品类目" align="left" min-width="120">
</el-table-column>
<el-table-column prop="bomCode" label="尺寸单位" align="left" min-width="120">
</el-table-column> -->
<el-table-column prop="flowState" label="状态" width="100">
<el-table-column prop="flowState" label="状态" width="100" align="center">
<template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
:disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

39
jnpf-java-boot/jnpf-web/src/views/scm/processclassification/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -31,11 +24,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -47,42 +38,38 @@
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="categoryCode" label="工序分类编码" align="left">
<el-table-column prop="categoryCode" label="工序分类编码" align="center">
</el-table-column>
<el-table-column prop="categoryName" label="工序分类名称" align="left">
<el-table-column prop="categoryName" label="工序分类名称" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

65
jnpf-java-boot/jnpf-web/src/views/scm/productionprocesses/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-left">
@ -23,11 +16,10 @@
</div>
<el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
:expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
:default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false"
v-if="refreshTree">
:default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree">
<span class="custom-tree-node" slot-scope="{ node, data }">
<i :class="data.icon"></i>
<span class="text">{{node.label}}</span>
<span class="text">{{ node.label }}</span>
</span>
</el-tree>
</div>
@ -41,8 +33,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="工序类型">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
:props="typeProps">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions" :props="typeProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -63,11 +54,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
@ -79,64 +68,60 @@
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="productionName" label="工序名称" align="left">
<el-table-column prop="productionName" label="工序名称" align="center" fixed="left" sortable>
</el-table-column>
<el-table-column prop="productionCode" label="工序编号" align="left">
<el-table-column prop="productionCode" label="工序编号" align="center" fixed="left" sortable>
</el-table-column>
<el-table-column prop="processId" label="工序分类" align="left">
<el-table-column prop="processId" label="工序分类" align="center">
</el-table-column>
<el-table-column prop="responsibleOfficer" label="负责人员" align="left">
<el-table-column prop="responsibleOfficer" label="负责人员" align="center">
</el-table-column>
<el-table-column label="工序类型" prop="type" algin="left">
<el-table-column label="工序类型" prop="type" align="center">
<template slot-scope="scope">
{{ scope.row.type}}
{{ scope.row.type }}
</template>
</el-table-column>
<el-table-column label="状态" prop="status" algin="left">
<el-table-column label="状态" prop="status" align="center">
<template slot-scope="scope">
{{ scope.row.status}}
{{ scope.row.status }}
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="添加时间" align="left">
<el-table-column prop="creatorTime" label="添加时间" align="center">
</el-table-column>
<el-table-column prop="creatorUserId" label="添加人" align="left">
<el-table-column prop="creatorUserId" label="添加人" align="center">
</el-table-column>
<el-table-column prop="lastModifyTime" label="更新时间" align="left">
<el-table-column prop="lastModifyTime" label="更新时间" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>

Write Preview
Loading…
Cancel
Save