|
|
@@ -54,7 +54,8 @@ import { orderEnginbaseList, orderEnginBaseListExport, orderEnginBaseSave, order
|
|
|
import { lbsAmapRegion } from '@/api/common.js'
|
|
|
import geographicalPosi from '@/components/geographicalPosi/index.vue'
|
|
|
import { listPageV2 } from "@/api/auxiliaryFittings/attachmentProfile";
|
|
|
-import { materialNormList } from "@/api/auxiliaryChargeManagement";
|
|
|
+import { materialNormList } from "@/api/auxiliaryPriceManagement";
|
|
|
+
|
|
|
export default {
|
|
|
components: { TemplatePage, ImageUpload, geographicalPosi },
|
|
|
mixins: [import_mixin, operation_mixin],
|
|
|
@@ -493,7 +494,7 @@ export default {
|
|
|
}}
|
|
|
onChange={val => {
|
|
|
if (val) {
|
|
|
- row[column.columnAttributes.propName] = this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId), { value: 'categoryId', label: 'categoryName' }).find(item => item.value == val)?.label || ""
|
|
|
+ row[column.columnAttributes.propName] = this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId), { value: 'goodsCategoryId', label: 'categoryName' }).find(item => item.value == val)?.label || ""
|
|
|
} else {
|
|
|
row[column.columnAttributes.propName] = ''
|
|
|
}
|
|
|
@@ -502,7 +503,7 @@ export default {
|
|
|
placeholder="请选择"
|
|
|
>
|
|
|
{
|
|
|
- this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId), { value: 'categoryId', label: 'categoryName' }).map((item, index_) => (
|
|
|
+ this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId), { value: 'goodsCategoryId', label: 'categoryName' }).map((item, index_) => (
|
|
|
<el-option key={index_} label={item.label} value={item.value}></el-option>
|
|
|
))
|
|
|
}
|
|
|
@@ -538,13 +539,13 @@ export default {
|
|
|
onChange={val => {
|
|
|
this.delItemKey(3, row)
|
|
|
if (val) {
|
|
|
- var data = this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId && item.categoryId === row.goodsCategoryId), { value: 'normId', label: 'normName' }).find(item => item.value == val)
|
|
|
+ var data = this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId && item.goodsCategoryId === row.goodsCategoryId), { value: 'goodsId', label: 'goodsName' }).find(item => item.value == val)
|
|
|
row[column.columnAttributes.propName] = data?.label || ""
|
|
|
if (data) {
|
|
|
- row.goodsCode = data?.data?.normCode
|
|
|
- row.goodsSpecification = data?.data?.specification
|
|
|
- row.normType = data?.data?.normType
|
|
|
- row.goodsStockUnit = data?.data?.unit
|
|
|
+ row.goodsCode = data?.data?.goodsCode
|
|
|
+ row.goodsSpecification = data?.data?.goodsSpecification
|
|
|
+ row.normType = "M"
|
|
|
+ row.goodsStockUnit = data?.data?.goodsStockUnit
|
|
|
}
|
|
|
} else {
|
|
|
row[column.columnAttributes.propName] = ''
|
|
|
@@ -553,7 +554,7 @@ export default {
|
|
|
placeholder="请选择"
|
|
|
>
|
|
|
{
|
|
|
- this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId && item.categoryId === row.goodsCategoryId), { value: 'normId', label: 'normName' }).map((item, index_) => (
|
|
|
+ this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId && item.goodsCategoryId === row.goodsCategoryId), { value: 'goodsId', label: 'goodsName' }).map((item, index_) => (
|
|
|
<el-option key={index_} label={item.label} value={item.value}></el-option>
|
|
|
))
|
|
|
}
|
|
|
@@ -865,7 +866,6 @@ export default {
|
|
|
return (
|
|
|
<zj-table
|
|
|
columns={[
|
|
|
-
|
|
|
{
|
|
|
columnAttributes: {
|
|
|
label: '操作类型',
|
linwenxin