修改物料费用、公司权限

src/api/model/finance.js

@@ -0,0 +1,49 @@
+import config from "@/config";
+import http from "@/utils/request";
+
+export default {
+	cost:{
+		add: {
+			url: `${config.API_URL}/cost.add`,
+			name: "服务、快递费用添加",     			// 1 服务费	2 快递费
+			post: async function (params) {
+				return await http.post(this.url, params);
+			},
+		},
+		list: {
+			url: `${config.API_URL}/cost.list`,
+			name: "服务、快递费用列表",
+			get: async function (params) {
+				return await http.post(this.url, params);
+			},
+		},
+		typeList: {
+			url: `${config.API_URL}/cost.type.const.list`,
+			name: "费用类型常量列表",
+			post: async function (params) {
+				return await http.post(this.url, params);
+			},
+		},
+		categoryList: {
+			url: `${config.API_URL}/cost.category.const.list`,
+			name: "费用类别常量列表",
+			post: async function (params) {
+				return await http.post(this.url, params);
+			},
+		},
+		delete:{
+			url: `${config.API_URL}/cost.delete`,
+			name: "删除费用流水",
+			post: async function (params) {
+				return await http.post(this.url, params);
+			},
+		},
+		info:{
+			url: `${config.API_URL}/cost.detail.list`,
+			name: "费用详情",
+			post: async function (params) {
+				return await http.post(this.url, params);
+			},
+		}
+	},
+};

src/api/model/setup.js

@@ -88,6 +88,13 @@ export default {
 				return await http.post(this.url, data);
 			},
 		},
