|
|
@@ -218,6 +218,18 @@
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col
|
|
|
+ v-if="
|
|
|
+ (formData.recordTemplateStyle == '2' && this.businessType != 3) ||
|
|
|
+ formData.reportWorkType == 5
|
|
|
+ "
|
|
|
+ :span="8"
|
|
|
+ >
|
|
|
+ <el-form-item label="设备编号" prop="codeNumber">
|
|
|
+ <el-input v-model="formData.codeNumber" :disabled="true">
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col
|
|
|
v-if="formData.reportWorkType == 2 && this.businessType != 3"
|
|
|
:span="8"
|
|
|
@@ -404,7 +416,17 @@
|
|
|
autosize
|
|
|
></el-input>
|
|
|
</template>
|
|
|
-
|
|
|
+ <!-- <template v-slot:supplierName="{ row, $index }">
|
|
|
+ {{ row.supplierName }}
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-plus"
|
|
|
+ class="ele-btn-icon"
|
|
|
+ @click="addSupplier(row, $index)"
|
|
|
+ >
|
|
|
+ 选择供应商
|
|
|
+ </el-button>
|
|
|
+ </template> -->
|
|
|
<template v-slot:formula="{ row }">
|
|
|
<div v-if="row.paramType == 9" class="formula-builder">
|
|
|
<div class="formula-builder__selects">
|
|
|
@@ -719,6 +741,12 @@
|
|
|
ref="processModalRef"
|
|
|
@chooseProcess="processChooseProcess"
|
|
|
></processModal>
|
|
|
+
|
|
|
+ <!-- <vendorDialog
|
|
|
+ ref="supplierSelectionRef"
|
|
|
+ @success="confirmStaffSelection1"
|
|
|
+ :isAll="true"
|
|
|
+ ></vendorDialog> -->
|
|
|
</ele-modal>
|
|
|
</template>
|
|
|
|
|
|
@@ -743,6 +771,7 @@
|
|
|
import toolModal from './toolModal.vue';
|
|
|
import bindSubstanceList from './bindSubstanceList.vue';
|
|
|
import MaterialAdd from '../../components/MaterialAdd.vue';
|
|
|
+ // import vendorDialog from '@/views/factoryModel/qualificationManagement/components/vendorDialog.vue';
|
|
|
|
|
|
import {
|
|
|
recordrulesSave,
|
|
|
@@ -763,6 +792,7 @@
|
|
|
import { recordrulesexecutemethodPage } from '@/api/recordrulesexecutemethod/index';
|
|
|
import { businessTypeList } from '@/views/regulationManagement/components/util';
|
|
|
|
|
|
+
|
|
|
export default {
|
|
|
mixins: [dictMixins],
|
|
|
components: {
|
|
|
@@ -775,7 +805,8 @@
|
|
|
processModal,
|
|
|
ProductModalCorrelation,
|
|
|
experimentationProcess,
|
|
|
- bindSubstanceList
|
|
|
+ bindSubstanceList,
|
|
|
+ // vendorDialog
|
|
|
},
|
|
|
props: {
|
|
|
typeInfo: {
|
|
|
@@ -815,6 +846,14 @@
|
|
|
slot: 'paramValue',
|
|
|
minWidth: 261
|
|
|
},
|
|
|
+ // {
|
|
|
+ // prop: 'supplierName',
|
|
|
+ // label: '供应商',
|
|
|
+ // align: 'center',
|
|
|
+ // slot: 'supplierName',
|
|
|
+ // minWidth: 261
|
|
|
+ // },
|
|
|
+
|
|
|
{
|
|
|
prop: 'iotPointName',
|
|
|
label: '物联点位',
|
|
|
@@ -1140,7 +1179,8 @@
|
|
|
versionMark: '',
|
|
|
smallVersion: '',
|
|
|
produceTaskId: '',
|
|
|
- produceTaskName: ''
|
|
|
+ produceTaskName: '',
|
|
|
+ codeNumber: ''
|
|
|
};
|
|
|
|
|
|
return {
|
|
|
@@ -1318,6 +1358,22 @@
|
|
|
|
|
|
console.log('this.formData', this.formData);
|
|
|
},
|
|
|
+ // addSupplier(row, index) {
|
|
|
+ // this.currentIndex = index;
|
|
|
+ // this.$refs.supplierSelectionRef.open();
|
|
|
+ // },
|
|
|
+ confirmStaffSelection1(data = []) {
|
|
|
+ this.$set(
|
|
|
+ this.formData.details[this.currentIndex],
|
|
|
+ 'supplierName',
|
|
|
+ data.map((item) => item.name).toString()
|
|
|
+ );
|
|
|
+ this.$set(
|
|
|
+ this.formData.details[this.currentIndex],
|
|
|
+ 'supplierId',
|
|
|
+ data.map((item) => item.id).toString()
|
|
|
+ );
|
|
|
+ },
|
|
|
// 过程控制 修改规则详情
|
|
|
async processEditSetValue(row) {
|
|
|
const data = await recordrulesGetById(row.rulesId);
|
|
|
@@ -1794,6 +1850,7 @@
|
|
|
console.log('data', data, index, categoryId);
|
|
|
this.formData.deviceId = data?.id || null;
|
|
|
this.formData.deviceName = data?.name || '';
|
|
|
+ this.formData.codeNumber = data?.codeNumber || '';
|
|
|
if (this.formData.reportWorkType == 5) {
|
|
|
this.formData.details = this.formData.details.filter(
|
|
|
(item) => !item.paramCode
|
