|
@@ -70,119 +70,113 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div v-if="isExpanded">
|
|
<div v-if="isExpanded">
|
|
|
- <el-row>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="工艺路线:">
|
|
|
|
|
- <el-input @click.native="openVersion" clearable v-model="form.produceRoutingName"
|
|
|
|
|
- :disabled="btnType == 'detail'" placeholder="请选择" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="工序:">
|
|
|
|
|
- <el-select style="width: 100%" v-model="form.produceTaskId" placeholder="请选择" clearable
|
|
|
|
|
- @change="produceTaskChange" :disabled="btnType == 'detail'">
|
|
|
|
|
- <el-option v-for="item in produceTaskList" :key="item.id" :label="item.name" :value="item.id">
|
|
|
|
|
- </el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="合格数:" prop="qualifiedNumber">
|
|
|
|
|
- <el-input v-model="form.qualifiedNumber" disabled placeholder="请输入"></el-input>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="不合格数:" prop="noQualifiedNumber">
|
|
|
|
|
- <el-input v-model="form.noQualifiedNumber" disabled placeholder="请输入"></el-input>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
- <el-row>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="质检部门" prop="groupId">
|
|
|
|
|
- <deptSelect :disabled="btnType == 'detail'" v-model="form.groupId" @changeGroup="searchDeptNodeClick" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="质检人" prop="qualityId">
|
|
|
|
|
- <el-select :disabled="btnType == 'detail'" v-model="form.qualityId" @change="changeExecutor" size="small"
|
|
|
|
|
- style="width: 100%" filterable>
|
|
|
|
|
- <el-option v-for="item in executorList" :key="item.id" :value="item.id" :label="item.name"></el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="质检时间:" prop="qualityTime">
|
|
|
|
|
- <el-date-picker class="w100" v-model="form.qualityTime" type="date" value-format="yyyy-MM-dd"
|
|
|
|
|
- :disabled="btnType == 'detail'" placeholder="请选择"></el-date-picker>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="工时(h):" prop="hours">
|
|
|
|
|
- <el-input v-model="form.hours" :disabled="btnType == 'detail'"></el-input>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
- <el-row>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="合格率:" prop="qualificationRate">
|
|
|
|
|
- <el-input v-model="form.qualificationRate" disabled />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="不合格率:" prop="noQualificationRate">
|
|
|
|
|
- <el-input v-model="form.noQualificationRate" disabled />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="总重量:" prop="totalWeight">
|
|
|
|
|
- <el-input type="number" v-model="form.totalWeight" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="取样数量:" prop="sampleNumber" :rules="{
|
|
|
|
|
- required: form.qualityMode == 2 ? true : false,
|
|
|
|
|
- message: '请输入取样数量',
|
|
|
|
|
- trigger: 'blur'
|
|
|
|
|
- }" v-if="form.qualityMode == 2">
|
|
|
|
|
- <el-input type="number"
|
|
|
|
|
- :disabled="form.qualityMode == 1 || (form.qualityMode == 2 && form.sampleNumber) ? true : false"
|
|
|
|
|
- v-model="form.sampleNumber" @change="handleChangeNumber" />
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
- <el-row>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="检验标准" prop="inspectionStandards">
|
|
|
|
|
- <!-- 计量 计重 -->
|
|
|
|
|
- <el-select style="width: 100%" v-model="form.inspectionStandards" placeholder="请选择"
|
|
|
|
|
- :disabled="parseInt(qualityType1) == 1">
|
|
|
|
|
- <el-option v-for="item in inspectionStandardsList" :label="item.label" :value="item.value"
|
|
|
|
|
- :key="item.value">
|
|
|
|
|
- </el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="检验方式:" prop="qualityMode">
|
|
|
|
|
- <!-- <DictSelection dictName="取样类型" v-model="form.qualityMode" :disabled="qualityType == 1"></DictSelection> -->
|
|
|
|
|
- <el-select style="width: 100%" v-model="form.qualityMode" placeholder="请选择"
|
|
|
|
|
- :disabled="parseInt(qualityType1) == 1">
|
|
|
|
|
- <el-option v-for="item in qualityModeList" :label="item.label" :value="item.value" :key="item.value">
|
|
|
|
|
- </el-option>
|
|
|
|
|
- </el-select>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="质检结果:" prop="qualityResults">
|
|
|
|
|
- <el-select v-model="form.qualityResults" placeholder="请选择" style="width: 100%"
|
|
|
|
|
- :disabled="btnType == 'issued'" clearable>
|
|
|
|
|
- <el-option label="合格" :value=1 />
|
|
|
|
|
- <el-option label="不合格" :value=2 />
|
|
|
|
|
- </el-select>
|
|
|
|
|
- </el-form-item>
|
|
|
|
|
- </el-col>
|
|
|
|
|
- </el-row>
|
|
|
|
|
|
|
+
|
|
|
|
|
+ <el-col :span="6" v-if="parseInt(qualityType1) == 2">
|
|
|
|
|
+ <el-form-item label="工艺路线:">
|
|
|
|
|
+ <el-input @click.native="openVersion" clearable v-model="form.produceRoutingName"
|
|
|
|
|
+ :disabled="btnType == 'detail'" placeholder="请选择" />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6" v-if="parseInt(qualityType1) == 2">
|
|
|
|
|
+ <el-form-item label="工序:">
|
|
|
|
|
+ <el-select style="width: 100%" v-model="form.produceTaskId" placeholder="请选择" clearable
|
|
|
|
|
+ @change="produceTaskChange" :disabled="btnType == 'detail'">
|
|
|
|
|
+ <el-option v-for="item in produceTaskList" :key="item.id" :label="item.name" :value="item.id">
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="合格数:" prop="qualifiedNumber">
|
|
|
|
|
+ <el-input v-model="form.qualifiedNumber" disabled placeholder="请输入"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="不合格数:" prop="noQualifiedNumber">
|
|
|
|
|
+ <el-input v-model="form.noQualifiedNumber" disabled placeholder="请输入"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="质检部门" prop="groupId">
|
|
|
|
|
+ <deptSelect :disabled="btnType == 'detail'" v-model="form.groupId" @changeGroup="searchDeptNodeClick" />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="质检人" prop="qualityId">
|
|
|
|
|
+ <el-select :disabled="btnType == 'detail'" v-model="form.qualityId" @change="changeExecutor" size="small"
|
|
|
|
|
+ style="width: 100%" filterable>
|
|
|
|
|
+ <el-option v-for="item in executorList" :key="item.id" :value="item.id" :label="item.name"></el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="质检时间:" prop="qualityTime">
|
|
|
|
|
+ <el-date-picker class="w100" v-model="form.qualityTime" type="date" value-format="yyyy-MM-dd"
|
|
|
|
|
+ :disabled="btnType == 'detail'" placeholder="请选择"></el-date-picker>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="工时(h):" prop="hours">
|
|
|
|
|
+ <el-input v-model="form.hours" :disabled="btnType == 'detail'"></el-input>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="合格率:" prop="qualificationRate">
|
|
|
|
|
+ <el-input v-model="form.qualificationRate" disabled />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="不合格率:" prop="noQualificationRate">
|
|
|
|
|
+ <el-input v-model="form.noQualificationRate" disabled />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="总重量:" prop="totalWeight">
|
|
|
|
|
+ <el-input type="number" v-model="form.totalWeight" />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="取样数量:" prop="sampleNumber" :rules="{
|
|
|
|
|
+ required: form.qualityMode == 2 ? true : false,
|
|
|
|
|
+ message: '请输入取样数量',
|
|
|
|
|
+ trigger: 'blur'
|
|
|
|
|
+ }" v-if="form.qualityMode == 2">
|
|
|
|
|
+ <el-input type="number"
|
|
|
|
|
+ :disabled="form.qualityMode == 1 || (form.qualityMode == 2 && form.sampleNumber) ? true : false"
|
|
|
|
|
+ v-model="form.sampleNumber" @change="handleChangeNumber" />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="检验标准" prop="inspectionStandards">
|
|
|
|
|
+ <!-- 计量 计重 -->
|
|
|
|
|
+ <el-select style="width: 100%" v-model="form.inspectionStandards" placeholder="请选择"
|
|
|
|
|
+ :disabled="parseInt(qualityType1) == 1">
|
|
|
|
|
+ <el-option v-for="item in inspectionStandardsList" :label="item.label" :value="item.value"
|
|
|
|
|
+ :key="item.value">
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="检验方式:" prop="qualityMode">
|
|
|
|
|
+ <!-- <DictSelection dictName="取样类型" v-model="form.qualityMode" :disabled="qualityType == 1"></DictSelection> -->
|
|
|
|
|
+ <el-select style="width: 100%" v-model="form.qualityMode" placeholder="请选择"
|
|
|
|
|
+ :disabled="parseInt(qualityType1) == 1">
|
|
|
|
|
+ <el-option v-for="item in qualityModeList" :label="item.label" :value="item.value" :key="item.value">
|
|
|
|
|
+ </el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
|
+ <el-form-item label="质检结果:" prop="qualityResults">
|
|
|
|
|
+ <el-select v-model="form.qualityResults" placeholder="请选择" style="width: 100%" :disabled="btnType == 'issued'"
|
|
|
|
|
+ clearable>
|
|
|
|
|
+ <el-option label="合格" :value=1 />
|
|
|
|
|
+ <el-option label="不合格" :value=2 />
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
|
<el-form-item label="备注:" prop="remark">
|
|
<el-form-item label="备注:" prop="remark">
|
|
@@ -324,9 +318,9 @@ export default {
|
|
|
},
|
|
},
|
|
|
// 获取工序数据
|
|
// 获取工序数据
|
|
|
async getTaskList() {
|
|
async getTaskList() {
|
|
|
- // if (!this.form.produceRoutingId) {
|
|
|
|
|
- // return;
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ if (!this.form.produceRoutingId) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
const res = await getProduceTaskList({
|
|
const res = await getProduceTaskList({
|
|
|
isDetail: true,
|
|
isDetail: true,
|
|
|
pageNum: 1,
|
|
pageNum: 1,
|