suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

Browse Source
dev-scheduling
zhangdi 3 months ago
parent 1628cfd74e 186d79d78e
commit f9f12df09e
20 changed files with 879 additions and 18402 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      src/api/basicData/platingTypeInfo.js
  2. 2
      src/api/qualityManagement/periodicTesting/projectCycle.js
  3. 18
      src/api/qualityManagement/periodicTesting/testTask.js
  4. 2
      src/api/tankSolutionSystem/resultsCon.js
  5. 35
      src/views/periodicTesting/components/addProjectCycleDialog.vue
  6. 47
      src/views/periodicTesting/components/viewDialog.vue
  7. 18
      src/views/periodicTesting/projectCycle.vue
  8. 173
      src/views/periodicTesting/testTask.vue
  9. 1100
      src/views/processManagement/platingTypeInfo.vue
  10. 7
      src/views/productionDisposition/hearingDialog.vue
  11. 2
      src/views/productionTesting/components/sametankView.vue
  12. 17767
      src/views/productionTesting/productionQuality.vue
  13. 2
      src/views/qualityManagement/reviewFormMess/index.vue
  14. 6
      src/views/qualityManagement/reviewFormMess/options.js
  15. 1
      src/views/qualityManagement/reworkOrderReview/index.vue
  16. 1
      src/views/qualityManagement/scrapOrderReview/index.vue
  17. 46
      src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
  18. 11
      src/views/qualityManagement/tankSolutionSystem/inspectionReport.vue
  19. 2
      src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
  20. 2
      src/views/qualityManagement/tankSolutionSystem/workTankLine.vue

39
src/api/basicData/platingTypeInfo.js
Unescape View File

@ -0,0 +1,39 @@
// 镀种维护
import request from '@/axios';
// 查询镀种列表
export const getPlatingTypeList = params =>{
return request({
url:'/api/blade-desk/BA/Plating/list',
method:"get",
params
})
}
// 新增镀种
export const createPlatingType = data =>{
return request({
url:'/api/blade-desk/BA/Plating/save',
method:"post",
data
})
}
// 修改镀种
export const updatePlatingType = data =>{
return request({
url:'/api/blade-desk/BA/Plating/update',
method:"post",
data
})
}
// 删除镀种
export const deletePlatingType = (params) =>{
return request({
url:'/api/blade-desk/BA/Plating/remove',
method:'post',
params
})
}

2
src/api/qualityManagement/periodicTesting/projectCycle.js
Unescape View File

