From 21eaf20767aee0db24b679b798398dc735b50118 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Thu, 18 Sep 2025 15:52:26 +0800
Subject: [PATCH] 修改
---
src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue | 283 ++++++++++--------
src/api/contractLedger/index.js | 32 ++
src/api/customerCommunicate/index.js | 32 ++
src/api/monthlyInspectionRecord/index.js | 32 ++
src/views/work/marketingManagement/contractManagement/contractLedger/components/editDialog.vue | 105 ++----
src/views/work/marketingManagement/contractManagement/contractLedger/index.vue | 34 +-
src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue | 61 ---
src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/components/editDialog.vue | 181 +++++------
public/customerCommunicateExample.docx | 0
src/views/work/marketingManagement/customerList/communicate/index.vue | 92 ++++-
public/monthRecordExample.docx | 0
11 files changed, 476 insertions(+), 376 deletions(-)
diff --git a/public/customerCommunicateExample.docx b/public/customerCommunicateExample.docx
index 36d1c94..e4634b3 100644
--- a/public/customerCommunicateExample.docx
+++ b/public/customerCommunicateExample.docx
Binary files differ
diff --git a/public/monthRecordExample.docx b/public/monthRecordExample.docx
index 3d439dd..3fbbf78 100644
--- a/public/monthRecordExample.docx
+++ b/public/monthRecordExample.docx
Binary files differ
diff --git a/src/api/contractLedger/index.js b/src/api/contractLedger/index.js
new file mode 100644
index 0000000..06922a1
--- /dev/null
+++ b/src/api/contractLedger/index.js
@@ -0,0 +1,32 @@
+import request from "@/utils/request";
+
+export function getLedger(params) {
+ return request({
+ url: '/market/ledger/list',
+ method: 'get',
+ params: params
+ })
+}
+
+export function addLedger(data) {
+ return request({
+ url: '/market/ledger/insert',
+ method: 'post',
+ data: data
+ })
+}
+
+export function editLedger(params) {
+ return request({
+ url: `/market/ledger/update`,
+ method: 'post',
+ data: params
+ })
+}
+
+export function delLedger(data) {
+ return request({
+ url: `/market/ledger/deleted?ledgerId=${data}`,
+ method: 'get'
+ })
+}
diff --git a/src/api/customerCommunicate/index.js b/src/api/customerCommunicate/index.js
new file mode 100644
index 0000000..a2e032d
--- /dev/null
+++ b/src/api/customerCommunicate/index.js
@@ -0,0 +1,32 @@
+import request from "@/utils/request";
+
+export function getCustomerCommunicate(params) {
+ return request({
+ url: '/market/communication/list',
+ method: 'get',
+ params: params
+ })
+}
+
+export function addCustomerCommunicate(data) {
+ return request({
+ url: '/market/communication/insert',
+ method: 'post',
+ data: data
+ })
+}
+
+export function editCustomerCommunicate(params) {
+ return request({
+ url: `/market/communication/update`,
+ method: 'post',
+ data: params
+ })
+}
+
+export function delCustomerCommunicate(data) {
+ return request({
+ url: `/market/communication/deleted?communId=${data}`,
+ method: 'get'
+ })
+}
diff --git a/src/api/monthlyInspectionRecord/index.js b/src/api/monthlyInspectionRecord/index.js
new file mode 100644
index 0000000..7be3549
--- /dev/null
+++ b/src/api/monthlyInspectionRecord/index.js
@@ -0,0 +1,32 @@
+import request from "@/utils/request";
+
+export function getMonthlyRecord(params) {
+ return request({
+ url: '/market/monthly/list',
+ method: 'get',
+ params: params
+ })
+}
+
+export function addMonthlyRecord(data) {
+ return request({
+ url: '/market/monthly/insert',
+ method: 'post',
+ data: data
+ })
+}
+
+export function editMonthlyRecord(params) {
+ return request({
+ url: `/market/monthly/update`,
+ method: 'post',
+ data: params
+ })
+}
+
+export function delMonthlyRecord(data) {
+ return request({
+ url: `/market/monthly/deleted?monthlyId=${data}`,
+ method: 'get'
+ })
+}
diff --git a/src/views/work/marketingManagement/contractManagement/contractLedger/components/editDialog.vue b/src/views/work/marketingManagement/contractManagement/contractLedger/components/editDialog.vue
index 41ae3cb..052fa6c 100644
--- a/src/views/work/marketingManagement/contractManagement/contractLedger/components/editDialog.vue
+++ b/src/views/work/marketingManagement/contractManagement/contractLedger/components/editDialog.vue
@@ -19,15 +19,15 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="合同编号:" prop="name" >
- <el-input v-model="state.form.name" :disabled="title === '查看'" placeholder="顾客名称"/>
+ <el-form-item label="合同编号:" prop="number" >
+ <el-input v-model="state.form.number" :disabled="title === '查看'" placeholder="合同编号"/>
</el-form-item>
- <el-form-item label="合同名称:" prop="address" >
- <el-input v-model="state.form.address" :disabled="title === '查看'" placeholder="顾客地址"/>
+ <el-form-item label="合同名称:" prop="contractName" >
+ <el-input v-model="state.form.contractName" :disabled="title === '查看'" placeholder="合同名称"/>
</el-form-item>
- <el-form-item label="签订日期:" prop="remark" >
+ <el-form-item label="签订日期:" prop="signDate" >
<el-date-picker
- v-model="state.form.faultDate"
+ v-model="state.form.signDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择签订日期"
@@ -56,40 +56,26 @@
import {getToken} from "@/utils/auth";
import {addQualification, editQualification} from "@/api/companyInfo/qualifications";
import Cookies from "js-cookie";
+import {addLedger, editLedger} from "@/api/contractLedger";
const dialogVisible = ref(false);
const title = ref("");
const busRef = ref();
const length = ref()
const emit = defineEmits(["getList"]);
-const validateUserPhone = (rule, value, callback)=>{
- if(value === ''){
- callback(new Error('请输入手机号'))
- }else{
- if(!verifyPhone(value)){
- callback(new Error('手机号格式有误'))
- }else{
- callback()
- }
- }
-}
const state = reactive({
form: {
id: '',
companyId: '',
- name: '',
- address: '',
- person: '',
- phone: '',
- email: '',
- remark: ''
+ number: '',
+ contractName: '',
+ signDate: '',
},
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
- name:[{ required: true, message: '请输入顾客名称', trigger: 'blur' }],
- address:[{ required: true, message: '请输入顾客地址', trigger: 'blur' }],
- person:[{ required: true, message: '请输入联系人', trigger: 'blur' }],
- phone: [{ validator: validateUserPhone,required: true, trigger: 'blur' }],
+ number:[{ required: true, message: '请输入编号', trigger: 'blur' }],
+ contractName:[{ required: true, message: '请输入合同名称', trigger: 'blur' }],
+ signDate:[{ required: true, message: '请选择签订日期', trigger: 'blur' }],
},
companyList: [],
isAdmin: false
@@ -121,35 +107,35 @@
}
if(valid){
if(title.value === '新增'){
- // const {id, ...data} = JSON.parse(JSON.stringify(state.form))
- // const res = await addQualification(data)
- // if(res.code === 200){
- // ElMessage({
- // type: 'success',
- // message: '新增成功'
- // });
- // }else{
- // ElMessage.warning(res.message)
- // }
- // emit("getList")
- // busRef.value.clearValidate();
- // reset();
- // dialogVisible.value = false;
+ const {id, ...data} = JSON.parse(JSON.stringify(state.form))
+ const res = await addLedger(data)
+ if(res.code === 200){
+ ElMessage({
+ type: 'success',
+ message: '新增成功'
+ });
+ }else{
+ ElMessage.warning(res.message)
+ }
+ emit("getList")
+ busRef.value.clearValidate();
+ reset();
+ dialogVisible.value = false;
}else if(title.value === '编辑'){
- // const {...data} = JSON.parse(JSON.stringify(state.form))
- // const res = await editQualification(data)
- // if(res.code === 200){
- // ElMessage({
- // type: 'success',
- // message: '编辑成功'
- // });
- // }else{
- // ElMessage.warning(res.message)
- // }
- // emit("getList")
- // busRef.value.clearValidate();
- // reset();
- // dialogVisible.value = false;
+ const {...data} = JSON.parse(JSON.stringify(state.form))
+ const res = await editLedger(data)
+ if(res.code === 200){
+ ElMessage({
+ type: 'success',
+ message: '编辑成功'
+ });
+ }else{
+ ElMessage.warning(res.message)
+ }
+ emit("getList")
+ busRef.value.clearValidate();
+ reset();
+ dialogVisible.value = false;
}
}
}
@@ -166,12 +152,9 @@
state.form = {
id: '',
companyId: '',
- name: '',
- address: '',
- person: '',
- phone: '',
- email: '',
- remark: ''
+ number: '',
+ contractName: '',
+ signDate: '',
}
state.companyList = []
}
diff --git a/src/views/work/marketingManagement/contractManagement/contractLedger/index.vue b/src/views/work/marketingManagement/contractManagement/contractLedger/index.vue
index a470af3..6fba088 100644
--- a/src/views/work/marketingManagement/contractManagement/contractLedger/index.vue
+++ b/src/views/work/marketingManagement/contractManagement/contractLedger/index.vue
@@ -29,9 +29,10 @@
<!-- 表格数据 -->
<el-table v-loading="loading" :data="dataList" :border="true" >
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
- <el-table-column label="合同编号" prop="companyName" align="center" v-if="data.isAdmin" />
- <el-table-column label="合同名称" prop="certificateName" align="center" width="130"/>
- <el-table-column label="签订日期" prop="certificateNum" align="center" />
+ <el-table-column label="企业名称" prop="companyName" align="center" v-if="data.isAdmin" />
+ <el-table-column label="合同编号" prop="number" align="center"/>
+ <el-table-column label="合同名称" prop="contractName" align="center" width="130"/>
+ <el-table-column label="签订日期" prop="signDate" align="center" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -66,6 +67,7 @@
import {delQualification, getQualification} from "@/api/companyInfo/qualifications";
import axios from "axios";
import {getToken} from "@/utils/auth";
+import {delLedger, getLedger} from "@/api/contractLedger";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const noticeRef = ref();
@@ -100,21 +102,15 @@
}
});
const getList = async () => {
- // loading.value = true;
- // const res = await getQualification(data.queryParams);
- // if(res.code === 200){
- // dataList.value = res.data.list.map(item => {
- // return{
- // ...item,
- // effectiveTime: item.effectiveTime.substring(0,10),
- // }
- // })
- // total.value = res.data.total
- // }else{
- // ElMessage.warning(res.message)
- // }
- // loading.value = false;
-
+ loading.value = true;
+ const res = await getLedger(data.queryParams);
+ if(res.code === 200){
+ dataList.value = res.data.list
+ total.value = res.data.total
+ }else{
+ ElMessage.warning(res.message)
+ }
+ loading.value = false;
}
const searchClick = () => {
@@ -174,7 +170,7 @@
type: 'warning',
})
.then( async() => {
- const res = await delQualification(val.id);
+ const res = await delLedger(val.id);
if(res.code === 200){
ElMessage({
type: 'success',
diff --git a/src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue b/src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue
index ba532a4..23c46da 100644
--- a/src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue
+++ b/src/views/work/marketingManagement/customerList/communicate/components/editDialog.vue
@@ -25,36 +25,43 @@
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="记录名称:" prop="year" >
- <el-input :disabled="title === '查看'" v-model="state.form.name" placeholder="记录名称"></el-input>
+ <el-form-item label="记录名称:" prop="recordName" >
+ <el-input :disabled="title === '查看'" v-model="state.form.recordName" placeholder="记录名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="编号:" prop="year" >
- <el-input :disabled="title === '查看'" v-model="state.form.name" placeholder="编号"></el-input>
+ <el-form-item label="编号:" prop="number" >
+ <el-input :disabled="title === '查看'" v-model="state.form.number" placeholder="编号"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="客户单位/姓名:" prop="year" >
- <el-input :disabled="title === '查看'" v-model="state.form.name" placeholder="客户单位/姓名"></el-input>
+ <el-form-item label="客户单位/姓名:" prop="client" >
+ <el-input :disabled="title === '查看'" v-model="state.form.client" placeholder="客户单位/姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="联系电话:" prop="year" >
- <el-input :disabled="title === '查看'" v-model="state.form.name" placeholder="联系电话"></el-input>
+ <el-form-item label="联系电话:" prop="phone" >
+ <el-input :disabled="title === '查看'" v-model="state.form.phone" placeholder="联系电话"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="沟通时间:" prop="year" >
- <el-input :disabled="title === '查看'" v-model="state.form.name" placeholder="沟通时间"></el-input>
+ <el-form-item label="沟通时间:" prop="comTime" >
+ <el-date-picker
+ :disabled="title === '查看'"
+ v-model="state.form.comTime"
+ type="date"
+ value-format="YYYY-MM-DD"
+ placeholder="请选择日期"
+ style="width: 100%"
+ />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="沟通方式:" prop="year" >
+ <el-form-item label="沟通方式:" prop="comMethod" >
<el-checkbox-group v-model="state.checkMethodList" :disabled="title === '查看'" style="display: flex;flex-wrap: wrap" @change="changeCheck('method')" class="custom-checkbox-group">
<div v-for="(item,index) in state.methodsList">
<el-checkbox :label="item.id" :key="item.id" style="margin-left: 20px;">
@@ -62,7 +69,7 @@
<el-input
:disabled="title === '查看'"
v-if="item.id == 5 && state.checkMethodList.includes(5)"
- v-model="state.form.otherProduct"
+ v-model="state.form.methodMess"
style="margin-left: 5px;width: 160px"
placeholder="请输入其他"
size="small"
@@ -75,12 +82,12 @@
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="沟通地点:" prop="year" >
- <el-input :disabled="title === '查看'" v-model="state.form.name" placeholder="沟通地点"></el-input>
+ <el-form-item label="沟通地点:" prop="comAddr" >
+ <el-input :disabled="title === '查看'" v-model="state.form.comAddr" placeholder="沟通地点"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="沟通类型:" prop="year" >
+ <el-form-item label="沟通类型:" prop="comType" >
<el-checkbox-group v-model="state.checkTypeList" :disabled="title === '查看'" style="display: flex;flex-wrap: wrap" @change="changeCheck('type')" class="custom-checkbox-group">
<div v-for="(item,index) in state.typeList">
<el-checkbox :label="item.id" :key="item.id" style="margin-left: 20px;">
@@ -88,7 +95,7 @@
<el-input
:disabled="title === '查看'"
v-if="item.id == 5 && state.checkTypeList.includes(5)"
- v-model="state.form.otherProduct"
+ v-model="state.form.typeMess"
style="margin-left: 5px;width: 160px"
placeholder="请输入其他"
size="small"
@@ -101,13 +108,13 @@
</el-row>
<el-row :gutter="24" style="margin-top: 10px">
<el-col :span="12">
- <el-form-item label="详细内容:" prop="year" >
- <el-input :disabled="title === '查看'" type="textarea" :rows="4" v-model="state.form.name" placeholder="详细内容"></el-input>
+ <el-form-item label="详细内容:" prop="detailMess" >
+ <el-input :disabled="title === '查看'" type="textarea" :rows="4" v-model="state.form.detailMess" placeholder="详细内容"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="记录人:" prop="year" >
- <el-select clearable v-model="state.form.fictionId" :disabled="state.title =='查看'" filterable placeholder="编制" style="width: 100%">
+ <el-form-item label="记录人:" prop="detailUser" >
+ <el-select clearable v-model="state.form.detailUser" :disabled="title =='查看'" filterable placeholder="" style="width: 100%">
<el-option
v-for="item in state.peopleList"
:key="item.id"
@@ -116,12 +123,13 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="时间:" prop="year" >
+ <el-form-item label="时间:" prop="detailTime" >
<el-date-picker
- v-model="state.form.fictionTime"
+ :disabled="title === '查看'"
+ v-model="state.form.detailTime"
type="date"
value-format="YYYY-MM-DD"
- placeholder="请选择编制日期"
+ placeholder="请选择日期"
style="width: 100%"
/>
</el-form-item>
@@ -129,13 +137,13 @@
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="处理过程描述:" prop="year" >
- <el-input :disabled="title === '查看'" type="textarea" :rows="4" v-model="state.form.name" placeholder="详细内容"></el-input>
+ <el-form-item label="处理过程描述:" prop="disposeMess" >
+ <el-input :disabled="title === '查看'" type="textarea" :rows="4" v-model="state.form.disposeMess" placeholder="详细内容"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="记录人:" prop="year" >
- <el-select clearable v-model="state.form.fictionId" :disabled="state.title =='查看'" filterable placeholder="编制" style="width: 100%">
+ <el-form-item label="记录人:" prop="disposeUser" >
+ <el-select clearable v-model="state.form.disposeUser" :disabled="title =='查看'" filterable placeholder="" style="width: 100%">
<el-option
v-for="item in state.peopleList"
:key="item.id"
@@ -144,12 +152,13 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="时间:" prop="year" >
+ <el-form-item label="时间:" prop="disposeTime" >
<el-date-picker
- v-model="state.form.fictionTime"
+ :disabled="title === '查看'"
+ v-model="state.form.disposeTime"
type="date"
value-format="YYYY-MM-DD"
- placeholder="请选择编制日期"
+ placeholder="请选择日期"
style="width: 100%"
/>
</el-form-item>
@@ -157,13 +166,13 @@
</el-row>
<el-row :gutter="24">
<el-col :span="12">
- <el-form-item label="领导审阅:" prop="year" >
- <el-input :disabled="title === '查看'" type="textarea" :rows="4" v-model="state.form.name" placeholder="详细内容"></el-input>
+ <el-form-item label="领导审阅:" prop="leaderMess" >
+ <el-input :disabled="title === '查看'" type="textarea" :rows="4" v-model="state.form.leaderMess" placeholder="详细内容"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="记录人:" prop="year" >
- <el-select clearable v-model="state.form.fictionId" :disabled="state.title =='查看'" filterable placeholder="编制" style="width: 100%">
+ <el-form-item label="记录人:" prop="leaderUser" >
+ <el-select clearable v-model="state.form.leaderUser" :disabled="title =='查看'" filterable placeholder="" style="width: 100%">
<el-option
v-for="item in state.peopleList"
:key="item.id"
@@ -172,12 +181,13 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="时间:" prop="year" >
+ <el-form-item label="时间:" prop="leaderTime" >
<el-date-picker
- v-model="state.form.fictionTime"
+ :disabled="title === '查看'"
+ v-model="state.form.leaderTime"
type="date"
value-format="YYYY-MM-DD"
- placeholder="请选择编制日期"
+ placeholder="请选择日期"
style="width: 100%"
/>
</el-form-item>
@@ -202,6 +212,8 @@
import {getDept, getObject, getObjectPage} from "@/api/qualityObjectives/object";
import {addTable, editTable, getTargetById} from "@/api/qualityObjectives/table";
import {addNeedDiscren, editNeedDiscren} from "@/api/need/need";
+import {addCustomerCommunicate, editCustomerCommunicate} from "@/api/customerCommunicate";
+import {verifyPhone} from "@/utils/validate";
const dialogVisible = ref(false);
const title = ref("");
@@ -210,37 +222,66 @@
const selectPopperClass = "max-width-select";
const emit = defineEmits(["getList"]);
const dataRef = ref();
+const validatePhone = (rule, value, callback)=>{
+ if(value === ''){
+ callback(new Error('请输入手机号'))
+ }else{
+ if(!verifyPhone(value)){
+ callback(new Error('手机号格式有误'))
+ }else{
+ callback()
+ }
+ }
+}
const state = reactive({
form: {
id: '',
- companyId: null,
- deptId: null,
- year: '',
- fictionId: null,
- checkId: null,
- ratifyId: null,
- fictionTime: null,
- frequency: '',
- expectContents:[],
+ companyId: '',
+ recordName: "",
+ number: "",
+ client: "",
+ phone: "",
+ comTime: "",
+ comAddr: "",
+ comMethod: "",
+ methodMess: "",
+ comType: "",
+ typeMess: "",
+ detailMess: "",
+ detailUser: null,
+ detailTime: "",
+ disposeMess: "",
+ disposeUser: null,
+ disposeTime: "",
+ leaderMess: "",
+ leaderUser: null,
+ leaderTime: ""
},
rules: {
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
- deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
- year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
- fictionId: [{ required: true, message: '请选择编制人', trigger: 'blur' }],
- ratifyId: [{ required: true, message: '请选择批准人', trigger: 'blur' }],
- checkId: [{ required: true, message: '请选择审核人', trigger: 'blur' }],
- fictionTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
- frequency: [{ required: true, message: '请输入监测频率', trigger: 'blur' }],
- stakeholder: [{required: true, message: "", trigger: "blur"}],
- expectation: [{required: true, message: "", trigger: "blur"}],
- solutions: [{required: true, message: "", trigger: "blur"}],
- expectContents:[{ required: true, message: '请填写相关方期望或要求识别表', trigger: 'blur' }],
+ recordName: [{ required: true, message: '请输入记录名称', trigger: 'blur' }],
+ number: [{ required: true, message: '请输入编号', trigger: 'blur' }],
+ client: [{ required: true, message: '请输入客户单位/姓名', trigger: 'blur' }],
+ phone: [{required: true, trigger: "blur", validator: validatePhone}],
+ comTime: [{ required: true, message: '请选择沟通时间', trigger: 'blur' }],
+ comAddr: [{ required: true, message: '请输入沟通地点', trigger: 'blur' }],
+ comMethod: [{ required: true, message: '请选择沟通方式', trigger: 'blur' }],
+ methodMess: [{ required: true, message: '请输入其他详细内容', trigger: 'blur' }],
+ comType: [{ required: true, message: '请选择沟通类型', trigger: 'blur' }],
+ typeMess: [{ required: true, message: '请输入其他详细内容', trigger: 'blur' }],
+ detailMess: [{ required: true, message: '请输入详细内容', trigger: 'blur' }],
+ detailUser: [{ required: true, message: '请选择详细内容记录人', trigger: 'blur' }],
+ detailTime: [{ required: true, message: '请选择时间', trigger: 'blur' }],
+ disposeMess: [{ required: true, message: '请输入处理过程描述', trigger: 'blur' }],
+ disposeUser: [{ required: true, message: '请选择处理过程记录人', trigger: 'blur' }],
+ disposeTime: [{ required: true, message: '请选择时间', trigger: 'blur' }],
+ leaderMess: [{ required: true, message: '请输入领导审阅', trigger: 'blur' }],
+ leaderUser: [{ required: true, message: '请选择记录人', trigger: 'blur' }],
+ leaderTime: [{ required: true, message: '请选择时间', trigger: 'blur' }],
},
peopleList: [],
isAdmin: false,
companyList: [],
- deptList: [],
checkMethodList: [],
methodsList: [
{
@@ -249,7 +290,7 @@
},
{
id: 2,
- name: '面谈'
+ name: '电话'
},
{
id: 3,
@@ -305,13 +346,18 @@
}
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
- state.form = JSON.parse(JSON.stringify(value));
+ for (let key in state.form) {
+ if (key in value) {
+ state.form[key] = value[key];
+ }
+ }
+ state.checkMethodList = state.form.comMethod.split(',').map(Number)
+ state.checkTypeList = state.form.comType.split(',').map(Number)
if(state.isAdmin){
state.form.companyId = value.companyId
state.form.companyName = value.companyName
}
}
- await getDeptList()
await getPeopleList()
dialogVisible.value = true;
}
@@ -320,24 +366,24 @@
const valid = await busRef.value.validate();
if(valid){
if(title.value === '新增'){
- // console.log('sta',state.form)
- // const {id, ...data} = JSON.parse(JSON.stringify(state.form))
- // const res = await addNeedDiscren(data)
- // if(res.code === 200){
- // ElMessage({
- // type: 'success',
- // message: '新增成功'
- // });
- // }else{
- // ElMessage.warning(res.message)
- // }
- // emit("getList")
- // busRef.value.clearValidate();
- // reset();
- // dialogVisible.value = false;
+ console.log('sta',state.form)
+ const {id, ...data} = JSON.parse(JSON.stringify(state.form))
+ const res = await addCustomerCommunicate(data)
+ if(res.code === 200){
+ ElMessage({
+ type: 'success',
+ message: '新增成功'
+ });
+ }else{
+ ElMessage.warning(res.message)
+ }
+ emit("getList")
+ busRef.value.clearValidate();
+ reset();
+ dialogVisible.value = false;
}else if(title.value === '编辑'){
const {...data} = JSON.parse(JSON.stringify(state.form))
- const res = await editNeedDiscren(data)
+ const res = await editCustomerCommunicate(data)
if(res.code === 200){
ElMessage({
type: 'success',
@@ -353,20 +399,7 @@
}
}
}
-const getDeptList = async () => {
- if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
- return
- }
- const param = {
- pageNum: 1,
- pageSize: 999,
- companyId: state.form.companyId
- }
- const res = await getDept(param)
- if(res.code === 200){
- state.deptList = res.data
- }
-}
+
const getPeopleList = async ()=> {
if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
return
@@ -393,65 +426,59 @@
const reset = () => {
state.form = {
id: '',
- companyId: null,
- deptId: null,
- year: '',
- fictionId: null,
- checkId: null,
- ratifyId: null,
- fictionTime: null,
- frequency: '',
- expectContents:[],
+ companyId: '',
+ recordName: "",
+ number: "",
+ client: "",
+ phone: "",
+ comTime: "",
+ comAddr: "",
+ comMethod: "",
+ methodMess: "",
+ comType: "",
+ typeMess: "",
+ detailMess: "",
+ detailUser: null,
+ detailTime: "",
+ disposeMess: "",
+ disposeUser: null,
+ disposeTime: "",
+ leaderMess: "",
+ leaderUser: null,
+ leaderTime: ""
}
state.companyList = []
+ state.checkMethodList = []
+ state.checkTypeList = []
}
const changeCheck = (type) => {
switch (type) {
- case 'type': state.form.qualification = state.checkTypeList.join(','); if(!state.checkTypeList.includes(8))state.form.otherQualifi = '' ;break;
- case 'method': state.form.product = state.checkMethodList.join(',');if(!state.checkMethodList.includes(5))state.form.otherProduct = ''; break;
+ case 'type': state.form.comType = state.checkTypeList.join(','); if(!state.checkTypeList.includes(5))state.form.typeMess = '' ;break;
+ case 'method': state.form.comMethod = state.checkMethodList.join(',');if(!state.checkMethodList.includes(5))state.form.methodMess = ''; break;
}
}
const selectValueCom = (val) => {
- state.form.fictionId = null
- state.form.checkId = null
- state.form.ratifyId = null
- state.form.deptId = null
+ state.form.detailUser = null
+ state.form.detailTime = null
+ state.form.disposeUser = null
+ state.form.disposeTime = null
+ state.form.leaderUser = null
+ state.form.leaderTime = null
state.companyList.forEach(item => {
if(item.name === val){
state.form.companyId = item.id
}
})
- getDeptList()
+
getPeopleList()
}
-const addTableData = () => {
- state.form.expectContents.push({expectContentMesses: [{}]})
-}
-const addObject = (val,itemIndex) => {
- state.form.expectContents.forEach((item,index) => {
- if(index == itemIndex){
- item.expectContentMesses.push({})
- }
- })
-}
-const delObject = (val,itemIndex) => {
- state.form.expectContents.forEach((item,index) => {
- if(index == itemIndex){
- if(item.expectContentMesses.length == 1){
- state.form.expectContents.splice(index,1)
- }else {
- item.expectContentMesses.pop()
- }
- }
- })
-}
defineExpose({
openDialog
diff --git a/src/views/work/marketingManagement/customerList/communicate/index.vue b/src/views/work/marketingManagement/customerList/communicate/index.vue
index f9d82de..d263cb5 100644
--- a/src/views/work/marketingManagement/customerList/communicate/index.vue
+++ b/src/views/work/marketingManagement/customerList/communicate/index.vue
@@ -36,8 +36,8 @@
<el-table v-loading="loading" :data="dataList" :border="true" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
- <el-table-column label="记录名称" prop="name" align="center">
- </el-table-column>
+ <el-table-column label="企业名称" prop="companyName" align="center" v-if="data.isAdmin" />
+ <el-table-column label="记录名称" prop="recordName" align="center"></el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
<template #default="scope">
<el-button link type="primary" @click="openDialog('review',scope.row)" >查看</el-button>
@@ -71,6 +71,7 @@
import {generateWordDocument} from "@/utils/exportWord";
import {delTable, getTable} from "@/api/qualityObjectives/table";
import {delNeedDiscren, getNeedDiscren} from "@/api/need/need";
+import {delCustomerCommunicate, getCustomerCommunicate} from "@/api/customerCommunicate";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const noticeRef = ref();
@@ -88,6 +89,50 @@
companyList: [],
isAdmin: false,
dialogVisible: false,
+ methodsList: [
+ {
+ id: 1,
+ name: '面谈'
+ },
+ {
+ id: 2,
+ name: '电话'
+ },
+ {
+ id: 3,
+ name: '信函'
+ },
+ {
+ id: 4,
+ name: '邮件'
+ },
+ {
+ id: 5,
+ name: '其他:'
+ },
+ ],
+ typeList: [
+ {
+ id: 1,
+ name: '建议'
+ },
+ {
+ id: 2,
+ name: '咨询'
+ },
+ {
+ id: 3,
+ name: '反馈'
+ },
+ {
+ id: 4,
+ name: '抱怨'
+ },
+ {
+ id: 5,
+ name: '其他:'
+ },
+ ]
});
const dataList = ref([]);
const total = ref(0);
@@ -109,16 +154,15 @@
}
});
const getList = async () => {
- // loading.value = true;
- // const res = await getNeedDiscren(data.queryParams);
- // if(res.code === 200){
- // dataList.value = res.data.list
- // total.value = res.data.total
- // }else{
- // ElMessage.warning(res.message)
- // }
- // loading.value = false;
- dataList.value = [{}]
+ loading.value = true;
+ const res = await getCustomerCommunicate(data.queryParams);
+ if(res.code === 200){
+ dataList.value = res.data.list
+ total.value = res.data.total
+ }else{
+ ElMessage.warning(res.message)
+ }
+ loading.value = false;
}
const searchClick = () => {
@@ -184,13 +228,25 @@
}
const templatePath = ref('/customerCommunicateExample.docx')
const startGeneration = async () => {
- const data = JSON.parse(JSON.stringify(choosedData.value))
- data.forEach(item => {
-
-
+ const dataX = JSON.parse(JSON.stringify(choosedData.value))
+ dataX.forEach(item => {
+ item.methodList = data.methodsList.map(i => {
+ return {
+ ...i,
+ checked: item.comMethod.split(',').map(Number).includes(i.id),
+ name: i.id == 5 ? i.name + item.methodMess : i.name
+ }
+ })
+ item.typeList = data.typeList.map(i => {
+ return {
+ ...i,
+ checked: item.comType.split(',').map(Number).includes(i.id),
+ name: i.id == 5 ? i.name + item.typeMess : i.name
+ }
+ })
console.log('xxx',item.tableData)
try {
- generateWordDocument(templatePath.value, item, item.companyName + `_相关方期望和需求识别表.docx`);
+ generateWordDocument(templatePath.value, item, item.companyName + `_顾客沟通记录表.docx`);
} catch (error){
ElMessage({
type: 'warning',
@@ -212,7 +268,7 @@
type: 'warning',
})
.then( async() => {
- const res = await delNeedDiscren(val.id);
+ const res = await delCustomerCommunicate(val.id);
if(res.code === 200){
ElMessage({
type: 'success',
diff --git a/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/components/editDialog.vue b/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/components/editDialog.vue
index aeeeb99..11d9b70 100644
--- a/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/components/editDialog.vue
+++ b/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/components/editDialog.vue
@@ -25,14 +25,14 @@
</el-row>
<el-row :gutter="24">
<el-col :span="24">
- <el-form-item label="记录名称:" prop="year" >
- <el-input :disabled="title === '查看'" v-model="state.form.name" placeholder="记录名称"></el-input>
+ <el-form-item label="记录名称:" prop="recordName" >
+ <el-input :disabled="title === '查看'" v-model="state.form.recordName" placeholder="记录名称"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
- <el-form-item label="月度检查记录:" prop="expectContents" >
+ <el-form-item label="月度检查记录:" prop="inspectionMesses" >
<el-button
:disabled="title === '查看'"
type="primary"
@@ -40,68 +40,75 @@
style="margin-left: 10px;margin-bottom: 10px"
>新增</el-button>
<div style="display: flex;width: 100%;">
- <el-table :data="state.form.expectContents" :border="true" >
+ <el-table :data="state.form.inspectionMesses" :border="true" >
<el-table-column type="index" label="序号" align="center"></el-table-column>
- <el-table-column label="时间" prop="name" align="center" width="150">
+ <el-table-column label="时间" prop="monthlyTime" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'monthlyTime'" :rules="state.rules.monthlyTime">
+ <el-date-picker
+ :disabled="title === '查看'"
+ v-model="row.monthlyTime"
+ type="date"
+ value-format="YYYY-MM-DD"
+ placeholder="请选择日期"
+ style="width: 100%"
+ />
</el-form-item>
</template>
</el-table-column>
- <el-table-column label="检查人" prop="name" align="center" width="150">
+ <el-table-column label="检查人" prop="checkUser" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'checkUser'" :rules="state.rules.checkUser">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.checkUser" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
- <el-table-column label="防护" prop="name" align="center" width="150">
+ <el-table-column label="防护" prop="entrench" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'entrench'" :rules="state.rules.entrench">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.entrench" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
- <el-table-column label="标识" prop="name" align="center" width="150">
+ <el-table-column label="标识" prop="identification" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'identification'" :rules="state.rules.identification">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.identification" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
- <el-table-column label="摆放" prop="name" align="center" width="150">
+ <el-table-column label="摆放" prop="place" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'place'" :rules="state.rules.place">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.place" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
- <el-table-column label="清洁" prop="name" align="center" width="150">
+ <el-table-column label="清洁" prop="clean" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'clean'" :rules="state.rules.clean">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.clean" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
- <el-table-column label="安全" prop="name" align="center" width="150">
+ <el-table-column label="安全" prop="safety" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'safety'" :rules="state.rules.safety">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.safety" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
- <el-table-column label="环境" prop="name" align="center" width="150">
+ <el-table-column label="环境" prop="environment" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'environment'" :rules="state.rules.environment">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.environment" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
- <el-table-column label="帐务卡一致性" prop="name" align="center" width="150">
+ <el-table-column label="帐务卡一致性" prop="consistency" align="center" width="150">
<template #default="{row,$index}">
- <el-form-item :prop="'expectContents.' + '[' + $index + ']' + 'name'" :rules="state.rules.name">
- <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.name" placeholder="请输入"></el-input>
+ <el-form-item :prop="'inspectionMesses.' + '[' + $index + ']' + 'consistency'" :rules="state.rules.consistency">
+ <el-input style="margin-top: 10px" :disabled="title === '查看'" type="textarea" :rows="2" v-model="row.consistency" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
@@ -135,6 +142,7 @@
import {getDept, getObject, getObjectPage} from "@/api/qualityObjectives/object";
import {addTable, editTable, getTargetById} from "@/api/qualityObjectives/table";
import {addNeedDiscren, editNeedDiscren} from "@/api/need/need";
+import {addMonthlyRecord, editMonthlyRecord} from "@/api/monthlyInspectionRecord";
const dialogVisible = ref(false);
const title = ref("");
@@ -147,33 +155,26 @@
form: {
id: '',
companyId: null,
- deptId: null,
- year: '',
- fictionId: null,
- checkId: null,
- ratifyId: null,
- fictionTime: null,
- frequency: '',
- expectContents:[],
+ recordName: '',
+ inspectionMesses: []
},
rules: {
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
- deptId: [{ required: true, message: '请选择部门', trigger: 'blur' }],
- year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
- fictionId: [{ required: true, message: '请选择编制人', trigger: 'blur' }],
- ratifyId: [{ required: true, message: '请选择批准人', trigger: 'blur' }],
- checkId: [{ required: true, message: '请选择审核人', trigger: 'blur' }],
- fictionTime: [{ required: true, message: '请选择日期', trigger: 'blur' }],
- frequency: [{ required: true, message: '请输入监测频率', trigger: 'blur' }],
- stakeholder: [{required: true, message: "", trigger: "blur"}],
- expectation: [{required: true, message: "", trigger: "blur"}],
- solutions: [{required: true, message: "", trigger: "blur"}],
- expectContents:[{ required: true, message: '请填写相关方期望或要求识别表', trigger: 'blur' }],
+ recordName: [{ required: true, message: '请输入记录名称', trigger: 'blur' }],
+ monthlyTime: [{required: true, message: "", trigger: "blur"}],
+ checkUser: [{required: true, message: "", trigger: "blur"}],
+ entrench: [{required: true, message: "", trigger: "blur"}],
+ identification: [{required: true, message: "", trigger: "blur"}],
+ place: [{required: true, message: "", trigger: "blur"}],
+ clean: [{required: true, message: "", trigger: "blur"}],
+ safety: [{required: true, message: "", trigger: "blur"}],
+ environment: [{required: true, message: "", trigger: "blur"}],
+ consistency: [{required: true, message: "", trigger: "blur"}],
+ inspectionMesses:[{ required: true, message: '请填写月度检查记录表', trigger: 'blur' }],
},
peopleList: [],
isAdmin: false,
companyList: [],
- deptList: [],
})
onMounted(() => {
@@ -198,7 +199,6 @@
state.form.companyName = value.companyName
}
}
- await getDeptList()
await getPeopleList()
dialogVisible.value = true;
}
@@ -207,24 +207,27 @@
const valid = await busRef.value.validate();
if(valid){
if(title.value === '新增'){
- // console.log('sta',state.form)
- // const {id, ...data} = JSON.parse(JSON.stringify(state.form))
- // const res = await addNeedDiscren(data)
- // if(res.code === 200){
- // ElMessage({
- // type: 'success',
- // message: '新增成功'
- // });
- // }else{
- // ElMessage.warning(res.message)
- // }
- // emit("getList")
- // busRef.value.clearValidate();
- // reset();
- // dialogVisible.value = false;
+ console.log('sta',state.form)
+ const {id, ...data} = JSON.parse(JSON.stringify(state.form))
+ const res = await addMonthlyRecord(data)
+ if(res.code === 200){
+ ElMessage({
+ type: 'success',
+ message: '新增成功'
+ });
+ }else{
+ ElMessage.warning(res.message)
+ }
+ emit("getList")
+ busRef.value.clearValidate();
+ reset();
+ dialogVisible.value = false;
}else if(title.value === '编辑'){
const {...data} = JSON.parse(JSON.stringify(state.form))
- const res = await editNeedDiscren(data)
+ data.inspectionMesses.forEach(item => {
+ item.monthlyId = data.id
+ })
+ const res = await editMonthlyRecord(data)
if(res.code === 200){
ElMessage({
type: 'success',
@@ -240,20 +243,7 @@
}
}
}
-const getDeptList = async () => {
- if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
- return
- }
- const param = {
- pageNum: 1,
- pageSize: 999,
- companyId: state.form.companyId
- }
- const res = await getDept(param)
- if(res.code === 200){
- state.deptList = res.data
- }
-}
+
const getPeopleList = async ()=> {
if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
return
@@ -281,14 +271,8 @@
state.form = {
id: '',
companyId: null,
- deptId: null,
- year: '',
- fictionId: null,
- checkId: null,
- ratifyId: null,
- fictionTime: null,
- frequency: '',
- expectContents:[],
+ recordName: '',
+ inspectionMesses: []
}
state.companyList = []
}
@@ -298,38 +282,29 @@
const selectValueCom = (val) => {
- state.form.fictionId = null
- state.form.checkId = null
- state.form.ratifyId = null
- state.form.deptId = null
state.companyList.forEach(item => {
if(item.name === val){
state.form.companyId = item.id
}
})
- getDeptList()
getPeopleList()
}
const addTableData = () => {
- state.form.expectContents.push({expectContentMesses: [{}]})
+ state.form.inspectionMesses.push({})
}
const addObject = (val,itemIndex) => {
- state.form.expectContents.forEach((item,index) => {
+ state.form.inspectionMesses.forEach((item,index) => {
if(index == itemIndex){
item.expectContentMesses.push({})
}
})
}
const delObject = (val,itemIndex) => {
- state.form.expectContents.forEach((item,index) => {
+ state.form.inspectionMesses.forEach((item,index) => {
if(index == itemIndex){
- if(item.expectContentMesses.length == 1){
- state.form.expectContents.splice(index,1)
- }else {
- item.expectContentMesses.pop()
- }
+ state.form.inspectionMesses.splice(index,1)
}
})
}
diff --git a/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue b/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue
index 96654b2..e92382f 100644
--- a/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue
+++ b/src/views/work/procurementPlatform/warehouseManagement/monthlyInspectionRecord/index.vue
@@ -36,9 +36,10 @@
<el-table v-loading="loading" :data="dataList" :border="true" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
+ <el-table-column label="企业名称" prop="companyName" align="center" v-if="data.isAdmin" />
<el-table-column label="名称" align="center">
<template #default="scope">
- <span>{{scope.row.deptName}}登记</span>
+ <span>{{scope.row.recordName}}登记</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
@@ -74,6 +75,7 @@
import {generateWordDocument} from "@/utils/exportWord";
import {delTable, getTable} from "@/api/qualityObjectives/table";
import {delNeedDiscren, getNeedDiscren} from "@/api/need/need";
+import {delMonthlyRecord, getMonthlyRecord} from "@/api/monthlyInspectionRecord";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const noticeRef = ref();
@@ -112,16 +114,15 @@
}
});
const getList = async () => {
- // loading.value = true;
- // const res = await getNeedDiscren(data.queryParams);
- // if(res.code === 200){
- // dataList.value = res.data.list
- // total.value = res.data.total
- // }else{
- // ElMessage.warning(res.message)
- // }
- // loading.value = false;
- dataList.value = [{}]
+ loading.value = true;
+ const res = await getMonthlyRecord(data.queryParams);
+ if(res.code === 200){
+ dataList.value = res.data.list
+ total.value = res.data.total
+ }else{
+ ElMessage.warning(res.message)
+ }
+ loading.value = false;
}
const searchClick = () => {
@@ -189,41 +190,7 @@
const startGeneration = async () => {
const data = JSON.parse(JSON.stringify(choosedData.value))
data.forEach(item => {
- item.expectContents = [
- {
- name: '张三',
- expectContentMesses: [
- {
- need: 'xxx',
- personName: 'x',
- visit:true,
- network: true,
- other: false
-
- },
- {
- need: '22',
- personName: '2',
- visit:false,
- network: false,
- other: true
-
- },
- ]
- }
- ]
- item.tableData = item.expectContents.map((i,index) => {
- return{
- ...i,
- expectContentMesses: i.expectContentMesses.map((q,qindex) => {
- return{
- ...q,
- first: qindex == 0,
- num: index+1,
- }
- })
- }
- })
+ item.tableData = item.inspectionMesses
console.log('xxx',item.tableData)
try {
generateWordDocument(templatePath.value, item, item.companyName + `_月度检查记录表.docx`);
@@ -248,7 +215,7 @@
type: 'warning',
})
.then( async() => {
- const res = await delNeedDiscren(val.id);
+ const res = await delMonthlyRecord(val.id);
if(res.code === 200){
ElMessage({
type: 'success',
--
Gitblit v1.9.2