yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

加工中心

Browse Source
jg-waiwang-pro
XI_TENG\xixi_ 8 months ago
parent ce1dd1d879
commit 60d0d37899
9 changed files with 206 additions and 53 deletions
Show Stats Download Patch File Download Diff File

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/classplan/ClassPlanConstant.java
View File

File diff suppressed because one or more lines are too long

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/classteam/ClassTeamConstant.java
View File

File diff suppressed because one or more lines are too long

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/classtime/ClassTimeConstant.java
View File

File diff suppressed because one or more lines are too long

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/productionprocesses/ProductionProcessesConstant.java
View File

File diff suppressed because one or more lines are too long

6
jnpf-java-boot/jnpf-web/src/views/scm/bom/form.vue
Unescape View File

@ -436,8 +436,8 @@ export default {
// }, // },
productSelect(model, row) { productSelect(model, row) {
console.log(model); // console.log(model);
console.log(row); // console.log(row);
this.dataForm.spec = row.spec this.dataForm.spec = row.spec
this.dataForm.inventoryType = row.inventory_types this.dataForm.inventoryType = row.inventory_types
@ -449,7 +449,7 @@ export default {
// console.log(row.spec); // console.log(row.spec);
console.log(this.dataForm.inventoryType); // console.log(this.dataForm.inventoryType);
}, },
changeData(model, index) { changeData(model, index) {
this.isEdit = false this.isEdit = false

2
jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue
Unescape View File

@ -144,7 +144,7 @@
{{ scope.row.bomStatus}} {{ scope.row.bomStatus}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="bomCode" label="库存单位" align="left" min-width="120"> <el-table-column prop="inventoryUnitId" label="库存单位" align="left" min-width="120">
</el-table-column> </el-table-column>
<el-table-column prop="productSpec" label="规格" align="left" min-width="120"> <el-table-column prop="productSpec" label="规格" align="left" min-width="120">
</el-table-column> </el-table-column>

63
jnpf-java-boot/jnpf-web/src/views/scm/classplan/form.vue
Unescape View File

@ -105,8 +105,7 @@
<span class="required-sign">*</span>班次名称 <span class="required-sign">*</span>班次名称
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.timeId" <JnpfPopupSelect v-model="scope.row.timeId" @change="changeDataTimeList"
@change="changeData('classplanitem-timeId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm" :rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.classplanitemtimeId" placeholder="请选择" hasPage :templateJson="interfaceRes.classplanitemtimeId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
@ -117,24 +116,24 @@
</JnpfPopupSelect> </JnpfPopupSelect>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="creatorTime"> <el-table-column label="开始时间" prop="startTime">
<template slot="header" v-if="false"> <template slot="header" v-if="false">
<span class="required-sign">*</span>创建时间 <span class="required-sign">*</span>开始时间
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.creatorTime" <JnpfInput v-model="dataForm.startTime"
@change="changeData('classplanitem-creatorTime',scope.$index)" @change="changeData('classplanitem-creatorTime',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建用户" prop="creatorUserId"> <el-table-column label="结束时间" prop="endTime">
<template slot="header" v-if="false"> <template slot="header" v-if="false">
<span class="required-sign">*</span>创建用户 <span class="required-sign">*</span>结束时间
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.creatorUserId" <JnpfInput v-model="dataForm.endTime"
@change="changeData('classplanitem-creatorUserId',scope.$index)" @change="changeData('classplanitem-creatorUserId',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</template> </template>
@ -180,8 +179,7 @@
<span class="required-sign">*</span>班组名称 <span class="required-sign">*</span>班组名称
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.teamId" <JnpfPopupSelect v-model="scope.row.teamId" @change="changeDataList"
@change="changeData('classplanteam-teamId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm" :rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.classplanteamteamId" placeholder="请选择" hasPage :templateJson="interfaceRes.classplanteamteamId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
@ -206,28 +204,42 @@
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="删除时间" prop="deleteTime"> <el-table-column label="类型" prop="types">
<template slot="header" v-if="false"> <template slot="header" v-if="false">
<span class="required-sign">*</span>删除时间 <span class="required-sign">*</span>类型
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.deleteTime" <JnpfInput v-model="dataForm.types"
@change="changeData('classplanteam-deleteTime',scope.$index)" @change="changeData('classplanteam-deleteTime',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="creatorTime">
<el-table-column label="负责人" prop="fRealName">
<template slot="header" v-if="false"> <template slot="header" v-if="false">
<span class="required-sign">*</span>创建时间 <span class="required-sign">*</span>负责人
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.creatorTime" <JnpfInput v-model="dataForm.fRealName"
@change="changeData('classplanteam-creatorTime',scope.$index)" @change="changeData('classplanteam-creatorTime',scope.$index)" disabled
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<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>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark"> <el-table-column label="备注" prop="remark">
<template slot="header" v-if="false"> <template slot="header" v-if="false">
<span class="required-sign">*</span>备注 <span class="required-sign">*</span>备注
@ -467,6 +479,17 @@ export default {
this.visible = false this.visible = false
this.$emit('refreshDataList', true) this.$emit('refreshDataList', true)
}, },
changeDataTimeList(model, row) {
this.dataForm.startTime = row.start_time
this.dataForm.endTime = row.end_time
},
changeDataList(model, row) {
this.dataForm.fRealName = row.f_real_name
this.dataForm.types = row.types
this.dataForm.fCreatorTime = row.f_creator_time
this.dataForm.fMobilePhone = row.f_mobile_phone
},
changeData(model, index) { changeData(model, index) {
this.isEdit = false this.isEdit = false
this.childIndex = index this.childIndex = index

39
jnpf-java-boot/jnpf-web/src/views/scm/classteam/form.vue
Unescape View File

@ -189,15 +189,46 @@
<template slot="header" v-if="false"> <template slot="header" v-if="false">
<span class="required-sign">*</span>员工姓名 <span class="required-sign">*</span>员工姓名
</template> </template>
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<JnpfUserSelect v-model="scope.row.belongUserId" <JnpfUserSelect v-model="scope.row.belongUserId"
@change="changeData('classteamuse-belongUserId',scope.$index)" @change="changeData('classteamuse-belongUserId',scope.$index)"
placeholder="请选择" selectType="all"
:ableIds="ableAll.classteamusebelongUserIdableIds" clearable
:style='{"width":"100%"}'>
</JnpfUserSelect>
</template> -->
<template slot-scope="scope">
<JnpfUserSelect v-model="scope.row.belongUserId" @change="changeDataList"
placeholder="请选择" selectType="all" placeholder="请选择" selectType="all"
:ableIds="ableAll.classteamusebelongUserIdableIds" clearable :ableIds="ableAll.classteamusebelongUserIdableIds" clearable
:style='{"width":"100%"}'> :style='{"width":"100%"}'>
</JnpfUserSelect> </JnpfUserSelect>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机" prop="mobilePhone">
<template slot="header">
<span class="required-sign">*</span>手机
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.mobilePhone" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="组织部门" prop="organize">
<template slot="header">
<span class="required-sign">*</span>组织部门
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.organize" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50"> <el-table-column label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" <el-button size="mini" type="text" class="JNPF-table-delBtn"
@ -428,6 +459,12 @@ export default {
this.visible = false this.visible = false
this.$emit('refreshDataList', true) this.$emit('refreshDataList', true)
}, },
changeDataList(model, row) {
this.dataForm.mobilePhone = row.mobilePhone
this.dataForm.organize = row.organize
debugger
},
changeData(model, index) { changeData(model, index) {
this.isEdit = false this.isEdit = false
this.childIndex = index this.childIndex = index

109
jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
Unescape View File

@ -136,8 +136,7 @@
v-if="judgeRequired('workorderproductList-productId')">*</span>商品名称 v-if="judgeRequired('workorderproductList-productId')">*</span>商品名称
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" <JnpfPopupSelect v-model="scope.row.productId" @change="changeDataProductList"
@change="changeData('workorderproduct-productId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm" :rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderproductproductId" placeholder="请选择" :templateJson="interfaceRes.workorderproductproductId" placeholder="请选择"
:disabled="judgeWrite('workorderproductList')||judgeWrite('workorderproductList-productId')" :disabled="judgeWrite('workorderproductList')||judgeWrite('workorderproductList-productId')"
@ -149,6 +148,50 @@
</JnpfPopupSelect> </JnpfPopupSelect>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="存货类型" prop="creatorUserId">
<template slot="header">
<span class="required-sign">*</span>存货类型
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.productTypeIds" placeholder="请输入" disabled
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" prop="creatorUserId">
<template slot="header">
<span class="required-sign">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.spec" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位" prop="lastModifyUserId">
<template slot="header">
<span class="required-sign">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="条码" prop="deleteUserId">
<template slot="header">
<span class="required-sign">*</span>条码
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.barCode" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')" <el-table-column label="加工单位" v-if="judgeShow('workorderproduct-unitId')"
prop="unitId"> prop="unitId">
<template slot="header"> <template slot="header">
@ -258,14 +301,14 @@
</div> --> </div> -->
<el-table :data="dataForm.workOrderPrimaryList" size='mini'> <el-table :data="dataForm.workOrderPrimaryList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="商品id" v-if="judgeShow('workorderprimary-productId')" <el-table-column label="商品名称" v-if="judgeShow('workorderprimary-productId')"
prop="productId"> prop="productId">
<template slot="header"> <template slot="header">
<span class="required-sign" <span class="required-sign"
v-if="judgeRequired('workorderprimaryList-productId')">*</span>商品id v-if="judgeRequired('workorderprimaryList-productId')">*</span>商品名称
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfPopupSelect v-model="dataForm.productId" @change="changeProductIdData" <JnpfPopupSelect v-model="dataForm.productId" @change="changeDataProductList"
:rowIndex="scope.$index" :formData="dataForm" :rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择" :templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
@ -275,6 +318,49 @@
:style='{"width":"100%"}'> :style='{"width":"100%"}'>
</JnpfPopupSelect> </JnpfPopupSelect>
</template> </template>
</el-table-column>
<el-table-column label="存货类型" prop="creatorUserId">
<template slot="header">
<span class="required-sign">*</span>存货类型
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.productTypeIds" placeholder="请输入" disabled
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" prop="creatorUserId">
<template slot="header">
<span class="required-sign">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.spec" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位" prop="lastModifyUserId">
<template slot="header">
<span class="required-sign">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.inventoryUnitIds" placeholder="请输入" disabled
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="条码" prop="deleteUserId">
<template slot="header">
<span class="required-sign">*</span>条码
</template>
<template slot-scope="scope">
<JnpfInput v-model="dataForm.barCode" placeholder="请输入" disabled clearable
:style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" <JnpfPopupSelect v-model="scope.row.productId"
@ -290,7 +376,7 @@
</JnpfPopupSelect> </JnpfPopupSelect>
</template> </template>
--> -->
</el-table-column>
<el-table-column label="理论发料量" v-if="judgeShow('workorderprimary-theoryNum')" <el-table-column label="理论发料量" v-if="judgeShow('workorderprimary-theoryNum')"
prop="theoryNum"> prop="theoryNum">
<template slot="header"> <template slot="header">
@ -541,8 +627,15 @@ export default {
}, },
mounted() { }, mounted() { },
methods: { methods: {
changeProductIdData(model, row) { changeDataProductList(model, row) {
debugger debugger
this.dataForm.spec = row.spec
this.dataForm.inventoryType = row.inventory_types
this.dataForm.inventoryUnitIds = row.inventory_unit_ids
this.dataForm.salesMainUnitIds = row.sales_main_unit_ids
this.dataForm.barCode = row.bar_code
this.dataForm.operateUnitIds = row.operate_unit_ids
this.dataForm.productTypeIds = row.product_type_ids
}, },
changeData(model, index) { changeData(model, index) {
@ -685,7 +778,7 @@ export default {
const e = this.dataForm.workOrderPrimaryList[i]; const e = this.dataForm.workOrderPrimaryList[i];
if (!e.productId) { if (!e.productId) {
this.$message({ this.$message({
message: '商品id不能为空', message: '商品名称不能为空',
type: 'error', type: 'error',
duration: 1000 duration: 1000
}); });

Write Preview
Loading…
Cancel
Save