|
@@ -4,15 +4,6 @@
|
|
|
<el-tabs v-model="activeName" type="card">
|
|
<el-tabs v-model="activeName" type="card">
|
|
|
<el-tab-pane label="基本信息" name="1">
|
|
<el-tab-pane label="基本信息" name="1">
|
|
|
<el-form ref="form1" :model="form" label-width="94px">
|
|
<el-form ref="form1" :model="form" label-width="94px">
|
|
|
- <!-- <el-col
|
|
|
|
|
- :span="item.span"
|
|
|
|
|
- v-for="(item, index) in infoList"
|
|
|
|
|
- :key="index"
|
|
|
|
|
- >
|
|
|
|
|
- <el-form-item :label="`${item.label}:`">
|
|
|
|
|
- <el-input :value="form[item.prop]" disabled />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col> -->
|
|
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
<el-col :span="6">
|
|
|
<el-form-item label="编码">
|
|
<el-form-item label="编码">
|
|
@@ -183,6 +174,16 @@
|
|
|
<fileMain ref="fileMainRef" type="view" v-model="accessory" />
|
|
<fileMain ref="fileMainRef" type="view" v-model="accessory" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
+ <el-col :span="18">
|
|
|
|
|
+ <el-form-item label="周期">
|
|
|
|
|
+ <rule-cycle
|
|
|
|
|
+ ref="cycleMultipleRef"
|
|
|
|
|
+ :formData="form"
|
|
|
|
|
+ :pageType="'detail'"
|
|
|
|
|
+ :isBindPlan="true"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
@@ -352,9 +353,7 @@
|
|
|
</template>
|
|
</template>
|
|
|
<template v-slot:attachmentUrl="{ row, $index }">
|
|
<template v-slot:attachmentUrl="{ row, $index }">
|
|
|
<fileMain type="view" v-model="row.attachmentUrl"> </fileMain>
|
|
<fileMain type="view" v-model="row.attachmentUrl"> </fileMain>
|
|
|
- </template>
|
|
|
|
|
-
|
|
|
|
|
- </ele-pro-table
|
|
|
|
|
|
|
+ </template> </ele-pro-table
|
|
|
></el-tab-pane>
|
|
></el-tab-pane>
|
|
|
<el-tab-pane label="检测方案" name="3">
|
|
<el-tab-pane label="检测方案" name="3">
|
|
|
<ele-pro-table
|
|
<ele-pro-table
|
|
@@ -485,13 +484,16 @@
|
|
|
import sampleReport from '@/views/inspectionWork/components/sampleReport.vue';
|
|
import sampleReport from '@/views/inspectionWork/components/sampleReport.vue';
|
|
|
import { getById as getByIdProjectTask } from '@/api/inspectionProjectTask';
|
|
import { getById as getByIdProjectTask } from '@/api/inspectionProjectTask';
|
|
|
import { getById as getByIdProjectRequest } from '@/api/inspectionProjectRequest';
|
|
import { getById as getByIdProjectRequest } from '@/api/inspectionProjectRequest';
|
|
|
|
|
+ import RuleCycle from '@/components/rule-cycle.vue';
|
|
|
|
|
+
|
|
|
export default {
|
|
export default {
|
|
|
mixins: [detailMixins],
|
|
mixins: [detailMixins],
|
|
|
components: {
|
|
components: {
|
|
|
sampleListDialog,
|
|
sampleListDialog,
|
|
|
experimentReport,
|
|
experimentReport,
|
|
|
inspectionProjectReport,
|
|
inspectionProjectReport,
|
|
|
- sampleReport
|
|
|
|
|
|
|
+ sampleReport,
|
|
|
|
|
+ RuleCycle
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
@@ -645,13 +647,18 @@
|
|
|
this.infoList.map((item) => {
|
|
this.infoList.map((item) => {
|
|
|
obj[item.prop] = res[item.prop];
|
|
obj[item.prop] = res[item.prop];
|
|
|
});
|
|
});
|
|
|
- this.form = obj;
|
|
|
|
|
|
|
+ this.form = res;
|
|
|
this.form.status = res.status;
|
|
this.form.status = res.status;
|
|
|
this.form.qualityWorkOrderDetailVO = res.qualityWorkOrderDetailVO;
|
|
this.form.qualityWorkOrderDetailVO = res.qualityWorkOrderDetailVO;
|
|
|
this.accessory = res.accessory;
|
|
this.accessory = res.accessory;
|
|
|
console.log(result, 'result');
|
|
console.log(result, 'result');
|
|
|
if (name == '计划') {
|
|
if (name == '计划') {
|
|
|
this.form.total = result.data.productNumber || 0;
|
|
this.form.total = result.data.productNumber || 0;
|
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
|
+ this.$refs.cycleMultipleRef?.setRecordRulesCycleList(
|
|
|
|
|
+ this.form.cycleList
|
|
|
|
|
+ );
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
this.fieldAssign(res, obj);
|
|
this.fieldAssign(res, obj);
|
|
|
this.sampleInfo(res);
|
|
this.sampleInfo(res);
|