Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue
jg-waiwang-pro
胡川虎 5 months ago
commit cdc850efcf

@ -717,7 +717,12 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
queryWrapper.isNull("a.f_delete_mark"); queryWrapper.isNull("a.f_delete_mark");
queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
queryWrapper.like("a.organize_json_id",organize); queryWrapper.like("a.organize_json_id",organize);
// queryWrapper.orderByDesc("a.f_creator_time"); // 排序
queryWrapper.eq("a.delivery_type","1"); //取仓配的凭证
queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize()); Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper); IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper);
return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal()); return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal());

@ -125,7 +125,6 @@ public class BusinessLine1Controller {
List<BusinessContact1Entity> businessContact1List = businessLine1Service.getBusinessContact1List(entity.getId(),businessLine1Pagination); List<BusinessContact1Entity> businessContact1List = businessLine1Service.getBusinessContact1List(entity.getId(),businessLine1Pagination);
businessLine1Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List))); businessLine1Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List)));
realList.add(businessLine1Map); realList.add(businessLine1Map);
}else {
} }
} }
} }

@ -699,8 +699,7 @@ public class WarehousingNotificationController {
QueryWrapper<WarehousingProductEntity> warehousingProductEntityQueryWrapper=new QueryWrapper<>(); QueryWrapper<WarehousingProductEntity> warehousingProductEntityQueryWrapper=new QueryWrapper<>();
warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id); warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id);
warehousingProductEntityQueryWrapper.like("organize_json_id",organize); warehousingProductEntityQueryWrapper.like("organize_json_id",organize);
warehousingProductEntityQueryWrapper.like("delivery_type","1"); //取仓配的凭证 //
warehousingProductEntityQueryWrapper.like("document_type",voucherPagination.getDocumentType());
List<WarehousingProductEntity> warehousingProductEntityList = warehousingProductService.list(warehousingProductEntityQueryWrapper); List<WarehousingProductEntity> warehousingProductEntityList = warehousingProductService.list(warehousingProductEntityQueryWrapper);
List<VoucherEntity> list=new ArrayList<>(); List<VoucherEntity> list=new ArrayList<>();

