问题修改

jg-waiwang-pro
XI_TENG\xixi_ 5 months ago
parent 39da9d76e8
commit 4afb7e1ba0

@ -42,10 +42,7 @@
AND t4.f_real_name LIKE concat('%',#{classPlanPagination.fRealName},'%')
</if>
<!-- <if test="classPlanPagination.startTime != null and classPlanPagination.endTime != null ">-->
<!--&#45;&#45; AND t1.start_time &gt; #{classPlanPagination.startTime[0]} AND t1.create_time &lt;= #{classPlanPagination.startTime[1]}-->
<!-- AND t1.start_time between #{classPlanPagination.startTime} and #{classPlanPagination.endTime}-->
<!-- </if>-->
</select>

@ -23,6 +23,8 @@
<result column="grossWeight" property="grossWeight"/>
<result column="creatorUserName" property="creatorUserName"/>
<result column="belongUserName" property="belongUserName"/>
<result column="inspectionType1" property="inspectionType1"/>
<result column="conclusionType1" property="conclusionType1"/>
</resultMap>
<select id="queryWarehousingInspectionList" resultMap="warehousingInspectionMap">
@ -35,7 +37,7 @@
WHEN 2 THEN
'出库质检'
END AS inspectionType,
END AS inspectionType1,
CASE
a.conclusion_type
@ -44,7 +46,7 @@
WHEN 2 THEN
'不合格'
END AS conclusionType,
END AS conclusionType1,
c.NAME AS productName,
c.spec AS spec,

@ -603,6 +603,7 @@ public class ContractLServiceImpl extends ServiceImpl<ContractLMapper, ContractL
entity.setId(mainId);
entity.setFlowId(contractLForm.getFlowId());
entity.setVersion(0);
entity.setCurrency("1"); //币种默认人民币
}else{
entity.setFlowId(contractLForm.getFlowId());
}

