|
@@ -142,7 +142,7 @@
|
|
|
label="dictValue" url="/blade-system/dict-biz/dictionary?code=hazard_Level"
|
|
|
:filterable="true"></dic-select>
|
|
|
</tempalte>
|
|
|
- <tempalte slot-scope="{type,disabled}" slot="dgFlashPointUnitForm">
|
|
|
+ <tempalte slot-scope="{type,disabled}" slot="dgFlashPointUnitForm">
|
|
|
<dic-select v-model="Detailform.dgFlashPointUnit" placeholder="易燃易爆品闪点单位" key="dictKey"
|
|
|
label="dictValue" url="/blade-system/dict-biz/dictionary?code=Emergency_Unit"
|
|
|
:filterable="true"></dic-select>
|
|
@@ -168,8 +168,8 @@
|
|
|
<span>
|
|
|
<avue-crud :data="verifyDataList" :option="optionVerify" :row-style="rowStyle">
|
|
|
<template slot="whether" slot-scope="{ row }">
|
|
|
- <i v-if="row.whether==1" class="el-icon-check" style="color: #E6A23C;"></i>
|
|
|
- <i v-if="row.whether==0" class="el-icon-close" style="color: #F56C6C;"></i>
|
|
|
+ <i v-if="row.whether == 1" class="el-icon-check" style="color: #E6A23C;"></i>
|
|
|
+ <i v-if="row.whether == 0" class="el-icon-close" style="color: #F56C6C;"></i>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</span>
|
|
@@ -283,7 +283,7 @@ export default {
|
|
|
optionVerify: {
|
|
|
header: false,
|
|
|
menu: false,
|
|
|
- align:'center',
|
|
|
+ align: 'center',
|
|
|
column: [
|
|
|
{
|
|
|
label: '箱号',
|
|
@@ -434,19 +434,19 @@ export default {
|
|
|
overHidden: true,
|
|
|
display: false,
|
|
|
},
|
|
|
- {
|
|
|
- label: "包装等级",
|
|
|
- prop: "packingLevel",
|
|
|
- labelWidth: 130,
|
|
|
- width: "120",
|
|
|
- overHidden: true,
|
|
|
- display: false,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // label: "包装等级",
|
|
|
+ // prop: "packingLevel",
|
|
|
+ // labelWidth: 130,
|
|
|
+ // width: "120",
|
|
|
+ // overHidden: true,
|
|
|
+ // display: false,
|
|
|
+ // rules: [{
|
|
|
+ // required: true,
|
|
|
+ // message: "",
|
|
|
+ // trigger: "blur"
|
|
|
+ // }]
|
|
|
+ // },
|
|
|
{
|
|
|
label: "货物描述",
|
|
|
prop: "commodityDescr",
|
|
@@ -1302,8 +1302,8 @@ export default {
|
|
|
selectionDetailList: [], // 选中的数据
|
|
|
loading: false,
|
|
|
Detailform: {
|
|
|
- dgEmerTemperatureUnit:'C',
|
|
|
- dgCtrlTemperatureUnit:'C',
|
|
|
+ dgEmerTemperatureUnit: 'C',
|
|
|
+ dgCtrlTemperatureUnit: 'C',
|
|
|
},
|
|
|
}
|
|
|
},
|
|
@@ -1376,6 +1376,10 @@ export default {
|
|
|
this.Detailform.packingUnit = this.assemblyForm.packingUnit
|
|
|
this.Detailform.commodityDescr = this.assemblyForm.commodityDescr
|
|
|
this.Detailform.marks = this.assemblyForm.marks
|
|
|
+ this.Detailform.Detailform = {
|
|
|
+ dgEmerTemperatureUnit: 'C',
|
|
|
+ dgCtrlTemperatureUnit: 'C',
|
|
|
+ }
|
|
|
this.$refs.crudDetail.rowAdd()
|
|
|
},
|
|
|
// 货物明细单个保存接口
|