diff --git a/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue b/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue
index cff517f..a68d536 100644
--- a/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue
+++ b/src/views/invoicing/bizSuppliers/NuBizSuppliersInfoList.vue
@@ -33,8 +33,10 @@
-
+
+
+
@@ -46,9 +48,10 @@
import { syncList, deleteOne, batchDelete, getImportUrl, getExportUrl } from './NuBizSuppliersInfo.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import NuBizSuppliersMateriallInfoModal from './NuBizSuppliersMateriallInfoModal.vue'
+ import SuppliersWlTypeModal from './components/SuppliersWlTypeModal.vue'
import { useUserStore } from '/@/store/modules/user';
import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
-import { defHttp } from '/@/utils/http/axios';
+ import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
@@ -59,6 +62,7 @@ import { defHttp } from '/@/utils/http/axios';
const queryParam = reactive({});
const toggleSearchStatus = ref(false);
const wlRegisterModal = ref();
+ const wlTypeModal = ref();
const userStore = useUserStore();
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
@@ -70,22 +74,13 @@ import { defHttp } from '/@/utils/http/axios';
useSearchForm: false,
showIndexColumn: true,
actionColumn: {
- width: 120,
+ width: 180,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
- exportConfig: {
- name: "供应商信息",
- url: getExportUrl,
- params: queryParam,
- },
- importConfig: {
- url: getImportUrl,
- success: handleSuccess
- },
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys,selectedRows }] = tableContext;
const labelCol = reactive({
@@ -120,33 +115,36 @@ import { defHttp } from '/@/utils/http/axios';
* 合作
*/
async function handleWlType(record) {
- var params = { id: record.id }
- await createConfirm({
- iconType: 'warning',
- title: '确认合作',
- content: '是否与此供应商进行合作',
- okText: '确认',
- cancelText: '取消',
- onOk: () => {
- console.log("🚀 ~ handleWlType ~ record:", record)
- // 成功回调
- setTimeout(() => {
- createMessage.success("更新成功!")
- searchQuery();
- }, 1000);
- return defHttp.post({
- url: '/invoicing/configSuppliersInfo/cooperationSupp',
- params,
- timeout: 100000
- }).then((res) => {
- // 返回一个立即解决的Promise,确保confirm可以关闭
- return Promise.resolve();
- }).catch(error => {
- // 出错时也要确保能关闭弹出框
- return Promise.resolve();
- });
- }
- });
+ wlTypeModal.value.disableSubmit = false;
+ wlTypeModal.value.edit(record);
+
+ // var params = { id: record.id }
+ // await createConfirm({
+ // iconType: 'warning',
+ // title: '确认合作',
+ // content: '是否与此供应商进行合作',
+ // okText: '确认',
+ // cancelText: '取消',
+ // onOk: () => {
+ // console.log("🚀 ~ handleWlType ~ record:", record)
+ // // 成功回调
+ // setTimeout(() => {
+ // createMessage.success("更新成功!")
+ // searchQuery();
+ // }, 1000);
+ // return defHttp.post({
+ // url: '/invoicing/configSuppliersInfo/cooperationSupp',
+ // params,
+ // timeout: 100000
+ // }).then((res) => {
+ // // 返回一个立即解决的Promise,确保confirm可以关闭
+ // return Promise.resolve();
+ // }).catch(error => {
+ // // 出错时也要确保能关闭弹出框
+ // return Promise.resolve();
+ // });
+ // }
+ // });
}
@@ -180,7 +178,7 @@ async function handleWlType(record) {
onClick: handleWlEdit.bind(null, record),
},
{
- label: '合作',
+ label: '物料配置',
onClick: handleWlType.bind(null, record),
ifShow: !record.izEnabled
},
diff --git a/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfo.api.ts b/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfo.api.ts
index 97abc3b..37170fb 100644
--- a/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfo.api.ts
+++ b/src/views/invoicing/bizSuppliers/NuBizSuppliersMaterialInfo.api.ts
@@ -11,6 +11,7 @@ enum Api {
deleteBatch = '/bizSuppliers/nuBizSuppliersMaterialInfo/deleteBatch',
importExcel = '/bizSuppliers/nuBizSuppliersMaterialInfo/importExcel',
exportXls = '/allMaterialInfo/nuBizAllMaterialInfo/exportXls',
+ saveBacthType = '/bizSuppliers/nuBizSuppliersMaterialType/saveBacthType',
}
/**
@@ -70,3 +71,7 @@ export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}
+export const saveBacthType = (params, isUpdate) => {
+ let url = Api.saveBacthType;
+ return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/invoicing/bizSuppliers/components/SuppliersWlTypeForm.vue b/src/views/invoicing/bizSuppliers/components/SuppliersWlTypeForm.vue
new file mode 100644
index 0000000..7b17396
--- /dev/null
+++ b/src/views/invoicing/bizSuppliers/components/SuppliersWlTypeForm.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/invoicing/bizSuppliers/components/SuppliersWlTypeModal.vue b/src/views/invoicing/bizSuppliers/components/SuppliersWlTypeModal.vue
new file mode 100644
index 0000000..e1ed8d7
--- /dev/null
+++ b/src/views/invoicing/bizSuppliers/components/SuppliersWlTypeModal.vue
@@ -0,0 +1,82 @@
+
+
+
+
+ 关闭
+ 确认
+
+
+
+
+
+
+
+