yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 83b6bbc0cf e9c5bc412b
commit c23f8baa8e
13 changed files with 90 additions and 68 deletions
Show Stats Download Patch File Download Diff File

11
SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
Unescape View File

@ -378,7 +378,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
for (ContractFileModel model : dt) {
model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime()));
model.setNum(DateUtil.cstFormat(model.getNum()));
// model.setNum(DateUtil.cstFormat(model.getNum()));
if (model.getContractType() != null) {
if (model.getContractType().equals("采购合同")) {
model.setContractType("0");
@ -411,14 +411,17 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
}
if (model.getStatus() != null) {
if (model.getStatus().equals("合同进行中")) {
model.setStatus("0");
} else if (model.getStatus().equals("合同审批中")) {
model.setStatus("1");
} else if (model.getStatus().equals("合同审批结束")) {
} else if (model.getStatus().equals("合同审批中")) {
model.setStatus("2");
} else if (model.getStatus().equals("合同审批结束")) {
model.setStatus("3");
}else if (model.getStatus().equals("合同待审批")) {
model.setStatus("0");
}
}
}
List<ContractFileEntity> entitys = JsonUtil.getJsonToList(dt, ContractFileEntity.class);
//记录成功了几条

4
SC-web/src/views/scm/basicInformation/areasetting/index.vue
Unescape View File

@ -24,8 +24,8 @@
</el-button>
<el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入
</el-button>
<!-- <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" v-has="'btn_edit'" @click="">编辑
</el-button>
<el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除

4
SC-web/src/views/scm/basicInformation/contractfile/index.vue
Unescape View File

@ -25,8 +25,8 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<!-- <el-button type="text" icon="=el-icon-detail" @click="goDetail(scope.row.id)">查看-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出

24
SC-web/src/views/scm/basicInformation/customer/index.vue
Unescape View File

@ -43,14 +43,14 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<!-- <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
<!-- </el-button>-->
<!-- <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
<!-- </el-button>-->
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -117,13 +117,13 @@
<el-table-column label="操作" fixed="right"
width="150">
width="80">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>

15
SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
Unescape View File

@ -25,8 +25,8 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -48,10 +48,13 @@
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

15
SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
Unescape View File

@ -25,8 +25,8 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
</div>
@ -50,10 +50,13 @@
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

25
SC-web/src/views/scm/basicInformation/material/index.vue
Unescape View File

@ -25,14 +25,14 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<!-- <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
<!-- </el-button>-->
<!-- <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
<!-- </el-button>-->
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -92,12 +92,15 @@
<el-table-column label="操作" fixed="right"
width="100">
width="80">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

4
SC-web/src/views/scm/basicInformation/monitormanage/index.vue
Unescape View File

@ -34,8 +34,8 @@
</el-button>
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<!-- <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_edit'" icon="el-icon-download" @click="">编辑
</el-button>
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除

9
SC-web/src/views/scm/basicInformation/natural/index.vue
Unescape View File

@ -29,8 +29,8 @@
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入
</el-button>
<!-- <el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入-->
<!-- </el-button>-->
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'" >批量删除
</el-button>
</div>
@ -56,13 +56,16 @@
<el-table-column prop="creatorTime" label="创建时间" width="300" align="center" sortable
/>
<el-table-column label="操作" fixed="right"
width="100">
width="150">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">删除
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>

4
SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
Unescape View File

@ -30,8 +30,8 @@
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<!-- <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>

26
SC-web/src/views/scm/basicInformation/supplier/index.vue
Unescape View File

@ -48,14 +48,14 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<!-- <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
<!-- </el-button>-->
<!-- <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
<!-- </el-button>-->
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -151,12 +151,16 @@
<el-table-column prop="supplierSiteCode" label="供应商地点" width="120" align="center" sortable
sortable="custom"/>
<el-table-column label="操作" fixed="right"
width="100">
width="80">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<!-- <el-button type="text" v-has="'btn_edit'"-->
<!-- @click="addOrUpdateHandle(scope.row.id)">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

9
SC-web/src/views/scm/basicInformation/vehicle/index.vue
Unescape View File

@ -29,8 +29,8 @@
</el-button>
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<!-- <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
@ -66,12 +66,15 @@
<el-table-column prop="contact" label="手机号" width="0" align="center" sortable/>
<el-table-column prop="creatorusername" label="录入人" width="0" align="center" sortable/>
<el-table-column prop="creatortime" label="创建时间" width="0" align="center" sortable/>
<el-table-column label="操作" fixed="right" width="100">
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>

4
SC-web/src/views/scm/basicInformation/warehouse/index.vue
Unescape View File

@ -29,8 +29,8 @@
</el-button>
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<!-- <el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>

Write Preview
Loading…
Cancel
Save