|
@@ -71,11 +71,11 @@
|
|
|
}}</template>
|
|
}}</template>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
|
|
|
|
+ <!-- <el-col :span="8">
|
|
|
<el-form-item label="产地:">
|
|
<el-form-item label="产地:">
|
|
|
<span>{{ extInfo.provenance }}</span>
|
|
<span>{{ extInfo.provenance }}</span>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
|
|
|
|
+ </el-col> -->
|
|
|
<!-- <el-col :span="8">
|
|
<!-- <el-col :span="8">
|
|
|
<el-form-item label="送货人:">
|
|
<el-form-item label="送货人:">
|
|
|
<span>{{ infoData.fromUser }}</span>
|
|
<span>{{ infoData.fromUser }}</span>
|
|
@@ -284,11 +284,22 @@
|
|
|
>
|
|
>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
<el-table-column
|
|
|
- label="产地"
|
|
|
|
|
- prop="provenance"
|
|
|
|
|
- :show-overflow-tooltip="true"
|
|
|
|
|
- >
|
|
|
|
|
- </el-table-column>
|
|
|
|
|
|
|
+ label="产地"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="provenance"
|
|
|
|
|
+ v-if="bizType == 2"
|
|
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
|
|
+ width="120"
|
|
|
|
|
+ >
|
|
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
|
|
+ {{
|
|
|
|
|
+ row.provenance &&
|
|
|
|
|
+ row.provenance
|
|
|
|
|
+ .map((item) => getDictValue('产地', item))
|
|
|
|
|
+ .join(',')
|
|
|
|
|
+ }}
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
<el-table-column
|
|
|
label="生产日期"
|
|
label="生产日期"
|
|
|
prop="detailProductionDate"
|
|
prop="detailProductionDate"
|
|
@@ -689,6 +700,8 @@
|
|
|
mounted() {
|
|
mounted() {
|
|
|
this.getFieldModel();
|
|
this.getFieldModel();
|
|
|
this.requestDict('类型用途');
|
|
this.requestDict('类型用途');
|
|
|
|
|
+ this.requestDict('产地');
|
|
|
|
|
+
|
|
|
this.getAllCategoryType();
|
|
this.getAllCategoryType();
|
|
|
this._getInfo(this.businessId);
|
|
this._getInfo(this.businessId);
|
|
|
},
|
|
},
|
