diff --git a/sgzb-ui/src/api/store/newBuy.js b/sgzb-ui/src/api/store/newBuy.js
index 762f2593..96dec0ca 100644
--- a/sgzb-ui/src/api/store/newBuy.js
+++ b/sgzb-ui/src/api/store/newBuy.js
@@ -1,357 +1,365 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
// 查询新购任务列表
export function listPurchaseCheckInfo(query) {
return request({
- url: "/material/purchaseCheckInfo/list",
- method: "get",
+ url: '/material/purchaseCheckInfo/list',
+ method: 'get',
params: query,
- });
+ })
}
//新增新购任务
export function addPurchaseCheckInfo(data) {
return request({
- url: "/material/purchaseCheckInfo",
- method: "post",
+ url: '/material/purchaseCheckInfo',
+ method: 'post',
data: data,
- });
+ })
}
//编辑新购任务
export function updatePurchaseCheckInfo(data) {
return request({
- url: "/material/purchaseCheckInfo",
- method: "put",
+ url: '/material/purchaseCheckInfo',
+ method: 'put',
data: data,
- });
+ })
}
//任务 详情
export function getPurchaseCheckInfo(query) {
return request({
- url: "/material/purchaseCheckInfo/getDetails",
- method: "get",
+ url: '/material/purchaseCheckInfo/getDetails',
+ method: 'get',
params: query,
- });
+ })
}
//消息通知
export function bmNoticeInfo(data) {
return request({
- url: "/material/purchaseCheckInfo/bmNoticeInfo",
- method: "post",
+ url: '/material/purchaseCheckInfo/bmNoticeInfo',
+ method: 'post',
data: data,
- });
+ })
}
// 新购验收--验收弹窗-确认验收
export function updatePurchaseCheckDetails(data) {
return request({
- url: "/material/purchaseCheckDetails",
- method: "put",
+ url: '/material/purchaseCheckDetails',
+ method: 'put',
data: data,
- });
+ })
}
// 新购验收-编号管理列表
export function listPurchaseMacodeInfo(query) {
return request({
- url: "/material/purchaseMacode/list",
- method: "get",
+ url: '/material/purchaseMacode/list',
+ method: 'get',
params: query,
- });
+ })
}
export function getMacodeInfo(taskId) {
return request({
- url: "/material/purchaseMacode/" + taskId,
- method: "get",
- });
+ url: '/material/purchaseMacode/' + taskId,
+ method: 'get',
+ })
}
// 新购验收-编号管理-新增
export function addPurchaseMacode(data) {
return request({
- url: "/material/purchaseMacode",
- method: "post",
+ url: '/material/purchaseMacode',
+ method: 'post',
data: data,
- });
+ })
}
// 修改
export function updateMacode(data) {
return request({
- url: "/material/purchaseMacode",
- method: "put",
+ url: '/material/purchaseMacode',
+ method: 'put',
data: data,
- });
+ })
}
// 删除
export function delMacode(taskIds) {
return request({
- url: "/material/purchaseMacode/" + taskIds,
- method: "delete",
- });
+ url: '/material/purchaseMacode/' + taskIds,
+ method: 'delete',
+ })
}
//新购验收-编号管理-绑定弹窗详情列表
export function getMacodeList(query) {
return request({
- url: "/material/purchaseMacode/list",
- method: "get",
+ url: '/material/purchaseMacode/list',
+ method: 'get',
params: query,
- });
+ })
}
//新购验收-编号管理-绑定弹窗详情列表
export function getMacodeDetailList(query) {
return request({
- url: "/material/purchaseMacode/getInfo",
- method: "get",
+ url: '/material/purchaseMacode/getInfo',
+ method: 'get',
params: query,
- });
+ })
}
//新购验收-编号管理-生成编码
export function makeEquipmentNumber(data) {
return request({
- url: "/material/purchaseMacode/equipmentNumber",
- method: "post",
+ url: '/material/purchaseMacode/equipmentNumber',
+ method: 'post',
data: data,
- });
+ })
}
//新购验收-编号管理-保存
export function editPurchaseMacode(data) {
return request({
- url: "/material/purchaseMacode",
- method: "post",
+ url: '/material/purchaseMacode',
+ method: 'post',
data: data,
- });
+ })
}
// 删除
export function delMacodeList(maCode) {
return request({
- url: "/material/purchaseMacode/" + maCode,
- method: "delete",
- });
+ url: '/material/purchaseMacode/' + maCode,
+ method: 'delete',
+ })
}
//新购验收-验收-通知-常用人员
export function getNoticeUserList(query) {
return request({
- url: "/system/person/list",
- method: "get",
+ url: '/system/person/list',
+ method: 'get',
params: query,
- });
+ })
}
//新购验收-验收-通知-所有人员
export function getAllNotificationList(query) {
return request({
- url: "/system/person/notification",
- method: "get",
+ url: '/system/person/notification',
+ method: 'get',
params: query,
- });
+ })
}
//新购验收-验收-通知-常用人员-添加
export function addNoticeUser(data) {
return request({
- url: "/system/person",
- method: "post",
+ url: '/system/person',
+ method: 'post',
data: data,
- });
+ })
}
// 删除
export function delNoticeUser(id) {
return request({
- url: "/system/person/" + id,
- method: "delete",
- });
+ url: '/system/person/' + id,
+ method: 'delete',
+ })
}
//新购验收-入库列表
export function getPutInList(query) {
return request({
- url: "/material/purchaseCheckInfo/putInList",
- method: "get",
+ url: '/material/purchaseCheckInfo/putInList',
+ method: 'get',
params: query,
- });
+ })
}
export function getPutinDetailsList(query) {
return request({
- url: "/material/purchaseMacode/putinDetails",
- method: "get",
+ url: '/material/purchaseMacode/putinDetails',
+ method: 'get',
params: query,
- });
+ })
}
// 修改状态-审核
export function changePutinStatus(data) {
return request({
- url: "/material/purchaseMacode/manageStatus",
- method: "put",
+ url: '/material/purchaseMacode/manageStatus',
+ method: 'put',
data: data,
- });
+ })
}
//新购工机具验收单
export function getAcceptanceForm(query) {
return request({
- url: "/material/purchaseCheckInfo/getAcceptanceForm",
- method: "get",
+ url: '/material/purchaseCheckInfo/getAcceptanceForm',
+ method: 'get',
params: query,
- });
+ })
}
//新购工机具入库单
export function warehousingEntry(query) {
return request({
- url: "/material/purchaseMacode/warehousingEntry",
- method: "get",
+ url: '/material/purchaseMacode/warehousingEntry',
+ method: 'get',
params: query,
- });
+ })
}
// 配件所属上级树
export function getAccessoryTree(data) {
return request({
- url: "/system/select/getAccessoryTree",
- method: "post",
+ url: '/system/select/getAccessoryTree',
+ method: 'post',
data: data,
- });
+ })
}
// 查询新购配件列表
export function listPurchaseAccessory(query) {
return request({
- url: "/material/purchaseAccessory/list",
- method: "get",
+ url: '/material/purchaseAccessory/list',
+ method: 'get',
params: query,
- });
+ })
}
//新增新购配件任务
export function addPurchaseAccessory(data) {
return request({
- url: "/material/purchaseAccessory",
- method: "post",
+ url: '/material/purchaseAccessory',
+ method: 'post',
data: data,
- });
+ })
}
//配件任务 详情
export function getPurchaseAccessoryDetails(query) {
return request({
- url: "/material/purchaseAccessory/getDetails",
- method: "get",
+ url: '/material/purchaseAccessory/getDetails',
+ method: 'get',
params: query,
- });
+ })
}
//编辑新购配件任务
export function updatePurchaseAccessory(data) {
return request({
- url: "/material/purchaseAccessory/edit",
- method: "post",
+ url: '/material/purchaseAccessory/edit',
+ method: 'post',
data: data,
- });
+ })
}
//验收新购配件任务
export function checkPurchaseAccessory(data) {
return request({
- url: "/material/purchaseAccessory/check",
- method: "post",
+ url: '/material/purchaseAccessory/check',
+ method: 'post',
data: data,
- });
+ })
}
//删除新购配件任务
export function delPurchaseAccessory(taskIds) {
return request({
- url: "/material/purchaseAccessory/" + taskIds,
- method: "delete",
- });
+ url: '/material/purchaseAccessory/' + taskIds,
+ method: 'delete',
+ })
}
//配件入库 列表
export function getPurchaseAccessoryPutInList(query) {
return request({
- url: "/material/purchaseAccessory/putInList",
- method: "get",
+ url: '/material/purchaseAccessory/putInList',
+ method: 'get',
params: query,
- });
+ })
}
//配件入库 配件类型下拉数据
export function getPartList(query) {
return request({
- url: "/material/purchaseAccessory/getPartList",
- method: "get",
+ url: '/material/purchaseAccessory/getPartList',
+ method: 'get',
params: query,
- });
+ })
}
//配件入库 配件类型下拉数据
export function getAccessoryPutInDetailList(query) {
return request({
- url: "/material/purchaseAccessory/putinDetails",
- method: "get",
+ url: '/material/purchaseAccessory/putinDetails',
+ method: 'get',
params: query,
- });
+ })
}
//配件入库 审批操作
export function checkInputAccessory(data) {
return request({
- url: "/material/purchaseAccessory/checkInput",
- method: "post",
+ url: '/material/purchaseAccessory/checkInput',
+ method: 'post',
data: data,
- });
+ })
}
//新购配件验收单
export function getAccessoryAcceptanceForm(query) {
return request({
- url: "/material/purchaseAccessory/getAcceptanceForm",
- method: "get",
+ url: '/material/purchaseAccessory/getAcceptanceForm',
+ method: 'get',
params: query,
- });
+ })
}
//新购配件入库单
export function accessoryWarehousingEntry(query) {
return request({
- url: "/material/purchaseAccessory/warehousingEntry",
- method: "get",
+ url: '/material/purchaseAccessory/warehousingEntry',
+ method: 'get',
params: query,
- });
+ })
}
// 删除
export function purchaseCheckInfoRemove(maCode) {
return request({
- url: "/material/purchaseCheckInfo/" + maCode,
- method: "delete",
- });
+ url: '/material/purchaseCheckInfo/' + maCode,
+ method: 'delete',
+ })
}
//新增计划管理
export function addPlanManagement(data) {
return request({
- url: "/material/planManagement/addOrUpdate",
- method: "post",
+ url: '/material/planManagement/addOrUpdate',
+ method: 'post',
data: data,
- });
+ })
}
//配件入库 配件类型下拉数据
export function getPlanList(query) {
return request({
- url: "/material/planManagement/getList",
- method: "get",
+ url: '/material/planManagement/getList',
+ method: 'get',
params: query,
- });
+ })
}
//借调操作
export function addOrUpdateMange(data) {
return request({
- url: "/material/planManagement/addOrUpdateMange",
- method: "post",
+ url: '/material/planManagement/addOrUpdateMange',
+ method: 'post',
data: data,
- });
+ })
}
//计划借调列表
export function getManageList(query) {
return request({
- url: "/material/planManagement/getManageList",
- method: "get",
+ url: '/material/planManagement/getManageList',
+ method: 'get',
params: query,
- });
+ })
+}
+//抱杆成套数据明细
+export function getWholeSetDetails(query) {
+ return request({
+ url: '/material/purchaseCheckInfo/wholeSetDetails',
+ method: 'get',
+ params: query,
+ })
}
diff --git a/sgzb-ui/src/components/HoldingpoleDialog/index.vue b/sgzb-ui/src/components/HoldingpoleDialog/index.vue
new file mode 100644
index 00000000..8f3f69fe
--- /dev/null
+++ b/sgzb-ui/src/components/HoldingpoleDialog/index.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index 31774e39..51036f94 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -5,48 +5,23 @@
-
+
-
+
-
-
+
+
@@ -56,49 +31,23 @@
-
+
-
+
-
+
-
+
-
+
@@ -136,54 +85,26 @@
-
-
+
+
-
+
-
+
-
-
+
+
@@ -191,17 +112,11 @@
-
+
-
+
- 删除
+ 明细
+ 删除
+
+
@@ -228,13 +144,14 @@ import { getUserByRoleList } from '@/api/system/user'
import { equipmentTypeTree, supplierInfoList } from '@/api/store/tools'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import HoldingpoleDialog from '@/components/HoldingpoleDialog/index.vue';
-import {} from '@/api/store/newBuy'
+import { } from '@/api/store/newBuy'
export default {
name: 'NewDevicesArrival',
dicts: ['sys_normal_disable'],
- components: { Treeselect },
+ components: { Treeselect, HoldingpoleDialog },
data() {
return {
taskId: '',
@@ -269,6 +186,8 @@ export default {
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
+ showDialog: false,
+ holdingpoleData: {},
// 日期范围
dateRange: [],
// 数据范围选项
@@ -467,7 +386,7 @@ export default {
if (this.$refs.menu != undefined) {
this.$refs.menu.setCheckedKeys([])
}
- ;(this.menuExpand = false),
+ ; (this.menuExpand = false),
(this.menuNodeAll = false),
(this.deptExpand = true),
(this.deptNodeAll = false),
@@ -514,7 +433,7 @@ export default {
if (this.equipmentList.length > 0) {
this.$modal
.confirm('是否确认保存当前页面')
- .then(function() {})
+ .then(function () { })
.then(() => {
if (this.isEdit) {
console.log('编辑')
@@ -538,7 +457,7 @@ export default {
})
}
})
- .catch(() => {})
+ .catch(() => { })
} else {
this.$modal.msgError('请先选择并添加机具类型!!!')
}
@@ -561,6 +480,16 @@ export default {
// this.form = response.data;
// this.open = true;
},
+ /** 明细按钮操作 */
+ handleDetail(row) {
+ this.holdingpoleData = row
+ this.showDialog = true
+ },
+ onDialogClose() {
+ console.log('弹窗已关闭');
+ this.showDialog = false
+ // 在这里执行关闭后的相关操作
+ },
/** 删除按钮操作 */
handleDelete(row) {
console.log(row.id)
@@ -573,7 +502,7 @@ export default {
}
})
})
- .catch(() => {})
+ .catch(() => { })
// const roleIds = row.roleId || this.ids;
// this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function() {
@@ -601,6 +530,7 @@ export default {
::v-deep input::-webkit-inner-spin-button {
-webkit-appearance: none !important;
}
+
::v-deep input[type='number'] {
-moz-appearance: textfield !important;
}