@ -117,8 +117,6 @@ public class WarehousingReceiveController {
for (WarehousingReceiveEntity entity : list) {
entity.setReceiveNum(warehousingReceiveService.queryReceiveNumber(entity.getId()));
// QueryWrapper<WorkOrderEntity> workOrderEntityQueryWrapper =new QueryWrapper<>();
// workOrderEntityQueryWrapper.lambda().eq(WorkOrderEntity::getId,entity.getBusinessId());
WorkOrderEntity workOrderEntity = workOrderService.getInfo(entity.getBusinessId());
if (workOrderEntity != null) {
entity.setBusinessWorkOrder(workOrderEntity.getCode());

@ -457,7 +457,11 @@ public class WarehousingReportlossController {
InventoryEntity inventoryEntity = new InventoryEntity();
if(inventoryList != null && inventoryList.size() > 0){
inventoryEntity = inventoryList.get(0);
inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
if(inventoryEntity.getInventoryNumber()!=null){
inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
}else {
inventoryEntity.setInventoryNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber()));//库存数量
}
}else{
inventoryEntity.setProductId(warehousingOutboundProductModel.getProductId());
inventoryEntity.setCode(productWarehouseEntity.getCode());

@ -86,7 +86,10 @@ public class WarehousingInspectionEntity {
@TableField(exist = false)
private String belongUserName;
@TableField(exist = false)
private String inspectionType1;
@TableField(exist = false)
private String conclusionType1;

File diff suppressed because it is too large Load Diff

@ -57,13 +57,15 @@
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
custom-column border @selection-change="handleSelectionChange"
:span-method="arraySpanMethod">
<el-table-column prop="timeName" label="排班计划名称" align="center" fixed="left" sortable>
<el-table-column prop="timeName" label="排班计划名称" align="center" fixed="left" sortable
width="200px">
</el-table-column>
<el-table-column prop="timeCode" label="排班计划编号" align="center" fixed="left" sortable>
<el-table-column prop="timeCode" label="排班计划编号" align="center" fixed="left" sortable
width="200px">
</el-table-column>
<el-table-column prop="startTime" label="有效时间(开始)" align="center">
<el-table-column prop="startTime" label="有效时间(开始)" align="center" width="150px">
</el-table-column>
<el-table-column prop="endTime" label="结束时间(结束)" align="center">
<el-table-column prop="endTime" label="结束时间(结束)" align="center" width="150px">
</el-table-column>
<el-table-column label="单据状态" prop="timeStatus" align="center">
<template slot-scope="scope">
@ -71,11 +73,11 @@
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="添加时间" align="center">
<el-table-column prop="creatorTime" label="添加时间" align="center" width="180px">
</el-table-column>
<el-table-column prop="creatorUserId" label="添加人" align="center">
<el-table-column prop="creatorUserId" label="添加人" align="center" width="150px">
</el-table-column>
<el-table-column prop="lastModifyTime" label="更新时间" align="center">
<el-table-column prop="lastModifyTime" label="更新时间" align="center" width="180px">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center">

@ -90,9 +90,11 @@
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
custom-column border @selection-change="handleSelectionChange"
:span-method="arraySpanMethod">
<el-table-column prop="teamCode" label="班组编号" align="center" fixed="left" sortable>
<el-table-column prop="teamCode" label="班组编号" align="center" fixed="left" sortable
width="200px">
</el-table-column>
<el-table-column prop="teamName" label="班组名称" align="center" fixed="left" sortable>
<el-table-column prop="teamName" label="班组名称" align="center" fixed="left" sortable
width="180px">
</el-table-column>
<el-table-column prop="type" label="类型" align="center">
<template slot-scope="scope">
@ -109,11 +111,11 @@
<el-table-column prop="classTeamUseNum" label="班组成员" align="center">
</el-table-column>
<el-table-column prop="creatorTime" label="添加时间" align="center">
<el-table-column prop="creatorTime" label="添加时间" align="center" width="180px">
</el-table-column>
<el-table-column prop="creatorUserId" label="添加人" align="center">
<el-table-column prop="creatorUserId" label="添加人" align="center" width="150px">
</el-table-column>
<el-table-column prop="lastModifyTime" label="更新时间" align="center">
<el-table-column prop="lastModifyTime" label="更新时间" align="center" width="180px">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center">

@ -55,17 +55,19 @@
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
custom-column border @selection-change="handleSelectionChange"
:span-method="arraySpanMethod">
<el-table-column prop="timeCode" label="班次编号" align="center" sortable fixed="left">
<el-table-column prop="timeCode" label="班次编号" align="center" sortable fixed="left"
width="200px">
</el-table-column>
<el-table-column prop="timeName" label="班次名称" align="center" sortable fixed="left">
<el-table-column prop="timeName" label="班次名称" align="center" sortable fixed="left"
width="180px">
</el-table-column>
<el-table-column prop="timeNm" label="班次简称" align="center" sortable>
<el-table-column prop="timeNm" label="班次简称" align="center">
</el-table-column>
<el-table-column prop="startTime" label="开始时间" align="center" sortable>
<el-table-column prop="startTime" label="开始时间" align="center">
</el-table-column>
<el-table-column prop="endTime" label="结束时间" align="center" sortable>
<el-table-column prop="endTime" label="结束时间" align="center">
</el-table-column>
<el-table-column label="状态" prop="timeStatus" align="center">
@ -74,11 +76,11 @@
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="添加时间" align="center">
<el-table-column prop="creatorTime" label="添加时间" align="center" width="180px">
</el-table-column>
<el-table-column prop="creatorUserId" label="添加人" align="center">
<el-table-column prop="creatorUserId" label="添加人" align="center" width="150px">
</el-table-column>
<el-table-column prop="lastModifyTime" label="更新时间" align="center">
<el-table-column prop="lastModifyTime" label="更新时间" align="center" width="180px">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center">

@ -1,8 +1,8 @@
<template>
<div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px" label-position="right"
:disabled="setting.readonly">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
label-position="right" :disabled="setting.readonly">
<template v-if="!loading && formOperates">
<!-- 具体表单 -->
<el-col :span="24">
@ -12,7 +12,7 @@
</div>
</el-col>
<el-col :span="8" v-if="judgeShow('name')">
<jnpf-form-tip-item label="登录账号" v-if="judgeShow('name')" prop="name">
<jnpf-form-tip-item label="登录账号(司机名称)" v-if="judgeShow('name')" prop="name">
<JnpfInput v-model="dataForm.name" @change="changeData('name', -1)" placeholder="请输入"
:disabled="judgeWrite('name')" clearable :style='{ "width": "100%" }'>
</JnpfInput>
@ -20,32 +20,36 @@
</el-col>
<el-col :span="8" v-if="judgeShow('mobile')">
<jnpf-form-tip-item label="手机号码" v-if="judgeShow('mobile')" prop="mobile">
<JnpfInput v-model="dataForm.mobile" @change="changeData('mobile', -1)" placeholder="请输入"
:disabled="judgeWrite('mobile')" clearable :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.mobile" @change="changeData('mobile', -1)"
placeholder="请输入" :disabled="judgeWrite('mobile')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('wechat')">
<jnpf-form-tip-item label="微信账号" v-if="judgeShow('wechat')" prop="wechat">
<JnpfInput v-model="dataForm.wechat" @change="changeData('wechat', -1)" placeholder="请输入"
:disabled="judgeWrite('wechat')" clearable :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.wechat" @change="changeData('wechat', -1)"
placeholder="请输入" :disabled="judgeWrite('wechat')" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('brithdayTime')">
<jnpf-form-tip-item label="出生日期" v-if="judgeShow('brithdayTime')" prop="brithdayTime">
<JnpfDatePicker v-model="dataForm.brithdayTime" @change="changeData('brithdayTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('brithdayTime')" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
<JnpfDatePicker v-model="dataForm.brithdayTime"
@change="changeData('brithdayTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
:disabled="judgeWrite('brithdayTime')" clearable :style='{ "width": "100%" }'
type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('sex')">
<jnpf-form-tip-item label="性别" v-if="judgeShow('sex')" prop="sex">
<JnpfRadio v-model="dataForm.sex" @change="changeData('sex', -1)" :disabled="judgeWrite('sex')"
optionType="default" direction="horizontal" size="small" :options="sexOptions" :props="sexProps">
<JnpfRadio v-model="dataForm.sex" @change="changeData('sex', -1)"
:disabled="judgeWrite('sex')" optionType="default" direction="horizontal"
size="small" :options="sexOptions" :props="sexProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
@ -62,19 +66,22 @@
</div>
<el-table :data="dataForm.driverVehicleList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="车牌号" v-if="judgeShow('drivervehicle-vehicleId')" prop="vehicleId">
<el-table-column label="车牌号" v-if="judgeShow('drivervehicle-vehicleId')"
prop="vehicleId">
<template slot="header">
<span class="required-sign"></span>车牌号
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.vehicleId"
@change="changeData('drivervehicle-vehicleId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.drivervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('drivervehicleList') || judgeWrite('drivervehicleList-vehicleId')" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='vehicle_number' :field="'vehicleId' + scope.$index"
interfaceId="531489245886438725" :pageSize="20"
:columnOptions="drivervehiclevehicleIdcolumnOptions" clearable :style='{ "width": "100%" }'>
@change="changeData('drivervehicle-vehicleId', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.drivervehiclevehicleId" placeholder="请选择"
:disabled="judgeWrite('drivervehicleList') || judgeWrite('drivervehicleList-vehicleId')"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='vehicle_number'
:field="'vehicleId' + scope.$index" interfaceId="531489245886438725"
:pageSize="20" :columnOptions="drivervehiclevehicleIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
@ -92,13 +99,14 @@
</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" />
<VehicleGoodsBox v-if="VehicleGoodsBoxVisible" ref="VehicleGoodsBox" @refreshDataList="initList" />
<VehicleGoodsBox v-if="VehicleGoodsBoxVisible" ref="VehicleGoodsBox"
@refreshDataList="initList" />
</div>
</template>

@ -65,11 +65,14 @@
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" has-c custom-column border>
<el-table-column prop="code" label="编号" align="center" sortable fixed="left">
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
border>
<el-table-column prop="code" label="编号" align="center" sortable fixed="left"
width="200px">
</el-table-column>
<el-table-column prop="name" label="名称" align="center" sortable fixed="left">
<el-table-column prop="name" label="名称" align="center" sortable fixed="left"
width="180px">
</el-table-column>
<el-table-column prop="monthTime" label="隶属月份" align="center">
</el-table-column>
@ -80,13 +83,13 @@
</el-table-column>
<el-table-column prop="cost" label="费用信息" align="center">
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" align="center">
<el-table-column prop="creatorTime" label="创建时间" align="center" width="180px">
</el-table-column>
<el-table-column prop="creatorUserId" label="创建人" align="center">
<el-table-column prop="creatorUserId" label="创建人" align="center" width="150px">
</el-table-column>
<el-table-column prop="lastModifyTime" label="更新时间" align="center">
<el-table-column prop="lastModifyTime" label="更新时间" align="center" width="180px">
</el-table-column>
<el-table-column prop="lastModifyUserId" label="更新人" align="center">
<el-table-column prop="lastModifyUserId" label="更新人" align="center" width="150px">
</el-table-column>
<el-table-column prop="flowState" label="状态" width="100" align="center">

@ -871,7 +871,7 @@ export default {
documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
documentTypeProps: { "label": "fullName", "value": "id" },
voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "driverName" }, { "label": "电话", "value": "mobile" },],
enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
firstSubjectBasicIdcolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
@ -983,7 +983,7 @@ export default {
this.dataForm.voucherVehicleList = []
let item = {
vehicleId: val2.id,
driverName: val2.name,
driverName: val2.driverName,
telephone: val2.mobile,
carrier: val2.carrier
}

@ -884,7 +884,7 @@ export default {
documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
documentTypeProps: { "label": "fullName", "value": "id" },
voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "driverName" }, { "label": "电话", "value": "mobile" },],
enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
firstSubjectBasicIdcolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
@ -1018,7 +1018,7 @@ export default {
this.dataForm.voucherVehicleList = []
let item = {
vehicleId: val2.id,
driverName: val2.name,
driverName: val2.driverName,
telephone: val2.mobile,
carrier: val2.carrier
}

@ -831,7 +831,7 @@ export default {
documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
documentTypeProps: { "label": "fullName", "value": "id" },
voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "driverName" }, { "label": "电话", "value": "mobile" },],
enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
firstSubjectBasicIdcolumnOptions: [{ "label": "客户名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
@ -911,7 +911,7 @@ export default {
this.dataForm.voucherVehicleList = []
let item = {
vehicleId: val2.id,
driverName: val2.name,
driverName: val2.driverName,
telephone: val2.mobile,
carrier: val2.carrier
}

@ -824,7 +824,7 @@ export default {
documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
documentTypeProps: { "label": "fullName", "value": "id" },
voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "driverName": "name" }, { "label": "电话", "value": "mobile" },],
enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
firstSubjectBasicIdcolumnOptions: [{ "label": "客户名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
@ -902,7 +902,7 @@ export default {
this.dataForm.voucherVehicleList = []
let item = {
vehicleId: val2.id,
driverName: val2.name,
driverName: val2.driverName,
telephone: val2.mobile,
carrier: val2.carrier
}

@ -81,15 +81,18 @@
<el-table-column prop="inspectionCode" label="质检单编号" align="center" sortable width="200px"
fixed="left">
</el-table-column>
<el-table-column label="质检类型" prop="inspectionType" align="center" sortable width="100px"
<!-- <el-table-column label="质检类型" prop="inspectionType" align="center" sortable width="100px"
fixed="left">
<template slot-scope="scope">
{{ scope.row.inspectionType }}
</template>
</el-table-column> -->
<el-table-column prop="inspectionType1" label="质检类型" align="center" fixed="left">
</el-table-column>
<el-table-column prop="conclusionType" label="质检结论" align="center" fixed="left">
<el-table-column prop="conclusionType1" label="质检结论" align="center" fixed="left">
</el-table-column>
<el-table-column prop="businessVoucher" label="关联单据" align="center" width="200px">
</el-table-column>
<!-- <el-table-column prop="inspectionType" label="质检类型" align="left">

@ -86,12 +86,20 @@
<el-table-column prop="carrier" label="承运商" align="center" width="150">
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
<el-table-column prop="creatorTime" label="创建时间" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.creatorTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="创建用户" align="center" width="150">
</el-table-column>
<el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
<el-table-column prop="lastModifyTime" label="修改时间" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.lastModifyTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column prop="lastUserName" label="修改用户" align="center" width="150">
</el-table-column>
@ -116,8 +124,8 @@
</el-button> -->
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
<el-button size="mini" type="text" v-has="'btn-warehousing'"
@click="addwarehousing(scope.row)">入库</el-button>
<el-button v-if="scope.row.warehousingStatus != 4" size="mini" type="text"
v-has="'btn-warehousing'" @click="addwarehousing(scope.row)">入库</el-button>
</template>
</el-table-column>
</JNPF-table>

@ -121,8 +121,8 @@
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
</el-button>
<el-button size="mini" type="text" v-has="'btn-warehousing'"
@click="addwarehousing(scope.row)">出库
<el-button v-if="scope.row.warehousingStatus != 4" size="mini" type="text"
v-has="'btn-warehousing'" @click="addwarehousing(scope.row)">出库
</el-button>
<!-- <el-button type="text" icon="icon-ym icon-ym-btn-add" v-has="'btn-warehousingsale'"
@click="addOrUpdateHandle()">出库

Loading…
Cancel
Save