bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：计划管理

This commit is contained in:
jackal 2024-04-10 15:12:25 +08:00
parent 5443d78201
commit ab8bd22d41
4 changed files with 202 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

341
sgzb-ui/src/api/store/newBuy.js
View File

@ -1,334 +1,341 @@
import request from '@/utils/request' import request from "@/utils/request";
// 查询新购任务列表 // 查询新购任务列表
export function listPurchaseCheckInfo(query) { export function listPurchaseCheckInfo(query) {
return request({ return request({
url: '/material/purchaseCheckInfo/list', url: "/material/purchaseCheckInfo/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//新增新购任务 //新增新购任务
export function addPurchaseCheckInfo(data) { export function addPurchaseCheckInfo(data) {
return request({ return request({
url: '/material/purchaseCheckInfo', url: "/material/purchaseCheckInfo",
method: 'post', method: "post",
data: data data: data,
}) });
} }
//编辑新购任务 //编辑新购任务
export function updatePurchaseCheckInfo(data) { export function updatePurchaseCheckInfo(data) {
return request({ return request({
url: '/material/purchaseCheckInfo', url: "/material/purchaseCheckInfo",
method: 'put', method: "put",
data: data data: data,
}) });
} }
//任务 详情 //任务 详情
export function getPurchaseCheckInfo(query) { export function getPurchaseCheckInfo(query) {
return request({ return request({
url: '/material/purchaseCheckInfo/getDetails', url: "/material/purchaseCheckInfo/getDetails",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//消息通知 //消息通知
export function bmNoticeInfo(data) { export function bmNoticeInfo(data) {
return request({ return request({
url: '/material/purchaseCheckInfo/bmNoticeInfo', url: "/material/purchaseCheckInfo/bmNoticeInfo",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 新购验收--验收弹窗-确认验收 // 新购验收--验收弹窗-确认验收
export function updatePurchaseCheckDetails(data) { export function updatePurchaseCheckDetails(data) {
return request({ return request({
url: '/material/purchaseCheckDetails', url: "/material/purchaseCheckDetails",
method: 'put', method: "put",
data: data data: data,
}) });
} }
// 新购验收-编号管理列表 // 新购验收-编号管理列表
export function listPurchaseMacodeInfo(query) { export function listPurchaseMacodeInfo(query) {
return request({ return request({
url: '/material/purchaseMacode/list', url: "/material/purchaseMacode/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
export function getMacodeInfo(taskId) { export function getMacodeInfo(taskId) {
return request({ return request({
url: '/material/purchaseMacode/' + taskId, url: "/material/purchaseMacode/" + taskId,
method: 'get' method: "get",
}) });
} }
// 新购验收-编号管理-新增 // 新购验收-编号管理-新增
export function addPurchaseMacode(data) { export function addPurchaseMacode(data) {
return request({ return request({
url: '/material/purchaseMacode', url: "/material/purchaseMacode",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 修改 // 修改
export function updateMacode(data) { export function updateMacode(data) {
return request({ return request({
url: '/material/purchaseMacode', url: "/material/purchaseMacode",
method: 'put', method: "put",
data: data data: data,
}) });
} }
// 删除 // 删除
export function delMacode(taskIds) { export function delMacode(taskIds) {
return request({ return request({
url: '/material/purchaseMacode/' + taskIds, url: "/material/purchaseMacode/" + taskIds,
method: 'delete' method: "delete",
}) });
} }
//新购验收-编号管理-绑定弹窗详情列表 //新购验收-编号管理-绑定弹窗详情列表
export function getMacodeList(query) { export function getMacodeList(query) {
return request({ return request({
url: '/material/purchaseMacode/list', url: "/material/purchaseMacode/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//新购验收-编号管理-绑定弹窗详情列表 //新购验收-编号管理-绑定弹窗详情列表
export function getMacodeDetailList(query) { export function getMacodeDetailList(query) {
return request({ return request({
url: '/material/purchaseMacode/getInfo', url: "/material/purchaseMacode/getInfo",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//新购验收-编号管理-生成编码 //新购验收-编号管理-生成编码
export function makeEquipmentNumber(data) { export function makeEquipmentNumber(data) {
return request({ return request({
url: '/material/purchaseMacode/equipmentNumber', url: "/material/purchaseMacode/equipmentNumber",
method: 'post', method: "post",
data: data data: data,
}) });
} }
//新购验收-编号管理-保存 //新购验收-编号管理-保存
export function editPurchaseMacode(data) { export function editPurchaseMacode(data) {
return request({ return request({
url: '/material/purchaseMacode', url: "/material/purchaseMacode",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 删除 // 删除
export function delMacodeList(maCode) { export function delMacodeList(maCode) {
return request({ return request({
url: '/material/purchaseMacode/' + maCode, url: "/material/purchaseMacode/" + maCode,
method: 'delete' method: "delete",
}) });
} }
//新购验收-验收-通知-常用人员 //新购验收-验收-通知-常用人员
export function getNoticeUserList(query) { export function getNoticeUserList(query) {
return request({ return request({
url: '/system/person/list', url: "/system/person/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//新购验收-验收-通知-所有人员 //新购验收-验收-通知-所有人员
export function getAllNotificationList(query) { export function getAllNotificationList(query) {
return request({ return request({
url: '/system/person/notification', url: "/system/person/notification",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//新购验收-验收-通知-常用人员-添加 //新购验收-验收-通知-常用人员-添加
export function addNoticeUser(data) { export function addNoticeUser(data) {
return request({ return request({
url: '/system/person', url: "/system/person",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 删除 // 删除
export function delNoticeUser(id) { export function delNoticeUser(id) {
return request({ return request({
url: '/system/person/' + id, url: "/system/person/" + id,
method: 'delete' method: "delete",
}) });
} }
//新购验收-入库列表 //新购验收-入库列表
export function getPutInList(query) { export function getPutInList(query) {
return request({ return request({
url: '/material/purchaseCheckInfo/putInList', url: "/material/purchaseCheckInfo/putInList",
method: 'get', method: "get",
params: query params: query,
}) });
} }
export function getPutinDetailsList(query) { export function getPutinDetailsList(query) {
return request({ return request({
url: '/material/purchaseMacode/putinDetails', url: "/material/purchaseMacode/putinDetails",
method: 'get', method: "get",
params: query params: query,
}) });
} }
// 修改状态-审核 // 修改状态-审核
export function changePutinStatus(data) { export function changePutinStatus(data) {
return request({ return request({
url: '/material/purchaseMacode/manageStatus', url: "/material/purchaseMacode/manageStatus",
method: 'put', method: "put",
data: data data: data,
}) });
} }
//新购工机具验收单 //新购工机具验收单
export function getAcceptanceForm(query) { export function getAcceptanceForm(query) {
return request({ return request({
url: '/material/purchaseCheckInfo/getAcceptanceForm', url: "/material/purchaseCheckInfo/getAcceptanceForm",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//新购工机具入库单 //新购工机具入库单
export function warehousingEntry(query) { export function warehousingEntry(query) {
return request({ return request({
url: '/material/purchaseMacode/warehousingEntry', url: "/material/purchaseMacode/warehousingEntry",
method: 'get', method: "get",
params: query params: query,
}) });
} }
// 配件所属上级树 // 配件所属上级树
export function getAccessoryTree(data) { export function getAccessoryTree(data) {
return request({ return request({
url: '/system/select/getAccessoryTree', url: "/system/select/getAccessoryTree",
method: 'post', method: "post",
data: data data: data,
}) });
} }
// 查询新购配件列表 // 查询新购配件列表
export function listPurchaseAccessory(query) { export function listPurchaseAccessory(query) {
return request({ return request({
url: '/material/purchaseAccessory/list', url: "/material/purchaseAccessory/list",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//新增新购配件任务 //新增新购配件任务
export function addPurchaseAccessory(data) { export function addPurchaseAccessory(data) {
return request({ return request({
url: '/material/purchaseAccessory', url: "/material/purchaseAccessory",
method: 'post', method: "post",
data: data data: data,
}) });
} }
//配件任务 详情 //配件任务 详情
export function getPurchaseAccessoryDetails(query) { export function getPurchaseAccessoryDetails(query) {
return request({ return request({
url: '/material/purchaseAccessory/getDetails', url: "/material/purchaseAccessory/getDetails",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//编辑新购配件任务 //编辑新购配件任务
export function updatePurchaseAccessory(data) { export function updatePurchaseAccessory(data) {
return request({ return request({
url: '/material/purchaseAccessory/edit', url: "/material/purchaseAccessory/edit",
method: 'post', method: "post",
data: data data: data,
}) });
} }
//验收新购配件任务 //验收新购配件任务
export function checkPurchaseAccessory(data) { export function checkPurchaseAccessory(data) {
return request({ return request({
url: '/material/purchaseAccessory/check', url: "/material/purchaseAccessory/check",
method: 'post', method: "post",
data: data data: data,
}) });
} }
//删除新购配件任务 //删除新购配件任务
export function delPurchaseAccessory(taskIds) { export function delPurchaseAccessory(taskIds) {
return request({ return request({
url: '/material/purchaseAccessory/' + taskIds, url: "/material/purchaseAccessory/" + taskIds,
method: 'delete' method: "delete",
}) });
} }
//配件入库 列表 //配件入库 列表
export function getPurchaseAccessoryPutInList(query) { export function getPurchaseAccessoryPutInList(query) {
return request({ return request({
url: '/material/purchaseAccessory/putInList', url: "/material/purchaseAccessory/putInList",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//配件入库 配件类型下拉数据 //配件入库 配件类型下拉数据
export function getPartList(query) { export function getPartList(query) {
return request({ return request({
url: '/material/purchaseAccessory/getPartList', url: "/material/purchaseAccessory/getPartList",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//配件入库 配件类型下拉数据 //配件入库 配件类型下拉数据
export function getAccessoryPutInDetailList(query) { export function getAccessoryPutInDetailList(query) {
return request({ return request({
url: '/material/purchaseAccessory/putinDetails', url: "/material/purchaseAccessory/putinDetails",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//配件入库 审批操作 //配件入库 审批操作
export function checkInputAccessory(data) { export function checkInputAccessory(data) {
return request({ return request({
url: '/material/purchaseAccessory/checkInput', url: "/material/purchaseAccessory/checkInput",
method: 'post', method: "post",
data: data data: data,
}) });
} }
//新购配件验收单 //新购配件验收单
export function getAccessoryAcceptanceForm(query) { export function getAccessoryAcceptanceForm(query) {
return request({ return request({
url: '/material/purchaseAccessory/getAcceptanceForm', url: "/material/purchaseAccessory/getAcceptanceForm",
method: 'get', method: "get",
params: query params: query,
}) });
} }
//新购配件入库单 //新购配件入库单
export function accessoryWarehousingEntry(query) { export function accessoryWarehousingEntry(query) {
return request({ return request({
url: '/material/purchaseAccessory/warehousingEntry', url: "/material/purchaseAccessory/warehousingEntry",
method: 'get', method: "get",
params: query params: query,
}) });
} }
// 删除 // 删除
export function purchaseCheckInfoRemove(maCode) { export function purchaseCheckInfoRemove(maCode) {
return request({ return request({
url: '/material/purchaseCheckInfo/' + maCode, url: "/material/purchaseCheckInfo/" + maCode,
method: 'delete' method: "delete",
}) });
}
//新增计划管理
export function addPlanManagement(data) {
return request({
url: "/material/planManagement/addOrUpdate",
method: "post",
data: data,
});
}
//配件入库 配件类型下拉数据
export function getPlanList(query) {
return request({
url: "/material/planManagement/getList",
method: "get",
params: query,
});
} }

24
sgzb-ui/src/views/store/newBuy/plan.vue
View File

@ -26,22 +26,22 @@
<el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column label="基层单位" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="基层单位" align="center" prop="lenderCompany" :show-overflow-tooltip="true" />
<el-table-column label="物资名称" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
<el-table-column label="单位" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="计划数" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="计划数" align="center" prop="lenderOrigPlanNum" :show-overflow-tooltip="true" />
<el-table-column label="计划单价" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="计划单价" align="center" prop="planPrice" :show-overflow-tooltip="true" />
<el-table-column label="计划总价" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="计划总价" align="center" prop="planCost" :show-overflow-tooltip="true" />
<el-table-column label="备注" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['store:labelType:edit']">编辑</el-button> v-hasPermi="['store:labelType:edit']">编辑</el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['store:labelType:remove']">删除</el-button> v-hasPermi="['store:labelType:remove']">删除</el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@ -52,6 +52,8 @@
<script> <script>
import { listType } from "@/api/system/dict/type"; import { listType } from "@/api/system/dict/type";
import { getPlanList } from "@/api/store/newBuy";
export default { export default {
name: "Plan", name: "Plan",
@ -88,7 +90,7 @@ export default {
/** 查询字典类型列表 */ /** 查询字典类型列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listType(this.queryParams).then(response => { getPlanList(this.queryParams).then(response => {
this.planList = response.rows; this.planList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;

18
sgzb-ui/src/views/store/newBuy/planAdd.vue
View File

@ -118,7 +118,7 @@
</template> </template>
<script> <script>
import { addPurchaseCheckInfo, getPurchaseCheckInfo, updatePurchaseCheckInfo } from "@/api/store/newBuy"; import { addPlanManagement, getPurchaseCheckInfo, updatePurchaseCheckInfo } from "@/api/store/newBuy";
import { getUserByRoleList } from "@/api/system/user"; import { getUserByRoleList } from "@/api/system/user";
import { equipmentTypeTree, supplierInfoList, getunitInfoAll } from "@/api/store/tools"; import { equipmentTypeTree, supplierInfoList, getunitInfoAll } from "@/api/store/tools";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
@ -410,14 +410,14 @@ export default {
} else if (!this.isEdit) { } else if (!this.isEdit) {
console.log('新增') console.log('新增')
// this.loading = true; this.loading = true;
// addPurchaseCheckInfo(this.maForm).then(response => { addPlanManagement(this.maForm).then(response => {
// if (response.code == 200) { if (response.code == 200) {
// this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
// this.$tab.closeOpenPage({ path: "/store/plan/plan" }); this.$tab.closeOpenPage({ path: "/store/plan/plan" });
// } }
// this.loading = false; this.loading = false;
// }) })
} }
}).catch(() => { }); }).catch(() => { });
} else { } else {

3
sgzb-ui/vue.config.js
View File

@ -42,9 +42,10 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
target: `http://10.40.92.8:8080`, //超 // target: `http://10.40.92.8:8080`, //超
// target: `http://10.40.92.253:8080`,//韩 // target: `http://10.40.92.253:8080`,//韩
// target: `http://10.40.92.209:8080`,//川/ // target: `http://10.40.92.209:8080`,//川/
target: `http://10.40.92.153:8080`, //帅
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;