diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js
new file mode 100644
index 00000000..35f0a1f0
--- /dev/null
+++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 初始化机床项目
+export function initMachineProject() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: 'PDM_项目名称_查询数据'
+ }
+ })
+}
+// 组件查询
+export function searchgroup(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: 'PDM_组件名称_查询数据',
+ param: '机床流水号=' + num
+ }
+ })
+}
+// 查询表1标准件和外购件
+export function searchTable1(...params) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购部采购_查询物料',
+ param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
+ Pagination: params[4] + '&' + params[5]
+ }
+ })
+}
+// 查询表1基本件
+export function searchTable2(...params) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购部采购_查询物料_基本件',
+ param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
+ Pagination: params[4] + '&' + params[5]
+ }
+ })
+}
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
new file mode 100644
index 00000000..ab132f40
--- /dev/null
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -0,0 +1,307 @@
+
+
+
+ 机床编号:
+
+
+ {{ item.label }}
+ {{ item.name }}
+
+
+ 组号:
+
+
+
+ 查询
+
+
+
+
+
+
+
+ 未分配
+ 未询价
+ 已询价
+ 已采购
+
+
+
+
+ {{ scope.row.机床图号 }}
+
+
+
+
+ {{ scope.row.组号 }}
+
+
+
+
+ {{ scope.row.物料名称 }}
+
+
+
+
+ {{ scope.row.物料型号 }}
+
+
+
+
+ {{ scope.row.物料规格 }}
+
+
+
+
+ {{ scope.row.零件数量 || '—' }}
+
+
+
+
+ {{ scope.row.数量 || '—' }}
+
+
+
+
+ {{ scope.row.已到货数量 || '—' }}
+
+
+
+
+ {{ scope.row.供应商名称 || '—' }}
+
+
+
+
+ {{ scope.row.采购合同编号 || '—' }}
+
+
+
+
+
+
+
+
+
+
+
+ 未分配
+ 未询价
+ 已询价
+ 已采购
+
+
+
+
+ {{ scope.row.机床图号 }}
+
+
+
+
+ {{ scope.row.组号 }}
+
+
+
+
+ {{ scope.row.零件名称 }}
+
+
+
+
+ {{ scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.规格 }}
+
+
+
+
+ {{ scope.row.材料 }}
+
+
+
+
+ {{ scope.row.零件数量 || '—' }}
+
+
+
+
+ {{ scope.row.数量 || '—' }}
+
+
+
+
+ {{ scope.row.已到货数量 || '—' }}
+
+
+
+
+ {{ scope.row.供应商名称 || '—' }}
+
+
+
+
+ {{ scope.row.采购合同编号 || '—' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index f4c9bae2..c464d35e 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -74,15 +74,7 @@
-
+
@@ -208,15 +200,7 @@
-
+
@@ -365,8 +349,6 @@ export default {
},
computed: {
...mapGetters([
- 'sidebar',
- 'avatar',
'name',
'id'
])
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index f4e02a5b..3d192ba5 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -24,7 +24,7 @@ export default {