From 812f2afdb6f9ca500a10806ad25641288dcd9cfd Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 12 十二月 2025 13:29:18 +0800
Subject: [PATCH] 修改
---
src/views/work/qualityManage/qualityInformationPage/external/components/editDialog.vue | 63 +++++++++++---------
src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/report/components/editDialog.vue | 8 +-
src/views/work/qualityManage/qualityInformationPage/internal/components/editDialog.vue | 105 ++++++++++++++++++++---------------
3 files changed, 100 insertions(+), 76 deletions(-)
diff --git a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/report/components/editDialog.vue b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/report/components/editDialog.vue
index e571600..af3cf4a 100644
--- a/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/report/components/editDialog.vue
+++ b/src/views/work/qualityInfo/supplierQuality/satisfiedEvaluste/report/components/editDialog.vue
@@ -25,6 +25,7 @@
<el-col :span="12">
<el-form-item label="年份:" prop="year">
<el-date-picker
+ style="width: 100%"
v-model="state.form.year"
type="year"
value-format="YYYY"
@@ -49,7 +50,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="实施调查的部门:" prop="deptId" >
- <el-select v-model="state.form.deptId" placeholder="请选择" :disabled="title === '查看'" clearable>
+ <el-select v-model="state.form.deptId" style="width: 100%" placeholder="请选择" :disabled="title === '查看'" clearable>
<el-option
v-for="item in state.deptList"
:key="item.deptId"
@@ -62,6 +63,7 @@
<el-col :span="12">
<el-form-item label="调查结束日期:" prop="endTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.endTime"
type="date"
@@ -124,8 +126,8 @@
</el-row>
<el-row :gutter="24" style="margin-top: 15px">
<el-col :span="24" >
- <span style="font-size: 14px;font-weight: 700;" >用户反馈的主要意见和建议:</span>
- <el-input style="margin-top: 5px" :disabled="title === '查看'" v-model="state.form.suggest" type="textarea" :rows="4"></el-input>
+ <span style="margin-left:8px;font-size: 15px;font-weight: 700;" >用户反馈的主要意见和建议:</span>
+ <el-input style="margin-left:8px;margin-top: 5px" :disabled="title === '查看'" v-model="state.form.suggest" type="textarea" :rows="4"></el-input>
</el-col>
</el-row>
<el-row :gutter="24" style="margin-top: 15px">
diff --git a/src/views/work/qualityManage/qualityInformationPage/external/components/editDialog.vue b/src/views/work/qualityManage/qualityInformationPage/external/components/editDialog.vue
index 67c4f43..bed1473 100644
--- a/src/views/work/qualityManage/qualityInformationPage/external/components/editDialog.vue
+++ b/src/views/work/qualityManage/qualityInformationPage/external/components/editDialog.vue
@@ -3,12 +3,12 @@
<el-dialog
v-model="dialogVisible"
:title="title"
- width="850px"
+ width="1100px"
:before-close="handleClose"
:close-on-press-escape="false"
:close-on-click-modal="false"
>
- <el-form :model="state.form" size="default" ref="busRef" :rules="state.formRules" >
+ <el-form :model="state.form" size="default" ref="busRef" :rules="state.formRules" label-width="150" label-position="right">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="单位名称:" prop="companyId" v-if="state.isAdmin">
@@ -48,23 +48,26 @@
</el-col>
</el-row>
<el-row :gutter="24">
- <el-col :span="8">
+ <el-col :span="12">
<el-form-item label="提供单位:" prop="offerUnit" >
<el-input :disabled="title === '查看'" v-model="state.form.offerUnit" placeholder="提供单位"></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="12">
<el-form-item label="型号:" prop="model" >
<el-input :disabled="title === '查看'" v-model="state.form.model" placeholder="型号"></el-input>
</el-form-item>
</el-col>
- <el-col :span="8">
+
+ </el-row>
+ <el-row :gutter="24">
+ <el-col :span="24">
<el-form-item label="提供方式:" prop="offerMethod" >
- <el-checkbox-group v-model="state.form.offerMethod" style="display: flex" :disabled="title === '查看'">
- <el-checkbox label="1" value="1" style="width: 25px;" >信函</el-checkbox>
- <el-checkbox label="2" value="2" style="width: 25px;">电话</el-checkbox>
- <el-checkbox label="3" value="3" style="width: 20px;">走访</el-checkbox>
- </el-checkbox-group>
+ <el-checkbox-group v-model="state.form.offerMethod" style="display: flex" :disabled="title === '查看'">
+ <el-checkbox label="1" value="1" style="width: 25px;" >信函</el-checkbox>
+ <el-checkbox label="2" value="2" style="width: 25px;">电话</el-checkbox>
+ <el-checkbox label="3" value="3" style="width: 20px;">走访</el-checkbox>
+ </el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
@@ -72,6 +75,7 @@
<el-col :span="12">
<el-form-item label="提供日期:" prop="offerTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.offerTime"
type="date"
@@ -109,6 +113,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="generalTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.generalTime"
type="date"
@@ -134,6 +139,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="productTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.productTime"
type="date"
@@ -159,6 +165,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="disposeTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.disposeTime"
type="date"
@@ -219,24 +226,24 @@
formRules:{
companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
feedFrom: [{ required: true, message: '请输入反馈单名称', trigger: 'blur' }],
- number: [{ required: true, message: '请输入编号', trigger: 'blur' }],
- productName: [{ required: true, message: '请输入产品名称', trigger: 'blur' }],
- makeNum: [{ required: true, message: '请输入制造号', trigger: 'blur' }],
- offerUnit: [{ required: true, message: '请输入提供单位', trigger: 'blur' }],
- offerTime: [{ required: true, message: '请输入提供日期', trigger: 'blur' }],
- offerMethod: [{ required: true, message: '请输入提供方式', trigger: 'blur' }],
- model: [{ required: true, message: '请输入型号', trigger: 'blur' }],
- comNum: [{ required: true, message: '请输入公司编号', trigger: 'blur' }],
- feedInformation: [{ required: true, message: '请输入反馈信息描述', trigger: 'blur' }],
- dutyMess: [{ required: true, message: '请输入责任单位意见', trigger: 'blur' }],
- generalSign: [{ required: true, message: '请输入综合办公室签名', trigger: 'blur' }],
- generalTime: [{ required: true, message: '请选择签名日期', trigger: 'blur' }],
- planMess: [{ required: true, message: '请输入计划意见', trigger: 'blur' }],
- productSign: [{ required: true, message: '请输入生产技术部签名', trigger: 'blur' }],
- productTime: [{ required: true, message: '请选择生产技术部签名日期', trigger: 'blur' }],
- disposeMess:[{ required: true, message: '请输入处置结果', trigger: 'blur' }],
- disposeSign: [{ required: true, message: '请输入处置人签名', trigger: 'blur' }],
- disposeTime: [{ required: true, message: '请选择处置人签名日期', trigger: 'blur' }]
+ // number: [{ required: true, message: '请输入编号', trigger: 'blur' }],
+ // productName: [{ required: true, message: '请输入产品名称', trigger: 'blur' }],
+ // makeNum: [{ required: true, message: '请输入制造号', trigger: 'blur' }],
+ // offerUnit: [{ required: true, message: '请输入提供单位', trigger: 'blur' }],
+ // offerTime: [{ required: true, message: '请输入提供日期', trigger: 'blur' }],
+ // offerMethod: [{ required: true, message: '请输入提供方式', trigger: 'blur' }],
+ // model: [{ required: true, message: '请输入型号', trigger: 'blur' }],
+ // comNum: [{ required: true, message: '请输入公司编号', trigger: 'blur' }],
+ // feedInformation: [{ required: true, message: '请输入反馈信息描述', trigger: 'blur' }],
+ // dutyMess: [{ required: true, message: '请输入责任单位意见', trigger: 'blur' }],
+ // generalSign: [{ required: true, message: '请输入综合办公室签名', trigger: 'blur' }],
+ // generalTime: [{ required: true, message: '请选择签名日期', trigger: 'blur' }],
+ // planMess: [{ required: true, message: '请输入计划意见', trigger: 'blur' }],
+ // productSign: [{ required: true, message: '请输入生产技术部签名', trigger: 'blur' }],
+ // productTime: [{ required: true, message: '请选择生产技术部签名日期', trigger: 'blur' }],
+ // disposeMess:[{ required: true, message: '请输入处置结果', trigger: 'blur' }],
+ // disposeSign: [{ required: true, message: '请输入处置人签名', trigger: 'blur' }],
+ // disposeTime: [{ required: true, message: '请选择处置人签名日期', trigger: 'blur' }]
},
companyList: [],
diff --git a/src/views/work/qualityManage/qualityInformationPage/internal/components/editDialog.vue b/src/views/work/qualityManage/qualityInformationPage/internal/components/editDialog.vue
index d447aae..ffd7745 100644
--- a/src/views/work/qualityManage/qualityInformationPage/internal/components/editDialog.vue
+++ b/src/views/work/qualityManage/qualityInformationPage/internal/components/editDialog.vue
@@ -3,7 +3,7 @@
<el-dialog
v-model="dialogVisible"
:title="title"
- width="850px"
+ width="1100px"
:before-close="handleClose"
:close-on-press-escape="false"
:close-on-click-modal="false"
@@ -24,12 +24,12 @@
</el-col>
</el-row>
<el-row :gutter="24">
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="反馈单名称:" prop="feedForm" >
<el-input :disabled="title === '查看'" v-model="state.form.feedForm" placeholder="反馈单名称"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="编号:" prop="number" >
<el-input :disabled="title === '查看'" v-model="state.form.number" placeholder="编号"></el-input>
</el-form-item>
@@ -53,24 +53,25 @@
</el-col>
</el-row>
<el-row :gutter="24">
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="责任单位:" prop="dutyUnitId" >
- <el-select
- :disabled="title === '查看'"
- v-model="state.form.dutyUnitId"
- placeholder="请选择部门"
- style="width: 240px;margin-bottom: 5px"
- >
- <el-option
- v-for="item in state.deptList"
- :key="item.deptId"
- :label="item.deptName"
- :value="item.deptId"
- />
- </el-select>
+ <el-input :disabled="title === '查看'" v-model="state.form.dutyUnitId" placeholder="责任单位"></el-input>
+<!-- <el-select-->
+<!-- :disabled="title === '查看'"-->
+<!-- v-model="state.form.dutyUnitId"-->
+<!-- placeholder="请选择部门"-->
+<!-- style="width: 240px;margin-bottom: 5px"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in state.deptList"-->
+<!-- :key="item.deptId"-->
+<!-- :label="item.deptName"-->
+<!-- :value="item.deptId"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
<el-form-item label="产品件号:" prop="partNum" >
<el-input :disabled="title === '查看'" v-model="state.form.partNum" placeholder="产品件号"></el-input>
</el-form-item>
@@ -79,31 +80,33 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="反馈单位:" prop="feedUnitId" >
- <el-select
- :disabled="title === '查看'"
- v-model="state.form.feedUnitId"
- placeholder="请选择部门"
- style="width: 240px;margin-bottom: 5px"
- >
- <el-option
- v-for="item in state.deptList"
- :key="item.deptId"
- :label="item.deptName"
- :value="item.deptId"
- />
- </el-select>
+ <el-input :disabled="title === '查看'" v-model="state.form.feedUnitId" placeholder="责任单位"></el-input>
+<!-- <el-select-->
+<!-- :disabled="title === '查看'"-->
+<!-- v-model="state.form.feedUnitId"-->
+<!-- placeholder="请选择部门"-->
+<!-- style="width: 240px;margin-bottom: 5px"-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in state.deptList"-->
+<!-- :key="item.deptId"-->
+<!-- :label="item.deptName"-->
+<!-- :value="item.deptId"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="反馈人:" prop="feedUserId" >
- <el-select clearable v-model="state.form.feedUserId" :disabled="title =='查看'" filterable style="width: 240px;margin-bottom: 5px">
- <el-option
- v-for="item in state.peopleList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- />
- </el-select>
+ <el-input :disabled="title === '查看'" v-model="state.form.feedUserId" placeholder="反馈人"></el-input>
+<!-- <el-select clearable v-model="state.form.feedUserId" :disabled="title =='查看'" filterable style="width: 240px;margin-bottom: 5px">-->
+<!-- <el-option-->
+<!-- v-for="item in state.peopleList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.name"-->
+<!-- :value="item.id"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="8">
@@ -135,7 +138,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="处置人:" prop="disposeId" >
- <el-select clearable v-model="state.form.disposeId" :disabled="title =='查看'" filterable style="width: 240px;margin-bottom: 5px">
+ <el-select clearable v-model="state.form.disposeId" :disabled="title =='查看'" filterable style="width: 100%;margin-bottom: 5px">
<el-option
v-for="item in state.peopleList"
:key="item.id"
@@ -148,6 +151,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="disposeTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.disposeTime"
type="date"
@@ -160,7 +164,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="检验员:" prop="checkOutId" >
- <el-select clearable v-model="state.form.checkOutId" :disabled="title =='查看'" filterable style="width: 240px;margin-bottom: 5px">
+ <el-select clearable v-model="state.form.checkOutId" :disabled="title =='查看'" filterable style="width: 100%;margin-bottom: 5px">
<el-option
v-for="item in state.peopleList"
:key="item.id"
@@ -173,6 +177,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="checkOutTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.checkOutTime"
type="date"
@@ -185,7 +190,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="反馈单位复查人:" prop="reviewId" >
- <el-select clearable v-model="state.form.reviewId" :disabled="title =='查看'" filterable style="width: 240px;margin-bottom: 5px">
+ <el-select clearable v-model="state.form.reviewId" :disabled="title =='查看'" filterable style="width: 100%;margin-bottom: 5px">
<el-option
v-for="item in state.peopleList"
:key="item.id"
@@ -198,6 +203,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="reviewTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.reviewTime"
type="date"
@@ -234,7 +240,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="检验组长:" prop="teamId" >
- <el-select clearable v-model="state.form.teamId" :disabled="title =='查看'" filterable style="width: 240px;margin-bottom: 5px">
+ <el-select clearable v-model="state.form.teamId" :disabled="title =='查看'" filterable style="width: 100%;margin-bottom: 5px">
<el-option
v-for="item in state.peopleList"
:key="item.id"
@@ -247,6 +253,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="teamTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.teamTime"
type="date"
@@ -259,7 +266,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任单位领导:" prop="dutyLeaderId" >
- <el-select clearable v-model="state.form.dutyLeaderId" :disabled="title =='查看'" filterable style="width: 240px;margin-bottom: 5px">
+ <el-select clearable v-model="state.form.dutyLeaderId" :disabled="title =='查看'" filterable style="width: 100%;margin-bottom: 5px">
<el-option
v-for="item in state.peopleList"
:key="item.id"
@@ -272,6 +279,7 @@
<el-col :span="12">
<el-form-item label="日期:" prop="dutyLeaderTime" >
<el-date-picker
+ style="width: 100%"
:disabled="title === '查看'"
v-model="state.form.dutyLeaderTime"
type="date"
@@ -346,7 +354,7 @@
dutyUnitId: [{ required: true, message: '请输入责任单位', trigger: 'blur' }],
partNum: [{ required: true, message: '请输入产品件号', trigger: 'blur' }],
feedUnitId: [{ required: true, message: '请输入反馈单位', trigger: 'blur' }],
- feedUserId: [{ required: true, message: '请选择反馈人', trigger: 'blur' }],
+ feedUserId: [{ required: true, message: '请输入反馈人', trigger: 'blur' }],
feedTime: [{ required: true, message: '请选择反馈日期', trigger: 'blur' }],
feedQuestion: [{ required: true, message: '请输入反馈问题描述', trigger: 'blur' }],
// disposeId: [{ required: true, message: '请选择处置人', trigger: 'blur' }],
@@ -384,6 +392,13 @@
title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ;
if(type === 'edit' || type === 'review') {
state.form = JSON.parse(JSON.stringify(value));
+ state.form.disposeId = state.form.disposeId ?state.form.disposeId:null
+ state.form.checkOutId = state.form.checkOutId ?state.form.checkOutId:null
+ state.form.reviewId = state.form.reviewId ?state.form.reviewId:null
+ state.form.teamId = state.form.teamId ?state.form.teamId:null
+ state.form.rework = state.form.teamId ?state.form.rework:null
+ state.form.delay = state.form.delay ?state.form.delay:null
+
if(state.isAdmin){
state.form.companyId = value.companyId
state.form.companyName = value.companyName
--
Gitblit v1.9.2