@ -65,7 +65,7 @@ export const remove = ids => {
// 获取镀种列表 // 获取镀种列表
export const getPlateList = () => { export const getPlateList = () => {
return request({ return request({
url:"/blade-desk/bsPlating/listForSelect", url:"/api/blade-desk/BA/Plating/listForSelectCycleTest",
method:'get', method:'get',
}) })
} }

18
src/api/qualityManagement/periodicTesting/testTask.js
Unescape View File

@ -14,6 +14,14 @@ export const getList = (current, size, params,filterType) => {
}); });
}; };
export const getTaskList = data =>{
return request({
url: '/api/blade-desk/QA/CycleTestTask/listSearch',
method: 'post',
data
});
}
// 新增 // 新增
export const add = row => { export const add = row => {
return request({ return request({
@ -90,4 +98,12 @@ export const writeTask = (params) =>{
}) })
} }
// 导出接口
export const exportExcel = (data) =>{
return request({
url:'/api/blade-desk/QA/CycleTestTask/export-excel',
method:'post',
data,
responseType: "blob",
})
}

2
src/api/tankSolutionSystem/resultsCon.js
Unescape View File

@ -12,7 +12,7 @@ export const getReportList = params =>{
// 生成报告列表 // 生成报告列表
export const generateReport = (params) =>{ export const generateReport = (params) =>{
return request({ return request({
url:"/api/blade-desk/QA/LiquidTankTaskCopy/list", url:"/api/blade-desk/QA/LiquidTankTaskCopy/listReport",
method:'get', method:'get',
params params
}) })

35
src/views/periodicTesting/components/addProjectCycleDialog.vue
Unescape View File

@ -14,6 +14,14 @@
v-show="title == '新增' || title == '编辑'" v-show="title == '新增' || title == '编辑'"
> >
<el-row> <el-row>
<el-col :span="8">
<el-form-item label="镀种：" prop="plateIds">
<!-- <el-input v-model="projectForm.plateName" placeholder="请输入镀种"></el-input> -->
<el-select v-model="projectForm.plateIds" multiple>
<el-option v-for="item in plateData" :key="item.id" :label="item.plating" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="项目名称：" prop="cycleTestItemId"> <el-form-item label="项目名称：" prop="cycleTestItemId">
<el-select filterable v-model="projectForm.cycleTestItemId" placeholder="请选择项目" @change="tpProjectChange" value-key="id"> <el-select filterable v-model="projectForm.cycleTestItemId" placeholder="请选择项目" @change="tpProjectChange" value-key="id">
@ -41,14 +49,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="镀种：" prop="plateName">
<el-input v-model="projectForm.plateName" placeholder="请输入镀种"></el-input>
<!-- <el-select v-model="projectForm.plateId">
<el-option v-for="item in plateData" :key="item.id" :label="item.plate" :value="item.id"></el-option>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="试验件：" prop="testType"> <el-form-item label="试验件：" prop="testType">
<el-select v-model="projectForm.testType" placeholder="请选择试验件"> <el-select v-model="projectForm.testType" placeholder="请选择试验件">
@ -86,7 +87,7 @@
v-model="projectForm.testDuration" v-model="projectForm.testDuration"
controls-position="right" controls-position="right"
@change="handleChange" @change="handleChange"
:min="0" :min="1"
> >
</el-input-number> </el-input-number>
<span style="margin-left: 5px">天</span> <span style="margin-left: 5px">天</span>
@ -118,8 +119,8 @@
v-model="projectForm.remind" v-model="projectForm.remind"
controls-position="right" controls-position="right"
@change="handleChange" @change="handleChange"
:min="projectForm.testDuration" :min="projectForm.genBefore || 0"
:max="Number(projectForm.testDuration) + Number(projectForm.genBefore)" :max="(Number(projectForm.testDuration) || 0) + (Number(projectForm.genBefore) || 0)"
> >
</el-input-number> </el-input-number>
<span style="margin-left: 5px">天</span> <span style="margin-left: 5px">天</span>
@ -318,7 +319,9 @@ export default {
openShow: false, openShow: false,
projectOption:[], projectOption:[],
pieceList:[], pieceList:[],
projectForm: {}, projectForm: {
projectCycle:1
},
projectRules: { projectRules: {
cycleTestItemId: [{ required: true, message: '请输入项目名称', trigger: 'blur' }], cycleTestItemId: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
testType: [{ required: true, message: '请选择试验件', trigger: 'blur' }], testType: [{ required: true, message: '请选择试验件', trigger: 'blur' }],
@ -329,6 +332,7 @@ export default {
jobType: [{ required: true, message: '请选择试验周期', trigger: 'blur' }], jobType: [{ required: true, message: '请选择试验周期', trigger: 'blur' }],
testMat:[{required:true,message:'请输入试验件材料',trigger:'blur'}], testMat:[{required:true,message:'请输入试验件材料',trigger:'blur'}],
minDoTestCount:[{required:true,message:'请输入最小试验数量',trigger:'blur'}], minDoTestCount:[{required:true,message:'请输入最小试验数量',trigger:'blur'}],
plateIds:[{required:true,message:'请选择镀种',trigger:'blur'}]
}, },
userData:[], userData:[],
monthTags:[], monthTags:[],
@ -341,6 +345,7 @@ export default {
if(this.row && this.row.id){ if(this.row && this.row.id){
this.getRowDetail(this.row.id) this.getRowDetail(this.row.id)
} }
this.projectForm.testDuration = 1
this.getPieces() this.getPieces()
this.getUsers() this.getUsers()
this.getProject() this.getProject()
@ -510,9 +515,10 @@ export default {
return month + day; return month + day;
}); });
} }
console.log('projectForm-----------',this.projectForm)
let params = { let params = {
testType:this.projectForm.testType, testType:this.projectForm.testType,
plateName:this.projectForm.plateName, // plateName:this.projectForm.plateName,
cycleTestItemId:this.projectForm.cycleTestItemId, cycleTestItemId:this.projectForm.cycleTestItemId,
cycleTestItemCondition:this.projectForm.cycleTestItemCondition, cycleTestItemCondition:this.projectForm.cycleTestItemCondition,
cycleTestItemStandard:this.projectForm.cycleTestItemStandard, cycleTestItemStandard:this.projectForm.cycleTestItemStandard,
@ -526,9 +532,10 @@ export default {
isPutOff:this.projectForm.isPutOff ? 1 : 0, isPutOff:this.projectForm.isPutOff ? 1 : 0,
minDoTestCount:this.projectForm.minDoTestCount, minDoTestCount:this.projectForm.minDoTestCount,
testMat:this.projectForm.testMat, testMat:this.projectForm.testMat,
plateIds:this.projectForm.plateIds.join(",")
} }
console.log('title--------------',this.title) console.log('params--------------',params)
if(this.title == '新增'){ if(this.title == '新增'){
params.processUserIds = this.projectForm.processUserIds.length != 0 ? this.projectForm.processUserIds.join(',') : '' params.processUserIds = this.projectForm.processUserIds.length != 0 ? this.projectForm.processUserIds.join(',') : ''
console.log('params==============',params) console.log('params==============',params)

47
src/views/periodicTesting/components/viewDialog.vue
Unescape View File

@ -4,65 +4,68 @@
<div style="font-weight: 550;">任务信息</div> <div style="font-weight: 550;">任务信息</div>
<div class="info_box"> <div class="info_box">
<el-row class="item_item" :gutter="20"> <el-row class="item_item" :gutter="20">
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>任务编号：</span><span>{{detailForm.code}}</span> <span>任务编号：</span><span>{{detailForm.code}}</span>
</el-col> </el-col>
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>试验项目：</span><span>{{detailForm.cycleTestItemName}}</span> <span>试验项目：</span><span>{{detailForm.cycleTestItemName}}</span>
</el-col> </el-col>
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>试验件：</span><span>{{detailForm.testTypeName}}</span> <span>试验件：</span><span>{{detailForm.testTypeName}}</span>
</el-col> </el-col>
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>试验标准：</span> <span>试验标准：</span>
<span style="color: #1890ff;cursor:pointer;" @click="downloadA(detailForm.standard.link,detailForm.standard.originalName)">{{detailForm.cycleTestStandardName}}</span> <span style="color: #1890ff;cursor:pointer;" @click="downloadA(detailForm.standard.link,detailForm.standard.originalName)">{{detailForm.cycleTestStandardName}}</span>
<!-- <a style="color: #1890ff;cursor:pointer;" :href="detailForm.link" :download="detailForm.cycleTestStandardName">{{ detailForm.cycleTestStandardName }}</a> --> <!-- <a style="color: #1890ff;cursor:pointer;" :href="detailForm.link" :download="detailForm.cycleTestStandardName">{{ detailForm.cycleTestStandardName }}</a> -->
</el-col> </el-col>
</el-row> <!-- </el-row> -->
<el-row class="item_item" :gutter="20"> <!-- <el-row class="item_item" :gutter="20"> -->
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>试验条件：</span><span>{{detailForm.cycleTestItemCondition}}</span> <span>试验条件：</span><span>{{detailForm.cycleTestItemCondition}}</span>
</el-col> </el-col>
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>工艺员：</span><span>{{detailForm.processUserName}}</span> <span>工艺员：</span><span>{{detailForm.processUserName}}</span>
</el-col> </el-col>
<!-- <el-col :span="6"> <!-- <el-col class="item_item" :span="6">
<span>试验员：</span><span>{{detailForm.mecMan.userName}}</span> <span>试验员：</span><span>{{detailForm.mecMan.userName}}</span>
</el-col> --> </el-col> -->
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>任务状态：</span><span>{{detailForm.statusName}}</span> <span>任务状态：</span><span>{{detailForm.statusName}}</span>
</el-col> </el-col>
<el-col :span="6"> <el-col class="item_item" :span="6" v-if="detailForm.flagOut == 1 && detailForm.statusName == '超期已完成'">
<span>超期原因：</span><span>{{detailForm.reasonForOut}}</span>
</el-col>
<!-- </el-row> -->
<!-- <el-row class="item_item" :gutter="20"> -->
<el-col class="item_item" :span="6">
<span>任务生成时间：</span><span>{{detailForm.genDatetime}}</span> <span>任务生成时间：</span><span>{{detailForm.genDatetime}}</span>
</el-col> </el-col>
</el-row> <el-col class="item_item" :span="6">
<el-row class="item_item" :gutter="20">
<el-col :span="6">
<span>任务下发时间：</span><span>{{detailForm.issueDate}}</span> <span>任务下发时间：</span><span>{{detailForm.issueDate}}</span>
</el-col> </el-col>
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>任务接收时间：</span><span>{{detailForm.acceptDate}}</span> <span>任务接收时间：</span><span>{{detailForm.acceptDate}}</span>
</el-col> </el-col>
<el-col :span="6"> <el-col class="item_item" :span="6">
<span>任务完成时间：</span><span>{{detailForm.finishDate}}</span> <span>任务完成时间：</span><span>{{detailForm.finishDate}}</span>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div style="font-weight: 550;" v-if="detailForm.status == 4 || detailForm.status == 9">试验结果</div> <div style="font-weight: 550;" v-if="detailForm.status == 4 || detailForm.status == 9">试验结果</div>
<div class="info_box" v-if="detailForm.status == 4 || detailForm.status == 9"> <div class="info_box" v-if="detailForm.status == 4 || detailForm.status == 9">
<el-row class="item_item" :gutter="20" v-if="detailForm.isDone == 1"> <el-row class="item_item" :gutter="20" >
<el-col :span="6"> <el-col class="item_item" :span="6" v-if="detailForm.isDone == 1">
<span>试验结果：</span> <span>试验结果：</span>
<!-- <span style="color: #1890FF;cursor: pointer;">{{detailForm.testDate}}</span> --> <!-- <span style="color: #1890FF;cursor: pointer;">{{detailForm.testDate}}</span> -->
<span style="color: #1890ff;cursor: pointer;" @click="downloadA(detailForm.link,detailForm.originalName)">{{detailForm.originalName}}</span> <span style="color: #1890ff;cursor: pointer;" @click="downloadA(detailForm.link,detailForm.originalName)">{{detailForm.originalName}}</span>
</el-col> </el-col>
<el-col :span="6"> <el-col class="item_item" :span="6" v-if="detailForm.isDone == 1">
<span>试验时间：</span> <span>试验时间：</span>
<span>{{detailForm.testDate}}</span> <span>{{detailForm.testDate}}</span>
</el-col> </el-col>
</el-row> <!-- </el-row> -->
<el-row class="item_item" :gutter="20" v-show="detailForm.isDone == 2" > <!-- <el-row class="item_item" :gutter="20" > -->
<el-col :span="6"> <el-col class="item_item" :span="6" v-if="detailForm.isDone == 2">
<span>未试验原因：</span><span>{{detailForm.reasonForNo}}</span> <span>未试验原因：</span><span>{{detailForm.reasonForNo}}</span>
</el-col> </el-col>
</el-row> </el-row>

18
src/views/periodicTesting/projectCycle.vue
Unescape View File

@ -256,7 +256,7 @@ export default {
delBtnIcon: ' ', delBtnIcon: ' ',
editBtnIcon: ' ', editBtnIcon: ' ',
labelWidth: 120, labelWidth: 120,
// menuWidth: 330, menuWidth: 190,
dialogWidth: 600, dialogWidth: 600,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -272,6 +272,14 @@ export default {
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
column: [ column: [
{
label: '镀种',
prop: 'plateNames',
search: false,
sortable: true,
filter: true,
width: 150,
},
{ {
label: '试验项目', label: '试验项目',
prop: 'cycleTestItemName', prop: 'cycleTestItemName',
@ -296,14 +304,6 @@ export default {
sortable: true, sortable: true,
width: 200, width: 200,
}, },
{
label: '镀种',
prop: 'plateName',
search: false,
sortable: true,
filter: true,
width: 150,
},
{ {
label: '试验件', label: '试验件',
prop: 'testTypeName', prop: 'testTypeName',

173
src/views/periodicTesting/testTask.vue
Unescape View File

@ -20,6 +20,7 @@
> >
<template #menu-left> <template #menu-left>
<el-button @click="handleIssue" type="primary" v-if="permission.issue_btn"> 转派 </el-button> <el-button @click="handleIssue" type="primary" v-if="permission.issue_btn"> 转派 </el-button>
<el-button type="warning" plain @click="handleExport">导出</el-button>
</template> </template>
<template #menu-right="{ size }"> <template #menu-right="{ size }">
<el-button type="warning" plain @click="handleSearch(1)">临期</el-button> <el-button type="warning" plain @click="handleSearch(1)">临期</el-button>
@ -118,6 +119,9 @@
<el-form-item label="未试验原因" prop="reasonForNo" v-if="writeForm.isDone == 2"> <el-form-item label="未试验原因" prop="reasonForNo" v-if="writeForm.isDone == 2">
<el-input type="textarea" v-model="writeForm.reasonForNo" placeholder="请填写未试验原因"></el-input> <el-input type="textarea" v-model="writeForm.reasonForNo" placeholder="请填写未试验原因"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="超期原因" prop="reasonForOut" v-if="writeForm.flagOut == 1">
<el-input type="textarea" v-model="writeForm.reasonForOut" placeholder="请填写超期原因"></el-input>
</el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
@ -137,9 +141,16 @@
</template> </template>
<script> <script>
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import { exportBlob } from '@/api/common';
import { downloadXls } from '@/utils/util';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import website from '@/config/website';
import { getToken } from '@/utils/auth';
import {dateFormat} from '@/utils/date'
import viewDialog from './components/viewDialog.vue'; import viewDialog from './components/viewDialog.vue';
import { getList, remove,issueTask,acceptTask,issueAllTask,writeTask } from '@/api/qualityManagement/periodicTesting/testTask.js'; import { getTaskList, remove,issueTask,acceptTask,issueAllTask,writeTask,exportExcel } from '@/api/qualityManagement/periodicTesting/testTask.js';
import { getUserList} from '@/api/qualityManagement/periodicTesting/projectCycle.js'; import { getUserList} from '@/api/qualityManagement/periodicTesting/projectCycle.js';
export default { export default {
@ -185,63 +196,51 @@ export default {
issueForm: {}, issueForm: {},
option: { option: {
tip: false, tip: false,
height: 'auto', align: 'center',
calcHeight: 32, size: 'medium',
columnSort: true, height:'auto',
// simplePage: true, searchLabelWidth:120,
simplePage: true,
searchShow: true, searchShow: true,
searchMenuSpan: 12, searchMenuSpan: 6,
searchIcon: true, searchIcon: true,
searchIndex: 3, searchIndex: 3,
tree: false, tree: false,
border: true, border: true,
index: false,
selection: true, selection: true,
viewBtn: false, viewBtn: false,
editBtn:false,
addBtn:false,
delBtn: false, delBtn: false,
addBtn: false,
editBtn: false,
editBtnText: '修改', editBtnText: '修改',
viewBtnText: '详情', viewBtnText:'详情',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
labelWidth: 120, labelWidth: 120,
menuWidth: 130, menuWidth: 120,
dialogWidth: 600, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
excelBtn: false,
filterBtn: true, filterBtn: true,
searchShowBtn: false, searchShowBtn: false,
excelBtn: true, excelBtn: true,
index: false,
showOverflowTooltip: true, showOverflowTooltip: true,
align: 'center', searchLabelPosition:'left',
searchLabelPosition: 'left', searchLabelPosition:'left',
searchGutter: 24, searchGutter:24,
searchSpan: 6, searchSpan:6,
menuAlign: 'left', menuAlign: 'left',
gridBtn: false, gridBtn:false,
searchMenuPosition: 'right', searchMenuPosition:'right',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
column: [ column: [
// [
// {"label": "任务编号",prop:"code"},
// {"label": "试验项目",prop:"cycleTestItemName"},
// {"label": "试验条件",prop:"cycleTestItemCondition"},
// {"label": "试验标准",prop:"cycleTestItemStandard"},
// {"label": "试验件",prop:"testType"},
// {"label": "工艺员",prop:"processUserName"},
// {"label": "状态",prop:""},
// {"label": "临期天数",prop:"remind"},
// {"label": "任务生成时间",prop:""},
// {"label": "任务下发时间",prop:""},
// {"label": "任务接成时间",prop:""},
// {"label": "任务完成时间",prop:""},
// ]
{ {
label: '任务编号', label: '任务编号',
prop: 'code', prop: 'code',
search: false, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
addDisplay: false, addDisplay: false,
@ -260,6 +259,7 @@ export default {
{ {
label: '试验项目', label: '试验项目',
prop: 'cycleTestItemId', prop: 'cycleTestItemId',
searchOrder: 3,
search: true, search: true,
hide:true, hide:true,
type: 'select', type: 'select',
@ -321,7 +321,7 @@ export default {
{ {
label: '试验条件', label: '试验条件',
prop: 'cycleTestItemCondition', prop: 'cycleTestItemCondition',
search: false, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 24,
@ -338,7 +338,7 @@ export default {
label: '试验标准', label: '试验标准',
prop: 'cycleTestStandardName', prop: 'cycleTestStandardName',
type: 'textarea', type: 'textarea',
search: false, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 24,
@ -355,7 +355,7 @@ export default {
label: '试验件', label: '试验件',
prop: 'testType', prop: 'testType',
type: 'select', type: 'select',
search: false, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 24,
@ -369,7 +369,7 @@ export default {
{ {
label: '临期天数', label: '临期天数',
prop: 'countDayToPlanedFinish', prop: 'countDayToPlanedFinish',
search: false, search: true,
sortable: true, sortable: true,
editDisplay: false, editDisplay: false,
filter: true, filter: true,
@ -406,6 +406,7 @@ export default {
{ {
label: '状态', label: '状态',
prop: 'status', prop: 'status',
searchOrder: 2,
search: true, search: true,
type: 'select', type: 'select',
sortable: true, sortable: true,
@ -434,10 +435,16 @@ export default {
// { label: '已完成', value: 5 }, // { label: '已完成', value: 5 },
// ], // ],
}, },
{
label:'超期原因',
prop:"reasonForOut",
span: 24,
width: 200,
},
{ {
label: '工艺员', label: '工艺员',
prop: 'processUserName', prop: 'processUserName',
search: false, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 24,
@ -452,13 +459,17 @@ export default {
{ {
label: '任务生成时间', label: '任务生成时间',
prop: 'genDatetime', prop: 'genDatetime',
type:"date",
searchOrder: 1,
finishTime: '', finishTime: '',
search: false, search: true,
searchRange: true,
sortable: true, sortable: true,
editDisplay: false, editDisplay: false,
filter: true, filter: true,
addDisplay: false, addDisplay: false,
span: 24, span: 24,
searchLabelWidth: 120,
width: 200, width: 200,
rules: [ rules: [
{ {
@ -471,8 +482,11 @@ export default {
{ {
label: '任务下发时间', label: '任务下发时间',
prop: 'issueDate', prop: 'issueDate',
search: false, type:"date",
searchRange: true,
search: true,
sortable: true, sortable: true,
searchOrder: 1,
editDisplay: false, editDisplay: false,
filter: true, filter: true,
addDisplay: false, addDisplay: false,
@ -489,7 +503,10 @@ export default {
{ {
label: '任务接收时间', label: '任务接收时间',
prop: 'acceptDate', prop: 'acceptDate',
search: false, type:"date",
searchRange: true,
searchOrder: 1,
search: true,
sortable: true, sortable: true,
editDisplay: false, editDisplay: false,
filter: true, filter: true,
@ -507,7 +524,10 @@ export default {
{ {
label: '任务完成时间', label: '任务完成时间',
prop: 'finishDate', prop: 'finishDate',
search: false, type:"date",
searchRange: true,
searchOrder: 1,
search: true,
sortable: true, sortable: true,
editDisplay: false, editDisplay: false,
filter: true, filter: true,
@ -552,6 +572,11 @@ export default {
rules.testResult = []; // 非必填 rules.testResult = []; // 非必填
rules.reasonForNo = [{ required: true, message: '请填写未试验原因', trigger: 'blur' }] rules.reasonForNo = [{ required: true, message: '请填写未试验原因', trigger: 'blur' }]
} }
if(this.writeForm.flagOut == 1){
rules.reasonForOut = [{ required: true, message: '请填写超期原因', trigger: 'blur' }];
}else{
rules.reasonForOut = [];
}
return rules; return rules;
}, },
}, },
@ -604,6 +629,7 @@ export default {
handleWrite(row) { handleWrite(row) {
this.writeForm = { this.writeForm = {
id:row.id, id:row.id,
flagOut:row.flagOut
}; };
this.fileList = []; this.fileList = [];
this.writeDialog = true; this.writeDialog = true;
@ -624,6 +650,35 @@ export default {
this.issueForm = {} this.issueForm = {}
this.issueDialog = true; this.issueDialog = true;
}, },
// 导出
handleExport(){
let param = {
...this.query,
genDatetimeStart:this.query.genDatetime && this.query.genDatetime.length != 0 && dateFormat(this.query.genDatetime[0],"yyyy-MM-dd"),
genDatetimeEnd:this.query.genDatetime && this.query.genDatetime.length != 0 && dateFormat(this.query.genDatetime[1],"yyyy-MM-dd"),
issueDateStart:this.query.issueDate && this.query.issueDate.length != 0 && dateFormat(this.query.issueDate[0],"yyyy-MM-dd"),
issueDateEnd:this.query.issueDate && this.query.issueDate.length != 0 && dateFormat(this.query.issueDate[1],"yyyy-MM-dd"),
acceptDateStart:this.query.acceptDate && this.query.acceptDate.length != 0 && dateFormat(this.query.acceptDate[0],"yyyy-MM-dd"),
acceptDateEnd:this.query.acceptDate && this.query.acceptDate.length != 0 && dateFormat(this.query.acceptDate[1],"yyyy-MM-dd"),
finishDateStart:this.query.finishDate && this.query.finishDate.length != 0 && dateFormat(this.query.finishDate[0],"yyyy-MM-dd"),
finishDateEnd:this.query.finishDate && this.query.finishDate.length != 0 && dateFormat(this.query.finishDate[1],"yyyy-MM-dd"),
dayToPlanedFinish:this.query.countDayToPlanedFinish && this.query.countDayToPlanedFinish
}
const { genDatetime,issueDate,acceptDate,finishDate,countDayToPlanedFinish, ...validData } = param;
this.$confirm('是否导出周期性试验任务数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
NProgress.start();
exportExcel(validData).then(res => {
console.log('res===============',res)
downloadXls(res.data, `试验任务表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`);
NProgress.done();
});
})
},
// 临期超期筛选数据 // 临期超期筛选数据
handleSearch(val){ handleSearch(val){
this.page.currentPage = 1 this.page.currentPage = 1
@ -660,8 +715,10 @@ export default {
isDone:this.writeForm.isDone, isDone:this.writeForm.isDone,
testDate:this.writeForm.isDone == 1 ? this.writeForm.testDate : '', testDate:this.writeForm.isDone == 1 ? this.writeForm.testDate : '',
testAttachId:this.writeForm.isDone == 1 ? this.fileList.map(item => item.attachId).join(',') : '', testAttachId:this.writeForm.isDone == 1 ? this.fileList.map(item => item.attachId).join(',') : '',
reasonForNo:this.writeForm.isDone == 2 ? this.writeForm.reasonForNo ? this.writeForm.reasonForNo : '' : '' reasonForNo:this.writeForm.isDone == 2 ? this.writeForm.reasonForNo ? this.writeForm.reasonForNo : '' : '',
reasonForOut:this.writeForm.flagOut == 1 && this.writeForm.reasonForOut
} }
console.log('prams----------',params)
writeTask(params).then(res =>{ writeTask(params).then(res =>{
if(res.data.code == 200){ if(res.data.code == 200){
this.$message.success('填报成功') this.$message.success('填报成功')
@ -731,7 +788,27 @@ export default {
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query),this.filterType).then(res => { let param = {
...params,
genDatetimeStart:params.genDatetime && params.genDatetime.length != 0 && dateFormat(params.genDatetime[0],"yyyy-MM-dd"),
genDatetimeEnd:params.genDatetime && params.genDatetime.length != 0 && dateFormat(params.genDatetime[1],"yyyy-MM-dd"),
issueDateStart:params.issueDate && params.issueDate.length != 0 && dateFormat(params.issueDate[0],"yyyy-MM-dd"),
issueDateEnd:params.issueDate && params.issueDate.length != 0 && dateFormat(params.issueDate[1],"yyyy-MM-dd"),
acceptDateStart:params.acceptDate && params.acceptDate.length != 0 && dateFormat(params.acceptDate[0],"yyyy-MM-dd"),
acceptDateEnd:params.acceptDate && params.acceptDate.length != 0 && dateFormat(params.acceptDate[1],"yyyy-MM-dd"),
finishDateStart:params.finishDate && params.finishDate.length != 0 && dateFormat(params.finishDate[0],"yyyy-MM-dd"),
finishDateEnd:params.finishDate && params.finishDate.length != 0 && dateFormat(params.finishDate[1],"yyyy-MM-dd"),
dayToPlanedFinish:params.countDayToPlanedFinish && params.countDayToPlanedFinish
}
const { genDatetime,issueDate,acceptDate,finishDate,countDayToPlanedFinish, ...validData } = param;
console.log('validData----------',validData)
getTaskList({
current:this.page.currentPage,
size:this.page.pageSize,
...validData,
filterType:this.filterType
}).then(res => {
this.data = res.data.data.records; this.data = res.data.data.records;
this.loading = false; this.loading = false;

1100
src/views/processManagement/platingTypeInfo.vue
View File

File diff suppressed because it is too large Load Diff

7
src/views/productionDisposition/hearingDialog.vue
Unescape View File

@ -41,7 +41,7 @@
</el-select> </el-select>
</el-descriptions-item> --> </el-descriptions-item> -->
<el-descriptions-item label="处置单类型:"> <el-descriptions-item label="处置单类型:">
<el-select v-model="detailInfo.reviewOrderMode" placeholder="请选择" style="width: 400px;" :disabled="type == 'view'"> <el-select v-model="detailInfo.reviewOrderMode" placeholder="请选择" style="width: 400px;" :disabled="type == 'view'" @change="changeOrderMode">
<el-option v-for="item in disposeTypeList" :key="item.id" :label="item.dictValue" :value="item.dictKey" /> <el-option v-for="item in disposeTypeList" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
<!-- <el-option label="装配模式" value="2" /> --> <!-- <el-option label="装配模式" value="2" /> -->
<!-- <el-option label="售后模式" value="3" /> --> <!-- <el-option label="售后模式" value="3" /> -->
@ -360,6 +360,11 @@ export default {
// this.getQuestionSmall() // this.getQuestionSmall()
}, },
methods: { methods: {
changeOrderMode(){
this.dutyList.map(item =>{
item.dutyPart = ''
})
},
// 获取责任零件 // 获取责任零件
getResponsiblePart(){ getResponsiblePart(){
getResponsiblePartList({ getResponsiblePartList({

2
src/views/productionTesting/components/sametankView.vue
Unescape View File

@ -1,7 +1,7 @@
<template> <template>
<el-dialog title="查看" append-to-body :modelValue="openShow" width="80%" @close="closeDialog"> <el-dialog title="查看" append-to-body :modelValue="openShow" width="80%" @close="closeDialog">
<div style="display: flex; align-items: center; justify-content: space-between"> <div style="display: flex; align-items: center; justify-content: space-between">
<el-descriptions title="订单信息" :column="5" border style="width: 100%" :label-width="110"> <el-descriptions title="订单信息" :column="5" border style="width: 100%" :label-width="160">
<el-descriptions-item label="车间订单号" class="fixed-width-item">{{ <el-descriptions-item label="车间订单号" class="fixed-width-item">{{
dialogData.woCode dialogData.woCode
}}</el-descriptions-item> }}</el-descriptions-item>

17767
src/views/productionTesting/productionQuality.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/qualityManagement/reviewFormMess/index.vue
Unescape View File

@ -35,7 +35,7 @@
<span v-if="row.bizType == 2">{{row.scrapNum}}</span> <span v-if="row.bizType == 2">{{row.scrapNum}}</span>
</template> </template>
<template #menu="{ row }"> <template #menu="{ row }">
<el-button type="text" @click="reviewFn(row)">审理</el-button> <el-button type="text" @click="reviewFn(row)" v-if="row.selfReviewFlag != 1 && row.selfReviewFlag != 2">审理</el-button>
</template> </template>
</avue-crud> </avue-crud>

6
src/views/qualityManagement/reviewFormMess/options.js
Unescape View File

@ -57,7 +57,7 @@ export const insideOption = {
search: true, search: true,
sortable: true, sortable: true,
span: 12, span: 12,
width: 150 width: 200
}, },
{ {
label: '物料号', label: '物料号',
@ -301,7 +301,7 @@ export const erpOption = {
sortable: true, sortable: true,
span: 12, span: 12,
display: false, display: false,
width:150 width:200
}, },
{ {
label: '工序号', label: '工序号',
@ -331,7 +331,7 @@ export const erpOption = {
sortable: true, sortable: true,
span: 12, span: 12,
display: false, display: false,
width:150 width:200
}, },
{ {
label: '返修路线', label: '返修路线',

1
src/views/qualityManagement/reworkOrderReview/index.vue
Unescape View File

@ -1,4 +1,5 @@
<template> <template>
<!-- 订单返工审理 -->
<basic-container> <basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"

1
src/views/qualityManagement/scrapOrderReview/index.vue
Unescape View File

@ -1,4 +1,5 @@
<template> <template>
<!-- 订单报废审理 -->
<basic-container> <basic-container>
<!-- <el-tabs v-model="activeName" @tab-click="handleClick"> <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="工序供应商订单处置流程" name="1"></el-tab-pane> <el-tab-pane label="工序供应商订单处置流程" name="1"></el-tab-pane>

46
src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
Unescape View File

@ -3,7 +3,7 @@
<el-form ref="form" :model="form" label-width="140px" :rules="rules"> <el-form ref="form" :model="form" label-width="140px" :rules="rules">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="作业中心:" prop="workCenterId"> <el-form-item label="作业中心：" prop="workCenterId">
<el-select v-model="form.workCenterId" :disabled="type == 'view'" placeholder="请选择" @change="changeWorkCenter"> <el-select v-model="form.workCenterId" :disabled="type == 'view'" placeholder="请选择" @change="changeWorkCenter">
<el-option v-for="item in workList" :key="item.id" :label="item.wcName" :value="item.id" /> <el-option v-for="item in workList" :key="item.id" :label="item.wcName" :value="item.id" />
<!-- <el-option label="作业中心2" value="2" /> --> <!-- <el-option label="作业中心2" value="2" /> -->
@ -11,7 +11,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="作业槽:" prop="workTankId"> <el-form-item label="作业槽：" prop="workTankId">
<el-select v-model="form.workTankId" :disabled="type == 'view'" placeholder="请选择"> <el-select v-model="form.workTankId" :disabled="type == 'view'" placeholder="请选择">
<el-option v-for="item in tankList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in tankList" :key="item.id" :label="item.name" :value="item.id" />
<!-- <el-option label="作业槽2" value="2" /> --> <!-- <el-option label="作业槽2" value="2" /> -->
@ -19,7 +19,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="分析项目:" prop="testElement"> <el-form-item label="分析项目：" prop="testElement">
<el-input v-model="form.testElement" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.testElement" :disabled="type == 'view'" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -27,7 +27,7 @@
<!-- <el-form-item label="工艺含量:" prop="gongyihanliang"> <!-- <el-form-item label="工艺含量:" prop="gongyihanliang">
<el-input v-model="input" placeholder="请输入" /> <el-input v-model="input" placeholder="请输入" />
</el-form-item> --> </el-form-item> -->
<el-form-item label="规范上下限(g/L):" prop="standardLimit"> <el-form-item label="规范上下限(g/L)：" prop="standardLimit">
<div style="display: flex;"> <div style="display: flex;">
<el-input v-model="form.normValueMin" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.normValueMin" :disabled="type == 'view'" placeholder="请输入" />
~<el-input v-model="form.normValueMax" :disabled="type == 'view'" placeholder="请输入" /> ~<el-input v-model="form.normValueMax" :disabled="type == 'view'" placeholder="请输入" />
@ -36,7 +36,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="目标上下限:"> <el-form-item label="目标上下限：">
<div style="display: flex;"> <div style="display: flex;">
<el-input v-model="form.targetValueMin" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.targetValueMin" :disabled="type == 'view'" placeholder="请输入" />
~<el-input v-model="form.targetValueMax" :disabled="type == 'view'" placeholder="请输入" /> ~<el-input v-model="form.targetValueMax" :disabled="type == 'view'" placeholder="请输入" />
@ -45,34 +45,34 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="目标值:" prop="targetValue"> <el-form-item label="目标值：" prop="targetValue">
<el-input v-model="form.targetValue" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.targetValue" :disabled="type == 'view'" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="添加点:"> <el-form-item label="添加点：">
<el-input v-model="form.fillingLocation" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.fillingLocation" :disabled="type == 'view'" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="体积:"> <el-form-item label="体积：">
<el-input v-model="form.volume" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.volume" :disabled="type == 'view'" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="测量值单位:" prop="testUnit"> <el-form-item label="测量值单位：" prop="testUnit">
<el-input v-model="form.testUnit" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.testUnit" :disabled="type == 'view'" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="添加值单位:" prop="addUnit"> <el-form-item label="添加值单位：" prop="addUnit">
<el-input v-model="form.addUnit" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.addUnit" :disabled="type == 'view'" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="加药量计算公式:" prop="addDrugFormulaId" label-width="140px"> <el-form-item label="加药量计算公式：" prop="addDrugFormulaId" label-width="140px">
<el-select v-model="form.addDrugFormulaId" :disabled="type == 'view'" placeholder="请选择"> <el-select v-model="form.addDrugFormulaId" :disabled="type == 'view'" placeholder="请选择">
<el-option v-for="item in drugList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in drugList" :key="item.id" :label="item.name" :value="item.id" />
<!-- <el-option label="计算公式2" value="2" /> --> <!-- <el-option label="计算公式2" value="2" /> -->
@ -80,7 +80,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="添加后理论值公式:" prop="afterTheoryFormulaId" label-width="140px"> <el-form-item label="添加后理论值公式：" prop="afterTheoryFormulaId" label-width="140px">
<el-select v-model="form.afterTheoryFormulaId" :disabled="type == 'view'" placeholder="请选择"> <el-select v-model="form.afterTheoryFormulaId" :disabled="type == 'view'" placeholder="请选择">
<el-option v-for="item in afterTheoryList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in afterTheoryList" :key="item.id" :label="item.name" :value="item.id" />
<!-- <el-option label="计算公式2" value="2" /> --> <!-- <el-option label="计算公式2" value="2" /> -->
@ -88,7 +88,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="温度范围:"> <el-form-item label="温度范围：">
<div style="display: flex;"> <div style="display: flex;">
<el-radio-group v-model="form.temperatureType" :disabled="type == 'view'"> <el-radio-group v-model="form.temperatureType" :disabled="type == 'view'">
<el-radio :value="1">无温度</el-radio> <el-radio :value="1">无温度</el-radio>
@ -114,7 +114,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="PH值范围:"> <el-form-item label="PH值范围：">
<div style="display: flex;"> <div style="display: flex;">
<el-radio-group v-model="form.phType" :disabled="type == 'view'"> <el-radio-group v-model="form.phType" :disabled="type == 'view'">
<el-radio :value="1">无温度</el-radio> <el-radio :value="1">无温度</el-radio>
@ -128,12 +128,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="药品名称:"> <el-form-item label="药品名称：">
<el-input v-model="form.drugName" :disabled="type == 'view'" placeholder="请输入" /> <el-input v-model="form.drugName" :disabled="type == 'view'" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="药品物料号:" prop="drugMaterialId"> <el-form-item label="药品物料号：" prop="drugMaterialId">
<el-select v-model="form.drugMaterialId" :disabled="type == 'view'" placeholder="请选择"> <el-select v-model="form.drugMaterialId" :disabled="type == 'view'" placeholder="请选择">
<el-option label="物料一" value="1" /> <el-option label="物料一" value="1" />
<el-option label="物料2" value="2" /> <el-option label="物料2" value="2" />
@ -141,18 +141,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="药品物料名称:" prop="drugMaterialName"> <el-form-item label="药品物料名称：" prop="drugMaterialName">
<el-input v-model="form.drugMaterialName" :disabled="type == 'view'" placeholder="请输入" disabled /> <el-input v-model="form.drugMaterialName" :disabled="type == 'view'" placeholder="请输入" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="测试周期(天):" prop="analysisCycle" > <el-form-item label="测试周期(天)：" prop="analysisCycle" >
<el-input-number v-model="form.analysisCycle" :disabled="type == 'view'" :min="1" controls-position="right" @change="handleChange" /> <el-input-number v-model="form.analysisCycle" :disabled="type == 'view'" :min="1" controls-position="right" @change="handleChange" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="化验人:" prop="testUserId"> <el-form-item label="化验人：" prop="testUserId">
<el-select v-model="form.testUserId" :disabled="type == 'view'" placeholder="请选择"> <el-select v-model="form.testUserId" :disabled="type == 'view'" placeholder="请选择">
<el-option v-for="item in personList" :key="item.id" :label="item.realName" :value="item.id" /> <el-option v-for="item in personList" :key="item.id" :label="item.realName" :value="item.id" />
<!-- <el-option label="化验人2" value="2" /> --> <!-- <el-option label="化验人2" value="2" /> -->
@ -161,7 +161,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="主管工艺:" prop="processUserId"> <el-form-item label="主管工艺：" prop="processUserId">
<el-select v-model="form.processUserId" :disabled="type == 'view'" placeholder="请选择"> <el-select v-model="form.processUserId" :disabled="type == 'view'" placeholder="请选择">
<el-option v-for="item in managerList" :key="item.id" :label="item.realName" :value="item.id" /> <el-option v-for="item in managerList" :key="item.id" :label="item.realName" :value="item.id" />
<!-- <el-option label="工艺2" value="2" /> --> <!-- <el-option label="工艺2" value="2" /> -->
@ -169,7 +169,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="班组:" prop="teamId"> <el-form-item label="班组：" prop="teamId">
<el-select v-model="form.teamId" :disabled="type == 'view'" placeholder="请选择"> <el-select v-model="form.teamId" :disabled="type == 'view'" placeholder="请选择">
<el-option v-for="item in teamList" :key="item.id" :label="item.tsName" :value="item.id" /> <el-option v-for="item in teamList" :key="item.id" :label="item.tsName" :value="item.id" />
<!-- <el-option label="班组2" value="2" /> --> <!-- <el-option label="班组2" value="2" /> -->
@ -177,7 +177,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="分析周期:" prop="jobType"> <el-form-item label="分析周期：" prop="jobType">
<el-select placeholder="请选择试验周期" :disabled="type == 'view'" v-model="form.jobType" @change="changeCycle"> <el-select placeholder="请选择试验周期" :disabled="type == 'view'" v-model="form.jobType" @change="changeCycle">
<el-option label="每周" :value="1"></el-option> <el-option label="每周" :value="1"></el-option>
<el-option label="每月" :value="2"></el-option> <el-option label="每月" :value="2"></el-option>
@ -245,7 +245,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="有效期:" prop="validDate"> <el-form-item label="有效期：" prop="validDate">
<el-date-picker :disabled="type == 'view'" v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 100%;" /> <el-date-picker :disabled="type == 'view'" v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 100%;" />
</el-form-item> </el-form-item>
</el-col> </el-col>

11
src/views/qualityManagement/tankSolutionSystem/inspectionReport.vue
Unescape View File

@ -16,7 +16,7 @@
</template> </template>
</avue-crud> </avue-crud>
<el-dialog title="检验报告" append-to-body v-model="lineBox" fullscreen width="95%"> <el-dialog title="检验报告" append-to-body v-model="lineBox" fullscreen width="95%">
<el-form :inline="true" v-model="lineForm" label-width="80px"> <el-form :inline="true" v-model="lineForm" label-width="80px" v-if="viewType == 'report'">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="5"> <el-col :span="5">
<el-form-item label="作业中心:" prop="workCenterId"> <el-form-item label="作业中心:" prop="workCenterId">
@ -126,6 +126,7 @@ export default {
total: 0, total: 0,
}, },
loading: false, loading: false,
viewType:"",
option: { option: {
tip: false, tip: false,
size: 'medium', size: 'medium',
@ -149,7 +150,6 @@ export default {
editBtnText: '修改', editBtnText: '修改',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
// menuWidth: 200,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -160,6 +160,7 @@ export default {
addBtnIcon: ' ', addBtnIcon: ' ',
viewBtnIcon: ' ', viewBtnIcon: ' ',
delBtnIcon: ' ', delBtnIcon: ' ',
menuWidth:100,
editBtnIcon: ' ', editBtnIcon: ' ',
index: false, index: false,
showOverflowTooltip: true, showOverflowTooltip: true,
@ -261,7 +262,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
// menuWidth: 200, menuWidth: 100,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -576,6 +577,7 @@ export default {
}, },
methods: { methods: {
handleLine() { handleLine() {
this.viewType = 'report'
this.reportData = [] this.reportData = []
this.lineForm = {} this.lineForm = {}
this.lineBox = true this.lineBox = true
@ -684,6 +686,9 @@ export default {
// this.lineBox = true // this.lineBox = true
getReportDetail({id:row.id}).then(res =>{ getReportDetail({id:row.id}).then(res =>{
console.log('res--------------',res) console.log('res--------------',res)
this.viewType = 'view'
this.reportData = res.data.data.copyList
this.lineBox = true
}) })
// console.log('row-------------------', row) // console.log('row-------------------', row)
// this.detailForm = row // this.detailForm = row

2
src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
Unescape View File

@ -150,7 +150,7 @@ export default {
dialogWidth: 600, dialogWidth: 600,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
filterBtn: true, filterBtn: false,
searchShowBtn: false, searchShowBtn: false,
excelBtn: true, excelBtn: true,
showOverflowTooltip: true, showOverflowTooltip: true,

2
src/views/qualityManagement/tankSolutionSystem/workTankLine.vue
Unescape View File

@ -144,7 +144,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
// menuWidth: 200, menuWidth: 100,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,

Write Preview
Loading…
Cancel
Save