|
|
@@ -19,7 +19,8 @@
|
|
|
type="primary"
|
|
|
icon="el-icon-plus"
|
|
|
class="ele-btn-icon"
|
|
|
- @click="handParent('',-1)">
|
|
|
+ @click="handParent('', -1)"
|
|
|
+ >
|
|
|
新增
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
@@ -27,11 +28,11 @@
|
|
|
type="primary"
|
|
|
icon="el-icon-plus"
|
|
|
class="ele-btn-icon"
|
|
|
- @click="handlAdd">
|
|
|
+ @click="handlAdd"
|
|
|
+ >
|
|
|
新增临时产品
|
|
|
</el-button>
|
|
|
</div>
|
|
|
-
|
|
|
</div>
|
|
|
</template>
|
|
|
<template v-slot:productName="{ row, $index }">
|
|
|
@@ -42,7 +43,8 @@
|
|
|
required: true,
|
|
|
message: '请输入',
|
|
|
trigger: 'change'
|
|
|
- }">
|
|
|
+ }"
|
|
|
+ >
|
|
|
<el-input
|
|
|
v-model="row.productName"
|
|
|
placeholder="请输入"
|
|
|
@@ -53,9 +55,8 @@
|
|
|
size="small"
|
|
|
type="primary"
|
|
|
@click.native="handParent(row, $index)"
|
|
|
- >选择
|
|
|
- </el-button
|
|
|
- >
|
|
|
+ >选择
|
|
|
+ </el-button>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
<template v-slot:productCode="scope">
|
|
|
@@ -82,9 +83,8 @@
|
|
|
size="small"
|
|
|
type="primary"
|
|
|
@click.native="handleTaskinstance(scope.row, scope.$index)"
|
|
|
- >选择
|
|
|
- </el-button
|
|
|
- >
|
|
|
+ >选择
|
|
|
+ </el-button>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
<template v-slot:productCategoryName="scope">
|
|
|
@@ -221,12 +221,12 @@
|
|
|
:prop="'datasource.' + scope.$index + '.files'"
|
|
|
>
|
|
|
<fileMain v-model="scope.row.files"></fileMain>
|
|
|
-<!-- <fileUpload-->
|
|
|
-<!-- v-model="scope.row.files"-->
|
|
|
-<!-- module="main"-->
|
|
|
-<!-- :showLib="false"-->
|
|
|
-<!-- :limit="5"-->
|
|
|
-<!-- />-->
|
|
|
+ <!-- <fileUpload-->
|
|
|
+ <!-- v-model="scope.row.files"-->
|
|
|
+ <!-- module="main"-->
|
|
|
+ <!-- :showLib="false"-->
|
|
|
+ <!-- :limit="5"-->
|
|
|
+ <!-- />-->
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
<template v-slot:technicalDrawings="scope">
|
|
|
@@ -234,15 +234,14 @@
|
|
|
style="margin-bottom: 20px"
|
|
|
:prop="'datasource.' + scope.$index + '.technicalDrawings'"
|
|
|
>
|
|
|
-
|
|
|
<fileMain v-model="scope.row.technicalDrawings"></fileMain>
|
|
|
|
|
|
-<!-- <fileUpload-->
|
|
|
-<!-- v-model="scope.row.technicalDrawings"-->
|
|
|
-<!-- module="main"-->
|
|
|
-<!-- :showLib="false"-->
|
|
|
-<!-- :limit="5"-->
|
|
|
-<!-- />-->
|
|
|
+ <!-- <fileUpload-->
|
|
|
+ <!-- v-model="scope.row.technicalDrawings"-->
|
|
|
+ <!-- module="main"-->
|
|
|
+ <!-- :showLib="false"-->
|
|
|
+ <!-- :limit="5"-->
|
|
|
+ <!-- />-->
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
|
|
|
@@ -274,7 +273,7 @@
|
|
|
<el-link
|
|
|
type="primary"
|
|
|
:underline="false"
|
|
|
- @click.native="handleMethod(scope.row,scope.$index)"
|
|
|
+ @click.native="handleMethod(scope.row, scope.$index)"
|
|
|
>
|
|
|
设置分批时间
|
|
|
</el-link>
|
|
|
@@ -304,6 +303,17 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
+ <template v-slot:provenance="scope">
|
|
|
+ <el-form-item :prop="'datasource.' + scope.$index + '.provenance'">
|
|
|
+ <DictSelection
|
|
|
+ dictName="产地"
|
|
|
+ clearable
|
|
|
+ v-model="scope.row.provenance"
|
|
|
+ multiple
|
|
|
+ >
|
|
|
+ </DictSelection>
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
|
|
|
<template v-slot:headerProductName="{ column }">
|
|
|
<span class="is-required">{{ column.label }}</span>
|
|
|
@@ -344,465 +354,502 @@
|
|
|
></product-list>
|
|
|
<head-list ref="headRef" @changeParent="changeAnswer"></head-list>
|
|
|
<timeDialog @chooseTime="chooseTime" ref="timeDialogRef"></timeDialog>
|
|
|
- <taskinstance-dialog ref="taskinstanceDialogRef" v-if="taskinstanceDialogFlag" @saveTaskInstance="saveTaskInstance" :visible.sync="taskinstanceDialogFlag"></taskinstance-dialog>
|
|
|
+ <taskinstance-dialog
|
|
|
+ ref="taskinstanceDialogRef"
|
|
|
+ v-if="taskinstanceDialogFlag"
|
|
|
+ @saveTaskInstance="saveTaskInstance"
|
|
|
+ :visible.sync="taskinstanceDialogFlag"
|
|
|
+ ></taskinstance-dialog>
|
|
|
</el-form>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import {numberReg} from 'ele-admin';
|
|
|
-import productList from '@/BIZComponents/product-list.vue';
|
|
|
-import cBomList from '@/BIZComponents/cBom-list.vue';
|
|
|
-import dictMixins from '@/mixins/dictMixins';
|
|
|
-import fileUpload from '@/components/upload/fileUpload';
|
|
|
-import headList from '@/BIZComponents/user-select/user-select.vue';
|
|
|
-import timeDialog from '@/components/timeDialog/index.vue';
|
|
|
-import {copyObj} from '@/utils/util';
|
|
|
-import {getInventoryTotalAPI} from "@/api/wms";
|
|
|
-import {getByCode} from "@/api/system/dictionary-data";
|
|
|
-import fileMain from "@/components/addDoc/index.vue";
|
|
|
-import taskinstanceDialog from '@/BIZComponents/procedure/taskinstanceDialog.vue'
|
|
|
-export default {
|
|
|
- mixins: [dictMixins],
|
|
|
- components: {
|
|
|
- fileMain,
|
|
|
- productList,
|
|
|
- cBomList,
|
|
|
- fileUpload,
|
|
|
- headList,
|
|
|
- timeDialog,
|
|
|
- taskinstanceDialog
|
|
|
- },
|
|
|
- data() {
|
|
|
- const defaultForm = {
|
|
|
- key: null,
|
|
|
- endTime: '',
|
|
|
- isFirst: 0,
|
|
|
- name: ''
|
|
|
- };
|
|
|
- return {
|
|
|
- numberReg,
|
|
|
- defaultForm,
|
|
|
- arrivalWayList: [
|
|
|
- {label: '一次性到货', value: 1},
|
|
|
- {label: '分批到货', value: 2}
|
|
|
- ],
|
|
|
- form: {
|
|
|
- datasource: []
|
|
|
- },
|
|
|
- rules: {},
|
|
|
- dictList: {},
|
|
|
- taskinstanceDialogFlag:false,
|
|
|
- columns: [
|
|
|
- {
|
|
|
- width: 45,
|
|
|
- type: 'index',
|
|
|
- columnKey: 'index',
|
|
|
- align: 'center'
|
|
|
- },
|
|
|
- {
|
|
|
- width: 120,
|
|
|
- prop: 'productCategoryName',
|
|
|
- label: '分类',
|
|
|
- slot: 'productCategoryName',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- width: 140,
|
|
|
- prop: 'productCode',
|
|
|
- label: '编码',
|
|
|
- slot: 'productCode',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- minWidth: 240,
|
|
|
- prop: 'productName',
|
|
|
- label: '名称',
|
|
|
- slot: 'productName',
|
|
|
- headerSlot: 'headerProductName',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- width: 80,
|
|
|
- prop: 'totalCount',
|
|
|
- label: '数量',
|
|
|
- slot: 'totalCount',
|
|
|
- headerSlot: 'headerTotalCount',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- width: 80,
|
|
|
- prop: 'availableCountBase',
|
|
|
- label: '库存数量',
|
|
|
- slot: 'availableCountBase',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- width: 160,
|
|
|
- prop: 'arrivalWay',
|
|
|
- label: '到货方式',
|
|
|
- slot: 'arrivalWay',
|
|
|
- headerSlot: 'headerArrivalWay',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- width: 170,
|
|
|
- prop: 'expectReceiveDate',
|
|
|
- label: '到货日期',
|
|
|
- slot: 'expectReceiveDate',
|
|
|
- headerSlot: 'headerExpectReceiveDate',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- minWidth: 240,
|
|
|
- prop: 'taskName',
|
|
|
- label: '工序',
|
|
|
- slot: 'taskName',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- width: 110,
|
|
|
- prop: 'batchNo',
|
|
|
- label: '批次号',
|
|
|
- slot: 'batchNo',
|
|
|
- align: "center",
|
|
|
- },
|
|
|
- {
|
|
|
- width: 150,
|
|
|
- prop: 'productBrand',
|
|
|
- label: '牌号',
|
|
|
- slot: 'productBrand',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- width: 130,
|
|
|
- prop: 'modelType',
|
|
|
- label: '型号',
|
|
|
- slot: 'modelType',
|
|
|
- align: "center"
|
|
|
+ import { numberReg } from 'ele-admin';
|
|
|
+ import productList from '@/BIZComponents/product-list.vue';
|
|
|
+ import cBomList from '@/BIZComponents/cBom-list.vue';
|
|
|
+ import dictMixins from '@/mixins/dictMixins';
|
|
|
+ import fileUpload from '@/components/upload/fileUpload';
|
|
|
+ import headList from '@/BIZComponents/user-select/user-select.vue';
|
|
|
+ import timeDialog from '@/components/timeDialog/index.vue';
|
|
|
+ import { copyObj } from '@/utils/util';
|
|
|
+ import { getInventoryTotalAPI } from '@/api/wms';
|
|
|
+ import { getByCode } from '@/api/system/dictionary-data';
|
|
|
+ import fileMain from '@/components/addDoc/index.vue';
|
|
|
+ import taskinstanceDialog from '@/BIZComponents/procedure/taskinstanceDialog.vue';
|
|
|
+ export default {
|
|
|
+ mixins: [dictMixins],
|
|
|
+ components: {
|
|
|
+ fileMain,
|
|
|
+ productList,
|
|
|
+ cBomList,
|
|
|
+ fileUpload,
|
|
|
+ headList,
|
|
|
+ timeDialog,
|
|
|
+ taskinstanceDialog
|
|
|
+ },
|
|
|
+ data() {
|
|
|
+ const defaultForm = {
|
|
|
+ key: null,
|
|
|
+ endTime: '',
|
|
|
+ isFirst: 0,
|
|
|
+ name: ''
|
|
|
+ };
|
|
|
+ return {
|
|
|
+ numberReg,
|
|
|
+ defaultForm,
|
|
|
+ arrivalWayList: [
|
|
|
+ { label: '一次性到货', value: 1 },
|
|
|
+ { label: '分批到货', value: 2 }
|
|
|
+ ],
|
|
|
+ form: {
|
|
|
+ datasource: []
|
|
|
},
|
|
|
+ rules: {},
|
|
|
+ dictList: {},
|
|
|
+ taskinstanceDialogFlag: false,
|
|
|
+ columns: [
|
|
|
+ {
|
|
|
+ width: 45,
|
|
|
+ type: 'index',
|
|
|
+ columnKey: 'index',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 120,
|
|
|
+ prop: 'productCategoryName',
|
|
|
+ label: '分类',
|
|
|
+ slot: 'productCategoryName',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 140,
|
|
|
+ prop: 'productCode',
|
|
|
+ label: '编码',
|
|
|
+ slot: 'productCode',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ minWidth: 240,
|
|
|
+ prop: 'productName',
|
|
|
+ label: '名称',
|
|
|
+ slot: 'productName',
|
|
|
+ headerSlot: 'headerProductName',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 80,
|
|
|
+ prop: 'totalCount',
|
|
|
+ label: '数量',
|
|
|
+ slot: 'totalCount',
|
|
|
+ headerSlot: 'headerTotalCount',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 80,
|
|
|
+ prop: 'availableCountBase',
|
|
|
+ label: '库存数量',
|
|
|
+ slot: 'availableCountBase',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 160,
|
|
|
+ prop: 'arrivalWay',
|
|
|
+ label: '到货方式',
|
|
|
+ slot: 'arrivalWay',
|
|
|
+ headerSlot: 'headerArrivalWay',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 170,
|
|
|
+ prop: 'expectReceiveDate',
|
|
|
+ label: '到货日期',
|
|
|
+ slot: 'expectReceiveDate',
|
|
|
+ headerSlot: 'headerExpectReceiveDate',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ minWidth: 240,
|
|
|
+ prop: 'taskName',
|
|
|
+ label: '工序',
|
|
|
+ slot: 'taskName',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 110,
|
|
|
+ prop: 'batchNo',
|
|
|
+ label: '批次号',
|
|
|
+ slot: 'batchNo',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ prop: 'provenance',
|
|
|
+ label: '产地',
|
|
|
+ slot: 'provenance',
|
|
|
+ align: 'center',
|
|
|
+ showOverflowTooltip: true,
|
|
|
+ minWidth: 200
|
|
|
+ },
|
|
|
|
|
|
- {
|
|
|
- width: 120,
|
|
|
- prop: 'specification',
|
|
|
- label: '规格',
|
|
|
- slot: 'specification',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- width: 120,
|
|
|
- prop: 'imgCode',
|
|
|
- align: 'center',
|
|
|
- label: '图号/件号',
|
|
|
- showOverflowTooltip: true
|
|
|
- },
|
|
|
- {
|
|
|
- width: 120,
|
|
|
- prop: 'produceType',
|
|
|
- align: 'center',
|
|
|
- label: '生产类型',
|
|
|
- showOverflowTooltip: true,
|
|
|
- formatter: (row, column) => {
|
|
|
- return row.produceType&&row.produceType.length ? row.produceType.map(item => this.getDictV('productionType', item+'')).join(',') : ''
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- width: 120,
|
|
|
- prop: 'approvalNumber',
|
|
|
- align: 'center',
|
|
|
- label: '批准文号',
|
|
|
- showOverflowTooltip: true
|
|
|
- },
|
|
|
- {
|
|
|
- width: 120,
|
|
|
- prop: 'packingSpecification',
|
|
|
- align: 'center',
|
|
|
- label: '包装规格',
|
|
|
- showOverflowTooltip: true
|
|
|
- },
|
|
|
+ {
|
|
|
+ width: 150,
|
|
|
+ prop: 'productBrand',
|
|
|
+ label: '牌号',
|
|
|
+ slot: 'productBrand',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 130,
|
|
|
+ prop: 'modelType',
|
|
|
+ label: '型号',
|
|
|
+ slot: 'modelType',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
|
|
|
- {
|
|
|
- width: 100,
|
|
|
- prop: 'measuringUnit',
|
|
|
- label: '单位',
|
|
|
- slot: 'measuringUnit',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
+ {
|
|
|
+ width: 120,
|
|
|
+ prop: 'specification',
|
|
|
+ label: '规格',
|
|
|
+ slot: 'specification',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 120,
|
|
|
+ prop: 'imgCode',
|
|
|
+ align: 'center',
|
|
|
+ label: '图号/件号',
|
|
|
+ showOverflowTooltip: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 120,
|
|
|
+ prop: 'produceType',
|
|
|
+ align: 'center',
|
|
|
+ label: '生产类型',
|
|
|
+ showOverflowTooltip: true,
|
|
|
+ formatter: (row, column) => {
|
|
|
+ return row.produceType && row.produceType.length
|
|
|
+ ? row.produceType
|
|
|
+ .map((item) => this.getDictV('productionType', item + ''))
|
|
|
+ .join(',')
|
|
|
+ : '';
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 120,
|
|
|
+ prop: 'approvalNumber',
|
|
|
+ align: 'center',
|
|
|
+ label: '批准文号',
|
|
|
+ showOverflowTooltip: true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 120,
|
|
|
+ prop: 'packingSpecification',
|
|
|
+ align: 'center',
|
|
|
+ label: '包装规格',
|
|
|
+ showOverflowTooltip: true
|
|
|
+ },
|
|
|
|
|
|
- {
|
|
|
- width: 130,
|
|
|
- prop: 'brand',
|
|
|
- label: '品牌',
|
|
|
- slot: 'brand',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
+ {
|
|
|
+ width: 100,
|
|
|
+ prop: 'measuringUnit',
|
|
|
+ label: '单位',
|
|
|
+ slot: 'measuringUnit',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
|
|
|
- {
|
|
|
- width: 160,
|
|
|
- prop: 'technicalDrawings',
|
|
|
- label: '图纸附件',
|
|
|
- slot: 'technicalDrawings'
|
|
|
- },
|
|
|
- {
|
|
|
- width: 160,
|
|
|
- prop: 'files',
|
|
|
- label: '附件',
|
|
|
- slot: 'files'
|
|
|
- },
|
|
|
- {
|
|
|
- width: 220,
|
|
|
- prop: 'remark',
|
|
|
- label: '备注',
|
|
|
- slot: 'remark',
|
|
|
- align: "center"
|
|
|
- },
|
|
|
- {
|
|
|
- columnKey: 'action',
|
|
|
- label: '操作',
|
|
|
- width: 120,
|
|
|
- align: 'center',
|
|
|
- resizable: false,
|
|
|
- slot: 'action',
|
|
|
- fixed: 'right',
|
|
|
- showOverflowTooltip: true
|
|
|
- }
|
|
|
- ]
|
|
|
- };
|
|
|
- },
|
|
|
- created() {
|
|
|
- this.getDictList('productionType')
|
|
|
- },
|
|
|
- methods: {
|
|
|
- getDictV(code, val) {
|
|
|
- if (!this.dictList[code]) return '';
|
|
|
- return this.dictList[code].find(item => item.value == val)?.label
|
|
|
- },
|
|
|
- async getDictList(code) {
|
|
|
- let {data: res} = await getByCode(code)
|
|
|
- this.dictList[code] = res.map(item => {
|
|
|
- let values = Object.keys(item)
|
|
|
- return {
|
|
|
- value: values[0],
|
|
|
- label: item[values[0]]
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- // 返回列表数据
|
|
|
- getTableValue() {
|
|
|
- let comitDatasource = this.form.datasource;
|
|
|
- if (comitDatasource.length === 0) return [];
|
|
|
- comitDatasource.forEach((v) => {
|
|
|
- v.totalPrice = (v.totalCount * v.singlePrice)?.toFixed(2) || 0;
|
|
|
- v.files = v.files || [];
|
|
|
- v.technicalDrawings = v.technicalDrawings || [];
|
|
|
- v.arrivalBatch = v.arrivalBatch || [];
|
|
|
- });
|
|
|
- return comitDatasource;
|
|
|
- },
|
|
|
- //修改回显
|
|
|
- async putTableValue(data) {
|
|
|
- if (data && data?.length) {
|
|
|
- this.form.datasource = data;
|
|
|
- //获取仓库库存
|
|
|
- let codeList = this.form.datasource.map(item => item.productCode)
|
|
|
- if(codeList.length){
|
|
|
- let inventoryTotalList = await getInventoryTotalAPI(codeList);
|
|
|
- this.form.datasource.forEach((item) => {
|
|
|
- let find =
|
|
|
- inventoryTotalList.find((key) => key.code == item.productCode) || {};
|
|
|
- item.availableCountBase = find.availableCountBase;
|
|
|
- });
|
|
|
- }
|
|
|
- this.$refs.table.reload()
|
|
|
- }
|
|
|
- },
|
|
|
- handleMethod(row,index) {
|
|
|
- this.$refs.timeDialogRef.open(row,index);
|
|
|
- },
|
|
|
- chooseTime({arrivalBatch,index}) {
|
|
|
- this.$set(this.form.datasource[index], 'arrivalBatch', copyObj(arrivalBatch));
|
|
|
- },
|
|
|
- //cbom新增
|
|
|
- handCBom(row, index) {
|
|
|
- this.$refs.cBomRef.open(this.form.datasource, index);
|
|
|
- },
|
|
|
- getSelectionCbom(obj, idx = -1) {
|
|
|
- obj.forEach((item, index) => {
|
|
|
- let i = idx == -1 ? index : idx;
|
|
|
- let row = JSON.parse(JSON.stringify(this.defaultForm));
|
|
|
- row.key = this.form.datasource.length + 1;
|
|
|
- let parasm = idx == -1 ? row : this.form.datasource[i];
|
|
|
- this.$set(parasm, 'productId', item.id);
|
|
|
- // this.$set(parasm, 'id', item.id);
|
|
|
- this.$set(parasm, 'categoryName', item.name);
|
|
|
- this.$set(parasm, 'productCategoryId', item.categoryLevelId);
|
|
|
- this.$set(parasm, 'productBrand', item.brandNum);
|
|
|
- this.$set(parasm, 'productCategoryName', item.category.categoryLevelPath);
|
|
|
- this.$set(parasm, 'totalCount', item.dosage);
|
|
|
- this.$set(parasm, 'productCode', item.code);
|
|
|
- this.$set(parasm, 'productName', item.name);
|
|
|
- this.$set(parasm, 'availableCountBase', item.availableCountBase);
|
|
|
- this.$set(parasm, 'modelType', item.modelType);
|
|
|
- this.$set(parasm, 'weightUnit', item.unit);
|
|
|
- this.$set(parasm, 'measuringUnit', item.unit);
|
|
|
- this.$set(parasm, 'specification', item.specification);
|
|
|
- this.$set(parasm, 'remark', '');
|
|
|
- this.$set(parasm, 'imgCode', item.imgCode);
|
|
|
- this.$set(parasm, 'produceType', item.produceType);
|
|
|
- this.$set(parasm, 'approvalNumber', item.extField?.approvalNumber);
|
|
|
- this.$set(parasm, 'packingSpecification', item.extField?.packingSpecification);
|
|
|
-
|
|
|
- if (idx == -1) {
|
|
|
- this.form.datasource.push(row);
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- //选择产品
|
|
|
- handParent(row, index) {
|
|
|
- // let item = {
|
|
|
- // id: row.productCode
|
|
|
- // };
|
|
|
+ {
|
|
|
+ width: 130,
|
|
|
+ prop: 'brand',
|
|
|
+ label: '品牌',
|
|
|
+ slot: 'brand',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
|
|
|
- this.$refs.productListRef.open(this.form.datasource, index);
|
|
|
- },
|
|
|
- //选择技术人回调
|
|
|
- changeAnswer(obj, idx) {
|
|
|
- this.$set(this.form.datasource[idx], 'technicalAnswerId', obj.id);
|
|
|
- this.$set(this.form.datasource[idx], 'technicalAnswerName', obj.name);
|
|
|
- },
|
|
|
- handHead(row, index) {
|
|
|
- let item = {
|
|
|
- id: row.technicalAnswerId
|
|
|
+ {
|
|
|
+ width: 160,
|
|
|
+ prop: 'technicalDrawings',
|
|
|
+ label: '图纸附件',
|
|
|
+ slot: 'technicalDrawings'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 160,
|
|
|
+ prop: 'files',
|
|
|
+ label: '附件',
|
|
|
+ slot: 'files'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ width: 220,
|
|
|
+ prop: 'remark',
|
|
|
+ label: '备注',
|
|
|
+ slot: 'remark',
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ columnKey: 'action',
|
|
|
+ label: '操作',
|
|
|
+ width: 120,
|
|
|
+ align: 'center',
|
|
|
+ resizable: false,
|
|
|
+ slot: 'action',
|
|
|
+ fixed: 'right',
|
|
|
+ showOverflowTooltip: true
|
|
|
+ }
|
|
|
+ ]
|
|
|
};
|
|
|
- this.$refs.headRef.open(item, index);
|
|
|
- },
|
|
|
- //选择产品回调
|
|
|
- changeParent(obj = [], idx) {
|
|
|
-
|
|
|
- // if (
|
|
|
- // obj.code &&
|
|
|
- // this.form.datasource
|
|
|
- // .map((item) => item.productCode)
|
|
|
- // .includes(obj.code)
|
|
|
- // ) {
|
|
|
- // this.$message.warning('不能选择重复的产品');
|
|
|
- // return;
|
|
|
- // }
|
|
|
- obj.forEach((item, index) => {
|
|
|
- let i = idx == -1 ? index : idx;
|
|
|
- let row = JSON.parse(JSON.stringify(this.defaultForm));
|
|
|
- row.key = this.form.datasource.length + 1;
|
|
|
- let parasm = idx == -1 ? row : this.form.datasource[i];
|
|
|
- this.$set(parasm, 'productId', item.id);
|
|
|
- // this.$set(parasm, 'id', item.id);
|
|
|
- this.$set(parasm, 'categoryName', item.name);
|
|
|
- this.$set(parasm, 'productCategoryId', item.categoryLevelId);
|
|
|
- this.$set(parasm, 'productBrand', item.brandNum);
|
|
|
- this.$set(parasm, 'productCategoryName', item.categoryLevelPath);
|
|
|
- this.$set(parasm, 'productCode', item.code);
|
|
|
- this.$set(parasm, 'productName', item.name);
|
|
|
- this.$set(parasm, 'availableCountBase', item.availableCountBase);
|
|
|
- this.$set(parasm, 'modelType', item.modelType);
|
|
|
- this.$set(parasm, 'weightUnit', item.weightUnit);
|
|
|
- this.$set(parasm, 'measuringUnit', item.measuringUnit);
|
|
|
- this.$set(parasm, 'specification', item.specification);
|
|
|
- this.$set(parasm, 'remark', '');
|
|
|
- this.$set(parasm, 'imgCode', item.imgCode);
|
|
|
- this.$set(parasm, 'produceType', item.produceType);
|
|
|
- this.$set(parasm, 'approvalNumber', item.extField.approvalNumber);
|
|
|
- this.$set(parasm, 'packingSpecification', item.extField.packingSpecification);
|
|
|
- if (idx == -1) {
|
|
|
- this.form.datasource.push(row);
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- handleTaskinstance(row,index){
|
|
|
- this.taskinstanceDialogFlag = true;
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.$refs.taskinstanceDialogRef.open(row,index)
|
|
|
- })
|
|
|
-
|
|
|
},
|
|
|
- saveTaskInstance(row={}){
|
|
|
- this.$set(this.form.datasource[row.index], 'taskId', row.id);
|
|
|
- this.$set(this.form.datasource[row.index], 'taskName', row.name);
|
|
|
- this.$set(this.form.datasource[row.index], 'routingId', row.produceRoutingId);
|
|
|
- },
|
|
|
- remove(i) {
|
|
|
- this.form.datasource.splice(i, 1);
|
|
|
- this.setSort();
|
|
|
- },
|
|
|
- // 清空表格
|
|
|
- restTable() {
|
|
|
- this.form.datasource = [];
|
|
|
- },
|
|
|
- // 重新排序
|
|
|
- setSort() {
|
|
|
- this.form.datasource.forEach((n, index) => {
|
|
|
- n.key = index + 1;
|
|
|
- });
|
|
|
- },
|
|
|
- // 添加
|
|
|
- handlAdd() {
|
|
|
- let item = JSON.parse(JSON.stringify(this.defaultForm));
|
|
|
- item.key = this.form.datasource.length + 1;
|
|
|
- this.form.datasource.push(item);
|
|
|
+ created() {
|
|
|
+ this.getDictList('productionType');
|
|
|
},
|
|
|
+ methods: {
|
|
|
+ getDictV(code, val) {
|
|
|
+ if (!this.dictList[code]) return '';
|
|
|
+ return this.dictList[code].find((item) => item.value == val)?.label;
|
|
|
+ },
|
|
|
+ async getDictList(code) {
|
|
|
+ let { data: res } = await getByCode(code);
|
|
|
+ this.dictList[code] = res.map((item) => {
|
|
|
+ let values = Object.keys(item);
|
|
|
+ return {
|
|
|
+ value: values[0],
|
|
|
+ label: item[values[0]]
|
|
|
+ };
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 返回列表数据
|
|
|
+ getTableValue() {
|
|
|
+ let comitDatasource = this.form.datasource;
|
|
|
+ if (comitDatasource.length === 0) return [];
|
|
|
+ comitDatasource.forEach((v) => {
|
|
|
+ v.totalPrice = (v.totalCount * v.singlePrice)?.toFixed(2) || 0;
|
|
|
+ v.files = v.files || [];
|
|
|
+ v.technicalDrawings = v.technicalDrawings || [];
|
|
|
+ v.arrivalBatch = v.arrivalBatch || [];
|
|
|
+ });
|
|
|
+ return comitDatasource;
|
|
|
+ },
|
|
|
+ //修改回显
|
|
|
+ async putTableValue(data) {
|
|
|
+ if (data && data?.length) {
|
|
|
+ this.form.datasource = data;
|
|
|
+ //获取仓库库存
|
|
|
+ let codeList = this.form.datasource.filter((item) => item.productCode).map((item) => item.productCode);
|
|
|
+ if (codeList.length) {
|
|
|
+ let inventoryTotalList = await getInventoryTotalAPI(codeList);
|
|
|
+ this.form.datasource.filter((item) => item.productCode).forEach((item) => {
|
|
|
+ let find =
|
|
|
+ inventoryTotalList.find(
|
|
|
+ (key) => key.code == item.productCode
|
|
|
+ ) || {};
|
|
|
+ item.availableCountBase = find.availableCountBase;
|
|
|
+ });
|
|
|
+ }
|
|
|
+ this.$refs.table.reload();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ handleMethod(row, index) {
|
|
|
+ this.$refs.timeDialogRef.open(row, index);
|
|
|
+ },
|
|
|
+ chooseTime({ arrivalBatch, index }) {
|
|
|
+ this.$set(
|
|
|
+ this.form.datasource[index],
|
|
|
+ 'arrivalBatch',
|
|
|
+ copyObj(arrivalBatch)
|
|
|
+ );
|
|
|
+ },
|
|
|
+ //cbom新增
|
|
|
+ handCBom(row, index) {
|
|
|
+ this.$refs.cBomRef.open(this.form.datasource, index);
|
|
|
+ },
|
|
|
+ getSelectionCbom(obj, idx = -1) {
|
|
|
+ obj.forEach((item, index) => {
|
|
|
+ let i = idx == -1 ? index : idx;
|
|
|
+ let row = JSON.parse(JSON.stringify(this.defaultForm));
|
|
|
+ row.key = this.form.datasource.length + 1;
|
|
|
+ let parasm = idx == -1 ? row : this.form.datasource[i];
|
|
|
+ this.$set(parasm, 'productId', item.id);
|
|
|
+ // this.$set(parasm, 'id', item.id);
|
|
|
+ this.$set(parasm, 'categoryName', item.name);
|
|
|
+ this.$set(parasm, 'productCategoryId', item.categoryLevelId);
|
|
|
+ this.$set(parasm, 'productBrand', item.brandNum);
|
|
|
+ this.$set(
|
|
|
+ parasm,
|
|
|
+ 'productCategoryName',
|
|
|
+ item.category.categoryLevelPath
|
|
|
+ );
|
|
|
+ this.$set(parasm, 'totalCount', item.dosage);
|
|
|
+ this.$set(parasm, 'productCode', item.code);
|
|
|
+ this.$set(parasm, 'productName', item.name);
|
|
|
+ this.$set(parasm, 'availableCountBase', item.availableCountBase);
|
|
|
+ this.$set(parasm, 'modelType', item.modelType);
|
|
|
+ this.$set(parasm, 'weightUnit', item.unit);
|
|
|
+ this.$set(parasm, 'measuringUnit', item.unit);
|
|
|
+ this.$set(parasm, 'specification', item.specification);
|
|
|
+ this.$set(parasm, 'remark', '');
|
|
|
+ this.$set(parasm, 'imgCode', item.imgCode);
|
|
|
+ this.$set(parasm, 'produceType', item.produceType);
|
|
|
+ this.$set(parasm, 'approvalNumber', item.extField?.approvalNumber);
|
|
|
+ this.$set(
|
|
|
+ parasm,
|
|
|
+ 'packingSpecification',
|
|
|
+ item.extField?.packingSpecification
|
|
|
+ );
|
|
|
+ this.$set(parasm, 'provenance', item.purchaseOrigins || []);
|
|
|
|
|
|
- validateForm(callback) {
|
|
|
- //开始表单校验
|
|
|
- this.$refs.form.validate((valid,obj) => {
|
|
|
- if(obj){
|
|
|
- let messages= Object.keys(obj).map(key=>obj[key][0])
|
|
|
- if(messages.length>0){
|
|
|
- this.$message.warning(messages[0].message);
|
|
|
+ if (idx == -1) {
|
|
|
+ this.form.datasource.push(row);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ //选择产品
|
|
|
+ handParent(row, index) {
|
|
|
+ // let item = {
|
|
|
+ // id: row.productCode
|
|
|
+ // };
|
|
|
|
|
|
+ this.$refs.productListRef.open(this.form.datasource, index);
|
|
|
+ },
|
|
|
+ //选择技术人回调
|
|
|
+ changeAnswer(obj, idx) {
|
|
|
+ this.$set(this.form.datasource[idx], 'technicalAnswerId', obj.id);
|
|
|
+ this.$set(this.form.datasource[idx], 'technicalAnswerName', obj.name);
|
|
|
+ },
|
|
|
+ handHead(row, index) {
|
|
|
+ let item = {
|
|
|
+ id: row.technicalAnswerId
|
|
|
+ };
|
|
|
+ this.$refs.headRef.open(item, index);
|
|
|
+ },
|
|
|
+ //选择产品回调
|
|
|
+ changeParent(obj = [], idx) {
|
|
|
+ // if (
|
|
|
+ // obj.code &&
|
|
|
+ // this.form.datasource
|
|
|
+ // .map((item) => item.productCode)
|
|
|
+ // .includes(obj.code)
|
|
|
+ // ) {
|
|
|
+ // this.$message.warning('不能选择重复的产品');
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ obj.forEach((item, index) => {
|
|
|
+ let i = idx == -1 ? index : idx;
|
|
|
+ let row = JSON.parse(JSON.stringify(this.defaultForm));
|
|
|
+ row.key = this.form.datasource.length + 1;
|
|
|
+ let parasm = idx == -1 ? row : this.form.datasource[i];
|
|
|
+ this.$set(parasm, 'productId', item.id);
|
|
|
+ // this.$set(parasm, 'id', item.id);
|
|
|
+ this.$set(parasm, 'categoryName', item.name);
|
|
|
+ this.$set(parasm, 'productCategoryId', item.categoryLevelId);
|
|
|
+ this.$set(parasm, 'productBrand', item.brandNum);
|
|
|
+ this.$set(parasm, 'productCategoryName', item.categoryLevelPath);
|
|
|
+ this.$set(parasm, 'productCode', item.code);
|
|
|
+ this.$set(parasm, 'productName', item.name);
|
|
|
+ this.$set(parasm, 'availableCountBase', item.availableCountBase);
|
|
|
+ this.$set(parasm, 'modelType', item.modelType);
|
|
|
+ this.$set(parasm, 'weightUnit', item.weightUnit);
|
|
|
+ this.$set(parasm, 'measuringUnit', item.measuringUnit);
|
|
|
+ this.$set(parasm, 'specification', item.specification);
|
|
|
+ this.$set(parasm, 'remark', '');
|
|
|
+ this.$set(parasm, 'imgCode', item.imgCode);
|
|
|
+ this.$set(parasm, 'produceType', item.produceType);
|
|
|
+ this.$set(parasm, 'approvalNumber', item.extField.approvalNumber);
|
|
|
+ this.$set(
|
|
|
+ parasm,
|
|
|
+ 'packingSpecification',
|
|
|
+ item.extField.packingSpecification
|
|
|
+ );
|
|
|
+ if (idx == -1) {
|
|
|
+ this.form.datasource.push(row);
|
|
|
}
|
|
|
+ });
|
|
|
+ },
|
|
|
+ handleTaskinstance(row, index) {
|
|
|
+ this.taskinstanceDialogFlag = true;
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.taskinstanceDialogRef.open(row, index);
|
|
|
+ });
|
|
|
+ },
|
|
|
+ saveTaskInstance(row = {}) {
|
|
|
+ this.$set(this.form.datasource[row.index], 'taskId', row.id);
|
|
|
+ this.$set(this.form.datasource[row.index], 'taskName', row.name);
|
|
|
+ this.$set(
|
|
|
+ this.form.datasource[row.index],
|
|
|
+ 'routingId',
|
|
|
+ row.produceRoutingId
|
|
|
+ );
|
|
|
+ },
|
|
|
+ remove(i) {
|
|
|
+ this.form.datasource.splice(i, 1);
|
|
|
+ this.setSort();
|
|
|
+ },
|
|
|
+ // 清空表格
|
|
|
+ restTable() {
|
|
|
+ this.form.datasource = [];
|
|
|
+ },
|
|
|
+ // 重新排序
|
|
|
+ setSort() {
|
|
|
+ this.form.datasource.forEach((n, index) => {
|
|
|
+ n.key = index + 1;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 添加
|
|
|
+ handlAdd() {
|
|
|
+ let item = JSON.parse(JSON.stringify(this.defaultForm));
|
|
|
+ item.key = this.form.datasource.length + 1;
|
|
|
+ this.form.datasource.push(item);
|
|
|
+ },
|
|
|
|
|
|
+ validateForm(callback) {
|
|
|
+ //开始表单校验
|
|
|
+ this.$refs.form.validate((valid, obj) => {
|
|
|
+ if (obj) {
|
|
|
+ let messages = Object.keys(obj).map((key) => obj[key][0]);
|
|
|
+ if (messages.length > 0) {
|
|
|
+ this.$message.warning(messages[0].message);
|
|
|
+ }
|
|
|
}
|
|
|
- callback(valid);
|
|
|
- });
|
|
|
+ callback(valid);
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-};
|
|
|
+ };
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
-.headbox {
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
- align-items: center;
|
|
|
+ .headbox {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
|
|
|
- .amount {
|
|
|
- font-size: 14px;
|
|
|
- font-weight: bold;
|
|
|
+ .amount {
|
|
|
+ font-size: 14px;
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
|
|
|
-.time-form .el-form-item {
|
|
|
- margin-bottom: 0 !important;
|
|
|
-}
|
|
|
+ .time-form .el-form-item {
|
|
|
+ margin-bottom: 0 !important;
|
|
|
+ }
|
|
|
|
|
|
-::v-deep .period {
|
|
|
- display: flex;
|
|
|
+ ::v-deep .period {
|
|
|
+ display: flex;
|
|
|
|
|
|
- .borderleftnone {
|
|
|
- .el-input--medium .el-input__inner {
|
|
|
- border-top-right-radius: 0;
|
|
|
- border-bottom-right-radius: 0;
|
|
|
+ .borderleftnone {
|
|
|
+ .el-input--medium .el-input__inner {
|
|
|
+ border-top-right-radius: 0;
|
|
|
+ border-bottom-right-radius: 0;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- .borderrightnone {
|
|
|
- .el-input--medium .el-input__inner {
|
|
|
- border-top-left-radius: 0;
|
|
|
- border-bottom-left-radius: 0;
|
|
|
+ .borderrightnone {
|
|
|
+ .el-input--medium .el-input__inner {
|
|
|
+ border-top-left-radius: 0;
|
|
|
+ border-bottom-left-radius: 0;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
|
|
|
-::v-deep .time-form tbody > tr:hover > td {
|
|
|
- background-color: transparent !important;
|
|
|
-}
|
|
|
+ ::v-deep .time-form tbody > tr:hover > td {
|
|
|
+ background-color: transparent !important;
|
|
|
+ }
|
|
|
|
|
|
-::v-deep .time-form .el-table tr {
|
|
|
- background-color: #ffffff;
|
|
|
-}
|
|
|
+ ::v-deep .time-form .el-table tr {
|
|
|
+ background-color: #ffffff;
|
|
|
+ }
|
|
|
</style>
|