@ -5,13 +5,8 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="联系人类型"> <el-form-item label="联系人类型">
<JnpfSelect <JnpfSelect v-model="query.contactsType" placeholder="请选择" clearable
v-model="query.contactsType" :options="contactsTypeOptions" :props="contactsTypeProps">
placeholder="请选择"
clearable
:options="contactsTypeOptions"
:props="contactsTypeProps"
>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -23,12 +18,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()" <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
>查询</el-button <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -36,188 +27,83 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
type="primary" @click="addOrUpdateHandle()">新增
icon="icon-ym icon-ym-btn-add"
v-has="'btn_add'"
@click="addOrUpdateHandle()"
>新增
</el-button> </el-button>
<el-button <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
type="text" v-has="'btn_download'">导出
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
v-has="'btn_download'"
>导出
</el-button> </el-button>
<el-button <!-- <el-button
type="text" type="text"
icon="icon-ym icon-ym-btn-clearn" icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'" v-has="'btn_batchRemove'"
>批量删除 >批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
icon="icon-ym icon-ym-filter JNPF-common-head-icon" @click="openSuperQuery()" />
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
effect="dark" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
:content="$t('common.refresh')" @click="initData()" />
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table <JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
v-loading="listLoading" @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
:data="list" custom-column>
@sort-change="sortChange" <el-table-column label="联系人类型" prop="contactsType" width="110" align="center" sortable
has-c fixed="left">
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
custom-column
>
<el-table-column
label="联系人类型"
prop="contactsType"
width="110"
align="center"
sortable
fixed="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.contactsType }} {{ scope.row.contactsType }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="name" label="姓名" width="120" align="center" sortable fixed="left">
prop="name"
label="姓名"
width="120"
align="center"
sortable
fixed="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="subjectBasicId" label="所属供应商" align="center" width="280">
prop="subjectBasicId"
label="所属供应商"
align="center"
width="280"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="position" label="职务" align="center" width="150">
prop="position"
label="职务"
align="center"
width="150"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="companyName" label="公司" align="center" width="280">
prop="companyName"
label="公司"
align="center"
width="280"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="mobile" label="手机" align="center" width="150">
prop="mobile"
label="手机"
align="center"
width="150"
>
</el-table-column> </el-table-column>
<el-table-column prop="phone" label="电话" align="center" width="150"> <el-table-column prop="phone" label="电话" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="emaile" label="邮箱" align="center" width="180">
prop="emaile"
label="邮箱"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="address" label="地址" align="center" width="400">
prop="address"
label="地址"
align="center"
width="400"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="markColor" label="是否星标" align="center" width="80">
prop="markColor"
label="是否星标"
align="center"
width="80"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" fixed="right" width="120">
label="操作"
align="center"
fixed="right"
width="120"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
type="text"
@click="addOrUpdateHandle(scope.row)"
v-has="'btn_edit'"
>编辑
</el-button> </el-button>
<el-button <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
type="text" @click="handleDel(scope.row.id)">删除
class="JNPF-table-delBtn"
v-has="'btn_remove'"
@click="handleDel(scope.row.id)"
>删除
</el-button> </el-button>
<el-button <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
type="text"
v-has="'btn_detail'"
@click="goDetail(scope.row.id)"
>详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination <pagination :total="total" :page.sync="listQuery.currentPage"
:total="total" :limit.sync="listQuery.pageSize" @pagination="initData" />
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
v-if="detailVisible" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
ref="Detail" @close="toFormDetailVisible = false" />
@refresh="detailVisible = false" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
/> @superQuery="superQuery" />
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div> </div>
</template> </template>
@ -484,7 +370,7 @@ export default {
this.initData(); this.initData();
}, },
// //
async initSearchData() {}, async initSearchData() { },
initData() { initData() {
this.listLoading = true; this.listLoading = true;
let _query = { let _query = {
@ -528,7 +414,7 @@ export default {
}); });
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
handelUpload() { handelUpload() {
this.uploadBoxVisible = true; this.uploadBoxVisible = true;
@ -568,7 +454,7 @@ export default {
}); });
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
openSuperQuery() { openSuperQuery() {
this.superQueryVisible = true; this.superQueryVisible = true;

@ -5,13 +5,8 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户分类"> <el-form-item label="客户分类">
<JnpfSelect <JnpfSelect v-model="query.calssify" placeholder="请选择" clearable
v-model="query.calssify" :options="calssifyOptions" :props="calssifyProps">
placeholder="请选择"
clearable
:options="calssifyOptions"
:props="calssifyProps"
>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -23,25 +18,15 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="客户星级"> <el-form-item label="客户星级">
<JnpfSelect <JnpfSelect v-model="query.customerStarRating" placeholder="请选择" clearable
v-model="query.customerStarRating" :options="customerStarRatingOptions" :props="customerStarRatingProps" multiple>
placeholder="请选择"
clearable
:options="customerStarRatingOptions"
:props="customerStarRatingProps"
multiple
>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()" <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
>查询</el-button <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -49,240 +34,108 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
type="primary" @click="addOrUpdateHandle()">新增
icon="icon-ym icon-ym-btn-add"
v-has="'btn_add'"
@click="addOrUpdateHandle()"
>新增
</el-button> </el-button>
<el-button <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
type="text" v-has="'btn_download'">导出
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
v-has="'btn_download'"
>导出
</el-button> </el-button>
<el-button <!-- <el-button
type="text" type="text"
icon="icon-ym icon-ym-btn-clearn" icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'" v-has="'btn_batchRemove'"
>批量删除 >批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
icon="icon-ym icon-ym-filter JNPF-common-head-icon" @click="openSuperQuery()" />
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
effect="dark" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
:content="$t('common.refresh')" @click="initData()" />
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table <JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
v-loading="listLoading" @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
:data="list" custom-column>
@sort-change="sortChange" <el-table-column prop="name" label="客户名称" align="center" sortable fixed="left">
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
border
custom-column
>
<el-table-column
prop="name"
label="客户名称"
align="center"
sortable
fixed="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="companyName" label="所属公司" align="center" sortable fixed="left">
prop="companyName"
label="所属公司"
align="center"
sortable
fixed="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="departmentName" label="所属部门" align="center" sortable fixed="left">
prop="departmentName"
label="所属部门"
align="center"
sortable
fixed="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="客户分类" prop="calssify" align="center" sortable width="150"
label="客户分类" fixed="left">
prop="calssify"
align="center"
sortable
width="150"
fixed="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.calssify }} {{ scope.row.calssify }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="enterpriseNature" label="企业性质" align="center" width="150">
prop="enterpriseNature"
label="企业性质"
align="center"
width="150"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="industryClassify" label="行业分类" align="center" width="150">
prop="industryClassify"
label="行业分类"
align="center"
width="150"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="customerStarRating" label="客户星级" align="center" width="150">
prop="customerStarRating"
label="客户星级"
align="center"
width="150"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="belongPeople" label="归属人员" align="center" width="150">
prop="belongPeople"
label="归属人员"
align="center"
width="150"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="flowState" label="状态" align="center" width="150">
prop="flowState"
label="状态"
align="center"
width="150"
>
<template slot-scope="scope" v-if="!scope.row.top"> <template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState == 1"></el-tag> <el-tag v-if="scope.row.flowState == 1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2" <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
>审核通过</el-tag <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
> <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3" <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
>审核驳回</el-tag
>
<el-tag type="info" v-else-if="scope.row.flowState == 4"
>流程撤回</el-tag
>
<el-tag type="info" v-else-if="scope.row.flowState == 5"
>审核终止</el-tag
>
<el-tag type="warning" v-else></el-tag> <el-tag type="warning" v-else></el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" fixed="right" align="center" width="200">
label="操作"
fixed="right"
align="center"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
type="text" @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
:disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)"
v-has="'btn_edit'"
>编辑
</el-button> </el-button>
<el-button <el-button type="text" class="JNPF-table-delBtn"
type="text" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1" v-has="'btn_remove'"
class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
:disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'"
@click="handleDel(scope.row.id)"
>删除
</el-button> </el-button>
<el-button <el-button size="mini" type="text" :disabled="!scope.row.flowState"
size="mini" @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
type="text" <el-button type="text" :disabled="scope.row.flowState != 2"
:disabled="!scope.row.flowState" @click="updateBusinessConfigHandle(scope.row)" v-has="'btn_edit'">业务配置
@click="updateHandle(scope.row, scope.row.flowState)"
>详情</el-button
>
<el-button
type="text"
:disabled="scope.row.flowState != 2"
@click="updateBusinessConfigHandle(scope.row)"
v-has="'btn_edit'"
>业务配置
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination <pagination :total="total" :page.sync="listQuery.currentPage"
:total="total" :limit.sync="listQuery.pageSize" @pagination="initData" />
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<FlowBusinessConfigBox <FlowBusinessConfigBox v-if="flowBusinessConfigVisible" ref="FlowBusinessConfigBox"
v-if="flowBusinessConfigVisible" @close="colseFlow" />
ref="FlowBusinessConfigBox" <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
@close="colseFlow" :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
/> lock-scroll width="400px">
<el-dialog
title="请选择流程"
:close-on-click-modal="false"
append-to-body
:visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll
width="400px"
>
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div <div class="template-item" v-for="item in flowList" :key="item.id"
class="template-item" @click="selectFlow(item)">
v-for="item in flowList"
:key="item.id"
@click="selectFlow(item)"
>
{{ item.fullName }} {{ item.fullName }}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
v-if="detailVisible" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
ref="Detail" @close="toFormDetailVisible = false" />
@refresh="detailVisible = false" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
/> @superQuery="superQuery" />
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div> </div>
</template> </template>
@ -791,7 +644,7 @@ export default {
this.initData(); this.initData();
}, },
// //
async initSearchData() {}, async initSearchData() { },
initData() { initData() {
this.listLoading = true; this.listLoading = true;
let _query = { let _query = {
@ -835,7 +688,7 @@ export default {
}); });
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
handelUpload() { handelUpload() {
this.uploadBoxVisible = true; this.uploadBoxVisible = true;
@ -875,7 +728,7 @@ export default {
}); });
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
openSuperQuery() { openSuperQuery() {
this.superQueryVisible = true; this.superQueryVisible = true;

@ -51,13 +51,13 @@
v-has="'btn_download'" v-has="'btn_download'"
>导出 >导出
</el-button> </el-button>
<el-button <!-- <el-button
type="text" type="text"
icon="icon-ym icon-ym-btn-clearn" icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'" v-has="'btn_batchRemove'"
>批量删除 >批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -59,9 +59,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -63,9 +63,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()" <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
v-has="'btn_upload'">导入 v-has="'btn_upload'">导入
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -48,9 +48,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()" <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
v-has="'btn_upload'">导入 v-has="'btn_upload'">导入
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -69,19 +69,21 @@
:span-method="arraySpanMethod"> :span-method="arraySpanMethod">
<!-- <el-table-column prop="code" label="业务线编号" align="left"> <!-- <el-table-column prop="code" label="业务线编号" align="left">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="name" label="车间名称" align="center" fixed="left" sortable> <el-table-column prop="name" label="车间名称" align="center" fixed="left" sortable
width="200px">
</el-table-column> </el-table-column>
<el-table-column prop="workFactory" label="所属工厂/基地" align="center" fixed="left" sortable> <el-table-column prop="workFactory" label="所属工厂/基地" align="center" fixed="left" sortable
width="200px">
</el-table-column> </el-table-column>
<el-table-column prop="description" label="描述" align="center"> <el-table-column prop="description" label="描述" align="center" width="150px">
</el-table-column> </el-table-column>
<el-table-column prop="creatorTime" label="添加时间" align="center"> <el-table-column prop="creatorTime" label="添加时间" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.creatorTime | toDate("yyyy-MM-dd") }} {{ scope.row.creatorTime | toDate("yyyy-MM-dd") }}
</template> </template>
</el-table-column> </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>
<!-- <el-table-column prop="lastModifyTime" label="更新时间" align="center"> <!-- <el-table-column prop="lastModifyTime" label="更新时间" align="center">
</el-table-column> --> </el-table-column> -->

