|
|
|
@ -98,7 +98,27 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="所属设备" prop="deviceCode">
|
|
|
|
|
<JnpfPopupSelect
|
|
|
|
|
<PopupSelectDeviceCode
|
|
|
|
|
v-model="dataForm.deviceCode"
|
|
|
|
|
@change="changeData('deviceCode', -1)"
|
|
|
|
|
:rowIndex="null"
|
|
|
|
|
:formData="dataForm"
|
|
|
|
|
:templateJson="interfaceRes.deviceCode"
|
|
|
|
|
placeholder="请选择"
|
|
|
|
|
propsValue="deviceCode"
|
|
|
|
|
popupWidth="800px"
|
|
|
|
|
popupTitle="选择数据"
|
|
|
|
|
popupType="dialog"
|
|
|
|
|
relationField="deviceName"
|
|
|
|
|
field="deviceCode"
|
|
|
|
|
interfaceId="564713894723988869"
|
|
|
|
|
:pageSize="20"
|
|
|
|
|
:columnOptions="deviceCodecolumnOptions"
|
|
|
|
|
clearable
|
|
|
|
|
:style="{ width: '100%' }"
|
|
|
|
|
>
|
|
|
|
|
</PopupSelectDeviceCode>
|
|
|
|
|
<!-- <JnpfPopupSelect
|
|
|
|
|
v-model="dataForm.deviceCode"
|
|
|
|
|
@change="changeData('deviceCode', -1)"
|
|
|
|
|
:rowIndex="null"
|
|
|
|
@ -117,7 +137,7 @@
|
|
|
|
|
clearable
|
|
|
|
|
:style="{ width: '100%' }"
|
|
|
|
|
>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
</JnpfPopupSelect> -->
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
@ -703,8 +723,8 @@ export default {
|
|
|
|
|
],
|
|
|
|
|
doorNumProps: { label: "fullName", value: "id" },
|
|
|
|
|
deviceCodecolumnOptions: [
|
|
|
|
|
{ label: "设备编码", value: "device_code" },
|
|
|
|
|
{ label: "设备名称", value: "device_name" }
|
|
|
|
|
{ label: "设备编码", value: "deviceCode" },
|
|
|
|
|
{ label: "设备名称", value: "deviceName" }
|
|
|
|
|
],
|
|
|
|
|
isShowOptions: [
|
|
|
|
|
{ fullName: "关闭", id: "0" },
|
|
|
|
@ -1056,35 +1076,35 @@ export default {
|
|
|
|
|
// 表单提交
|
|
|
|
|
dataFormSubmit(type) {
|
|
|
|
|
if (this.dataForm.price == null && !this.useUnifiedConfig) {
|
|
|
|
|
this.$message.error('请选择配置或输入回收单价');
|
|
|
|
|
this.$message.error("请选择配置或输入回收单价");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (this.useUnifiedConfig) {
|
|
|
|
|
this.dataForm.price = null;
|
|
|
|
|
}
|
|
|
|
|
if (this.dataForm.fullSet == null && !this.usefullSetConfig) {
|
|
|
|
|
this.$message.error('请选择配置或选择满溢报警');
|
|
|
|
|
this.$message.error("请选择配置或选择满溢报警");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (this.usefullSetConfig) {
|
|
|
|
|
this.dataForm.fullSet = "-1";
|
|
|
|
|
}
|
|
|
|
|
if (this.dataForm.smogSet == null && !this.useSmogSetConfig) {
|
|
|
|
|
this.$message.error('请选择配置或选择烟雾报警');
|
|
|
|
|
this.$message.error("请选择配置或选择烟雾报警");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (this.useSmogSetConfig) {
|
|
|
|
|
this.dataForm.smogSet = "-1";
|
|
|
|
|
}
|
|
|
|
|
if (this.dataForm.warningWeight == null && !this.warningWeightConfig) {
|
|
|
|
|
this.$message.error('请选择配置或输入重量上限');
|
|
|
|
|
this.$message.error("请选择配置或输入重量上限");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (this.warningWeightConfig) {
|
|
|
|
|
this.dataForm.warningWeight = null;
|
|
|
|
|
}
|
|
|
|
|
if (this.dataForm.closeDelay == null && !this.closeDelayConfig) {
|
|
|
|
|
this.$message.error('请选择配置或输入关门延时');
|
|
|
|
|
this.$message.error("请选择配置或输入关门延时");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (this.closeDelayConfig) {
|
|
|
|
|