yf
/
yxk_pc_mdh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Add import and update basic functions

This commit is contained in:
ruofei.yu 2025-09-04 17:18:37 +08:00
parent 925999f822
commit 88b081af32
35 changed files with 22138 additions and 21692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/index.js
View File

@ -12,7 +12,7 @@ module.exports = {
proxyTable: {
"/gyhl": {
// target: "/gyhl", //8889
target: "http://36.137.58.70:52/gyhl",
target: "http://36.139.25.238:52/gyhl",
// // target:"http://192.168.1.194:21925", //lj-local
changeOrigin: true,
pathRewrite: {

31
src/api/salesAPI.js
View File

@ -5,6 +5,37 @@ import base from './base'; // 导入接口域名列表
import axios from '@/request'; // 导入http中创建的axios实例
const salesAPI = {
// 导入
importAllFile(param,type) {
let url = "";
switch (type) {
case "sales":
url = "/apis/standard/importExcel/sales";
break;
case 'wlps':
url ="/apis/mdh/shfw/importExcel";
break;
case 'patrolPlan':
url ="/apis/patrolPlan/importExcel";
break;
case 'project':
url ="/apis/project/importExcel";
break;
case 'upkeepPlan':
url ="/apis/upkeepPlan/importExcel";
break;
case 'xqgl':
url ="/apis/mdh/xqgl/importExcel";
break;
default:''
}
return axios.post(`${base.url}${url}`, param, {
headers: {
'Content-Type': 'multipart/form-data'
}
});
},
// 获取销售订单列表
listSalesContract(param) {
return axios.get(`${base.url}/apis/salesContractApi/salesContractList`, { params: param })

169
src/components/Dialog/dialogImportFile.vue Normal file
View File

@ -0,0 +1,169 @@
<template>
<el-dialog
:title="title"
:visible.sync="dialogVisible"
:close-on-click-modal="false"
width="500px"
@close="handleClose"
>
<el-form ref="uploadForm" :model="form" label-width="80px">
<el-form-item label="选择文件">
<el-upload
ref="upload"
class="upload-demo"
action="#"
drag
:http-request="customUpload"
:headers="uploadHeaders"
:data="uploadData"
:before-upload="beforeUpload"
:on-success="handleSuccess"
:on-error="handleError"
:on-change="handleChange"
:auto-upload="false"
:file-list="fileList"
accept=".xlsx,.xls"
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip" slot="tip">
只能上传Excel文件，且不超过10MB
</div>
</el-upload>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose">取 消</el-button>
<el-button type="primary" @click="submitUpload" :loading="uploading">
{{ uploading ? '上传中...' : '确 定' }}
</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
name: 'DialogImportFile',
props: {
title: {
type: String,
default: '导入Excel文件'
},
uploadData: {
type: Object,
default: () => ({})
},
uploadHeaders: {
type: Object,
default: () => ({})
},
source: {
type: String,
default: ''
},
visible: {
type: Boolean,
default: false
}
},
data() {
return {
dialogVisible: this.visible,
fileList: [],
uploading: false,
form: {}
};
},
watch: {
visible(newVal) {
this.dialogVisible = newVal;
}
},
methods: {
handleClose() {
this.$emit('update:visible', false);
this.$emit('close');
this.$refs.upload.clearFiles();
this.fileList = [];
},
handleChange(file, fileList) {
this.fileList = fileList.slice(-1);
},
beforeUpload(file) {
const isExcel =
file.type === 'application/vnd.ms-excel' ||
file.type ===
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
const isLt10M = file.size / 1024 / 1024 < 10;
if (!isExcel) {
this.$message.error('只能上传Excel文件！');
return false;
}
if (!isLt10M) {
this.$message.error('上传文件大小不能超过10MB！');
return false;
}
return true;
},
// 自定义上传方法
async customUpload(options) {
const { file, onSuccess, onError } = options;
try {
const formData = new FormData();
formData.append('file', file);
this.$api.salesAPI.importAllFile(formData,this.source).then(response => {
console.log('上传成功', response);
}).catch(error => {
console.error('上传失败', error);
});
} catch (error) {
onError(error);
}
},
submitUpload() {
if (this.fileList.length === 0) {
this.$message.warning('请先选择文件');
return;
}
this.uploading = true;
this.$refs.upload.submit();
},
handleSuccess(response, file, fileList) {
this.uploading = false;
this.$message.success('文件上传成功');
const _self = this;
setTimeout(() => {
_self.$emit('success', response, file, fileList);
_self.handleClose();
}, 1000);
},
handleError(error, file, fileList) {
this.uploading = false;
this.$message.error('文件上传失败');
this.$emit('error', error, file, fileList);
}
}
};
</script>
<style scoped>
.upload-demo {
width: 100%;
}
.dialog-footer{
padding-right: 20px;
box-sizing: border-box;
}
</style>

4
src/pages/equipment/account.vue
View File

@ -91,8 +91,8 @@
<el-table-column prop="site" show-overflow-tooltip align="center" label="安装地点"></el-table-column>
<el-table-column prop="dept_name" show-overflow-tooltip align="center" label="使用部门"></el-table-column>
<el-table-column prop="user_name" align="center" label="负责人"></el-table-column>
<el-table-column prop="buy_time" show-overflow-tooltip align="center" label="购置时间"
width="114"></el-table-column>
<!-- <el-table-column prop="buy_time" show-overflow-tooltip align="center" label="购置时间"
width="114"></el-table-column> -->
</el-table>
</div>
<div class="sys-pagination">

15
src/pages/independent/center/components/disc.vue
View File

@ -1,6 +1,7 @@
<template>
<!-- 圆盘 -->
<div class="disc-wrap">
<div class="disc-wrap" >
<img :src="companyInfo.zp" style="width:100%;height:100%;" alt="">
<!-- <div class="disc">
<div class="inner"></div>
<div class="outer"></div>
@ -43,10 +44,17 @@
</template>
<script>
import "../../../../utils/flexble";
import { mapState } from "vuex";
export default {
data() {
return {};
}
},
computed: {
...mapState({
companyInfo: state => state.common.companyInfo
}),
},
};
</script>
<style scoped lang="less">
@ -55,11 +63,10 @@ export default {
height: 60%;
position: relative;
box-sizing: border-box;
background: url("../../../../assets/sc_bg.png");
// background: url("../../../../assets/sc_bg.png");
background-size: 100% 100%;
background-repeat: no-repeat;
.disc {
position: absolute;
top: 0;

8
src/pages/independent/screen.vue
View File

@ -5,7 +5,7 @@
<div class="header-wrap">
<div class="myheader">
<p class="header-title">
江西心诚药业互联网平台数字化展示中心
{{ companyInfo.screenName }}
</p>
<div class="time">{{ time }}</div>
<!-- <div class="weather">{{ "🌤晴 22℃" }}</div> -->
@ -51,6 +51,7 @@ import model3d from "./screen-3d";
import model3dsb from "./screen-3d-sb";
import model3dhcl from "./screen-3d-hcl";
import model3dfq from "./screen-3d-fq";
import { mapState } from "vuex";
export default {
name: "LongScreen",
@ -70,6 +71,11 @@ export default {
show: "cj"
};
},
computed: {
...mapState({
companyInfo: state => state.common.companyInfo
}),
},
mounted() {
this.timeSelse = setInterval(() => {
this.getTime();

21
src/pages/inspection/plan/index.vue
View File

@ -26,6 +26,7 @@
:disabled="btnDelDisabled"
>禁用</el-button
>
<el-button type="primary" v-has="'inspection:plan:import'" @click="importFile()">导入</el-button>
<!-- <el-button type="primary" @click="importPlan()">导入</el-button>
<el-button type="primary" @click="exportPlan()">导出</el-button>-->
</div>
@ -206,21 +207,34 @@
:visible.sync="chooseUserVisible"
@change="getUser"
></dialogChooseSingleUser>
<dialog-import-file
v-if="showUserImportDialog"
:visible.sync="showUserImportDialog"
title="点检计划批量导入"
source="patrolPlan"
:upload-data="{ type: 'user' }"
@success="handleUserImportSuccess"
@close="showUserImportDialog = false"
/>
</div>
</template>
<script>
import { formatDateTime } from "@/utils/tools.js";
import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
import btnInput from "@/components/btnInput.vue";
import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
export default {
name: "inspection_plan",
components: {
btnInput,
DialogImportFile,
dialogChooseSingleUser
},
data() {
return {
showUserImportDialog:false,
total: 0, //总条数
pageSizes: [10, 20, 50], //每页展示多少条
search_data: {
@ -255,7 +269,12 @@ export default {
this.initData();
},
methods: {
/**
handleUserImportSuccess(response, file, fileList) {
this.getList()
},
importFile(){
this.showUserImportDialog = true
}, /**
* 获取选择的负责人
*/
getUser(val) {

21
src/pages/khgxgl/wlps/index.vue
View File

@ -4,6 +4,8 @@
<div class="sys-operate">
<el-button type="primary" v-has="'upkeep:plan:add'" @click="add()">新增</el-button>
<el-button type="primary" v-has="'upkeep:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
<el-button type="primary" v-has="'upkeep:plan:import'" @click="importFile()">导入</el-button>
<!-- <el-button
type="primary"
v-has="'upkeep:plan:remove'"
@ -155,11 +157,22 @@
@change="getUser"
></dialogChooseSingleUser> -->
<!-- <chooseSbjh :visible.sync="chooseSbjhVisible" /> -->
<dialog-import-file
v-if="showUserImportDialog"
:visible.sync="showUserImportDialog"
title="售后管理批量导入"
source="wlps"
:upload-data="{ type: 'user' }"
@success="handleUserImportSuccess"
@close="showUserImportDialog = false"
/>
</div>
</template>
<script>
import { formatDateTime } from "@/utils/tools.js";
import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
// import btnInput from "@/components/btnInput.vue";
// import chooseSbjh from "./components/chooseSbjh.vue";
// import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
@ -171,12 +184,14 @@ let api = {
export default {
name: "wlps",
components: {
DialogImportFile
// btnInput
// dialogChooseSingleUser
// chooseSbjh
},
data() {
return {
showUserImportDialog:false,
ztList: [
{
name: "未开始",
@ -233,6 +248,12 @@ export default {
// this.initData();
},
methods: {
handleUserImportSuccess(response, file, fileList) {
this.getList()
},
importFile(){
this.showUserImportDialog = true
},
async reback() {
if (this.rowIds.length > 0) {
let r = this.rowIds[0];

20
src/pages/khgxgl/xqgl/index.vue
View File

@ -4,6 +4,7 @@
<div class="sys-operate">
<el-button type="primary" v-has="'upkeep:plan:add'" @click="add()">新增</el-button>
<el-button type="primary" v-has="'upkeep:plan:remove'" @click="remove()" :disabled="btnDelDisabled">删除</el-button>
<el-button type="primary" v-has="'upkeep:plan:import:xqgl'" @click="importFile()" >导入</el-button>
<!-- <el-button
type="primary"
v-has="'upkeep:plan:remove'"
@ -153,11 +154,22 @@
@change="getUser"
></dialogChooseSingleUser> -->
<!-- <chooseSbjh :visible.sync="chooseSbjhVisible" /> -->
<dialog-import-file
v-if="showUserImportDialog"
:visible.sync="showUserImportDialog"
title="需求管理批量导入"
source="xqgl"
:upload-data="{ type: 'user' }"
@success="handleUserImportSuccess"
@close="showUserImportDialog = false"
/>
</div>
</template>
<script>
import { formatDateTime } from "@/utils/tools.js";
import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
// import btnInput from "@/components/btnInput.vue";
// import chooseSbjh from "./components/chooseSbjh.vue";
// import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
@ -169,12 +181,14 @@ let api = {
export default {
name: "xqgl",
components: {
DialogImportFile
// btnInput
// dialogChooseSingleUser
// chooseSbjh
},
data() {
return {
showUserImportDialog:false,
ztList: [
{
name: "未开始",
@ -231,6 +245,12 @@ export default {
// this.initData();
},
methods: {
handleUserImportSuccess(response, file, fileList) {
this.getList()
},
importFile(){
this.showUserImportDialog = true
},
async reback() {
if (this.rowIds.length > 0) {
let r = this.rowIds[0];

16
src/pages/login/index.vue
View File

@ -1,9 +1,8 @@
<template>
<div class="sys-login" style="overflow: hidden;">
<div class="login-logo" style="display:flex;">
<img style="width:50px;height:50px;" src="../../assets/logo_xc.jpg" alt />
<h2 style="margin-left:10px;color:#fff">江西心诚药业有限公司</h2>
<!-- <img src="../../assets/logo1.png" alt /> -->
<img style="width:50px;height:50px;" :src="companyInfo.logoUrl" alt />
<h2 style="margin-left:10px;color:#fff">{{ companyInfo.name }}</h2>
</div>
<!-- <div class="login-slogan">
赋能万物&nbsp;连接未来
@ -48,15 +47,20 @@ export default {
name: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
password: [{ required: true, message: "密码不能为空", trigger: "blur" }]
},
sysMsg: ""
sysMsg: "",
};
},
computed: {},
computed: {
...mapState({
companyInfo: state => state.common.companyInfo
}),
},
methods: {
...mapActions({
login: "auth/loginByUser",
getNavList: "auth/getNavList"
getNavList: "auth/getNavList",
}),
submitForm() {
var self = this;
this.$refs.loginForm.validate(valid => {

25
src/pages/maintain/plan/index.vue
View File

@ -26,6 +26,12 @@
:disabled="btnDelDisabled"
>禁用</el-button
>
<el-button
type="primary"
v-has="'upkeep:plan:import:maintain'"
@click="importFile()"
>导入</el-button
>
<!-- <el-button type="primary" @click="execution()" :disabled="btnOtherDisabled">保养执行</el-button> -->
</div>
<div class="sys-search">
@ -215,21 +221,34 @@
:visible.sync="chooseUserVisible"
@change="getUser"
></dialogChooseSingleUser>
<dialog-import-file
v-if="showUserImportDialog"
:visible.sync="showUserImportDialog"
title="保养计划批量导入"
source="upkeep"
:upload-data="{ type: 'user' }"
@success="handleUserImportSuccess"
@close="showUserImportDialog = false"
/>
</div>
</template>
<script>
import { formatDateTime } from "@/utils/tools.js";
import btnInput from "@/components/btnInput.vue";
import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
import dialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
export default {
name: "upkeep_plan",
components: {
btnInput,
DialogImportFile,
dialogChooseSingleUser
},
data() {
return {
showUserImportDialog:false,
total: 0, //总条数
pageSizes: [10, 20, 50], //每页展示多少条
search_data: {
@ -267,6 +286,12 @@ export default {
this.initData();
},
methods: {
handleUserImportSuccess(response, file, fileList) {
this.getList()
},
importFile(){
this.showUserImportDialog = true
},
/**
* 获取选择的负责人
*/

4
src/pages/management/company.vue
View File

@ -133,6 +133,9 @@
<el-form-item label="监控总数" class="form-inline">
<el-input v-model="formData.jkzs" placeholder="监控总数"></el-input>
</el-form-item>
<el-form-item label="数字化大屏名称" class="form-inline">
<el-input v-model="formData.screenName" placeholder="数字化大屏名称"></el-input>
</el-form-item>
</div>
<div class="flex">
<el-form-item
@ -234,6 +237,7 @@ export default {
auto_upload: false,
uploadUrl: base.uploadUrl,
ftpPrefix: base.ftpPrefix,
screenName:"",
uploadAttachment: [],
provinceList: [], // 省列表
cityList: [], // 市列表

4
src/pages/management/customer/index.vue
View File

@ -62,9 +62,9 @@
<el-table-column prop="linkman_phone" align="center" label="联系电话"></el-table-column>
<el-table-column prop="address" align="center" label="地址" show-overflow-tooltip></el-table-column>
<!--<el-table-column prop="client_desc" align="center" label="备注" show-overflow-tooltip></el-table-column>-->
<el-table-column prop="taxNumber" align="center" label="社会统一信用代码" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="taxNumber" align="center" label="社会统一信用代码" show-overflow-tooltip></el-table-column>
<el-table-column prop="bankName" align="center" label="开户行" show-overflow-tooltip></el-table-column>
<el-table-column prop="account" align="center" label="账号" show-overflow-tooltip></el-table-column>
<el-table-column prop="account" align="center" label="账号" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="belongSalesmanName" align="center" label="所属业务员" show-overflow-tooltip></el-table-column>
<el-table-column prop="belongDeptName" align="center" label="所属部门" show-overflow-tooltip></el-table-column>
<el-table-column prop="statusName" align="center" label="审核状态" show-overflow-tooltip></el-table-column>

23
src/pages/management/project/index.vue
View File

@ -5,6 +5,7 @@
<!-- <el-button type="primary" :disabled="btnDelDisabled" @click="remove()" >删除</el-button> -->
<el-button type="primary" v-has="'management:project:show'" @click="show()"
:disabled="btnOtherDisabled">编辑</el-button>
<el-button type="primary" v-has="'management:project:import'" @click="importFile()">导入</el-button>
<!-- <el-button type="primary" v-has="'management:project:audit'" @click="audit(1)"
:disabled="btnOtherDisabled">审核</el-button>
<el-button type="primary" v-has="'management:project:disAudit'" @click="disAudit(1)"
@ -115,11 +116,23 @@
</span>
</el-dialog>
<DialogChooseSingleUser :visible.sync="chooseUserVisible" @change="getUser"></DialogChooseSingleUser>
<dialog-import-file
v-if="showUserImportDialog"
:visible.sync="showUserImportDialog"
title="项目管理批量导入"
source="project"
:upload-data="{ type: 'user' }"
@success="handleUserImportSuccess"
@close="showUserImportDialog = false"
/>
</div>
</template>
<script>
import config from "@/utils/config.js";
import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
import Cookies from "js-cookie";
import DialogChooseSingleUser from "@/components/System/dialogChooseSingleUser";
import { formatDateTime } from "@/utils/tools.js";
@ -128,11 +141,13 @@ import btnInput from "@/components/btnInput.vue";
export default {
components: {
btnInput,
DialogChooseSingleUser
DialogChooseSingleUser,
DialogImportFile
},
data() {
return {
chooseUserVisible:false,
showUserImportDialog:false,
dywzList:[],
planTime: [],
xmztList:[],
@ -195,6 +210,12 @@ export default {
.catch(error => {
console.log(error);
});
},
handleUserImportSuccess(response, file, fileList) {
this.getList()
},
importFile(){
this.showUserImportDialog = true
},
getUser(data) {
var self = this;

4
src/pages/mes/basic/process/index.vue
View File

@ -67,8 +67,8 @@
{{ scope.row.whetherCollect === 1 ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="manHour" align="center" label="单件工时（分钟）" show-overflow-tooltip></el-table-column>
<el-table-column prop="labourPrice" align="center" label="单件工价（元/件）" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="manHour" align="center" label="单件工时（分钟）" show-overflow-tooltip></el-table-column> -->
<!-- <el-table-column prop="labourPrice" align="center" label="单件工价（元/件）" show-overflow-tooltip></el-table-column> -->
<el-table-column prop="auditSignName" align="center" label="审核状态" show-overflow-tooltip></el-table-column>
</el-table>
</div>

98
src/pages/mes/jobShop/workReport/index.vue
View File

@ -37,6 +37,12 @@
</el-input> -->
<btn-input :valueText.sync='search_data.materielName' :valueId.sync='search_data.materielName' :chooseVisible.sync='chooseMaterielVisible'></btn-input>
</el-form-item>
<el-form-item label="生产计划单号" style='width:22%' class="form_item-inline">
<el-input v-model="search_data.scjhdh" placeholder="源单单号" clearable ></el-input>
</el-form-item>
<el-form-item label="工序计划单号" style='width:22%' class="form_item-inline">
<el-input v-model="search_data.gxjhdh" placeholder="源单单号" clearable ></el-input>
</el-form-item>
</div>
<div class='form_item_btn_out' >
<el-form-item>
@ -409,18 +415,18 @@
{title: "产品名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "自动采集", prop_: "autoCollect", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "自动采集", prop_: "autoCollect", select: false},
{title: "汇报工序", prop_: "processName", select: true},
{title: "完工数量(主计量单位)", prop_: "completionCount", select: true},
{title: "合格数量(主计量单位)", prop_: "conformityCount", select: true},
{title: "返工数量(主计量单位)", prop_: "reworkCount", select: true},
{title: "报废数量(主计量单位)", prop_: "scrapCount", select: true},
{title: "完工数量(辅助单位)", prop_: "completionCountSupport", select: true},
{title: "合格数量(辅助单位)", prop_: "conformityCountSupport", select: true},
{title: "返工数量(辅助单位)", prop_: "reworkCountSupport", select: true},
{title: "报废数量(辅助单位)", prop_: "scrapCountSupport", select: true},
{title: "供应商", prop_: "supplierName", select: true},
{title: "合格数量(主计量单位)", prop_: "conformityCount", select: false},
{title: "返工数量(主计量单位)", prop_: "reworkCount", select: false},
{title: "报废数量(主计量单位)", prop_: "scrapCount", select: false},
{title: "完工数量(辅助单位)", prop_: "completionCountSupport", select: false},
{title: "合格数量(辅助单位)", prop_: "conformityCountSupport", select: false},
{title: "返工数量(辅助单位)", prop_: "reworkCountSupport", select: false},
{title: "报废数量(辅助单位)", prop_: "scrapCountSupport", select: false},
{title: "供应商", prop_: "supplierName", select: false},
{title: "生产部门", prop_: "deptName", select: true},
{title: "加工设备", prop_: "deviceName", select: true},
{title: "生产计划单号", prop_: "proPlanWorkOrderNo", select: true},
@ -435,18 +441,18 @@
{title: "产品名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "自动采集", prop_: "autoCollect", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "自动采集", prop_: "autoCollect", select: false},
{title: "汇报工序", prop_: "processName", select: true},
{title: "完工数量(主计量单位)", prop_: "completionCount", select: true},
{title: "合格数量(主计量单位)", prop_: "conformityCount", select: true},
{title: "返工数量(主计量单位)", prop_: "reworkCount", select: true},
{title: "报废数量(主计量单位)", prop_: "scrapCount", select: true},
{title: "完工数量(辅助单位)", prop_: "completionCountSupport", select: true},
{title: "合格数量(辅助单位)", prop_: "conformityCountSupport", select: true},
{title: "返工数量(辅助单位)", prop_: "reworkCountSupport", select: true},
{title: "报废数量(辅助单位)", prop_: "scrapCountSupport", select: true},
{title: "供应商", prop_: "supplierName", select: true},
{title: "合格数量(主计量单位)", prop_: "conformityCount", select: false},
{title: "返工数量(主计量单位)", prop_: "reworkCount", select: false},
{title: "报废数量(主计量单位)", prop_: "scrapCount", select: false},
{title: "完工数量(辅助单位)", prop_: "completionCountSupport", select: false},
{title: "合格数量(辅助单位)", prop_: "conformityCountSupport", select: false},
{title: "返工数量(辅助单位)", prop_: "reworkCountSupport", select: false},
{title: "报废数量(辅助单位)", prop_: "scrapCountSupport", select: false},
{title: "供应商", prop_: "supplierName", select: false},
{title: "生产部门", prop_: "deptName", select: true},
{title: "加工设备", prop_: "deviceName", select: true},
{title: "生产计划单号", prop_: "proPlanWorkOrderNo", select: true},
@ -971,19 +977,47 @@
},
// 合计
getSummaries(param){
const { columns, data } = param;
const sums = [];
sums[1] = "总计";
sums[11] = "" + this.allCompletionCount;
sums[12] = "" + this.allConformityCount;
sums[13] = "" + this.allReworkCount;
sums[14] = "" + this.allScrapCount;
sums[15] = "" + this.allCompletionCountSupport;
sums[16] = "" + this.allConformityCountSupport;
sums[17] = "" + this.allReworkCountSupport;
sums[18] = "" + this.allScrapCountSupport;
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '总价';
return;
}
console.log(column.property)
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
switch (column.property) {
case 'completionCount':
sums[index] = this.allCompletionCount;
break;
case 'conformityCount':
sums[index] = this.allConformityCount;
break;
case 'reworkCount':
sums[index] = this.allReworkCount;
break;
case 'scrapCount':
sums[index] = this.allScrapCount;
break;
case 'completionCountSupport':
sums[index] = this.allCompletionCountSupport;
break;
case 'conformityCountSupport':
sums[index] = this.allConformityCountSupport;
break;
case 'reworkCountSupport':
sums[index] = this.allReworkCountSupport;
break;
case 'scrapCountSupport':
sums[index] = this.allScrapCountSupport;
break;
default:
}
} else {
sums[index] = '';
}
});
return sums;
},

40
src/pages/mes/planManagement/production/index.vue
View File

@ -245,54 +245,54 @@ export default {
{title: "生产计划单号", prop_: "planNo", select: true},
{title: "单据状态", prop_: "planStatusName", select: true},
{title: "下达人", prop_: "auditorName", select: true},
{title: "交货期", prop_: "deliveryDate", select: true},
{title: "交货期", prop_: "deliveryDate", select: false},
{title: "产品代码", prop_: "materialSerialNo", select: true},
{title: "产品名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "planCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "主单位数量", prop_: "planCount", select: false},
{title: "计划生产数量", prop_: "planCountSupport", select: true},
{title: "批号", prop_: "batchNo", select: true},
{title: "批号", prop_: "batchNo", select: false},
{title: "计划开工日期", prop_: "planStartTime", select: true},
{title: "计划完工日期", prop_: "planEndTime", select: true},
{title: "BOM单号", prop_: "bomSerialno", select: true},
{title: "BOM版本", prop_: "bomVersion", select: true},
{title: "BOM单号", prop_: "bomSerialno", select: false},
{title: "BOM版本", prop_: "bomVersion", select: false},
{title: "工艺编号", prop_: "tecRouteCode", select: true},
{title: "工艺版本", prop_: "tecRouteVersion", select: true},
{title: "工艺版本", prop_: "tecRouteVersion", select: false},
{title: "制单日期", prop_: "createTime", select: true},
{title: "下达时间", prop_: "giveTime", select: true},
{title: "结案时间", prop_: "actualFinishTime", select: true},
{title: "下达时间", prop_: "giveTime", select: false},
{title: "结案时间", prop_: "actualFinishTime", select: false},
{title: "源单类型", prop_: "sourceTypeName", select: true},
{title: "源单号", prop_: "sourceNo", select: true},
{title: "客户名称", prop_: "clientName", select: true},
{title: "客户名称", prop_: "clientName", select: false},
],
///弹出页面列表数据
showTableColumns: [
{title: "生产计划单号", prop_: "planNo", select: true},
{title: "单据状态", prop_: "planStatusName", select: true},
{title: "下达人", prop_: "auditorName", select: true},
{title: "交货期", prop_: "deliveryDate", select: true},
{title: "交货期", prop_: "deliveryDate", select: false},
{title: "产品代码", prop_: "materialSerialNo", select: true},
{title: "产品名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "planCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "主单位数量", prop_: "planCount", select: false},
{title: "计划生产数量", prop_: "planCountSupport", select: true},
{title: "批号", prop_: "batchNo", select: true},
{title: "批号", prop_: "batchNo", select: false},
{title: "计划开工日期", prop_: "planStartTime", select: true},
{title: "计划完工日期", prop_: "planEndTime", select: true},
{title: "BOM单号", prop_: "bomSerialno", select: true},
{title: "BOM版本", prop_: "bomVersion", select: true},
{title: "BOM单号", prop_: "bomSerialno", select: false},
{title: "BOM版本", prop_: "bomVersion", select: false},
{title: "工艺编号", prop_: "tecRouteCode", select: true},
{title: "工艺版本", prop_: "tecRouteVersion", select: true},
{title: "工艺版本", prop_: "tecRouteVersion", select: false},
{title: "制单日期", prop_: "createTime", select: true},
{title: "下达时间", prop_: "giveTime", select: true},
{title: "结案时间", prop_: "actualFinishTime", select: true},
{title: "下达时间", prop_: "giveTime", select: false},
{title: "结案时间", prop_: "actualFinishTime", select: false},
{title: "源单类型", prop_: "sourceTypeName", select: true},
{title: "源单号", prop_: "sourceNo", select: true},
{title: "客户名称", prop_: "clientName", select: true},
{title: "客户名称", prop_: "clientName", select: false},
],
showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
//显示的列表字段

16
src/pages/mes/planManagement/working_procedure/index.vue
View File

@ -246,14 +246,14 @@ export default {
{title: "工序计划单编号", prop_: "planNo", select: true},
{title: "单据状态", prop_: "planStatusName", select: true},
{title: "下达人", prop_: "audituserName", select: true},
{title: "客户", prop_: "clientName", select: true},
{title: "交货期", prop_: "deliveryDate", select: true},
{title: "客户", prop_: "clientName", select: false},
{title: "交货期", prop_: "deliveryDate", select: false},
{title: "产品代码", prop_: "materialSerialNo", select: true},
{title: "产品名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "planCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "主单位数量", prop_: "planCount", select: false},
{title: "计划生产数量", prop_: "planCountSupport", select: true},
{title: "生产计划单号", prop_: "productionPlanNo", select: true},
],
@ -262,14 +262,14 @@ export default {
{title: "工序计划单编号", prop_: "planNo", select: true},
{title: "单据状态", prop_: "planStatusName", select: true},
{title: "下达人", prop_: "audituserName", select: true},
{title: "客户", prop_: "clientName", select: true},
{title: "交货期", prop_: "deliveryDate", select: true},
{title: "客户", prop_: "clientName", select: false},
{title: "交货期", prop_: "deliveryDate", select: false},
{title: "产品代码", prop_: "materialSerialNo", select: true},
{title: "产品名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "planCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "主单位数量", prop_: "planCount", select: false},
{title: "计划生产数量", prop_: "planCountSupport", select: true},
{title: "生产计划单号", prop_: "productionPlanNo", select: true},
],

55
src/pages/mes/quality/deliveryInspection/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="sys-task sys-box">
<div class="sys-operate sys-tabs">
<el-button type="primary" @click="gotoAdd" v-has="'quality:deliveryInspection:add'">新增</el-button>
<el-button type="primary" @click="gotoAdd" v-has="'quality:deliveryInspection:add'">新增11</el-button>
<el-button type="primary" @click="remove()" :disabled="btnDelDisabled"
v-has="'quality:deliveryInspection:delete'">删除</el-button>
<el-button type="primary" @click="audit()" :disabled="btnOtherDisabled"
@ -32,10 +32,14 @@
<btn-input :valueText.sync='search_data.clientName' :valueId.sync='search_data.clientName'
:chooseVisible.sync='chooseClientVisible'></btn-input>
</el-form-item>
<el-form-item label="源单单号" style='width:22%' class="form_item-inline">
<el-input v-model="search_data.sourceNo" placeholder="源单单号" clearable ></el-input>
</el-form-item>
<el-form-item label="日期" style='width:36%' class="form_item-inline">
<el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
</div>
<div class='form_item_btn_out'>
<el-form-item>
@ -164,26 +168,26 @@ import btnInput from "@/components/btnInput.vue";
{title: "日期", prop_: "createTime", select: true},
{title: "物料代码", prop_: "materialSerialNo", select: true},
{title: "物料名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "计量单位", prop_: "unitUomName", select: true},
{title: "批号", prop_: "batchNo", select: true},
{title: "规格型号", prop_: "specification", select: false},
{title: "计量单位", prop_: "unitUomName", select: false},
{title: "批号", prop_: "batchNo", select: false},
{title: "部门", prop_: "deptName", select: true},
{title: "客户", prop_: "clientName", select: true},
{title: "报检数量(主单位)", prop_: "sendCount", select: true},
{title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
{title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
{title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "报检数量(辅单位)", prop_: "sendCountSupport", select: true},
{title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: true},
{title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: true},
{title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: true},
{title: "备注", prop_: "remarks", select: true},
{title: "制单人", prop_: "createrName", select: true},
{title: "审核人", prop_: "auditorName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "报检数量(辅单位)", prop_: "sendCountSupport", select: false},
{title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: false},
{title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: false},
{title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: false},
{title: "单据状态", prop_: "statusName", select: true},
{title: "制单人", prop_: "createrName", select: false},
{title: "审核人", prop_: "auditorName", select: false},
{title: "源单类型", prop_: "sourceTypeName", select: true},
{title: "源单单号", prop_: "sourceNo", select: true},
{title: "单据状态", prop_: "statusName", select: true},
{title: "备注", prop_: "remarks", select: true},
],
///弹出页面列表数据
showTableColumns: [
@ -191,26 +195,27 @@ import btnInput from "@/components/btnInput.vue";
{title: "日期", prop_: "createTime", select: true},
{title: "物料代码", prop_: "materialSerialNo", select: true},
{title: "物料名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "计量单位", prop_: "unitUomName", select: true},
{title: "批号", prop_: "batchNo", select: true},
{title: "规格型号", prop_: "specification", select: false},
{title: "计量单位", prop_: "unitUomName", select: false},
{title: "批号", prop_: "batchNo", select: false},
{title: "部门", prop_: "deptName", select: true},
{title: "客户", prop_: "clientName", select: true},
{title: "报检数量(主单位)", prop_: "sendCount", select: true},
{title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
{title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
{title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "报检数量(辅单位)", prop_: "sendCountSupport", select: true},
{title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: true},
{title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: true},
{title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: true},
{title: "备注", prop_: "remarks", select: true},
{title: "制单人", prop_: "createrName", select: true},
{title: "审核人", prop_: "auditorName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "报检数量(辅单位)", prop_: "sendCountSupport", select: false},
{title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: false},
{title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: false},
{title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: false},
{title: "单据状态", prop_: "statusName", select: true},
{title: "制单人", prop_: "createrName", select: false},
{title: "审核人", prop_: "auditorName", select: false},
{title: "源单类型", prop_: "sourceTypeName", select: true},
{title: "源单单号", prop_: "sourceNo", select: true},
{title: "单据状态", prop_: "statusName", select: true},
{title: "备注", prop_: "remarks", select: true},
],
showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
//显示的列表字段

98
src/pages/mes/quality/productInspection/index.vue
View File

@ -27,7 +27,9 @@
<btn-input :valueText.sync='search_data.serialNo' :valueId.sync='search_data.serialNo'
:chooseVisible.sync='chooseMaterielVisible'></btn-input>
</el-form-item>
<el-form-item label="源单单号" style='width:22%' class="form_item-inline">
<el-input v-model="search_data.sourceNo" placeholder="源单单号" clearable ></el-input>
</el-form-item>
<el-form-item label="日期" style='width:33.3%' class="form_item-inline">
<el-date-picker v-model="search_data.time" type="daterange" format="yyyy-MM-dd" range-separator="—"
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@ -154,25 +156,25 @@
{title: "日期", prop_: "createTime", select: true},
{title: "产品代码", prop_: "materialSerialNo", select: true},
{title: "产品名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "规格型号", prop_: "specification", select: false},
{title: "计量单位", prop_: "unitUomName", select: true},
{title: "批号", prop_: "batchNo", select: true},
{title: "批号", prop_: "batchNo", select: false},
{title: "生产部门", prop_: "deptName", select: true},
{title: "报检数量(主单位)", prop_: "sendCount", select: true},
{title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
{title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
{title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "报检数量(辅单位)", prop_: "sendCountSupport", select: true},
{title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: true},
{title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: true},
{title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: true},
{title: "备注", prop_: "remarks", select: true},
{title: "制单人", prop_: "createrName", select: true},
{title: "审核人", prop_: "auditorName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "报检数量(辅单位)", prop_: "sendCountSupport", select: false},
{title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: false},
{title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: false},
{title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: false},
{title: "备注", prop_: "remarks", select: false},
{title: "制单人", prop_: "createrName", select: false},
{title: "审核人", prop_: "auditorName", select: false},
{title: "源单类型", prop_: "sourceTypeName", select: true},
{title: "源单单号", prop_: "sourceNo", select: true},
{title: "单据状态", prop_: "statusName", select: true},
{title: "单据状态", prop_: "statusName", select: false},
],
///弹出页面列表数据
showTableColumns: [
@ -180,25 +182,25 @@
{title: "日期", prop_: "createTime", select: true},
{title: "产品代码", prop_: "materialSerialNo", select: true},
{title: "产品名称", prop_: "materialName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "规格型号", prop_: "specification", select: false},
{title: "计量单位", prop_: "unitUomName", select: true},
{title: "批号", prop_: "batchNo", select: true},
{title: "批号", prop_: "batchNo", select: false},
{title: "生产部门", prop_: "deptName", select: true},
{title: "报检数量(主单位)", prop_: "sendCount", select: true},
{title: "检验数量(主单位)", prop_: "inspectionCount", select: true},
{title: "合格数量(主单位)", prop_: "qualifiedCount", select: true},
{title: "不合格数量(主单位)", prop_: "unqualifiedCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "报检数量(辅单位)", prop_: "sendCountSupport", select: true},
{title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: true},
{title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: true},
{title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: true},
{title: "备注", prop_: "remarks", select: true},
{title: "制单人", prop_: "createrName", select: true},
{title: "审核人", prop_: "auditorName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "报检数量(辅单位)", prop_: "sendCountSupport", select: false},
{title: "检验数量(辅单位)", prop_: "inspectionCountSupport", select: false},
{title: "合格数量(辅单位)", prop_: "qualifiedCountSupport", select: false},
{title: "不合格数量(辅单位)", prop_: "unqualifiedCountSupport", select: false},
{title: "备注", prop_: "remarks", select: false},
{title: "制单人", prop_: "createrName", select: false},
{title: "审核人", prop_: "auditorName", select: false},
{title: "源单类型", prop_: "sourceTypeName", select: true},
{title: "源单单号", prop_: "sourceNo", select: true},
{title: "单据状态", prop_: "statusName", select: true},
{title: "单据状态", prop_: "statusName", select: false},
],
showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
//显示的列表字段
@ -347,18 +349,50 @@
* 计算合计
*/
getSummaries(param) {
const { columns, data } = param;
const sums = [];
sums[0] = "合计";
sums[7] = "" + this.sendCounts;
sums[8] = "" + this.inspectionCounts;
sums[9] = "" + this.qualifiedCounts;
sums[12] = "" + this.unqualifiedCounts;
sums[14] = "" + this.sendCountSupport;
sums[15] = "" + this.inspectionCountSupport;
sums[16] = "" + this.qualifiedCountSupport;
sums[17] = "" + this.unqualifiedCountSupport;
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '总价';
return;
}
console.log(column.property)
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
switch (column.property) {
case 'sendCount':
sums[index] = this.sendCounts;
break;
case 'inspectionCount':
sums[index] = this.inspectionCounts;
break;
case 'qualifiedCount':
sums[index] = this.qualifiedCounts;
break;
case 'unqualifiedCount':
sums[index] = this.unqualifiedCounts;
break;
case 'sendCountSupport':
sums[index] = this.sendCountSupport;
break;
case 'inspectionCountSupport':
sums[index] = this.inspectionCountSupport;
break;
case 'qualifiedCountSupport':
sums[index] = this.qualifiedCountSupport;
break;
case 'unqualifiedCountSupport':
sums[index] = this.unqualifiedCountSupport;
break;
default:
}
} else {
sums[index] = '';
}
});
return sums;
},
sortChange({ column, prop, order }){
let j={ column, prop, order };
let order_=j.order=="ascending"?'asc':'desc'

31
src/pages/scm/sales/delivery_note/index.vue
View File

@ -5,7 +5,7 @@
<el-tab-pane label="我发起的" name="first">
<mineTabPage :disableBtn="false"
:formTableData="formTableData"
:searchParamElement="searchParamElement"
:searchParamElement="launchSearch"
:tableData="tableData"
:listQuery="search_data"
:total="total"
@ -368,11 +368,11 @@ export default {
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "主单位数量", prop_: "deliveryCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "发货数量", prop_: "deliveryCountSupport", select: true},
{title: "销售单价", prop_: "sellUnitPrice", select: true},
{title: "销售金额", prop_: "sellAmount", select: true},
{title: "部门", prop_: "deptName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "发货数量", prop_: "deliveryCountSupport", select: false},
{title: "销售单价", prop_: "sellUnitPrice", select: false},
{title: "销售金额", prop_: "sellAmount", select: false},
{title: "部门", prop_: "deptName", select: false},
{title: "销售员", prop_: "salesPersonName", select: true},
{title: "审批状态", prop_: "approveStateName", select: true},
{title: "源单类型", prop_: "sourceTypeName", select: true},
@ -388,11 +388,11 @@ export default {
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "主单位数量", prop_: "deliveryCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "发货数量", prop_: "deliveryCountSupport", select: true},
{title: "销售单价", prop_: "sellUnitPrice", select: true},
{title: "销售金额", prop_: "sellAmount", select: true},
{title: "部门", prop_: "deptName", select: true},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "发货数量", prop_: "deliveryCountSupport", select: false},
{title: "销售单价", prop_: "sellUnitPrice", select: false},
{title: "销售金额", prop_: "sellAmount", select: false},
{title: "部门", prop_: "deptName", select: false},
{title: "销售员", prop_: "salesPersonName", select: true},
{title: "审批状态", prop_: "approveStateName", select: true},
{title: "源单类型", prop_: "sourceTypeName", select: true},
@ -405,7 +405,14 @@ export default {
{key: 0, label: "通知单号", searchType: "inputElement", placeholder: "通知单号", model: "deliveryCode", clearable: true},
{key: 1, label: "客户名称", searchType: "inputElement", placeholder: "客户", model: "clientName", clearable: true},
{key: 2, label: "物料名称", searchType: "inputElement", placeholder: "物料名称", model: "materielName", clearable: true},
{key: 3, label: "通知时间", searchType: "dateElement", placeholder: "请选择时间段", model: "timeArea", clearable: true}
{key: 3, label: "通知时间", searchType: "dateElement", placeholder: "请选择时间段", model: "timeArea", clearable: true},
],
launchSearch:[
{key: 0, label: "通知单号", searchType: "inputElement", placeholder: "通知单号", model: "deliveryCode", clearable: true},
{key: 1, label: "客户名称", searchType: "inputElement", placeholder: "客户", model: "clientName", clearable: true},
{key: 2, label: "物料名称", searchType: "inputElement", placeholder: "物料名称", model: "materielName", clearable: true},
{key: 3, label: "通知时间", searchType: "dateElement", placeholder: "请选择时间段", model: "timeArea", clearable: true},
{key: 4, label: "源单单号", searchType: "inputElement", placeholder: "源单单号", model: "sourceNo", clearable: true}
],
searchApproveParamElement: [
{label: "合同编号", searchType: "inputElement", placeholder: "合同编号", model: "dataCode", clearable: true},

1
src/pages/scm/sales/sales_contract/index.vue
View File

@ -1,6 +1,7 @@
<template>
<div class="sys-box knowledge-box">
<div class="sys-operate">
<el-button type="primary" @click="goAdd()" v-has="'sales:salesContract:add'">新增</el-button>
<el-button type="primary" @click="remove()" :disabled="btnOtherDisabled"
v-has="'sales:salesContract:remove'">删除</el-button>

52
src/pages/scm/sales/sales_contract/indexNew.vue
View File

@ -144,10 +144,20 @@
<DialogChooseSingleUser1 :visible.sync="chooseUserVisible1" @change="getUser1"></DialogChooseSingleUser1>
<!--选择物料-->
<dialogChooseSingleParts :visible.sync="chooseMaterielVisible" @change="getMateriel"></dialogChooseSingleParts>
<dialog-import-file
v-if="showUserImportDialog"
:visible.sync="showUserImportDialog"
title="销售订单批量导入"
source="sales"
:upload-data="{ type: 'user' }"
@success="handleUserImportSuccess"
@close="showUserImportDialog = false"
/>
</div>
</template>
<script>
import DialogImportFile from '@/components/Dialog/dialogImportFile.vue';
import { mapState, mapActions, mapGetters } from "vuex";
import btnInput from "@/components/btnInput.vue";
import FileSaver from "file-saver";
@ -171,10 +181,13 @@ export default {
mineTabPage,
listTabPage,
auditTabPage,
approvedPage
approvedPage,
DialogImportFile
},
data() {
return {
userUploadUrl:'/apis/standard/importExcel/sales',
showUserImportDialog:false,
total: 0, //总条数
approveTotal: 0, //总条数
pageSizes: [10, 20, 50], //每页展示多少条
@ -373,7 +386,9 @@ export default {
click: "tberp",
type: "primary",
disabled: false
}
},
{key:10,btnName:"导入",vhas:"sales:salesContract:import",click:"importFile",type:"primary",disabled:false},
],
//
otherButton: [
@ -452,18 +467,18 @@ export default {
{ title: "合同日期", prop_: "contractDate", select: true },
{ title: "合同编号", prop_: "contractCode", select: true },
{ title: "合同类型", prop_: "contractTypeName", select: true },
{ title: "客户合同编号", prop_: "clientContractCode", select: true },
{ title: "关闭标志", prop_: "closeStatusName", select: true },
{ title: "客户合同编号", prop_: "clientContractCode", select: false },
{ title: "关闭标志", prop_: "closeStatusName", select: false },
{ title: "客户名称", prop_: "clientName", select: true },
{ title: "销售员", prop_: "salesPersonName", select: true },
{ title: "销售部门", prop_: "salesPersonDeptName", select: true },
{ title: "发货是否检验", prop_: "isCheck", select: true },
{ title: "销售部门", prop_: "salesPersonDeptName", select: false},
{ title: "发货是否检验", prop_: "isCheck", select: false },
{ title: "物料代码", prop_: "materielSerialNo", select: true },
{ title: "物料名称", prop_: "materielName", select: true },
{ title: "物料名称", prop_: "materielName", select: false },
{ title: "规格型号", prop_: "specification", select: true },
{ title: "主计量单位", prop_: "unitUomName", select: true },
{ title: "主单位数量", prop_: "count", select: true },
{ title: "辅助单位", prop_: "supportUomName", select: true },
{ title: "主计量单位", prop_: "unitUomName", select: false },
{ title: "主单位数量", prop_: "count", select: false },
{ title: "辅助单位", prop_: "supportUomName", select: false },
{ title: "销售数量", prop_: "saleCount", select: true },
{ title: "含税单价（元）", prop_: "taxUnitPrice", select: true },
{ title: "销售金额（元）", prop_: "taxAmount", select: true },
@ -471,13 +486,13 @@ export default {
title: "交货日期",
prop_: "deliveryDate",
select: true,
sortable: true
sortable: false
},
// {title: "审核状态", prop_: "auditSignName", select: true},
{ title: "审批状态", prop_: "approveStatusName", select: true },
{ title: "行关闭状态", prop_: "itemCloseStatusName", select: true },
{ title: "行关闭时间", prop_: "itemCloseTime", select: true },
{ title: "行关闭原因", prop_: "itemCloseReason", select: true }
{ title: "行关闭状态", prop_: "itemCloseStatusName", select: false },
{ title: "行关闭时间", prop_: "itemCloseTime", select: false },
{ title: "行关闭原因", prop_: "itemCloseReason", select: false }
],
///弹出页面列表数据
showTableColumns: [
@ -616,6 +631,9 @@ export default {
}
},
methods: {
handleUserImportSuccess(response, file, fileList) {
this.getList()
},
associatedDocument() {
let data = this.salesContractIds[0];
this.$router.push({
@ -670,8 +688,14 @@ export default {
this.associatedDocument();
} else if (val === "tberp") {
this.tberp();
} else if( val === 'importFile'){
this.importFile()
}
},
importFile(){
console.log("123")
this.showUserImportDialog = true
},
tberp() {
this.$api.yxkAPI.yxkGet("/api/saleContract/u8Sync", {}).then(res => {
if (res.code == 0) {

3
src/pages/scm/sales/sales_contract/indexNew_1.vue
View File

@ -324,7 +324,8 @@ export default {
{key:5,btnName:"变更",vhas:"sales:salesContract:change",click:"change",type:"primary",disabled:true},
{key:6,btnName:"变更记录",vhas:"sales:salesContract:gotoAlterationList",click:"gotoAlterationList",type:"primary",disabled:true},
{key:7,btnName:"列表配置",click:"showColumnSetDialog",vhas:'',type:"primary",disabled:false},
{key:8,btnName:"关联单据",click:"associatedDocument",type:"primary",disabled:true}
{key:8,btnName:"关联单据",click:"associatedDocument",type:"primary",disabled:true},
],
//
otherButton:[

27
src/pages/scm/sales/sales_stock/index.vue
View File

@ -20,6 +20,9 @@
<el-form-item label="物料" style='width:22%' class="form_item-inline">
<el-input v-model="search_data.materielName" placeholder="模糊查询" clearable ></el-input>
</el-form-item>
<el-form-item label="源单单号" style='width:22%' class="form_item-inline">
<el-input v-model="search_data.sourceNo" placeholder="源单单号" clearable ></el-input>
</el-form-item>
<el-form-item label="出库日期" style='width:34%' class="form_item-inline">
<el-date-picker
v-model="time"
@ -265,14 +268,14 @@
{title: "物料名称", prop_: "materielName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "主单位数量", prop_: "count", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "count", select: false},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "出库数量", prop_: "outCount", select: true},
{title: "销售单价（元）", prop_: "sellUnitPrice", select: true},
{title: "销售金额（元）", prop_: "sellAmount", select: true},
{title: "批号", prop_: "batch", select: true},
{title: "销售单价（元）", prop_: "sellUnitPrice", select: false},
{title: "销售金额（元）", prop_: "sellAmount", select: false},
{title: "批号", prop_: "batch", select: false},
{title: "仓库", prop_: "facName", select: true},
{title: "仓位", prop_: "locationName", select: true},
{title: "仓位", prop_: "locationName", select: false},
{title: "部门", prop_: "deptName", select: true},
{title: "出库员", prop_: "operatorName", select: true},
{title: "审核状态", prop_: "auditSignName", select: true},
@ -288,14 +291,14 @@
{title: "物料名称", prop_: "materielName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "主单位数量", prop_: "count", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "count", select: false},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "出库数量", prop_: "outCount", select: true},
{title: "销售单价（元）", prop_: "sellUnitPrice", select: true},
{title: "销售金额（元）", prop_: "sellAmount", select: true},
{title: "批号", prop_: "batch", select: true},
{title: "销售单价（元）", prop_: "sellUnitPrice", select: false},
{title: "销售金额（元）", prop_: "sellAmount", select: false},
{title: "批号", prop_: "batch", select: false},
{title: "仓库", prop_: "facName", select: true},
{title: "仓位", prop_: "locationName", select: true},
{title: "仓位", prop_: "locationName", select: false},
{title: "部门", prop_: "deptName", select: true},
{title: "出库员", prop_: "operatorName", select: true},
{title: "审核状态", prop_: "auditSignName", select: true},

28
src/pages/scm/warehouse/otherStock/index.vue
View File

@ -278,16 +278,16 @@ export default {
{title: "物料代码", prop_: "serialno", select: true},
{title: "物料名称", prop_: "materielName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "供应商", prop_: "sourceCompanyName", select: true},
{title: "批号", prop_: "batch", select: true},
{title: "供应商", prop_: "sourceCompanyName", select: false},
{title: "批号", prop_: "batch", select: false},
{title: "主计量单位", prop_: "unitName", select: true},
{title: "主单位数量", prop_: "count", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "count", select: false},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "入库数量", prop_: "inCount", select: true},
{title: "单价（元）", prop_: "unitPrice", select: true},
{title: "金额（元）", prop_: "amount", select: true},
{title: "单价（元）", prop_: "unitPrice", select: false},
{title: "金额（元）", prop_: "amount", select: false},
{title: "仓库", prop_: "warehouseName", select: true},
{title: "仓位", prop_: "warehLocationName", select: true},
{title: "仓位", prop_: "warehLocationName", select: false},
{title: "审核状态", prop_: "auditSignName", select: true},
],
///弹出页面列表数据
@ -297,16 +297,16 @@ export default {
{title: "物料代码", prop_: "serialno", select: true},
{title: "物料名称", prop_: "materielName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "供应商", prop_: "sourceCompanyName", select: true},
{title: "批号", prop_: "batch", select: true},
{title: "供应商", prop_: "sourceCompanyName", select: false},
{title: "批号", prop_: "batch", select: false},
{title: "主计量单位", prop_: "unitName", select: true},
{title: "主单位数量", prop_: "count", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "count", select: false},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "入库数量", prop_: "inCount", select: true},
{title: "单价（元）", prop_: "unitPrice", select: true},
{title: "金额（元）", prop_: "amount", select: true},
{title: "单价（元）", prop_: "unitPrice", select: false},
{title: "金额（元）", prop_: "amount", select: false},
{title: "仓库", prop_: "warehouseName", select: true},
{title: "仓位", prop_: "warehLocationName", select: true},
{title: "仓位", prop_: "warehLocationName", select: false},
{title: "审核状态", prop_: "auditSignName", select: true},
],
showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据

27
src/pages/scm/warehouse/produceStock/index.vue
View File

@ -21,6 +21,9 @@
<el-form-item label="物料" style='width:33%' class="form_item-inline">
<el-input v-model="search_data.materielName" placeholder="物料" clearable></el-input>
</el-form-item>
<el-form-item label="源单单号" style='width:22%' class="form_item-inline">
<el-input v-model="search_data.sourceNo" placeholder="源单单号" clearable ></el-input>
</el-form-item>
<el-form-item label="入库日期" style='width:33%' class="form_item-inline">
<el-date-picker v-model="time" type="daterange" format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
range-separator="—" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>
@ -227,15 +230,15 @@ export default {
{title: "物料代码", prop_: "serialno", select: true},
{title: "物料名称", prop_: "materielName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "批号", prop_: "batch", select: true},
{title: "批号", prop_: "batch", select: false},
{title: "主计量单位", prop_: "unitName", select: true},
{title: "主单位数量", prop_: "count", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "count", select: false},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "入库数量", prop_: "inCount", select: true},
{title: "单价（元）", prop_: "unitPrice", select: true},
{title: "金额（元）", prop_: "amount", select: true},
{title: "单价（元）", prop_: "unitPrice", select: false},
{title: "金额（元）", prop_: "amount", select: false},
{title: "仓库", prop_: "warehouseName", select: true},
{title: "仓位", prop_: "warehLocationName", select: true},
{title: "仓位", prop_: "warehLocationName", select: false},
{title: "源单类型", prop_: "sourceTypeName", select: true},
{title: "源单单号", prop_: "sourceCode", select: true},
{title: "审核状态", prop_: "auditSignName", select: true},
@ -248,15 +251,15 @@ export default {
{title: "物料代码", prop_: "serialno", select: true},
{title: "物料名称", prop_: "materielName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "批号", prop_: "batch", select: true},
{title: "批号", prop_: "batch", select: false},
{title: "主计量单位", prop_: "unitName", select: true},
{title: "主单位数量", prop_: "count", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "主单位数量", prop_: "count", select: false},
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "入库数量", prop_: "inCount", select: true},
{title: "单价（元）", prop_: "unitPrice", select: true},
{title: "金额（元）", prop_: "amount", select: true},
{title: "单价（元）", prop_: "unitPrice", select: false},
{title: "金额（元）", prop_: "amount", select: false},
{title: "仓库", prop_: "warehouseName", select: true},
{title: "仓位", prop_: "warehLocationName", select: true},
{title: "仓位", prop_: "warehLocationName", select: false},
{title: "源单类型", prop_: "sourceTypeName", select: true},
{title: "源单单号", prop_: "sourceCode", select: true},
{title: "审核状态", prop_: "auditSignName", select: true},

21
src/pages/scm/warehouse/stock/index.vue
View File

@ -152,31 +152,30 @@ export default {
//默认列表数据
showTableColumnsDefault: [
{title: "仓库", prop_: "facilityName", select: true},
{title: "仓位", prop_: "facilityLocationName", select: true},
{title: "仓位", prop_: "facilityLocationName", select: false},
{title: "物料代码", prop_: "serialNo", select: true},
{title: "物料名称", prop_: "materielName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "批号", prop_: "batch", select: true},
{title: "批号", prop_: "batch", select: false},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "主单位库存数量", prop_: "totalCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "辅助单位库存数量", prop_: "totalRepertoryCount", select: true},
{title: "换算系数", prop_: "convCoefficient", select: true}
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "辅助单位库存数量", prop_: "totalRepertoryCount", select: false},
{title: "换算系数", prop_: "convCoefficient", select: false}
],
///弹出页面列表数据
showTableColumns: [
{title: "仓库", prop_: "facilityName", select: true},
{title: "仓位", prop_: "facilityLocationName", select: true},
{title: "仓位", prop_: "facilityLocationName", select: false},
{title: "物料代码", prop_: "serialNo", select: true},
{title: "物料名称", prop_: "materielName", select: true},
{title: "规格型号", prop_: "specification", select: true},
{title: "批号", prop_: "batch", select: true},
{title: "批号", prop_: "batch", select: false},
{title: "主计量单位", prop_: "unitUomName", select: true},
{title: "主单位库存数量", prop_: "totalCount", select: true},
{title: "辅助单位", prop_: "supportUomName", select: true},
{title: "辅助单位库存数量", prop_: "totalRepertoryCount", select: true},
{title: "换算系数", prop_: "convCoefficient", select: true}
{title: "辅助单位", prop_: "supportUomName", select: false},
{title: "辅助单位库存数量", prop_: "totalRepertoryCount", select: false},
{title: "换算系数", prop_: "convCoefficient", select: false}
],
showTableColumnsTemp: [],//弹框弹出的时候，保存当前的列表数据
//显示的列表字段

12
src/store/modules/common/index.js
View File

@ -5,6 +5,7 @@ const state = {
commonDepts: [],
logoUrl:undefined,
logoUrlFlag:false,
companyInfo:{}
}
const mutations = {
@ -24,7 +25,12 @@ const mutations = {
}
state.logoUrlFlag = true
sessionStorage.setItem("logoUrl",state.logoUrl)
}
},
setCompanyInfo: (state, data) => {
state.companyInfo = data;
sessionStorage.setItem("companyInfo", JSON.stringify(data));
},
}
const actions = {
@ -61,13 +67,15 @@ const actions = {
if(res.code ===0){
console.log("cesssssss")
commit('setLogoUrl',res.result.logoUrl)
commit('setCompanyInfo', res.result);
}
resolve(res)
}).catch(r=>{
reject(r)
})
})
}
},
}
const getters = {