@ -1,627 +0,0 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="业务线编号">
<el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务线名称">
<el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="类型">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
:props="typeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="所属分类">
<JnpfSelect v-model="query.industry" placeholder="请选择" clearable
:options="industryOptions" :props="industryProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="成立时间">
<JnpfDateRangePicker v-model="query.establishDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
收起
</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
v-has="'btn_upload'">导入
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<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="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="code" label="业务线编号" align="left">
</el-table-column>
<el-table-column prop="name" label="业务线名称" align="left">
</el-table-column>
<el-table-column prop="simpleName" label="业务线简称" align="left">
</el-table-column>
<el-table-column prop="type" label="类型" align="left">
</el-table-column>
<el-table-column prop="industry" label="所属分类" align="left">
</el-table-column>
<el-table-column prop="city" label="所在城市" align="left">
</el-table-column>
<el-table-column prop="establishDate" label="成立时间" align="left">
</el-table-column>
<el-table-column prop="description" label="描述" align="left">
</el-table-column>
<el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
<el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
<el-tag type="warning" v-else></el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn"
:disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
:visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{item.fullName}}
</div>
</el-scrollbar>
</el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getFormById } from '@/api/workFlow/FormDesign'
import { getFlowList } from '@/api/workFlow/FlowEngine'
import FlowBox from '@/views/workFlow/components/FlowBox'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: {
FlowBox,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
showAll: false,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
code: undefined,
name: undefined,
type: undefined,
industry: undefined,
establishDate: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
multipleSelection: [], total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
typeOptions: [],
typeProps: { "label": "fullName", "value": "id" },
parentIdOptions: [],
parentIdProps: { "label": "name", "value": "id" },
statusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
statusProps: { "label": "fullName", "value": "id" },
tableField133_contactTypeOptions: [],
tableField133_contactTypeProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
getFormById("521634040684484613").then(res1 => {
let flowId = res1.data && res1.data.id
getFlowList(flowId, '1').then(res2 => {
this.flowList = res2.data
this.getColumnList(),
this.initSearchDataAndListData()
this.gettypeOptions();
this.getindustryOptions();
this.queryData = JSON.parse(JSON.stringify(this.query))
}).catch((e) => {
this.$message({ type: 'error', message: e.message });
this.$router.push('/404');
})
})
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
gettypeOptions() {
getDictionaryDataSelector('517662753159119813').then(res => {
this.typeOptions = res.data.list
})
},
getindustryOptions() {
getDictionaryDataSelector('517664069117805509').then(res => {
this.industryOptions = res.data.list
})
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '521634040684484613',
type: 1,
};
request({
url: `/api/scm/BusinessLine1/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/BusinessLine1/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "scm/BusinessLine1")
})
},
handleSelectionChange(val) {
const res = val.map(item => item.id)
this.multipleSelection = res
},
handleBatchRemoveDel() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
})
return
}
const ids = this.multipleSelection
this.$confirm('您确定要删除这些数据吗, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/BusinessLine1/batchRemove`,
data: ids,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, flowState) {
if (!row) {
this.addHandle();
} else {
this.updateHandle(row, flowState)
}
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/scm/BusinessLine1/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
//
updateHandle(row, flowState) {
let data = {
id: row.id,
flowId: row.flowId || this.flowList[0].id,
opType: flowState ? 0 : '-1',
status: flowState
}
this.flowVisible = true
this.$nextTick(() => {
this.$refs.FlowBox.init(data)
})
},
toApprovalDetail(row) {
let data = {
id: row.id,
flowId: row.flowId,
opType: 0,
status: row.currentState
}
this.formVisible = true
this.$nextTick(() => {
this.$refs.FlowBox.init(data)
})
},
addHandle() {
if (!this.flowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
} else if (this.flowList.length === 1) {
this.selectFlow(this.flowList[0])
} else {
this.flowListVisible = true
}
},
//
selectFlow(item) {
let data = {
id: '',
formType: 1,
flowId: item.id,
opType: '-1'
}
this.flowListVisible = false
this.flowVisible = true
this.$nextTick(() => {
this.$refs.FlowBox.init(data)
})
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

@ -36,9 +36,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()" <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
v-has="'btn_upload'">导入 v-has="'btn_upload'">导入
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -54,9 +54,10 @@
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
custom-column border @selection-change="handleSelectionChange" custom-column border @selection-change="handleSelectionChange"
:span-method="arraySpanMethod"> :span-method="arraySpanMethod">
<el-table-column prop="code" label="生产线编号" align="center" sortable fixed="lfet"> <el-table-column prop="code" label="生产线编号" align="center" sortable fixed="lfet"
width="200px">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="生产线名称" align="center" sortable> <el-table-column prop="name" label="生产线名称" align="center" sortable width="200px">
</el-table-column> </el-table-column>
<el-table-column prop="simpleName" label=" 简称/英文名" align="center"> <el-table-column prop="simpleName" label=" 简称/英文名" align="center">
</el-table-column> </el-table-column>

@ -10,15 +10,15 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="排班计划状态"> <el-form-item label="排班计划状态">
<JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable :options="timeStatusOptions" <JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable
:props="timeStatusProps"> :options="timeStatusOptions" :props="timeStatusProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="倒班方式"> <el-form-item label="倒班方式">
<JnpfSelect v-model="query.shiftMethod" placeholder="请选择" clearable :options="shiftMethodOptions" <JnpfSelect v-model="query.shiftMethod" placeholder="请选择" clearable
:props="shiftMethodProps" multiple> :options="shiftMethodOptions" :props="shiftMethodProps" multiple>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -33,13 +33,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'"> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -47,12 +49,14 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <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="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> 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>
</el-table-column> </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>
@ -78,15 +82,16 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'"> <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -94,8 +99,10 @@
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -72,9 +72,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -15,8 +15,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="状态"> <el-form-item label="状态">
<JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable :options="timeStatusOptions" <JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable
:props="timeStatusProps"> :options="timeStatusOptions" :props="timeStatusProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -31,13 +31,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'"> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -45,12 +47,14 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <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="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> 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">
</el-table-column> </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">
@ -81,15 +85,16 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'"> <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -97,8 +102,10 @@
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -5,44 +5,27 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="合同类型"> <el-form-item label="合同类型">
<JnpfSelect <JnpfSelect v-model="query.contractType" placeholder="请选择" clearable
v-model="query.contractType" :options="contractTypeOptions" :props="contractTypeProps">
placeholder="请选择"
clearable
:options="contractTypeOptions"
:props="contractTypeProps"
>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="合同编号"> <el-form-item label="合同编号">
<el-input <el-input v-model="query.contractNumber" placeholder="请输入" clearable>
v-model="query.contractNumber"
placeholder="请输入"
clearable
>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="合同名称"> <el-form-item label="合同名称">
<el-input <el-input v-model="query.contractName" placeholder="请输入" clearable>
v-model="query.contractName"
placeholder="请输入"
clearable
>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()" <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
>查询</el-button <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -50,250 +33,104 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
type="primary" @click="addOrUpdateHandle()">新增
icon="icon-ym icon-ym-btn-add"
v-has="'btn_add'"
@click="addOrUpdateHandle()"
>新增
</el-button> </el-button>
<el-button <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
type="text" v-has="'btn_download'">导出
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
v-has="'btn_download'"
>导出
</el-button> </el-button>
<el-button <!-- <el-button
type="text" type="text"
icon="icon-ym icon-ym-btn-clearn" icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'" v-has="'btn_batchRemove'"
>批量删除 >批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
icon="icon-ym icon-ym-filter JNPF-common-head-icon" @click="openSuperQuery()" />
:underline="false"
@click="openSuperQuery()"
/>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
effect="dark" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
:content="$t('common.refresh')" @click="initData()" />
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table <JNPF-table v-loading="listLoading" :data="list" :border="true" @sort-change="sortChange"
v-loading="listLoading" has-c @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
:data="list" <el-table-column prop="contractType" label="合同类型" align="center" fixed="left" width="90">
:border="true"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
>
<el-table-column
prop="contractType"
label="合同类型"
align="center"
fixed="left"
width="90"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractTemplateId" label="合同模板" align="center" fixed="left"
prop="contractTemplateId" width="140">
label="合同模板"
align="center"
fixed="left"
width="140"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractNumber" label="合同编号" align="center" fixed="left"
prop="contractNumber" width="180">
label="合同编号"
align="center"
fixed="left"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractName" label="合同名称" align="center" fixed="left" width="180">
prop="contractName"
label="合同名称"
align="center"
fixed="left"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractNo" label="对方合同编号" align="center" width="180">
prop="contractNo"
label="对方合同编号"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractSignedTime" label="签订日期" align="center" width="180">
prop="contractSignedTime"
label="签订日期"
align="center"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ fnTimeStr(scope.row.contractSignedTime) }} {{ fnTimeStr(scope.row.contractSignedTime) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="businessId" label="关联业务线" align="center" width="180">
prop="businessId"
label="关联业务线"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractPeriodTime" label="有效期开始 " align="center"
prop="contractPeriodTime" width="180"><template slot-scope="scope">
label="有效期开始 "
align="center"
width="180"
><template slot-scope="scope">
{{ fnTimeStr(scope.row.contractPeriodTime) }} {{ fnTimeStr(scope.row.contractPeriodTime) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractPeriodTimeEnd" label="有效期结束 " align="center"
prop="contractPeriodTimeEnd" width="180"><template slot-scope="scope">
label="有效期结束 "
align="center"
width="180"
><template slot-scope="scope">
{{ fnTimeStr(scope.row.contractPeriodTimeEnd) }} {{ fnTimeStr(scope.row.contractPeriodTimeEnd) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deliveryTime" label="交货时间开始" align="center" width="180">
prop="deliveryTime"
label="交货时间开始"
align="center"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ fnTimeStr(scope.row.deliveryTime) }} {{ fnTimeStr(scope.row.deliveryTime) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deliveryTimeEnd" label="交货时间结束" align="center" width="180">
prop="deliveryTimeEnd"
label="交货时间结束"
align="center"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ fnTimeStr(scope.row.deliveryTimeEnd) }} {{ fnTimeStr(scope.row.deliveryTimeEnd) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deptId" label="签约主体" align="center" width="230">
prop="deptId"
label="签约主体"
align="center"
width="230"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ fnDeptName(scope.row.deptId) }} {{ fnDeptName(scope.row.deptId) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="subject" label="乙方主体" align="center" width="180">
prop="subject"
label="乙方主体"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column label="结算方式" align="center" width="180" <el-table-column label="结算方式" align="center" width="180"><template slot-scope="scope">
><template slot-scope="scope">
{{ fnSubjectSettlementMethodName(scope.row.subject) }} {{ fnSubjectSettlementMethodName(scope.row.subject) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="procurementModel" label="采购模式" align="center" width="180">
prop="procurementModel"
label="采购模式"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="relatedContractName" label="关联销售合同" align="center" width="180">
prop="relatedContractName"
label="关联销售合同"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="subject2" label="乙方主体二级" align="center" width="180">
prop="subject2"
label="乙方主体二级"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="subject3" label="乙方主体三级" align="center" width="180">
prop="subject3"
label="乙方主体三级"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deliveryModel" label="交货方式" align="center" width="180">
prop="deliveryModel"
label="交货方式"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deliveryLocation" label="交货地点 " align="center" width="180">
prop="deliveryLocation"
label="交货地点 "
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="modeTransport" label="运输方式" align="center" width="180">
prop="modeTransport"
label="运输方式"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="costBearingMian" label="费用承担主体" align="center" width="180">
prop="costBearingMian"
label="费用承担主体"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="pricingModel" label="定价模式 " align="center" width="180">
prop="pricingModel"
label="定价模式 "
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="contractRequirement" label="合同要求" align="center" width="180">
prop="contractRequirement"
label="合同要求"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="remark" label="备注" align="center" width="180">
prop="remark"
label="备注"
align="center"
width="180"
>
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
prop="contractLabel" prop="contractLabel"
@ -305,60 +142,31 @@
<el-table-column prop="flowState" label="状态" width="100"> <el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top"> <template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState == 1"></el-tag> <el-tag v-if="scope.row.flowState == 1"></el-tag>
<el-tag type="success" v-else-if="scope.row.flowState == 2" <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
>审核通过</el-tag <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
> <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState == 3" <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
>审核驳回</el-tag
>
<el-tag type="info" v-else-if="scope.row.flowState == 4"
>流程撤回</el-tag
>
<el-tag type="info" v-else-if="scope.row.flowState == 5"
>审核终止</el-tag
>
<el-tag type="warning" v-else></el-tag> <el-tag type="warning" v-else></el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="180"> <el-table-column label="操作" fixed="right" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
type="text" @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
:disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@click="updateHandle(scope.row)"
v-has="'btn_edit'"
>编辑
</el-button> </el-button>
<el-button <el-button type="text" @click="addOrUpdateSetHandle(scope.row)" v-has="'btn_edit'">
type="text"
@click="addOrUpdateSetHandle(scope.row)"
v-has="'btn_edit'"
>设置
</el-button> </el-button>
<el-button <el-button type="text" class="JNPF-table-delBtn"
type="text" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1" v-has="'btn_remove'"
class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
:disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
v-has="'btn_remove'"
@click="handleDel(scope.row.id)"
>删除
</el-button> </el-button>
<el-button <el-button size="mini" type="text" :disabled="!scope.row.flowState"
size="mini" @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
type="text"
:disabled="!scope.row.flowState"
@click="updateHandle(scope.row, scope.row.flowState)"
>详情</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination <pagination :total="total" :page.sync="listQuery.currentPage"
:total="total" :limit.sync="listQuery.pageSize" @pagination="initData" />
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -366,44 +174,23 @@
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
title="请选择流程" :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
:close-on-click-modal="false" lock-scroll width="400px">
append-to-body
:visible.sync="flowListVisible"
class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll
width="400px"
>
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div <div class="template-item" v-for="item in flowList" :key="item.id"
class="template-item" @click="selectFlow(item)">
v-for="item in flowList"
:key="item.id"
@click="selectFlow(item)"
>
{{ item.fullName }} {{ item.fullName }}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
v-if="detailVisible" <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
ref="Detail" @close="toFormDetailVisible = false" />
@refresh="detailVisible = false" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
/> @superQuery="superQuery" />
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
</div> </div>
</template> </template>
@ -767,7 +554,7 @@ export default {
this.initData(); this.initData();
}, },
// //
async initSearchData() {}, async initSearchData() { },
initData() { initData() {
this.listLoading = true; this.listLoading = true;
let _query = { let _query = {
@ -811,7 +598,7 @@ export default {
}); });
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
handelUpload() { handelUpload() {
this.uploadBoxVisible = true; this.uploadBoxVisible = true;
@ -851,7 +638,7 @@ export default {
}); });
}); });
}) })
.catch(() => {}); .catch(() => { });
}, },
openSuperQuery() { openSuperQuery() {
this.superQueryVisible = true; this.superQueryVisible = true;

@ -21,14 +21,15 @@
<template v-if="showAll"> <template v-if="showAll">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="出生日期"> <el-form-item label="出生日期">
<JnpfDateRangePicker v-model="query.brithdayTime" format="yyyy-MM-dd" startPlaceholder="开始日期" <JnpfDateRangePicker v-model="query.brithdayTime" format="yyyy-MM-dd"
endPlaceholder="结束日期"> startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="性别"> <el-form-item label="性别">
<JnpfSelect v-model="query.sex" placeholder="请选择" clearable :options="sexOptions" :props="sexProps"> <JnpfSelect v-model="query.sex" placeholder="请选择" clearable :options="sexOptions"
:props="sexProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -37,7 +38,8 @@
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button> <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button> <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll"> <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
v-if="!showAll">
展开 展开
</el-button> </el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else> <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@ -50,13 +52,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'"> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -64,12 +68,14 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <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="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> custom-column border @selection-change="handleSelectionChange"
:span-method="arraySpanMethod">
<el-table-column prop="name" label="司机" align="center" fixed="left" sortable> <el-table-column prop="name" label="司机" align="center" fixed="left" sortable>
</el-table-column> </el-table-column>
<el-table-column prop="mobile" label="手机号码" align="center" sortable> <el-table-column prop="mobile" label="手机号码" align="center" sortable>
@ -113,26 +119,30 @@
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible" <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px"> :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }} <div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{ item.fullName }}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -68,9 +68,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

