加工单bom修改

jg-waiwang-pro
CJYXTX\27961 7 months ago
parent 832890cfd1
commit 069a8933ca

@ -22,6 +22,8 @@
<result column="f_last_modify_user_id" property="lastModifyUserId"/>
<result column="salesMainUnitIds" property="salesMainUnitIds"/>
<result column="inventoryUnitIds" property="inventoryUnitIds"/>
<result column="operateUnitIds" property="operateUnitIds"/>
</resultMap>
<select id="getProductWarehouseList" resultMap="getProductWarehouseMap">
@ -52,7 +54,8 @@
many_unit_flag = 1,
JgFnUnitName ( sales_main_unit_id ),
JgFnUnitArrName ( sales_main_unit_id )) AS salesMainUnitIds,
JgFnUnitName ( inventory_unit_id ) AS inventoryUnitIds
JgFnUnitName ( inventory_unit_id ) AS inventoryUnitIds,
JgFnUnitName ( operate_unit_id ) AS operateUnitIds
FROM
jg_product
${ew.customSqlSegment}

@ -76,4 +76,10 @@ public class ClassTeamEntity {
@TableField(exist = false)
private Integer classTeamUseNum;
@TableField(exist = false)
private String realName;
@TableField(exist = false)
private String mobilePhone;
}

@ -240,4 +240,6 @@ public class ProductWarehouseEntity {
private String salesMainUnitIds;
@TableField(exist = false)
private String inventoryUnitIds;
@TableField(exist = false)
private String operateUnitIds;
}

