@@ -84,6 +80,7 @@ const loading = ref(false);
const showSearch = ref(true);
const queryFormRef = ref
();
const cailiaoshebeiFormRef = ref();
+const { proxy } = getCurrentInstance();
var token = '';
const initFormData: CailiaoshebeiForm = {
id: undefined,
@@ -134,7 +131,7 @@ const { queryParams, form, rules } = toRefs(data);
const getList = async () => {
// 请求数据
axios
- .get('http://192.168.110.159:8898/cailiaoshebei/materialsorder/trackPcPlanList', {
+ .get('http://192.168.110.159:8898/cailiaoshebei/materialsorder/pcPlanListGHS', {
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${token}`,
@@ -147,7 +144,7 @@ const getList = async () => {
})
.then((response) => {
form.value = response.data.rows[0];
- console.log(form.value);
+ getListAll();
})
.catch((error) => {
console.error('请求失败:', error);
@@ -170,6 +167,8 @@ const getListAll = () => {
})
.then((response) => {
console.log('请求成功:', response.data);
+ cailiaoshebeiList.value = response.data.rows;
+
loading.value = false;
})
.catch((error) => {
@@ -179,22 +178,29 @@ const getListAll = () => {
};
/** 提交按钮 */
const submitForm = async () => {
+ cailiaoshebeiList.value.forEach((item) => {
+ if (item.id) {
+ delete item.id;
+ }
+ });
axios
- .get('http://192.168.110.159:8898/cailiaoshebei/materialsorder/modifyTheOrderFormGYS', {
- headers: {
- 'Content-Type': 'application/json',
- 'Authorization': `Bearer ${token}`,
- 'X-Requested-With': 'XMLHttpRequest'
- },
- params: {
- id: '',
- materialstatus: '',
- overdueType: '',
- cause: ''
+ .put(
+ 'http://192.168.110.159:8898/cailiaoshebei/materialsorder/modifyTheOrderFormGYS',
+ { ...form.value, list: cailiaoshebeiList.value, batchNumber: form.value.batchNumber }, // 请求体
+ {
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': `Bearer ${token}`,
+ 'X-Requested-With': 'XMLHttpRequest'
+ },
+ params: {
+ /* 如果你还要传 URL 查询参数 */
+ }
}
- })
+ )
.then((response) => {
- console.log('请求成功:', response.data);
+ proxy?.$modal.msgSuccess('操作成功');
+
loading.value = false;
})
.catch((error) => {
diff --git a/src/views/materials/orderMaterials/index.vue b/src/views/materials/orderMaterials/index.vue
index 2fb321e..e95997d 100644
--- a/src/views/materials/orderMaterials/index.vue
+++ b/src/views/materials/orderMaterials/index.vue
@@ -4,7 +4,7 @@
-
+
userStore.selectedProject);
const batchTreeRef = ref(null);
const cailiaoshebeiList = ref([]);
const buttonLoading = ref(false);
-const loading = ref(true);
+const loading = ref(false);
const showSearch = ref(true);
const ids = ref>([]);
const single = ref(true);
@@ -250,9 +250,12 @@ const data = reactive>({
});
const { queryParams, form, rules } = toRefs(data);
+const batchNumber = ref('');
/** 查询物资-材料设备列表 */
const getList = async () => {
+ if (!queryParams.value.batchNumber) return;
+
loading.value = true;
const res = await listCailiaoshebei(queryParams.value);
cailiaoshebeiList.value = res.rows;
@@ -287,6 +290,11 @@ const handleNodeClick = (data: any) => {
getList();
};
+const searchBatchList = async () => {
+ queryParams.value.batchNumber = batchNumber.value;
+ getBatchList();
+};
+
/** 取消按钮 */
const cancel = () => {
reset();
diff --git a/src/views/materials/suppliesprice/index.vue b/src/views/materials/suppliesprice/index.vue
index db2d71b..46eab90 100644
--- a/src/views/materials/suppliesprice/index.vue
+++ b/src/views/materials/suppliesprice/index.vue
@@ -15,7 +15,7 @@
-->
-
+
+
+
+ {{ node.label }}
+
+
-
-
-
-
-
-
+
修改 userStore.selectedProject);
const batchTreeRef = ref(null);
const cailiaoshebeiList = ref([]);
const buttonLoading = ref(false);
-const loading = ref(true);
+const loading = ref(false);
const showSearch = ref(true);
const ids = ref>([]);
const single = ref(true);
@@ -262,6 +263,7 @@ const multiple = ref(true);
const total = ref(0);
const batchOptions = ref([]);
const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status'));
+const batchNumber = ref('');
const queryFormRef = ref();
const cailiaoshebeiFormRef = ref();
@@ -357,8 +359,8 @@ const getBatchList = async () => {
/** 节点单击事件 */
const handleNodeClick = (data: any) => {
- console.log('🚀 ~ handleNodeClick ~ data:', data);
queryParams.value.batchNumber = data.batchNumber;
+ batchNumber.value = '';
form.value.batchNumber = data.batchNumber;
form.value.approvalPlan = data.approvalPlan;
console.log('🚀 ~ handleNodeClick ~ form.value:', form.value);
@@ -368,6 +370,11 @@ const handleNodeClick = (data: any) => {
getList();
};
+const searchBatchList = () => {
+ queryParams.value.batchNumber = batchNumber.value;
+ getBatchList();
+};
+
/** 取消按钮 */
const cancel = () => {
reset();
@@ -506,6 +513,14 @@ onUnmounted(() => {
});