File diff suppressed because it is too large Load Diff

@ -24,13 +24,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'"> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -38,12 +40,14 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <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="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> custom-column border @selection-change="handleSelectionChange"
:span-method="arraySpanMethod">
<el-table-column prop="categoryCode" label="工序分类编码" align="center"> <el-table-column prop="categoryCode" label="工序分类编码" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="categoryName" label="工序分类名称" align="center"> <el-table-column prop="categoryName" label="工序分类名称" align="center">
@ -52,15 +56,16 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'"> <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -68,8 +73,10 @@
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -16,7 +16,8 @@
</div> </div>
<el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox" <el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
:expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps" :expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
:default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree"> :default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false"
v-if="refreshTree">
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<i :class="data.icon"></i> <i :class="data.icon"></i>
<span class="text">{{ node.label }}</span> <span class="text">{{ node.label }}</span>
@ -33,7 +34,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="工序类型"> <el-form-item label="工序类型">
<JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions" :props="typeProps"> <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
:props="typeProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -54,13 +56,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'"> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -68,12 +72,14 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <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="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c custom-column border <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> custom-column border @selection-change="handleSelectionChange"
:span-method="arraySpanMethod">
<el-table-column prop="productionName" label="工序名称" align="center" fixed="left" sortable> <el-table-column prop="productionName" label="工序名称" align="center" fixed="left" sortable>
</el-table-column> </el-table-column>
<el-table-column prop="productionCode" label="工序编号" align="center" fixed="left" sortable> <el-table-column prop="productionCode" label="工序编号" align="center" fixed="left" sortable>
@ -104,15 +110,16 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'"> <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -120,8 +127,10 @@
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -5,22 +5,22 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="价格类型"> <el-form-item label="价格类型">
<JnpfSelect v-model="query.priceType" placeholder="请选择" clearable :options="priceTypeOptions" <JnpfSelect v-model="query.priceType" placeholder="请选择" clearable
:props="priceTypeProps"> :options="priceTypeOptions" :props="priceTypeProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="有效时间开始"> <el-form-item label="有效时间开始">
<JnpfDateRangePicker v-model="query.startTime" format="yyyy-MM-dd" startPlaceholder="开始日期" <JnpfDateRangePicker v-model="query.startTime" format="yyyy-MM-dd"
endPlaceholder="结束日期"> startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="有效时间结束"> <el-form-item label="有效时间结束">
<JnpfDateRangePicker v-model="query.endTime" format="yyyy-MM-dd" startPlaceholder="开始日期" <JnpfDateRangePicker v-model="query.endTime" format="yyyy-MM-dd"
endPlaceholder="结束日期"> startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -35,13 +35,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'"> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -49,17 +51,22 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <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="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
<el-table-column prop="priceNo" label="价格编号" align="center" width="250" sortable fixed="left"> custom-column>
<el-table-column prop="priceNo" label="价格编号" align="center" width="250" sortable
fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="价格类型" prop="priceTypeName" align="center" width="150" sortable fixed="left"> <el-table-column label="价格类型" prop="priceTypeName" align="center" width="150" sortable
fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="productName" label="商品" align="center" width="200" sortable fixed="left"> <el-table-column prop="productName" label="商品" align="center" width="200" sortable
fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="makerName" label="报价方" align="center" width="250"> <el-table-column prop="makerName" label="报价方" align="center" width="250">
</el-table-column> </el-table-column>
@ -81,461 +88,461 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'"> <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)"> <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)"> <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { import {
mapGetters mapGetters
} from "vuex"; } from "vuex";
import { import {
getDictionaryDataSelector getDictionaryDataSelector
} from '@/api/systemData/dictionary' } from '@/api/systemData/dictionary'
import JNPFForm from './form' import JNPFForm from './form'
import Detail from './Detail' import Detail from './Detail'
import ExportBox from '@/components/ExportBox' import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail' import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { import {
getDataInterfaceRes getDataInterfaceRes
} from '@/api/systemData/dataInterface' } from '@/api/systemData/dataInterface'
import { import {
getConfigData getConfigData
} from '@/api/onlineDev/visualDev' } from '@/api/onlineDev/visualDev'
import { import {
getDefaultCurrentValueUserIdAsync getDefaultCurrentValueUserIdAsync
} from '@/api/permission/user' } from '@/api/permission/user'
import { import {
getDefaultCurrentValueDepartmentIdAsync getDefaultCurrentValueDepartmentIdAsync
} from '@/api/permission/organize' } from '@/api/permission/organize'
import columnList from './columnList' import columnList from './columnList'
import { import {
thousandsFormat thousandsFormat
} from "@/components/Generator/utils/index" } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery' import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson' import superQueryJson from './superQueryJson'
export default { export default {
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
ExportBox, ExportBox,
ToFormDetail, ToFormDetail,
SuperQuery SuperQuery
}, },
data() { data() {
return { return {
keyword: '', keyword: '',
expandsTree: true, expandsTree: true,
refreshTree: true, refreshTree: true,
toFormDetailVisible: false, toFormDetailVisible: false,
expandObj: {}, expandObj: {},
columnOptions: [], columnOptions: [],
mergeList: [], mergeList: [],
exportList: [], exportList: [],
columnList, columnList,
superQueryVisible: false, superQueryVisible: false,
superQueryJson, superQueryJson,
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
priceType: undefined, priceType: undefined,
startTime: undefined, startTime: undefined,
endTime: undefined, endTime: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
multipleSelection: [],
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
priceTypeOptions: [{
"fullName": "采购价格",
"id": "1"
}, {
"fullName": "销售价格",
"id": "2"
}],
priceTypeProps: {
"label": "fullName",
"value": "id"
},
pricingUnitIdOptions: [],
pricingUnitIdProps: {
"label": "unit_name",
"value": "id"
},
interfaceRes: {
makerId: [],
makerName: [],
productId: [],
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
}, },
toggleTreeExpand(expands) { treeProps: {
this.refreshTree = false children: 'children',
this.expandsTree = expands label: 'fullName',
this.$nextTick(() => { value: 'id',
this.refreshTree = true isLeaf: 'isLeaf'
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
}, },
filterNode(value, data) { list: [],
if (!value) return true; listLoading: true,
return data[this.treeProps.label].indexOf(value) !== -1; multipleSelection: [],
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
}, },
loadNode(node, resolve) { formVisible: false,
const nodeData = node.data flowVisible: false,
const config = { flowListVisible: false,
treeInterfaceId: "", flowList: [],
treeTemplateJson: [] exportBoxVisible: false,
} priceTypeOptions: [{
if (config.treeInterfaceId) { "fullName": "采购价格",
// "id": "1"
if (config.treeTemplateJson && config.treeTemplateJson.length) { }, {
for (let i = 0; i < config.treeTemplateJson.length; i++) { "fullName": "销售价格",
const element = config.treeTemplateJson[i]; "id": "2"
element.defaultValue = nodeData[element.relationField] || '' }],
} priceTypeProps: {
} "label": "fullName",
// "value": "id"
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
}, },
getColumnList() { pricingUnitIdOptions: [],
// pricingUnitIdProps: {
this.columnOptions = this.transformColumnList(this.columnList) "label": "unit_name",
"value": "id"
}, },
transformColumnList(columnList) { interfaceRes: {
let list = [] makerId: [],
for (let i = 0; i < columnList.length; i++) { makerName: [],
const e = columnList[i]; productId: [],
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
}, },
arraySpanMethod({ }
column },
}) { computed: {
for (let i = 0; i < this.mergeList.length; i++) { ...mapGetters(['userInfo']),
if (column.property == this.mergeList[i].prop) { menuId() {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan] return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
} }
} }
}, //
getMergeList(list) { let query = {
let newList = JSON.parse(JSON.stringify(list)) paramList: config.treeTemplateJson || [],
newList.forEach(item => { }
if (item.children && item.children.length) { //
let child = { getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
prop: item.prop + '-child-first' let data = res.data
} if (Array.isArray(data)) {
item.children.unshift(child) resolve(data);
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else { } else {
this.mergeList.push({ resolve([]);
prop: item.prop,
rowspan: 1,
colspan: 1
})
} }
}) })
}, }
getExportList(list) { },
let exportList = [] getColumnList() {
for (let i = 0; i < list.length; i++) { //
if (list[i].jnpfKey === 'table') { this.columnOptions = this.transformColumnList(this.columnList)
for (let j = 0; j < list[i].children.length; j++) { },
exportList.push(list[i].children[j]) transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
} }
} else {
exportList.push(list[i])
} }
} }
this.exportList = exportList }
}, this.getMergeList(list)
goDetail(id) { this.getExportList(list)
this.detailVisible = true return list
this.$nextTick(() => { },
this.$refs.Detail.init(id) arraySpanMethod({
}) column
}, }) {
sortChange({ for (let i = 0; i < this.mergeList.length; i++) {
column, if (column.property == this.mergeList[i].prop) {
prop, return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
order }
}) { }
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' },
this.listQuery.sidx = !order ? '' : prop getMergeList(list) {
this.initData() let newList = JSON.parse(JSON.stringify(list))
}, newList.forEach(item => {
async initSearchDataAndListData() { if (item.children && item.children.length) {
await this.initSearchData() let child = {
this.initData() prop: item.prop + '-child-first'
}, }
// item.children.unshift(child)
async initSearchData() {}, }
initData() { })
this.listLoading = true; newList.forEach(item => {
let _query = { if (item.children && item.children.length) {
...this.listQuery, item.children.forEach((child, index) => {
...this.query, if (index == 0) {
keyword: this.keyword, this.mergeList.push({
dataType: 0, prop: child.prop,
menuId: this.menuId, rowspan: 1,
moduleId: '529565976849564293', colspan: item.children.length
type: 1, })
}; } else {
request({ this.mergeList.push({
url: `/api/scm/ProductPrice/getList`, prop: child.prop,
method: 'post', rowspan: 0,
data: _query colspan: 0
}).then(res => { })
var _list = res.data.list; }
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/ProductPrice/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
}) })
}).catch(() => {}); } else {
}, this.mergeList.push({
handelUpload() { prop: item.prop,
this.uploadBoxVisible = true rowspan: 1,
this.$nextTick(() => { colspan: 1
this.$refs.UploadBox.init("", "scm/ProductPrice")
})
},
handleSelectionChange(val) {
const res = val.map(item => item.id)
this.multipleSelection = res
},
handleBatchRemoveDel() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
}) })
return
} }
const ids = this.multipleSelection })
this.$confirm('您确定要删除这些数据吗, 是否继续?', '提示', { },
type: 'warning' getExportList(list) {
}).then(() => { let exportList = []
request({ for (let i = 0; i < list.length; i++) {
url: `/api/scm/ProductPrice/batchRemove`, if (list[i].jnpfKey === 'table') {
data: ids, for (let j = 0; j < list[i].children.length; j++) {
method: 'DELETE' exportList.push(list[i].children[j])
}).then(res => { }
this.$message({ } else {
type: 'success', exportList.push(list[i])
message: res.msg, }
onClose: () => { }
this.initData() this.exportList = exportList
} },
}); goDetail(id) {
}) this.detailVisible = true
}).catch(() => {}) this.$nextTick(() => {
}, this.$refs.Detail.init(id)
openSuperQuery() { })
this.superQueryVisible = true },
this.$nextTick(() => { sortChange({
this.$refs.SuperQuery.init() column,
}) prop,
}, order
superQuery(queryJson) { }) {
this.listQuery.superQueryJson = queryJson this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.currentPage = 1 this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
}, },
addOrUpdateHandle(row, isDetail) { async initSearchDataAndListData() {
let id = row ? row.id : "" await this.initSearchData()
this.formVisible = true this.initData()
this.$nextTick(() => { },
this.$refs.JNPFForm.init(id, isDetail, this.list) //
async initSearchData() { },
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '529565976849564293',
type: 1,
};
request({
url: `/api/scm/ProductPrice/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/ProductPrice/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
}) })
}, }).catch(() => { });
exportData() { },
this.exportBoxVisible = true handelUpload() {
this.$nextTick(() => { this.uploadBoxVisible = true
this.$refs.ExportBox.init(this.exportList) this.$nextTick(() => {
this.$refs.UploadBox.init("", "scm/ProductPrice")
})
},
handleSelectionChange(val) {
const res = val.map(item => item.id)
this.multipleSelection = res
},
handleBatchRemoveDel() {
if (!this.multipleSelection.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
}) })
}, return
download(data) { }
let query = { const ids = this.multipleSelection
...data, this.$confirm('您确定要删除这些数据吗, 是否继续?', '提示', {
...this.listQuery, type: 'warning'
...this.query, }).then(() => {
menuId: this.menuId
}
request({ request({
url: `/api/scm/ProductPrice/Actions/Export`, url: `/api/scm/ProductPrice/batchRemove`,
method: 'post', data: ids,
data: query method: 'DELETE'
}).then(res => { }).then(res => {
if (!res.data.url) return this.$message({
this.jnpf.downloadFile(res.data.url) type: 'success',
this.$refs.ExportBox.visible = false message: res.msg,
this.exportBoxVisible = false onClose: () => {
this.initData()
}
});
}) })
}, }).catch(() => { })
search() { },
this.listQuery.currentPage = 1 openSuperQuery() {
this.listQuery.pageSize = 20 this.superQueryVisible = true
this.listQuery.sort = "desc" this.$nextTick(() => {
this.listQuery.sidx = "" this.$refs.SuperQuery.init()
this.initData() })
}, },
refresh(isrRefresh) { superQuery(queryJson) {
this.formVisible = false this.listQuery.superQueryJson = queryJson
if (isrRefresh) this.reset() this.listQuery.currentPage = 1
}, this.initData()
reset() { },
this.query = JSON.parse(JSON.stringify(this.queryData)) addOrUpdateHandle(row, isDetail) {
this.search() let id = row ? row.id : ""
}, this.formVisible = true
colseFlow(isrRefresh) { this.$nextTick(() => {
this.flowVisible = false this.$refs.JNPFForm.init(id, isDetail, this.list)
if (isrRefresh) this.reset() })
}, },
} exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({
url: `/api/scm/ProductPrice/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
} }
}
</script> </script>

@ -38,9 +38,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -53,12 +53,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_upload'">导入
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createReturnCargoOrder()">生成退货订单 @click="createReturnCargoOrder()">生成退货订单
</el-button> </el-button>

@ -68,9 +68,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addSaleHandle()">生成销售订单 @click="addSaleHandle()">生成销售订单
</el-button> </el-button>

@ -38,9 +38,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
<!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createDeliveryOrder()">生成发货单 @click="createDeliveryOrder()">生成发货单
</el-button> --> </el-button> -->

@ -66,9 +66,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()" <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
v-has="'btn_upload'">导入 v-has="'btn_upload'">导入
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createPurchaseOrder()">生成采购单 @click="createPurchaseOrder()">生成采购单
</el-button> </el-button>

@ -38,9 +38,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -38,9 +38,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -53,9 +53,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createSaleOrder()">生成销售单 @click="createSaleOrder()">生成销售单
</el-button> </el-button>

@ -10,15 +10,15 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="业务类型"> <el-form-item label="业务类型">
<JnpfSelect v-model="query.receiptType" placeholder="请选择" clearable :options="receiptTypeOptions" <JnpfSelect v-model="query.receiptType" placeholder="请选择" clearable
:props="receiptTypeProps"> :options="receiptTypeOptions" :props="receiptTypeProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单时间"> <el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期" <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
endPlaceholder="结束日期" /> startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
@ -32,13 +32,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'"> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -46,12 +48,14 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <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="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column border> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
border>
<el-table-column prop="receiptCode" label="订单编号" sortable align="center" width="160"> <el-table-column prop="receiptCode" label="订单编号" sortable align="center" width="160">
</el-table-column> </el-table-column>
<el-table-column prop="subjectName" label="客户名称" sortable align="center" width="200"> <el-table-column prop="subjectName" label="客户名称" sortable align="center" width="200">
@ -115,26 +119,30 @@
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible" <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px"> :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }} <div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{ item.fullName }}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>