+		delete:{
+			url: `${config.API_URL}/material.cost.delete`,
+			name: "物料成本删除",
+			post: async function (data) {
+				return await http.post(this.url, data);
+			},
+		},
 		template:{
 			url: `${config.API_URL}/material.cost.import.template`,
 			name: "物料成本导入模版",

src/views/finance/feesStatistics/index.vue

@@ -49,12 +49,9 @@
 							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
 							<template #dropdown>
 								<el-dropdown-menu>
-									<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">查看详情</el-dropdown-item>
+									<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑费用</el-dropdown-item>
-									<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑公司</el-dropdown-item>
+									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除费用</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-AbilityAuthorization" @click="table_empower(scope.row)" divided>功能授权</el-dropdown-item>
+									<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See" divided>查看详情</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-DataAuthorization">数据授权</el-dropdown-item>
-									<el-dropdown-item  icon="sc-icon-UserList" @click="table_user_ist(scope.row)" divided>用户列表</el-dropdown-item>
-									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除公司</el-dropdown-item>
 								</el-dropdown-menu>
 							</template>
 						</el-dropdown>
@@ -80,23 +77,21 @@ export default {
 				show: false,
 			},
 			list: {
-				apiObj: {},
+				apiObj: this.$API.finance.cost.list,
 				column: [],
 			},
 			selection: [],
 			exportShow:false,
 			searchShow:false,
 			searchList:[
-				{name:'生产日期',type:'date',code:'activation_date'},
+				{name:'费用类型',type:'multiple',code:'type_name', data:[], placeholder:"请选择费用类型",show:true},
-				{name:'反厂日期',type:'date',code:'activation_date'},
+				{name:'费用类别',type:'select',code:'category_name', data:[], placeholder:"请选择费用类别",show:false},
-				{name:'处理时间',type:'date',code:'activation_date'},
+				{name:'地址',type:'text',code:['location'],placeholder:"地址",isOpen:true,show:false},
-				{name:'客户名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",show:false},
+				{name:'单号',type:'text',code:['identifier'],placeholder:"请输入单号",isOpen:true,show:false},
-				{name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",show:false},
+				{name:'单位',type:'text',code:['unit'],placeholder:"请输入单位",isOpen:true,show:false},
-				{name:'工单号',type:'text',code:['mobile'],placeholder:"请输入手机号",isOpen:true,show:false},
+				{name:'交付/快递日期',type:'date',code:'time',show:true},
-				{name:'邮件地址',type:'text',code:['email'],placeholder:"请输入邮箱地址",isOpen:true,show:false},
+				{name:'新增日期',type:'date',code:'created_at',show:true},
-				{name:'公司地址',type:'text',code:['address'],placeholder:"请输入公司地址",isOpen:true,show:false},
+				{name:'关键字',type:'text',code:['quantity','amount','remark'],keyword:true,show:true},
-				{name:'负责人',type:'text',code:['owner'],placeholder:"请输入负责人",isOpen:true,show:false},
-				{name:'关键字',type:'text',code:['domain','name'],keyword:true,show:true},
 			],
 			params: {},
 		}

src/views/setting/advanced/setup/material.vue

@@ -4,6 +4,7 @@
 			<el-header>
 				<div class="left-panel">
 					<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
+					<el-button type="danger" :disabled="selection.length>0?false:true" :size="size" icon="el-icon-Delete" @click="all_delete"></el-button>
 					<scImport ref="scImport" :size="size" title="批量导入物料成本" @parentParams="importUpload" @importSuccess="importSuccess">
 						<template #header>
 							<el-button type="primary" :size="size" plain @click="importFile">批量导入</el-button>
@@ -25,7 +26,8 @@
 					<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
 				</div>
 			</div>
-			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow>
+			<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow @selection-change="selectionChange">
+				<sc-table-column type="selection" align="center" width="40"></sc-table-column>
 				<sc-table-column label="序号" align="center" type="index"></sc-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="160">
 					<template #default="scope">
@@ -33,7 +35,6 @@
 							<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
 							<template #dropdown>
 								<el-dropdown-menu>
-									<el-dropdown-item @click="table_see(scope.row, 'see')" icon="sc-icon-See">查看</el-dropdown-item>
 									<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除配置</el-dropdown-item>
 								</el-dropdown-menu>
 							</template>
@@ -60,6 +61,7 @@ export default {
 			dialog:{
 				show:false,
 			},
+			selection:[],
 			list:{
 				apiObj: this.$API.setup.material.list,
 				column:[]
@@ -110,6 +112,11 @@ export default {
 			this.$refs.table.refresh()
 		},
 
+		//表格选择后回调事件
+		selectionChange(selection){
+			this.selection = selection;
+		},
+
 		add(){
 			this.dialog.save = true
 			this.$nextTick(() => {
@@ -121,11 +128,29 @@ export default {
 			this.$refs.table.refresh();
 		},
 
-		table_see(){
+		all_delete(){
-
+			this.$confirm(`确定删除所选配置吗？`, '提示', {
+				type: 'warning'
+			}).then(async () => {
+				const reqData = {ids: this.selection.map(em=> em.id)};
+				const res = await this.$API.setup.material.delete.post(reqData);
+				if(res.code == 200){
+					this.$refs.table.refresh()
+					this.$message.success("删除成功")
+				}
+			}).catch(()=>{})
 		},
-		table_del(){
+		table_del(row){
-
+			this.$confirm(`确定删除 ${row.m_mpn} 吗？`, '提示', {
+				type: 'warning'
+			}).then(async () => {
+				const reqData = {ids: [row.id]};
+				const res = await this.$API.setup.material.delete.post(reqData);
+				if(res.code == 200){
+					this.$refs.table.refresh()
+					this.$message.success("删除成功")
+				}
+			}).catch(()=>{})
 		},
 
 		upSearch(){

src/views/setting/company/index.vue

@@ -2,7 +2,7 @@
 	<el-container class="mainBox mainHeaderNoBorderPadding">
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" v-auth="'addCompany'" :size="size" icon="el-icon-plus" @click="add">新增公司</el-button>
+				<el-button type="primary" v-auth="'organizationAdd'" :size="size" icon="el-icon-plus" @click="add">新增公司</el-button>
 				<scImport ref="scImport" :size="size" title="批量导入公司组织" @parentParams="importUpload" @importSuccess="importSuccess">
 					<template #header>
 						<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
@@ -41,7 +41,7 @@
 					</el-image>
 				</template>
 				<template #active_status="scope">
-					<el-switch :size="size" v-auth="'modifyCompanyStatus'" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
+					<el-switch :size="size" v-auth="'organizationUpdateStatus'" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
 				</template>
 				<el-table-column label="操作" fixed="right" align="center" width="150">
 					<template #default="scope">
@@ -50,7 +50,7 @@
 							<template #dropdown>
 								<el-dropdown-menu>
 									<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">查看详情</el-dropdown-item>
-									<div v-auth="'updateCompany'">
+									<div v-auth="'organizationUpdate'">
 										<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑公司</el-dropdown-item>
 									</div>
 									<div v-auth="'addCompanyPermissionView'">
@@ -60,7 +60,7 @@
 									<div v-auth="'companyUser'">
 										<el-dropdown-item icon="sc-icon-UserList" @click="table_user_ist(scope.row)" divided>用户列表</el-dropdown-item>
 									</div>
-									<div v-auth="'deleteCompany'">
+									<div v-auth="'organizationDelete'">
 										<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除公司</el-dropdown-item>
 									</div>
 								</el-dropdown-menu>