@ -103,7 +103,11 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addbomitemList()" v-if="!judgeWrite('bomitemList')">
<!-- <div class="table-actions" @click="addbomitemList()" v-if="!judgeWrite('bomitemList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
<div class="table-actions" @click="choice()" v-if="!judgeWrite('bomitemList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
@ -227,9 +231,13 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addbomitemvalueList()" v-if="!judgeWrite('bomitemvalueList')">
<div class="table-actions" @click="choiceRaw()" v-if="!judgeWrite('bomitemvalueList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
<!-- <div class="table-actions" @click="addbomitemvalueList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
@ -239,7 +247,11 @@
</el-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
<BomProductGoodsBox v-if="BomgoodsBoxVisible" ref="BomGoodsBox" @refreshDataList="initList" />
<BomProductRawGoodsBox v-if="BomgoodsBoxRawVisible" ref="BomGoodsRawBox" @refreshDataList="initRawList" />
</div>
</template>
<script>
@ -254,11 +266,12 @@ import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
import ProductGoodsBox from '@/views/scm/publicPage/BomProductGoodsBox'
import BomProductGoodsBox from '@/views/scm/publicPage/BomProductGoodsBox'
import BomProductRawGoodsBox from '@/views/scm/publicPage/BomProductGoodsBox'
export default {
mixins: [comMixin],
components: {},
components: { BomProductGoodsBox, BomProductRawGoodsBox },
props: [],
data() {
return {
@ -275,6 +288,8 @@ export default {
setting: {},
eventType: '',
userBoxVisible: false,
BomgoodsBoxVisible: false,
BomgoodsBoxRawVisible: false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
@ -559,6 +574,61 @@ export default {
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
choice() {
this.BomgoodsBoxVisible = true
let excludeIdList = [];
for (let i = 0; i < this.dataForm.bomItemList.length; i++) {
excludeIdList.push(this.dataForm.bomItemList[i].productId);
}
this.$nextTick(() => {
this.$refs.BomGoodsBox.init(excludeIdList)
})
},
initList(list) {
for (let i = 0; i < list.length; i++) {
const e = list[i];
let item = {
productId: e.id,
name: e.name,
spec: e.spec,
inventoryType: e.inventoryType,
inventoryUnitIds: e.inventoryUnitIds,
salesMainUnitIds: e.salesMainUnitIds,
barCode: e.barCode,
productTypeIds: e.productTypeId,
}
this.dataForm.bomItemList.push(item)
}
},
choiceRaw() {
this.BomgoodsBoxRawVisible = true
let excludeIdList = [];
for (let i = 0; i < this.dataForm.bomItemValueList.length; i++) {
excludeIdList.push(this.dataForm.bomItemValueList[i].productId);
}
this.$nextTick(() => {
this.$refs.BomGoodsRawBox.init(excludeIdList)
})
},
initRawList(list) {
for (let i = 0; i < list.length; i++) {
const e = list[i];
let item = {
productId: e.id,
name: e.name,
spec: e.spec,
inventoryType: e.inventoryType,
inventoryUnitIds: e.inventoryUnitIds,
salesMainUnitIds: e.salesMainUnitIds,
barCode: e.barCode,
operateUnitIds: e.operateUnitIds,
productTypeIds: e.productTypeId,
}
this.dataForm.bomItemValueList.push(item)
}
},
//
initDefaultData() {

@ -1,9 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
<template>
<el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
@ -17,39 +14,38 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计划编号" prop="timeCode">
<JnpfInput v-model="dataForm.timeCode" @change="changeData('timeCode',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.timeCode" @change="changeData('timeCode', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计划名称" prop="timeName">
<JnpfInput v-model="dataForm.timeName" @change="changeData('timeName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.timeName" @change="changeData('timeName', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="简称/英文名" prop="timeNm">
<JnpfInput v-model="dataForm.timeNm" @change="changeData('timeNm',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.timeNm" @change="changeData('timeNm', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="有效时间" prop="startTime">
<JnpfDatePicker v-model="dataForm.startTime" @change="changeData('startTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
format="yyyy-MM-dd">
<JnpfDatePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="4">
<jnpf-form-tip-item>
<JnpfText
:textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":19,"line-height":32,"font-style":"normal","text-align":"left"}'
:textStyle='{ "color": "#000000", "font-weight": "normal", "text-decoration": "none", "font-size": 19, "line-height": 32, "font-style": "normal", "text-align": "left" }'
content="至">
</JnpfText>
</jnpf-form-tip-item>
@ -57,25 +53,23 @@
<el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="endTime">
<JnpfDatePicker v-model="dataForm.endTime" @change="changeData('endTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
format="yyyy-MM-dd">
<JnpfDatePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="计划状态" prop="timeStatus">
<JnpfRadio v-model="dataForm.timeStatus" @change="changeData('timeStatus',-1)"
optionType="button" direction="horizontal" size="medium"
:options="timeStatusOptions" :props="timeStatusProps">
<JnpfRadio v-model="dataForm.timeStatus" @change="changeData('timeStatus', -1)" optionType="button"
direction="horizontal" size="medium" :options="timeStatusOptions" :props="timeStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="描述" prop="remark">
<JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -87,9 +81,8 @@
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="倒班方式" prop="shiftMethod">
<JnpfSelect v-model="dataForm.shiftMethod" @change="changeData('shiftMethod',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="shiftMethodOptions"
:props="shiftMethodProps">
<JnpfSelect v-model="dataForm.shiftMethod" @change="changeData('shiftMethod', -1)" placeholder="请选择"
clearable :style='{ "width": "100%" }' :options="shiftMethodOptions" :props="shiftMethodProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
@ -105,14 +98,11 @@
<span class="required-sign">*</span>班次名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.timeId" @change="changeDataTimeList"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.classplanitemtimeId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='time_name' :field="'timeId'+scope.$index"
interfaceId="523033213203919429" :pageSize="20"
:columnOptions="classplanitemtimeIdcolumnOptions" clearable
:style='{"width":"100%"}'>
<JnpfPopupSelect v-model="scope.row.timeId" @change="changeDataTimeList" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.classplanitemtimeId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='time_name'
:field="'timeId' + scope.$index" interfaceId="523033213203919429" :pageSize="20"
:columnOptions="classplanitemtimeIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
@ -121,9 +111,9 @@
<span class="required-sign">*</span>开始时间
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.startTimeMin"
@change="changeData('classplanitem-creatorTime',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.startTimeMin"
@change="changeData('classplanitem-creatorTime', scope.$index)" disabled placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -132,9 +122,9 @@
<span class="required-sign">*</span>结束时间
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.endTimeMin"
@change="changeData('classplanitem-creatorUserId',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.endTimeMin"
@change="changeData('classplanitem-creatorUserId', scope.$index)" disabled placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -143,9 +133,8 @@
<span class="required-sign">*</span>备注
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark"
@change="changeData('classplanitem-remark',scope.$index)" placeholder="请输入"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.remark" @change="changeData('classplanitem-remark', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -156,9 +145,14 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addclassplanitemList()">
<!-- <div class="table-actions" @click="addclassplanitemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
<div class="table-actions" @click="choice()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
@ -179,75 +173,55 @@
<span class="required-sign">*</span>班组名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.teamId" @change="changeDataList"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.classplanteamteamId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='team_name' :field="'teamId'+scope.$index"
interfaceId="523050983727575621" :pageSize="20"
:columnOptions="classplanteamteamIdcolumnOptions" clearable
:style='{"width":"100%"}'>
<JnpfPopupSelect v-model="scope.row.teamId" @change="changeDataList" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.classplanteamteamId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='team_name'
:field="'teamId' + scope.$index" interfaceId="523050983727575621" :pageSize="20"
:columnOptions="classplanteamteamIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
<!-- <template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.timeId"
@change="changeData('classplanitem-timeId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.classplanitemtimeId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='time_name' :field="'timeId'+scope.$index"
interfaceId="523033213203919429" :pageSize="20"
:columnOptions="classplanitemtimeIdcolumnOptions" clearable
:style='{"width":"100%"}'>
</JnpfPopupSelect>
</template> -->
</el-table-column>
<el-table-column label="类型" prop="types">
<!-- <el-table-column label="类型" prop="types">
<template slot="header" v-if="false">
<span class="required-sign">*</span>类型
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.types"
@change="changeData('classplanteam-deleteTime',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.types" @change="changeData('classplanteam-deleteTime', scope.$index)"
disabled placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="负责人" prop="fRealName">
</el-table-column> -->
<!-- <el-table-column label="负责人" prop="fRealName">
<template slot="header" v-if="false">
<span class="required-sign">*</span>负责人
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.fRealName"
@change="changeData('classplanteam-creatorTime',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.fRealName"
@change="changeData('classplanteam-creatorTime', scope.$index)" disabled placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="联系手机" prop="fMobilePhone">
<!-- <el-table-column label="联系手机" prop="fMobilePhone">
<template slot="header" v-if="false">
<span class="required-sign">*</span>联系手机
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.fMobilePhone"
@change="changeData('classplanteam-creatorTime',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.fMobilePhone"
@change="changeData('classplanteam-creatorTime', scope.$index)" disabled placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="备注" prop="remark">
<template slot="header" v-if="false">
<span class="required-sign">*</span>备注
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark"
@change="changeData('classplanteam-remark',scope.$index)" placeholder="请输入"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.remark" @change="changeData('classplanteam-remark', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -258,31 +232,39 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addclassplanteamList()">
<!-- <div class="table-actions" @click="addclassplanteamList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div> -->
<div class="table-actions" @click="calssTeamChoice()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{'下一条'}}
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
<ClassTeamGoodsBox v-if="classTeamVisible" ref="classTeamBox" @refreshDataList="initList" />
<ClassTimeGoodsBox v-if="classTimeVisible" ref="classTimeBox" @refreshDataList="classTimeList" />
</el-dialog>
</template>
@ -296,8 +278,12 @@ import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
import ClassTeamGoodsBox from '@/views/scm/publicPage/ClassTeamGoodsBox'
import ClassTimeGoodsBox from '@/views/scm/publicPage/ClassTimeGoodsBox'
export default {
components: {},
components: { ClassTeamGoodsBox, ClassTimeGoodsBox },
props: [],
data() {
return {
@ -314,6 +300,8 @@ export default {
setting: {},
eventType: '',
userBoxVisible: false,
classTeamVisible: false,
classTimeVisible: false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
@ -603,6 +591,55 @@ export default {
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
choice() {
this.classTimeVisible = true
let excludeIdList = [];
for (let i = 0; i < this.dataForm.classPlanItemList.length; i++) {
excludeIdList.push(this.dataForm.classPlanItemList[i].productId);
}
this.$nextTick(() => {
this.$refs.classTimeBox.init(excludeIdList)
})
},
classTimeList(list) {
for (let i = 0; i < list.length; i++) {
const e = list[i];
let item = {
timeId: e.id,
timeCode: e.timeCode,
timeName: e.timeName,
timeNm: e.timeNm,
startTimeMin: e.startTime,
endTimeMin: e.endTime,
}
this.dataForm.classPlanItemList.push(item)
}
},
calssTeamChoice() {
this.classTeamVisible = true
let excludeIdList = [];
for (let i = 0; i < this.dataForm.classPlanTeamList.length; i++) {
excludeIdList.push(this.dataForm.classPlanTeamList[i].productId);
}
this.$nextTick(() => {
this.$refs.classTeamBox.init(excludeIdList)
})
},
initList(list) {
for (let i = 0; i < list.length; i++) {
const e = list[i];
let item = {
teamId: e.id,
name: e.teamName,
types: e.type,
}
this.dataForm.classPlanTeamList.push(item)
}
},
//
initDefaultData() {

@ -1,9 +1,6 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
<template>
<el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
@ -17,60 +14,57 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="班组编号" prop="teamCode">
<JnpfInput v-model="dataForm.teamCode" @change="changeData('teamCode',-1)"
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.teamCode" @change="changeData('teamCode', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="班组名称" prop="teamName">
<JnpfInput v-model="dataForm.teamName" @change="changeData('teamName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.teamName" @change="changeData('teamName', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="班组简称" prop="teamNm">
<JnpfInput v-model="dataForm.teamNm" @change="changeData('teamNm',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.teamNm" @change="changeData('teamNm', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="类型" prop="type">
<JnpfSelect v-model="dataForm.type" @change="changeData('type',-1)" placeholder="请选择"
clearable :style='{"width":"100%"}' :options="typeOptions" :props="typeProps">
<JnpfSelect v-model="dataForm.type" @change="changeData('type', -1)" placeholder="请选择" clearable
:style='{ "width": "100%" }' :options="typeOptions" :props="typeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="所属工厂" prop="parentId">
<JnpfSelect v-model="dataForm.parentId" @change="changeData('parentId',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="parentIdOptions"
:props="parentIdProps">
<JnpfSelect v-model="dataForm.parentId" @change="changeData('parentId', -1)" placeholder="请选择" clearable
:style='{ "width": "100%" }' :options="parentIdOptions" :props="parentIdProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="所属车间" prop="parentIds">
<JnpfSelect v-model="dataForm.parentIds" @change="changeData('parentIds',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="parentIdsOptions"
:props="parentIdsProps">
<JnpfSelect v-model="dataForm.parentIds" @change="changeData('parentIds', -1)" placeholder="请选择" clearable
:style='{ "width": "100%" }' :options="parentIdsOptions" :props="parentIdsProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="班组状态" prop="teamStatus">
<JnpfRadio v-model="dataForm.teamStatus" @change="changeData('teamStatus',-1)"
optionType="default" direction="horizontal" size="medium"
:options="teamStatusOptions" :props="teamStatusProps">
<JnpfRadio v-model="dataForm.teamStatus" @change="changeData('teamStatus', -1)" optionType="default"
direction="horizontal" size="medium" :options="teamStatusOptions" :props="teamStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="描述" prop="remark">
<JnpfInput v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -90,9 +84,8 @@
</template>
<template slot-scope="scope">
<JnpfSelect v-model="scope.row.contactType"
@change="changeData('businesscontactteam-contactType',scope.$index)"
placeholder="请选择" clearable :style='{"width":"100%"}'
:options="businesscontactteamcontactTypeOptions"
@change="changeData('businesscontactteam-contactType', scope.$index)" placeholder="请选择" clearable
:style='{ "width": "100%" }' :options="businesscontactteamcontactTypeOptions"
:props="businesscontactteamcontactTypeProps">
</JnpfSelect>
</template>
@ -102,9 +95,8 @@
<span class="required-sign">*</span>姓名
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.name"
@change="changeData('businesscontactteam-name',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.name" @change="changeData('businesscontactteam-name', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -113,9 +105,8 @@
<span class="required-sign">*</span>手机号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.phone"
@change="changeData('businesscontactteam-phone',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.phone" @change="changeData('businesscontactteam-phone', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -125,8 +116,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.landline"
@change="changeData('businesscontactteam-landline',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businesscontactteam-landline', scope.$index)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -135,9 +126,8 @@
<span class="required-sign">*</span>邮箱
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.email"
@change="changeData('businesscontactteam-email',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.email" @change="changeData('businesscontactteam-email', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -146,9 +136,8 @@
<span class="required-sign">*</span>传真
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.fax"
@change="changeData('businesscontactteam-fax',scope.$index)" placeholder="请输入"
clearable :style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.fax" @change="changeData('businesscontactteam-fax', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -158,8 +147,8 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.lastModifyTime"
@change="changeData('businesscontactteam-lastModifyTime',scope.$index)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@change="changeData('businesscontactteam-lastModifyTime', scope.$index)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -199,10 +188,9 @@
</JnpfUserSelect>
</template> -->
<template slot-scope="scope">
<JnpfUserSelect v-model="scope.row.belongUserId" @change="changeDataList"
placeholder="请选择" selectType="all"
:ableIds="ableAll.classteamusebelongUserIdableIds" clearable
:style='{"width":"100%"}'>
<JnpfUserSelect v-model="scope.row.belongUserId" @change="changeDataList" placeholder="请选择"
selectType="all" :ableIds="ableAll.classteamusebelongUserIdableIds" clearable
:style='{ "width": "100%" }'>
</JnpfUserSelect>
</template>
</el-table-column>
@ -212,8 +200,8 @@
<span class="required-sign">*</span>手机
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.mobilePhone" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.mobilePhone" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -223,8 +211,8 @@
<span class="required-sign">*</span>组织部门
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.organize" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
<JnpfInput v-model="scope.row.organize" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -244,20 +232,20 @@
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{'下一条'}}
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
@ -460,8 +448,12 @@ export default {
this.$emit('refreshDataList', true)
},
changeDataList(model, row) {
this.dataForm.mobilePhone = row.mobilePhone
this.dataForm.organize = row.organize
// this.dataForm.mobilePhone = row.mobilePhone
// this.dataForm.organize = row.organize
row.belongUserId = row.id
this.dataForm.classTeamUseList.push(row)
this.dataForm.classTeamUseList.splice(-2, 1)
},
changeData(model, index) {

@ -0,0 +1,141 @@
<template>
<el-dialog title="选择商品" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="800px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="10">
<el-form-item label="关键词">
<el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">{{ $t('common.search') }}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
</el-button>
</el-form-item>
</el-col>
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="search()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
<el-table-column prop="teamCode" label="班组编号" align="left">
</el-table-column>
<el-table-column prop="teamName" label="班组名称" align="left">
</el-table-column>
<el-table-column prop="teamNm" label="班组简称" align="left">
</el-table-column>
<el-table-column prop="parentId" label="所属工厂" align="left">
</el-table-column>
<el-table-column prop="parentIds" label="所属车间" align="left">
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
<el-button type="primary" @click="select()">{{ $t('common.confirmButton') }}</el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
visible: false,
listLoading: true,
keyword: '',
list: [],
total: 0,
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
excludeIdList: [],
checked: []
}
},
methods: {
init(excludeIdList) {
this.visible = true
this.listLoading = true
if (excludeIdList) {
this.excludeIdList = excludeIdList;
}
let query = {
...this.listQuery,
keyword: this.keyword,
excludeIdList: this.excludeIdList,
dataType: 0,
}
/* GoodsList(query).then(res => {
this.list = res.data.list
this.listLoading = false
}) */
request({
url: `/api/scm/ClassTeam/getList`,
method: 'post',
data: query
}).then(res => {
this.list = res.data.list
this.listLoading = false
this.total = res.data.pagination.total
})
},
refresh() {
this.keyword = ''
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.init()
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.init()
},
select() {
if (!this.checked.length) return
this.visible = false
this.$emit('refreshDataList', this.checked)
},
handleSelectionChange(val) {
this.checked = val
}
}
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

@ -0,0 +1,139 @@
<template>
<el-dialog title="选择商品" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="800px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="10">
<el-form-item label="关键词">
<el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">{{ $t('common.search') }}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
</el-button>
</el-form-item>
</el-col>
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="search()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
<el-table-column prop="timeCode" label="班组编号" align="left">
</el-table-column>
<el-table-column prop="timeName" label="班组名称" align="left">
</el-table-column>
<el-table-column prop="timeNm" label="班组简称" align="left">
</el-table-column>
<el-table-column prop="startTime" label="开始时间" align="left">
</el-table-column>
<el-table-column prop="endTime" label="结束时间" align="left">
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
<el-button type="primary" @click="select()">{{ $t('common.confirmButton') }}</el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
visible: false,
listLoading: true,
keyword: '',
list: [],
total: 0,
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
excludeIdList: [],
checked: []
}
},
methods: {
init(excludeIdList) {
this.visible = true
this.listLoading = true
if (excludeIdList) {
this.excludeIdList = excludeIdList;
}
let query = {
...this.listQuery,
keyword: this.keyword,
excludeIdList: this.excludeIdList,
dataType: 0,
}
/* GoodsList(query).then(res => {
this.list = res.data.list
this.listLoading = false
}) */
request({
url: `/api/scm/ClassTime/getList`,
method: 'post',
data: query
}).then(res => {
this.list = res.data.list
this.listLoading = false
this.total = res.data.pagination.total
})
},
refresh() {
this.keyword = ''
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.init()
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.init()
},
select() {
if (!this.checked.length) return
this.visible = false
this.$emit('refreshDataList', this.checked)
},
handleSelectionChange(val) {
this.checked = val
}
}
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

@ -615,7 +615,6 @@ export default {
warehousinginspectionvouchervoucheId: [{ "fieldName": "这是质检单的类型", "field": "inspectionType", "defaultValue": "", "jnpfKey": "select", "dataType": "varchar", "id": "q3dbiy1", "relationField": "inspectionType", "required": "1" }],
// warehousinginspectionproductproductId: [{ "fieldName": "", "field": "productId", "defaultValue": "", "jnpfKey": "select", "dataType": "varchar", "id": "q3dbiy1", "relationField": "productIds", "required": "1" }],
warehousinginspectionproductproductId: [{ "fieldName": "根据凭证带出的商品进行查询", "field": "product", "defaultValue": "", "jnpfKey": "billRule", "dataType": "varchar", "id": "rBzgiy1", "relationField": "productIds", "required": "1" }],
warehousinginspectionconclusiongrossWeight: [],
warehousinginspectionconclusiontareWeight: [],
warehousinginspectionconclusionbuckleWeight: [],

@ -491,7 +491,6 @@
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
<BomProductGoodsBox v-if="BomgoodsBoxVisible" ref="BomGoodsBox" @refreshDataList="initList" />
<BomProductRawGoodsBox v-if="BomgoodsBoxRawVisible" ref="BomGoodsRawBox" @refreshDataList="initRawList" />

Loading…
Cancel
Save