@ -17,8 +17,8 @@
</el-col> --> </el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单时间"> <el-form-item label="制单时间">
<JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期" <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
endPlaceholder="结束日期"> startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -33,7 +33,8 @@
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button> <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button> <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll"> <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
v-if="!showAll">
展开 展开
</el-button> </el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else> <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@ -46,13 +47,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'"> <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createReturnCargoOrder()">生成退货单 @click="createReturnCargoOrder()">生成退货单
</el-button> </el-button>
@ -66,15 +69,19 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <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="initData()" /> <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column border> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
<el-table-column prop="voucherCode" label="凭证编号" fixed="left" sortable align="center" width="160"> border>
<el-table-column prop="voucherCode" label="凭证编号" fixed="left" sortable align="center"
width="160">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="documentType1" fixed="left" align="center" width="100"> <el-table-column label="单据类型" prop="documentType1" fixed="left" align="center"
width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.documentType1 }} {{ scope.row.documentType1 }}
</template> </template>
@ -173,26 +180,30 @@
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage"
@pagination="initData" /> :limit.sync="listQuery.pageSize" @pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" /> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" /> <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
<el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible" <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px"> :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
lock-scroll width="400px">
<el-scrollbar class="template-list"> <el-scrollbar class="template-list">
<div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }} <div class="template-item" v-for="item in flowList" :key="item.id"
@click="selectFlow(item)">{{ item.fullName }}
</div> </div>
</el-scrollbar> </el-scrollbar>
</el-dialog> </el-dialog>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" /> @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div> </div>
</template> </template>
@ -342,11 +353,11 @@ export default {
const selectData = this.multipleSelectionItem const selectData = this.multipleSelectionItem
let stateFlag = true; let stateFlag = true;
selectData.forEach(function (item) { selectData.forEach(function (item) {
if(item.flowState != 2){ if (item.flowState != 2) {
stateFlag = false; stateFlag = false;
} }
}); });
if(!stateFlag){ if (!stateFlag) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '请选择审核通过的数据', message: '请选择审核通过的数据',
@ -398,11 +409,11 @@ export default {
const selectData = this.multipleSelectionItem const selectData = this.multipleSelectionItem
let stateFlag = true; let stateFlag = true;
selectData.forEach(function (item) { selectData.forEach(function (item) {
if(item.flowState != 2){ if (item.flowState != 2) {
stateFlag = false; stateFlag = false;
} }
}); });
if(!stateFlag){ if (!stateFlag) {
this.$message({ this.$message({
type: 'error', type: 'error',
message: '请选择审核通过的数据', message: '请选择审核通过的数据',

@ -32,9 +32,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -38,9 +38,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -68,9 +68,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createPurchaseOrder()">生成采购订单 @click="createPurchaseOrder()">生成采购订单
</el-button> </el-button>

@ -53,9 +53,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -60,9 +60,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -55,9 +55,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -60,9 +60,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -40,9 +40,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -59,9 +59,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -61,9 +61,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -37,9 +37,9 @@
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()" <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
@ -55,9 +55,7 @@
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
custom-column border @selection-change="handleSelectionChange" custom-column border @selection-change="handleSelectionChange"
:span-method="arraySpanMethod"> :span-method="arraySpanMethod">
<!-- <el-table-column prop="businessfactoryId" label="工厂名称" align="center" sortable
fixed="left">
</el-table-column> -->
<el-table-column prop="businessfactory" label="工厂名称" align="center" sortable fixed="left" <el-table-column prop="businessfactory" label="工厂名称" align="center" sortable fixed="left"
width="200px"> width="200px">
</el-table-column> </el-table-column>
@ -75,7 +73,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="businessCode" label="外部单据编号" align="center"> <el-table-column prop="businessCode" label="外部单据编号" align="center" width="180">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="creatorTime" label="制单时间" align="center"> <!-- <el-table-column prop="creatorTime" label="制单时间" align="center">
</el-table-column> --> </el-table-column> -->

Loading…
Cancel
Save