修改费用单和飞书问题303,304

jg-waiwang-pro
CJYXTX\27961 7 months ago
parent 9ecad9a265
commit 81ac7cd98a

@ -224,12 +224,36 @@ public class CwCostServiceImpl extends ServiceImpl<CwCostMapper, CwCostEntity> i
});
}
if(ObjectUtil.isNotEmpty(cwCostPagination.getType())){
cwCostNum++;
cwCostQueryWrapper.lambda().eq(CwCostEntity::getType,cwCostPagination.getType());
}
if(ObjectUtil.isNotEmpty(cwCostPagination.getCostType())){
cwCostNum++;
List<String> idList = new ArrayList<>();
try {
String[][] costType = JsonUtil.getJsonToBean(cwCostPagination.getCostType(),String[][].class);
for(int i=0;i<costType.length;i++){
if(costType[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(costType[i])));
}
}
}catch (Exception e1){
try {
List<String> costType = JsonUtil.getJsonToList(cwCostPagination.getCostType(),String.class);
if(costType.size()>0){
idList.addAll(costType);
}
}catch (Exception e2){
idList.add(String.valueOf(cwCostPagination.getCostType()));
}
}
cwCostQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(CwCostEntity::getCostType, tt).or();
});
});
}
}

@ -95,8 +95,12 @@ public class BusinessLineController {
List<BusinessLineEntity> list = businessLineService.list();
List<BusinessLineEntity> workTreeList =new ArrayList<>();
for (BusinessLineEntity businessLineEntity:list){
if (businessLineEntity.getDiffFlag().equals("3")||businessLineEntity.getDiffFlag().equals("5")){
workTreeList.add(businessLineEntity);
if (businessLineEntity.getDiffFlag().equals("2")||businessLineEntity.getDiffFlag().equals("5")){
if (businessLineEntity.getDiffFlag().equals("2")&& businessLineEntity.getType().equals("1")){
//type1是仓库 2是工厂
}else{
workTreeList.add(businessLineEntity);
}
}
}
List<BusinessLineModel> models = JsonUtil.getJsonToList(workTreeList, BusinessLineModel.class);

@ -19,6 +19,8 @@ public class CwCostEntity {
private String id;
@TableField(value = "INSTITUTION_ID" , updateStrategy = FieldStrategy.IGNORED)
private String institutionId;
@TableField(value = "COST_TYPE" , updateStrategy = FieldStrategy.IGNORED)
private String costType;
@TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED)
private String code;
@TableField(value = "SUBJECT_ID" , updateStrategy = FieldStrategy.IGNORED)

@ -29,6 +29,9 @@ public class CwCostForm {
/** 费用归属 **/
@JsonProperty("institutionId")
private Object institutionId;
/** 费用单类型 **/
@JsonProperty("costType")
private Object costType;
/** 往来单位 **/
@JsonProperty("subjectId")
private String subjectId;

@ -42,4 +42,7 @@ public class CwCostPagination extends Pagination {
/** 收付类型 */
@JsonProperty("type")
private Object type;
/** 费用单类型 */
@JsonProperty("costType")
private Object costType;
}

@ -161,7 +161,7 @@ export default {
exportBoxVisible: false,
treeData: [],
treeActiveId: '',
diffFlag: '3',
diffFlag: '2',
typeOptions: [],
typeProps: { "label": "fullName", "value": "id" },
parentIdOptions: [],

@ -17,8 +17,9 @@ div -1
</el-col>
<el-col :span="8" v-if="judgeShow('code')">
<jnpf-form-tip-item label="生产线编号" v-if="judgeShow('code')" prop="code">
<JnpfInput v-model="dataForm.code" @change="changeData('code', -1)" placeholder="系统自动生成"
:disabled="judgeWrite('code')" readonly :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.code" @change="changeData('code', -1)"
placeholder="系统自动生成" :disabled="judgeWrite('code')" readonly
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -31,48 +32,50 @@ div -1
</el-col>
<el-col :span="8" v-if="judgeShow('simpleName')">
<jnpf-form-tip-item label=" 简称/英文名" v-if="judgeShow('simpleName')" prop="simpleName">
<JnpfInput v-model="dataForm.simpleName" @change="changeData('simpleName', -1)" placeholder="请输入"
:disabled="judgeWrite('simpleName')" clearable :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.simpleName" @change="changeData('simpleName', -1)"
placeholder="请输入" :disabled="judgeWrite('simpleName')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('type')">
<jnpf-form-tip-item label="类型" v-if="judgeShow('type')" prop="type">
<JnpfSelect v-model="dataForm.type" @change="changeData('type', -1)" placeholder="请选择"
:disabled="judgeWrite('type')" clearable :style='{ "width": "100%" }' :options="typeOptions"
:props="typeProps">
:disabled="judgeWrite('type')" clearable :style='{ "width": "100%" }'
:options="typeOptions" :props="typeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('parentId')">
<jnpf-form-tip-item label="所属工厂" v-if="judgeShow('parentId')" prop="parentId">
<JnpfSelect v-model="dataForm.parentId" @change="changeData('parentId', -1)" placeholder="请选择"
:disabled="judgeWrite('parentId')" clearable :style='{ "width": "100%" }' :options="parentIdOptions"
:props="parentIdProps">
<JnpfSelect v-model="dataForm.parentId" @change="changeData('parentId', -1)"
placeholder="请选择" :disabled="judgeWrite('parentId')" clearable
:style='{ "width": "100%" }' :options="parentIdOptions" :props="parentIdProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('workshopId')">
<jnpf-form-tip-item label="所属车间" v-if="judgeShow('workshopId')" prop="workshopId">
<JnpfSelect v-model="dataForm.workshopId" @change="changeData('workshopId', -1)" placeholder="请选择"
:disabled="judgeWrite('workshopId')" clearable :style='{ "width": "100%" }' :options="workshopIdOptions"
:props="workshopIdProps">
<JnpfSelect v-model="dataForm.workshopId" @change="changeData('workshopId', -1)"
placeholder="请选择" :disabled="judgeWrite('workshopId')" clearable
:style='{ "width": "100%" }' :options="workshopIdOptions" :props="workshopIdProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('status')">
<jnpf-form-tip-item label="状态" v-if="judgeShow('status')" prop="status">
<JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)" :disabled="judgeWrite('status')"
optionType="button" direction="horizontal" :style='{ "width": "100%" }' size="large"
:options="statusOptions" :props="statusProps">
<JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)"
:disabled="judgeWrite('status')" optionType="button" direction="horizontal"
:style='{ "width": "100%" }' size="large" :options="statusOptions"
:props="statusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('description')">
<jnpf-form-tip-item label="描述" v-if="judgeShow('description')" prop="description">
<JnpfTextarea v-model="dataForm.description" @change="changeData('description', -1)" placeholder="请输入"
:disabled="judgeWrite('description')" clearable :style='{ "width": "100%" }'
:autosize='{ "minRows": 4, "maxRows": 4 }'>
<JnpfTextarea v-model="dataForm.description" @change="changeData('description', -1)"
placeholder="请输入" :disabled="judgeWrite('description')" clearable
:style='{ "width": "100%" }' :autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
@ -89,15 +92,19 @@ div -1
</div>
<el-table :data="dataForm.businessContactList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="类型" v-if="judgeShow('businesscontact1-contactType')" prop="contactType">
<el-table-column label="类型" v-if="judgeShow('businesscontact1-contactType')"
prop="contactType">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('businesscontactList-contactType')">*</span>
<span class="required-sign"
v-if="judgeRequired('businesscontactList-contactType')">*</span>类型
</template>
<template slot-scope="scope">
<JnpfSelect v-model="scope.row.contactType"
@change="changeData('businesscontact1-contactType', scope.$index)" placeholder="请选择"
@change="changeData('businesscontact1-contactType', scope.$index)"
placeholder="请选择"
:disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-contactType')"
clearable :style='{ "width": "100%" }' :options="businesscontact1contactTypeOptions"
clearable :style='{ "width": "100%" }'
:options="businesscontact1contactTypeOptions"
:props="businesscontact1contactTypeProps">
</JnpfSelect>
</template>
@ -115,38 +122,45 @@ div -1
</template>
</el-table-column> -->
<el-table-column label="姓名" v-if="judgeShow('businesscontact1-name')" prop="name" align="center">
<el-table-column label="姓名" v-if="judgeShow('businesscontact1-name')" prop="name"
align="center">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('businesscontact1-name')">*</span>
<span class="required-sign"
v-if="judgeRequired('businesscontact1-name')">*</span>姓名
</template>
<template slot-scope="scope">
<JnpfUserSelect v-model="scope.row.name" @change="changeData('businesscontact1-name', scope.$index)"
placeholder="请选择" selectType="all" :ableIds="ableAll.businesscontact1nameableIds" clearable
<JnpfUserSelect v-model="scope.row.name"
@change="changeData('businesscontact1-name', scope.$index)" placeholder="请选择"
selectType="all" :ableIds="ableAll.businesscontact1nameableIds" clearable
:style='{ "width": "100%" }'>
</JnpfUserSelect>
</template>
</el-table-column>
<el-table-column label="手机号" v-if="judgeShow('businesscontact1-phone')" prop="phone">
<el-table-column label="手机号" v-if="judgeShow('businesscontact1-phone')"
prop="phone">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('businesscontactList-phone')">*</span>
<span class="required-sign"
v-if="judgeRequired('businesscontactList-phone')">*</span>手机号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.phone" @change="changeData('businesscontact1-phone', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-phone')" clearable
:style='{ "width": "100%" }'>
<JnpfInput v-model="scope.row.phone"
@change="changeData('businesscontact1-phone', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-phone')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="座机" v-if="judgeShow('businesscontact1-landline')" prop="landline">
<el-table-column label="座机" v-if="judgeShow('businesscontact1-landline')"
prop="landline">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('businesscontactList-landline')">*</span>
<span class="required-sign"
v-if="judgeRequired('businesscontactList-landline')">*</span>座机
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.landline"
@change="changeData('businesscontact1-landline', scope.$index)" placeholder="请输入"
@change="changeData('businesscontact1-landline', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-landline')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
@ -154,25 +168,27 @@ div -1
</el-table-column>
<el-table-column label="邮箱" v-if="judgeShow('businesscontact1-email')" prop="email">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('businesscontactList-email')">*</span>
<span class="required-sign"
v-if="judgeRequired('businesscontactList-email')">*</span>邮箱
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.email" @change="changeData('businesscontact1-email', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-email')" clearable
:style='{ "width": "100%" }'>
<JnpfInput v-model="scope.row.email"
@change="changeData('businesscontact1-email', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-email')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="传真" v-if="judgeShow('businesscontact1-fax')" prop="fax">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('businesscontactList-fax')">*</span>
<span class="required-sign"
v-if="judgeRequired('businesscontactList-fax')">*</span>传真
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.fax" @change="changeData('businesscontact1-fax', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-fax')" clearable
:style='{ "width": "100%" }'>
<JnpfInput v-model="scope.row.fax"
@change="changeData('businesscontact1-fax', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('businesscontactList') || judgeWrite('businesscontactList-fax')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
@ -189,15 +205,17 @@ div -1
</template>
</el-table-column> -->
<el-table-column label="更新时间" v-if="judgeShow('businesscontact1-lastModifyTime')" prop="lastModifyTime">
<el-table-column label="更新时间" v-if="judgeShow('businesscontact1-lastModifyTime')"
prop="lastModifyTime">
<template slot="header">
<span class="required-sign" v-if="judgeRequired('businesscontact1-lastModifyTime')">*</span>
<span class="required-sign"
v-if="judgeRequired('businesscontact1-lastModifyTime')">*</span>更新时间
</template>
<template slot-scope="scope">
<JnpfDatePicker v-model="scope.row.lastModifyTime"
@change="changeData('businesscontact1-lastModifyTime', scope.$index)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择"
:startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('businesscontact1List') || judgeWrite('businesscontact1-lastModifyTime')"
clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
@ -211,15 +229,16 @@ div -1
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addbusinesscontact1List()" v-if="!judgeWrite('businesscontactList')">
<div class="table-actions" @click="addbusinesscontact1List()"
v-if="!judgeWrite('businesscontactList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
<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-form>
</el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -185,7 +185,7 @@
</el-table-column>
<el-table-column label="商品分类"
v-if="judgeShow('warehousinginventoryproduct-categoryName')" prop="categoryName"
v-if="judgeShow('warehousinginventoryproduct-categoryName')" prop="productTypeIds"
align="center" width="220">
<template slot="header">
@ -194,7 +194,7 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.categoryName"
<JnpfInput v-model="scope.row.productTypeIds"
@change="changeData('warehousinginventoryproduct-categoryName', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-categoryName')"
@ -214,45 +214,49 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryNumber"
@change="changeData('warehousinginventoryproduct-firmOfferQuantity', scope.$index)"
placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
@change="grossWeightChange(scope.$index)" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<!-- <el-table-column label="品牌"
v-if="judgeShow('warehousinginventoryproduct-brandName')" prop="brandName"
align="center" width="220">
<el-table-column label="实盘数量"
v-if="judgeShow('warehousinginventoryproduct-firmOfferQuantity')"
prop="firmOfferQuantity" align="center" width="220">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-brandName')">*</span>品牌
v-if="judgeRequired('warehousinginventoryproductList-firmOfferQuantity')">*</span>实盘数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.brandName"
@change="changeData('warehousinginventoryproduct-brandName', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-brandName')"
<JnpfInput v-model="scope.row.firmOfferQuantity"
@input="grossWeightChange(scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-firmOfferQuantity')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
<!-- <JnpfInput v-model="scope.row.firmOfferQuantity"
@change="grossWeightChange(scope.$index)" placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-firmOfferQuantity')"
clearable :style='{ "width": "100%" }'>
</JnpfInput> -->
</template>
</el-table-column> -->
</el-table-column>
<el-table-column label="实盘数量"
v-if="judgeShow('warehousinginventoryproduct-firmOfferQuantity')"
prop="firmOfferQuantity" align="center" width="220">
<el-table-column label="盈亏数量"
v-if="judgeShow('warehousinginventoryproduct-profitAndLossQuantity')"
prop="profitAndLossQuantity" align="center" width="220">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousinginventoryproductList-firmOfferQuantity')">*</span>实盘数量
v-if="judgeRequired('warehousinginventoryproductList-profitAndLossQuantity')">*</span>盈亏数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.firmOfferQuantity"
@change="changeData('warehousinginventoryproduct-firmOfferQuantity', scope.$index)"
<JnpfInput v-model="scope.row.profitAndLossQuantity"
@change="changeData('warehousinginventoryproduct-profitAndLossQuantity', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-firmOfferQuantity')"
:disabled="judgeWrite('warehousinginventoryproductList') || judgeWrite('warehousinginventoryproductList-profitAndLossQuantity')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
@ -404,6 +408,7 @@ export default {
dateManufacture: '',
productIdOptions: [],
firmOfferQuantity: '',
profitAndLossQuantity: '',
firmOfferQuantityOptions: [],
enabledmark: undefined
},
@ -516,6 +521,9 @@ export default {
},
mounted() { },
methods: {
grossWeightChange(index) {
this.dataForm.warehousingInventoryProductList[index].profitAndLossQuantity = this.jnpf.floatSub(this.dataForm.warehousingInventoryProductList[index].inventoryNumber, this.dataForm.warehousingInventoryProductList[index].firmOfferQuantity)
},
productBatch(model, row) {
row.productId = row.id
@ -556,7 +564,8 @@ export default {
productTypeIds: e.productTypeId,
inventoryNumber: e.inventoryNumber,
batchNumber: e.batchNumber,
creatorTime: e.creatorTime,
dateManufacture: e.creatorTime,
productTypeIds: e.productTypeIds,
}
this.dataForm.warehousingInventoryProductList.push(item)
}
@ -679,6 +688,7 @@ export default {
let item = {
productId: '',
firmOfferQuantity: undefined,
profitAndLossQuantity: undefined,
cargoId: '',
}
this.getwarehousinginventoryproductList(item)

Loading…
Cancel
Save