|
|
@@ -2,354 +2,146 @@
|
|
|
<div class="borderless" v-loading="pageLoading">
|
|
|
<div class="customer-head">
|
|
|
<div class="customer-back">
|
|
|
- <el-button
|
|
|
- type="danger"
|
|
|
- style="border: none;background: none;color: red"
|
|
|
- icon="el-icon-arrow-left"
|
|
|
- @click="backToList"
|
|
|
- :loading="btnLoading"
|
|
|
- >返回列表</el-button
|
|
|
- >
|
|
|
+ <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
|
|
|
+ @click="backToList" :loading="btnLoading">返回列表</el-button>
|
|
|
</div>
|
|
|
<div class="add-customer-btn">
|
|
|
- <el-button
|
|
|
- v-if="checker && form.status != 3"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- class="el-button--small-yh"
|
|
|
- @click.stop="openCheckDialog"
|
|
|
- >
|
|
|
+ <el-button v-if="checker && form.status != 3" type="primary" size="small" class="el-button--small-yh"
|
|
|
+ @click.stop="openCheckDialog">
|
|
|
审批
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
- v-if="form.status > 0"
|
|
|
- @click.native="(checkScheduleDialog = true), (checkId = form.id)"
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- class="el-button--small-yh"
|
|
|
- >审核进度</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- class="el-button--small-yh"
|
|
|
- @click.stop="openEdit"
|
|
|
- v-if="form.id && disabled"
|
|
|
- >编 辑</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- v-if="!checkDisabled && confirmDisabled"
|
|
|
- :disabled="!form.id || disabled"
|
|
|
- size="small"
|
|
|
- @click="pleaseCheck"
|
|
|
- :loading="btnLoading"
|
|
|
- class="el-button--small-yh"
|
|
|
- >请核</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- v-if="form.status == 1"
|
|
|
- :disabled="disabled"
|
|
|
- size="small"
|
|
|
- @click="repealCancel"
|
|
|
- :loading="btnLoading"
|
|
|
- >撤销请核</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- style="margin-right: 8px;"
|
|
|
- @click="dealerSubmit"
|
|
|
- :disabled="disabled || checkDisabled"
|
|
|
- :loading="btnLoading"
|
|
|
- v-if="form.id"
|
|
|
- >
|
|
|
+ <el-button v-if="form.status > 0" @click.native="(checkScheduleDialog = true), (checkId = form.id)"
|
|
|
+ type="primary" size="small" class="el-button--small-yh">审核进度</el-button>
|
|
|
+ <el-button type="primary" size="small" class="el-button--small-yh" @click.stop="openEdit"
|
|
|
+ v-if="form.id && disabled">编 辑</el-button>
|
|
|
+ <el-button type="primary" v-if="!checkDisabled && confirmDisabled" :disabled="!form.id || disabled" size="small"
|
|
|
+ @click="pleaseCheck" :loading="btnLoading" class="el-button--small-yh">请核</el-button>
|
|
|
+ <el-button type="primary" v-if="form.status == 1" :disabled="disabled" size="small" @click="repealCancel"
|
|
|
+ :loading="btnLoading">撤销请核</el-button>
|
|
|
+ <el-button type="primary" size="small" style="margin-right: 8px;" @click="dealerSubmit"
|
|
|
+ :disabled="disabled || checkDisabled" :loading="btnLoading" v-if="form.id">
|
|
|
{{
|
|
|
- form.confirmStatus == 0
|
|
|
- ? "确认订单"
|
|
|
- : form.confirmStatus == 3
|
|
|
- ? "撤销订单"
|
|
|
- : ""
|
|
|
+ form.confirmStatus == 0
|
|
|
+ ? "确认订单"
|
|
|
+ : form.confirmStatus == 3
|
|
|
+ ? "撤销订单"
|
|
|
+ : ""
|
|
|
}}
|
|
|
</el-button>
|
|
|
<el-dropdown style="margin-right: 8px;">
|
|
|
- <el-button type="warning" size="small"
|
|
|
- >账单处理<i class="el-icon-arrow-down el-icon--right"></i
|
|
|
- ></el-button>
|
|
|
+ <el-button type="warning" size="small">账单处理<i class="el-icon-arrow-down el-icon--right"></i></el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<!-- <el-dropdown-item-->
|
|
|
<!-- @click.native="applySettlement('收费')"-->
|
|
|
<!-- :disabled="disabled"-->
|
|
|
<!-- >生成账单-->
|
|
|
<!-- </el-dropdown-item>-->
|
|
|
- <el-dropdown-item
|
|
|
- @click.native="openApplicationDialog"
|
|
|
- :disabled="!form.id"
|
|
|
- >查看账单
|
|
|
+ <el-dropdown-item @click.native="openApplicationDialog" :disabled="!form.id">查看账单
|
|
|
</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
- <el-button
|
|
|
- type="success"
|
|
|
- :disabled="!form.id"
|
|
|
- size="small"
|
|
|
- @click="copyDoc"
|
|
|
- :loading="btnLoading"
|
|
|
- >
|
|
|
+ <el-button type="success" :disabled="!form.id" size="small" @click="copyDoc" :loading="btnLoading">
|
|
|
复制单据
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- @click="editCustomer"
|
|
|
- size="small"
|
|
|
- :loading="btnLoading"
|
|
|
- :disabled="disabled"
|
|
|
- >保存数据
|
|
|
+ <el-button type="primary" @click="editCustomer" size="small" :loading="btnLoading" :disabled="disabled">保存数据
|
|
|
</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="customer-main">
|
|
|
<containerTitle title="基础信息" />
|
|
|
<basic-container :showBtn="true">
|
|
|
- <avue-form
|
|
|
- ref="form"
|
|
|
- class="trading-form"
|
|
|
- v-model="form"
|
|
|
- :option="option"
|
|
|
- >
|
|
|
+ <avue-form ref="form" class="trading-form" v-model="form" :option="option">
|
|
|
<template slot="corpId">
|
|
|
- <crop-select
|
|
|
- v-model="form.corpId"
|
|
|
- @getCorpData="getCorpData"
|
|
|
- corpType="KH"
|
|
|
- :disabled="disabled || confirmDisabled || checkDisabled"
|
|
|
- />
|
|
|
+ <crop-select v-model="form.corpId" @getCorpData="getCorpData" corpType="KH"
|
|
|
+ :disabled="disabled || confirmDisabled || checkDisabled" />
|
|
|
</template>
|
|
|
<template slot="belongToCorpId">
|
|
|
- <crop-select
|
|
|
- v-model="form.belongToCorpId"
|
|
|
- @getCorpData="getGSData"
|
|
|
- corpType="GS"
|
|
|
- :disabled="disabled || confirmDisabled || checkDisabled"
|
|
|
- />
|
|
|
+ <crop-select v-model="form.belongToCorpId" @getCorpData="getGSData" corpType="GS"
|
|
|
+ :disabled="disabled || confirmDisabled || checkDisabled" />
|
|
|
</template>
|
|
|
<template slot="storageId">
|
|
|
- <warehouse-select
|
|
|
- v-model="form.storageId"
|
|
|
- @returnBack="storageChange"
|
|
|
- :configuration="configurationWarehouse"
|
|
|
- :disabled="disabled || confirmDisabled || checkDisabled"
|
|
|
- />
|
|
|
+ <warehouse-select v-model="form.storageId" @returnBack="storageChange"
|
|
|
+ :configuration="configurationWarehouse" :disabled="disabled || confirmDisabled || checkDisabled" />
|
|
|
</template>
|
|
|
<template slot="chargeMember">
|
|
|
- <el-select
|
|
|
- v-model="form.chargeMember"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- :disabled="disabled"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in userList"
|
|
|
- :key="index"
|
|
|
- :label="item.realName"
|
|
|
- :value="item.realName"
|
|
|
- ></el-option>
|
|
|
+ <el-select v-model="form.chargeMember" filterable clearable size="small" :disabled="disabled">
|
|
|
+ <el-option v-for="(item, index) in userList" :key="index" :label="item.realName" :value="item.realName">
|
|
|
+ </el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</avue-form>
|
|
|
</basic-container>
|
|
|
<containerTitle title="商品信息" />
|
|
|
<basic-container>
|
|
|
- <avue-crud
|
|
|
- ref="crud"
|
|
|
- :data="dataList"
|
|
|
- :option="tableOption"
|
|
|
- :cell-style="cellStyle"
|
|
|
- @saveColumn="saveColumn"
|
|
|
- @resetColumn="resetColumn"
|
|
|
- >
|
|
|
+ <avue-crud ref="crud" :data="dataList" :option="tableOption" :cell-style="cellStyle" @saveColumn="saveColumn"
|
|
|
+ @resetColumn="resetColumn">
|
|
|
<template slot="headerSerial" slot-scope="{ column }">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- icon="el-icon-circle-plus-outline"
|
|
|
- circle
|
|
|
- size="mini"
|
|
|
- :disabled="
|
|
|
- disabled || !form.storageId || confirmDisabled || checkDisabled
|
|
|
- "
|
|
|
- @click="$refs.crud.rowCellAdd()"
|
|
|
- ></el-button>
|
|
|
+ <el-button type="primary" icon="el-icon-circle-plus-outline" circle size="mini" :disabled="
|
|
|
+ disabled || !form.storageId || confirmDisabled || checkDisabled
|
|
|
+ " @click="$refs.crud.rowCellAdd()"></el-button>
|
|
|
</template>
|
|
|
<template slot="menuLeft">
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- icon="el-icon-plus"
|
|
|
- size="small"
|
|
|
- @click.stop="newDetails"
|
|
|
- :disabled="
|
|
|
- disabled || !form.storageId || confirmDisabled || checkDisabled
|
|
|
- "
|
|
|
- >录入明细</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="info"
|
|
|
- icon="el-icon-printer"
|
|
|
- size="small"
|
|
|
- @click.stop="openReport"
|
|
|
- >报表打印</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- icon="el-icon-download"
|
|
|
- @click="downloadHandle"
|
|
|
- >下载模板</el-button
|
|
|
- >
|
|
|
- <el-upload
|
|
|
- :action="baseURL"
|
|
|
- :headers="headers"
|
|
|
- :disabled="
|
|
|
- disabled || confirmDisabled || !form.storageId || checkDisabled
|
|
|
- "
|
|
|
- :on-progress="uploading"
|
|
|
- :show-file-list="false"
|
|
|
- :data="uploadParam"
|
|
|
- accept=".xls,.xlsx"
|
|
|
- multiple
|
|
|
- :on-success="importTemplate"
|
|
|
- :on-error="uploadError"
|
|
|
- style="float: right"
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- size="small"
|
|
|
- icon="el-icon-upload"
|
|
|
- :disabled="
|
|
|
- disabled ||
|
|
|
- confirmDisabled ||
|
|
|
- !form.storageId ||
|
|
|
- checkDisabled
|
|
|
- "
|
|
|
- >导 入</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newDetails" :disabled="
|
|
|
+ disabled || !form.storageId || confirmDisabled || checkDisabled
|
|
|
+ ">录入明细</el-button>
|
|
|
+ <el-button type="info" icon="el-icon-printer" size="small" @click.stop="openReport">报表打印</el-button>
|
|
|
+ <el-button type="primary" size="small" icon="el-icon-download" @click="downloadHandle">下载模板</el-button>
|
|
|
+ <el-upload :action="baseURL" :headers="headers" :disabled="
|
|
|
+ disabled || confirmDisabled || !form.storageId || checkDisabled
|
|
|
+ " :on-progress="uploading" :show-file-list="false" :data="uploadParam" accept=".xls,.xlsx" multiple
|
|
|
+ :on-success="importTemplate" :on-error="uploadError" style="float: right">
|
|
|
+ <el-button type="primary" size="small" icon="el-icon-upload" :disabled="
|
|
|
+ disabled ||
|
|
|
+ confirmDisabled ||
|
|
|
+ !form.storageId ||
|
|
|
+ checkDisabled
|
|
|
+ ">导 入</el-button>
|
|
|
</el-upload>
|
|
|
</template>
|
|
|
<template slot="menu" slot-scope="{ row, index }">
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- icon="el-icon-edit"
|
|
|
- type="text"
|
|
|
- @click="rowCell(row, index)"
|
|
|
- :disabled="disabled || confirmDisabled || checkDisabled"
|
|
|
- >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- icon="el-icon-delete"
|
|
|
- type="text"
|
|
|
- @click="rowDel(row, index)"
|
|
|
- :disabled="disabled || confirmDisabled || checkDisabled"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
+ <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
|
|
|
+ :disabled="disabled || confirmDisabled || checkDisabled">{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
|
|
|
+ <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
|
|
|
+ :disabled="disabled || confirmDisabled || checkDisabled">删除</el-button>
|
|
|
</template>
|
|
|
<template slot="code" slot-scope="{ row, index }">
|
|
|
<span v-if="row.$cellEdit" style="display:flex">
|
|
|
- <el-select
|
|
|
- v-model="row.code"
|
|
|
- placeholder="请选择"
|
|
|
- filterable
|
|
|
- size="small"
|
|
|
- style="width:60%"
|
|
|
- @change="codeChange(row, index)"
|
|
|
- :disabled="!form.storageId"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in goodsoptions"
|
|
|
- :key="item.id"
|
|
|
- :label="item.code"
|
|
|
- :value="item.code"
|
|
|
- >
|
|
|
+ <el-select v-model="row.code" placeholder="请选择" filterable size="small" style="width:60%"
|
|
|
+ @change="codeChange(row, index)" :disabled="!form.storageId">
|
|
|
+ <el-option v-for="item in goodsoptions" :key="item.id" :label="item.code" :value="item.code">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-button
|
|
|
- icon="el-icon-search"
|
|
|
- size="small"
|
|
|
- @click="rePick(row, index)"
|
|
|
- ></el-button>
|
|
|
+ <el-button icon="el-icon-search" size="small" @click="rePick(row, index)"></el-button>
|
|
|
</span>
|
|
|
<span v-else> {{ row.code }}</span>
|
|
|
</template>
|
|
|
<template slot="cname" slot-scope="{ row, index }">
|
|
|
<span v-if="row.$cellEdit" style="display:flex">
|
|
|
- <el-select
|
|
|
- v-model="row.itemId"
|
|
|
- placeholder="请选择"
|
|
|
- size="small"
|
|
|
- filterable
|
|
|
- style="width:60%"
|
|
|
- @change="cnameChange(row, index)"
|
|
|
- :disabled="!form.storageId"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in goodsoptions"
|
|
|
- :key="item.id"
|
|
|
- :label="item.cname"
|
|
|
- :value="item.id"
|
|
|
- >
|
|
|
+ <el-select v-model="row.itemId" placeholder="请选择" size="small" filterable style="width:60%"
|
|
|
+ @change="cnameChange(row, index)" :disabled="!form.storageId">
|
|
|
+ <el-option v-for="item in goodsoptions" :key="item.id" :label="item.cname" :value="item.id">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-button
|
|
|
- icon="el-icon-search"
|
|
|
- size="small"
|
|
|
- @click="rePick(row, index)"
|
|
|
- ></el-button>
|
|
|
+ <el-button icon="el-icon-search" size="small" @click="rePick(row, index)"></el-button>
|
|
|
</span>
|
|
|
<span v-else> {{ row.cname }}</span>
|
|
|
</template>
|
|
|
<template slot="orderQuantity" slot-scope="{ row, index }">
|
|
|
- <el-input-number
|
|
|
- v-if="row.$cellEdit"
|
|
|
- v-model="row.orderQuantity"
|
|
|
- size="small"
|
|
|
- :controls="false"
|
|
|
- :precision="0"
|
|
|
- @input="amountChange(row)"
|
|
|
- :disabled="!form.storageId"
|
|
|
- style="width: 100%"
|
|
|
- />
|
|
|
+ <el-input-number v-if="row.$cellEdit" v-model="row.orderQuantity" size="small" :controls="false"
|
|
|
+ :precision="0" @input="amountChange(row)" :disabled="!form.storageId" style="width: 100%" />
|
|
|
<span v-else>{{ row.orderQuantity | IntegerFormat }}</span>
|
|
|
</template>
|
|
|
<template slot="price" slot-scope="{ row, index }">
|
|
|
- <el-input-number
|
|
|
- v-if="row.$cellEdit"
|
|
|
- v-model="row.price"
|
|
|
- size="small"
|
|
|
- :controls="false"
|
|
|
- :precision="2"
|
|
|
- @input="amountChange(row)"
|
|
|
- style="width: 100%"
|
|
|
- :disabled="!form.storageId"
|
|
|
- ></el-input-number>
|
|
|
+ <el-input-number v-if="row.$cellEdit" v-model="row.price" size="small" :controls="false" :precision="2"
|
|
|
+ @input="amountChange(row)" style="width: 100%" :disabled="!form.storageId"></el-input-number>
|
|
|
<span v-else>{{ row.price }}</span>
|
|
|
</template>
|
|
|
<!-- 单位-->
|
|
|
<template slot="unit" slot-scope="{ row, index }">
|
|
|
- <el-select
|
|
|
- v-if="row.$cellEdit"
|
|
|
- v-model="row.unit"
|
|
|
- size="small"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- :disabled="!form.storageId"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in unitOption"
|
|
|
- :key="index"
|
|
|
- :label="item.dictValue"
|
|
|
- :value="item.dictValue"
|
|
|
- />
|
|
|
+ <el-select v-if="row.$cellEdit" v-model="row.unit" size="small" clearable filterable
|
|
|
+ :disabled="!form.storageId">
|
|
|
+ <el-option v-for="(item, index) in unitOption" :key="index" :label="item.dictValue"
|
|
|
+ :value="item.dictValue" />
|
|
|
</el-select>
|
|
|
<span v-else>{{ row.unit }}</span>
|
|
|
</template>
|
|
|
@@ -360,137 +152,65 @@
|
|
|
<span>{{ row.storageQuantity | IntegerFormat }}</span>
|
|
|
</template>
|
|
|
<template slot="lotNo" slot-scope="{ row, index }">
|
|
|
- <span v-if="row.batch == 1" style="color: #c90707;margin-right: 3px"
|
|
|
- >*</span
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-if="row.$cellEdit"
|
|
|
- v-model="row.lotNo"
|
|
|
- size="small"
|
|
|
- filterable
|
|
|
- allow-create
|
|
|
- clearable
|
|
|
- @change="lotNoChange(row)"
|
|
|
- :disabled="!form.storageId"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in row.arr"
|
|
|
- :key="index"
|
|
|
- :label="item.lotNo"
|
|
|
- :value="item.lotNo"
|
|
|
- />
|
|
|
+ <span v-if="row.batch == 1" style="color: #c90707;margin-right: 3px">*</span>
|
|
|
+ <el-select v-if="row.$cellEdit" v-model="row.lotNo" size="small" filterable allow-create clearable
|
|
|
+ @change="lotNoChange(row)" :disabled="!form.storageId">
|
|
|
+ <el-option v-for="(item, index) in row.arr" :key="index" :label="item.lotNo" :value="item.lotNo" />
|
|
|
</el-select>
|
|
|
<span v-else>{{ row.lotNo }}</span>
|
|
|
</template>
|
|
|
<template slot="newJob" slot-scope="{ row, index }">
|
|
|
- <span
|
|
|
- style="color: #1e9fff;cursor: pointer"
|
|
|
- @click="openHistory(row)"
|
|
|
- >{{ row.newJob }}</span
|
|
|
- >
|
|
|
+ <span style="color: #1e9fff;cursor: pointer" @click="openHistory(row)">{{ row.newJob }}</span>
|
|
|
</template>
|
|
|
<template slot="remarks" slot-scope="{ row, index }">
|
|
|
- <el-input
|
|
|
- v-if="row.$cellEdit"
|
|
|
- v-model="row.remarks"
|
|
|
- size="small"
|
|
|
- :disabled="!form.storageId"
|
|
|
- />
|
|
|
+ <el-input v-if="row.$cellEdit" v-model="row.remarks" size="small" :disabled="!form.storageId" />
|
|
|
<span v-else>{{ row.remarks }}</span>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
</basic-container>
|
|
|
<containerTitle title="详细信息" />
|
|
|
<basic-container :showBtn="true">
|
|
|
- <avue-form
|
|
|
- ref="form1"
|
|
|
- class="trading-form"
|
|
|
- v-model="form"
|
|
|
- :option="detailOption"
|
|
|
- ></avue-form>
|
|
|
+ <avue-form ref="form1" class="trading-form" v-model="form" :option="detailOption"></avue-form>
|
|
|
</basic-container>
|
|
|
<containerTitle title="附件管理"></containerTitle>
|
|
|
- <c-upload
|
|
|
- :data="uploadData"
|
|
|
- deleteUrl="/api/blade-client/corpsbank/update"
|
|
|
- :enumerationValue="84"
|
|
|
- :disabled="disabled || confirmDisabled || checkDisabled"
|
|
|
- />
|
|
|
+ <c-upload :data="uploadData" deleteUrl="/api/blade-client/corpsbank/update" :enumerationValue="84"
|
|
|
+ :disabled="disabled || confirmDisabled || checkDisabled" />
|
|
|
</div>
|
|
|
<!-- 商品弹窗-->
|
|
|
- <el-dialog
|
|
|
- title="导入商品"
|
|
|
- append-to-body
|
|
|
- class="el-dialogDeep"
|
|
|
- :visible.sync="dialogVisible"
|
|
|
- width="80%"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :destroy-on-close="true"
|
|
|
- :close-on-press-escape="false"
|
|
|
- @close="closeGoods"
|
|
|
- top="5vh"
|
|
|
- v-dialog-drag
|
|
|
- >
|
|
|
+ <el-dialog title="导入商品" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @closed="closeGoods"
|
|
|
+ top="5vh" v-dialog-drag>
|
|
|
<span>
|
|
|
<el-row>
|
|
|
<el-col :span="4">
|
|
|
<div>
|
|
|
<el-scrollbar>
|
|
|
<basic-container>
|
|
|
- <avue-tree
|
|
|
- :option="treeOption"
|
|
|
- @node-click="nodeClick"
|
|
|
- :style="treeStyle"
|
|
|
- />
|
|
|
+ <avue-tree :option="treeOption" @node-click="nodeClick" :style="treeStyle" />
|
|
|
</basic-container>
|
|
|
</el-scrollbar>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
<el-col :span="20">
|
|
|
- <avue-crud
|
|
|
- :option="goodsOption"
|
|
|
- :table-loading="loading"
|
|
|
- :data="goodsListShow"
|
|
|
- ref="goodsCrud"
|
|
|
- :search.sync="search"
|
|
|
- @search-change="searchChange"
|
|
|
- @selection-change="selectionChange"
|
|
|
- @row-click="rowClick"
|
|
|
- :page.sync="page"
|
|
|
- @on-load="onLoad"
|
|
|
- @saveColumn="saveGoodsColumn"
|
|
|
- @resetColumn="resetGoodsColumn"
|
|
|
- :cell-style="cellStyle"
|
|
|
- >
|
|
|
+ <avue-crud :option="goodsOption" :table-loading="loading" :data="goodsListShow" ref="goodsCrud"
|
|
|
+ :search.sync="search" @search-change="searchChange" @selection-change="selectionChange"
|
|
|
+ @row-click="rowClick" :page.sync="page" @on-load="onLoad" @saveColumn="saveGoodsColumn"
|
|
|
+ @resetColumn="resetGoodsColumn" :cell-style="cellStyle">
|
|
|
<template slot="menuLeft">
|
|
|
<el-tabs v-model="activeName" @tab-click="tabHandle">
|
|
|
<el-tab-pane label="查询结果" name="searchList"></el-tab-pane>
|
|
|
- <el-tab-pane
|
|
|
- label="已选定数据"
|
|
|
- name="importStaging"
|
|
|
- ></el-tab-pane>
|
|
|
+ <el-tab-pane label="已选定数据" name="importStaging"></el-tab-pane>
|
|
|
</el-tabs>
|
|
|
</template>
|
|
|
<template slot-scope="scope" slot="menu">
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- icon="el-icon-edit"
|
|
|
- size="small"
|
|
|
- @click.stop="importStagList(scope.row, scope.index)"
|
|
|
- v-if="activeName == 'searchList'"
|
|
|
- :disabled="
|
|
|
+ <el-button type="text" icon="el-icon-edit" size="small"
|
|
|
+ @click.stop="importStagList(scope.row, scope.index)" v-if="activeName == 'searchList'" :disabled="
|
|
|
goodsListSave.findIndex(item => item.id == scope.row.id) !==
|
|
|
- -1
|
|
|
- "
|
|
|
- >选择
|
|
|
+ -1
|
|
|
+ ">选择
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- icon="el-icon-delete"
|
|
|
- size="small"
|
|
|
- @click.stop="removeStagList(scope.row, scope.index)"
|
|
|
- v-else
|
|
|
- >移除
|
|
|
+ <el-button type="text" icon="el-icon-delete" size="small"
|
|
|
+ @click.stop="removeStagList(scope.row, scope.index)" v-else>移除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</avue-crud>
|
|
|
@@ -500,96 +220,32 @@
|
|
|
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- @click="importGoods"
|
|
|
- :disabled="selectionList.length == 0 && goodsListSave.length == 0"
|
|
|
- >导入</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" @click="importGoods"
|
|
|
+ :disabled="selectionList.length == 0 && goodsListSave.length == 0">导入</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<!-- 报表-->
|
|
|
- <report-dialog
|
|
|
- :switchDialog="switchDialog"
|
|
|
- :reportId="form.id"
|
|
|
- reportName="经销商-销售单"
|
|
|
- @onClose="onClose()"
|
|
|
- />
|
|
|
+ <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="经销商-销售单" @onClose="onClose()" />
|
|
|
<!-- 账单-->
|
|
|
- <el-dialog
|
|
|
- append-to-body
|
|
|
- title="账单"
|
|
|
- class="el-dialogDeep"
|
|
|
- :visible.sync="financialAccountDialog"
|
|
|
- width="70%"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :destroy-on-close="true"
|
|
|
- :close-on-press-escape="false"
|
|
|
- v-dialog-drag
|
|
|
- >
|
|
|
- <financial-account
|
|
|
- :billType="billType"
|
|
|
- :billData="{}"
|
|
|
- :arrList="applyPaymentList"
|
|
|
- :belongCompany="form.belongToCorpId"
|
|
|
- @choceFun="choceFun"
|
|
|
- />
|
|
|
+ <el-dialog append-to-body title="账单" class="el-dialogDeep" :visible.sync="financialAccountDialog" width="70%"
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
+ <financial-account :billType="billType" :billData="{}" :arrList="applyPaymentList"
|
|
|
+ :belongCompany="form.belongToCorpId" @choceFun="choceFun" />
|
|
|
</el-dialog>
|
|
|
<!-- 历史记录-->
|
|
|
- <view-history
|
|
|
- v-if="historyVisible"
|
|
|
- ref="history"
|
|
|
- :params="historyParams"
|
|
|
- @closeDialog="closeDialog"
|
|
|
- />
|
|
|
- <el-dialog
|
|
|
- append-to-body
|
|
|
- title="审批"
|
|
|
- class="el-dialogDeep"
|
|
|
- :visible.sync="checkDialog"
|
|
|
- width="50%"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :destroy-on-close="true"
|
|
|
- :close-on-press-escape="false"
|
|
|
- v-dialog-drag
|
|
|
- >
|
|
|
- <check
|
|
|
- :checkData="checkData"
|
|
|
- :checkDetail="false"
|
|
|
- :idList="[]"
|
|
|
- @choceCheckFun="choceCheckFun"
|
|
|
- >
|
|
|
+ <view-history v-if="historyVisible" ref="history" :params="historyParams" @closeDialog="closeDialog" />
|
|
|
+ <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
+ <check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
|
|
|
</check>
|
|
|
</el-dialog>
|
|
|
- <el-dialog
|
|
|
- append-to-body
|
|
|
- title="审批进度"
|
|
|
- class="el-dialogDeep"
|
|
|
- :visible.sync="checkScheduleDialog"
|
|
|
- width="40%"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :destroy-on-close="true"
|
|
|
- :close-on-press-escape="false"
|
|
|
- v-dialog-drag
|
|
|
- >
|
|
|
- <check-schedule
|
|
|
- :checkId="checkId"
|
|
|
- :batchNo="batchNo"
|
|
|
- @choceScheduleFun="choceScheduleFun"
|
|
|
- >
|
|
|
+ <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
+ <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun">
|
|
|
</check-schedule>
|
|
|
</el-dialog>
|
|
|
- <el-dialog
|
|
|
- title="申请记录"
|
|
|
- append-to-body
|
|
|
- class="el-dialogDeep"
|
|
|
- :visible.sync="applicationDialog"
|
|
|
- width="60%"
|
|
|
- :close-on-click-modal="false"
|
|
|
- :destroy-on-close="true"
|
|
|
- :close-on-press-escape="false"
|
|
|
- v-dialog-drag
|
|
|
- >
|
|
|
+ <el-dialog title="申请记录" append-to-body class="el-dialogDeep" :visible.sync="applicationDialog" width="60%"
|
|
|
+ :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
|
|
|
<bill-application :billId="form.id" @choceApplication="choceApplication">
|
|
|
</bill-application>
|
|
|
</el-dialog>
|
|
|
@@ -613,7 +269,8 @@ import {
|
|
|
historyPrice,
|
|
|
itemDetail,
|
|
|
pleaseCheck,
|
|
|
- repealCancel
|
|
|
+ repealCancel,
|
|
|
+ salesOrderEntry
|
|
|
} from "@/api/dealer/sales";
|
|
|
import reportDialog from "@/components/report-dialog/main";
|
|
|
import {
|
|
|
@@ -829,7 +486,7 @@ export default {
|
|
|
treeOption: {
|
|
|
nodeKey: "id",
|
|
|
lazy: true,
|
|
|
- treeLoad: function(node, resolve) {
|
|
|
+ treeLoad: function (node, resolve) {
|
|
|
const parentId = node.level === 0 ? 0 : node.data.id;
|
|
|
getDeptLazyTree(parentId).then(res => {
|
|
|
resolve(
|
|
|
@@ -1062,7 +719,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- getGSData(row) {},
|
|
|
+ getGSData(row) { },
|
|
|
//修改提交触发
|
|
|
editCustomer(status) {
|
|
|
this.$refs["form"].validate((valid, done) => {
|
|
|
@@ -1158,10 +815,10 @@ export default {
|
|
|
const a = res.data.data
|
|
|
? res.data.data
|
|
|
: {
|
|
|
- stock: 0,
|
|
|
- balanceAmount: 0,
|
|
|
- balanceQuantity: 0
|
|
|
- };
|
|
|
+ stock: 0,
|
|
|
+ balanceAmount: 0,
|
|
|
+ balanceQuantity: 0
|
|
|
+ };
|
|
|
this.$set(
|
|
|
form,
|
|
|
"purchaseAmount",
|
|
|
@@ -1175,6 +832,31 @@ export default {
|
|
|
});
|
|
|
return form;
|
|
|
},
|
|
|
+ getStockInfo2(data) {
|
|
|
+ //tradeType JXS
|
|
|
+ //goodsId
|
|
|
+ //storageId
|
|
|
+ //lotNo 批次号
|
|
|
+ let form = {};
|
|
|
+ const a = data
|
|
|
+ ? data
|
|
|
+ : {
|
|
|
+ stock: 0,
|
|
|
+ balanceAmount: 0,
|
|
|
+ balanceQuantity: 0
|
|
|
+ };
|
|
|
+ this.$set(
|
|
|
+ form,
|
|
|
+ "purchaseAmount",
|
|
|
+ a.inQuantity
|
|
|
+ ? a.inQuantity == 0
|
|
|
+ ? 0
|
|
|
+ : (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2)
|
|
|
+ : 0
|
|
|
+ );
|
|
|
+ this.$set(form, "stock", a.balanceQuantity);
|
|
|
+ return form;
|
|
|
+ },
|
|
|
// 获得批次号
|
|
|
async getLotNo(data) {
|
|
|
let arr = [];
|
|
|
@@ -1250,128 +932,79 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
if (this.goodsListSave.length > 0) {
|
|
|
- // 暂存的有数据
|
|
|
- this.goodsListSave.forEach(async e => {
|
|
|
- getMarketPrice({ code: e.code, isFreight: 0, isLabel: 0 }).then(
|
|
|
- response => {
|
|
|
- if (response.data.data.length > 0) {
|
|
|
- this.$set(e, "price", response.data.data[0].salePrice);
|
|
|
- } else {
|
|
|
- this.$set(e, "price", "0");
|
|
|
- }
|
|
|
- }
|
|
|
- );
|
|
|
- let historyData = await this.getHistoryData(e, 1); // 获得最新数据
|
|
|
- if (historyData.length > 0) {
|
|
|
- e.newJob = historyData[0].price;
|
|
|
- e.newDate = historyData[0].businesDate;
|
|
|
- } else {
|
|
|
- e.newJob = null;
|
|
|
- e.newDate = null;
|
|
|
- }
|
|
|
- if (e.batch == 0) {
|
|
|
- form = await this.getStockInfo({
|
|
|
- tradeType: "JXS",
|
|
|
- goodsId: e.id,
|
|
|
- storageId: this.form.storageId
|
|
|
- });
|
|
|
- e.storageQuantity = form.stock;
|
|
|
- e.purchaseAmount = form.purchaseAmount;
|
|
|
- e.arr = [];
|
|
|
- } else {
|
|
|
- e.storageQuantity = 0;
|
|
|
- e.purchaseAmount = 0;
|
|
|
- e.arr = await this.getLotNo({
|
|
|
+ let goodsList = []
|
|
|
+ let arr = []
|
|
|
+ arr = this.goodsListSave
|
|
|
+ this.goodsListSave.forEach(e => {
|
|
|
+ goodsList.push({
|
|
|
+ code: e.code,
|
|
|
+ itemId: e.id
|
|
|
+ })
|
|
|
+ });
|
|
|
+ salesOrderEntry({ typeId: 1, isFreight: 0, isLabel: 0, billType: "XS", tradeType: "JXS", storageId: this.form.storageId, salesOrderEntry: goodsList }).then(res => {
|
|
|
+ let data = res.data.data
|
|
|
+ arr.forEach((e, index) => {
|
|
|
+ this.dataList.push({
|
|
|
+ price: data[index].salePrice.length > 0 ? data[index].salePrice[0].salePrice : 0,
|
|
|
+ newJob: data[index].historicalProcurement.length > 0 ? data[index].historicalProcurement[0].price : null,
|
|
|
+ newDate: data[index].historicalProcurement.length > 0 ? data[index].historicalProcurement[0].businesDate : null,
|
|
|
+ storageQuantity: e.batch == 0 ? (data[index].stockGoodsDetail ? this.getStockInfo2(data[index].stockGoodsDetail).stock : 0) : 0,
|
|
|
+ purchaseAmount: e.batch == 0 ? (data[index].stockGoodsDetail ? this.getStockInfo2(data[index].stockGoodsDetail).purchaseAmount : 0) : 0,
|
|
|
+ arr: e.batch != 0 ? data[index].goodsBatch : null,
|
|
|
itemId: e.id,
|
|
|
- storageId: this.form.storageId,
|
|
|
- tradeType: "JXS"
|
|
|
+ code: e.code,
|
|
|
+ cname: e.cname,
|
|
|
+ corpId: e.corpId,
|
|
|
+ corpName: e.corpName,
|
|
|
+ brandItem: e.brandItem,
|
|
|
+ specsOne: e.specsOne,
|
|
|
+ specsTwo: e.specsTwo,
|
|
|
+ typeno: e.typeno,
|
|
|
+ unit: e.unit,
|
|
|
+ size: e.size,
|
|
|
+ priceCategory: e.goodsTypeName,
|
|
|
+ batch: e.batch,
|
|
|
+ $cellEdit: true
|
|
|
});
|
|
|
- }
|
|
|
- this.dataList.push({
|
|
|
- itemId: e.id,
|
|
|
- code: e.code,
|
|
|
- cname: e.cname,
|
|
|
- brandItem: e.brandItem,
|
|
|
- specsOne: e.specsOne,
|
|
|
- specsTwo: e.specsTwo,
|
|
|
- typeno: e.typeno,
|
|
|
- corpId: e.corpId,
|
|
|
- corpName: e.corpName,
|
|
|
- unit: e.unit,
|
|
|
- size: e.size,
|
|
|
- price: e.price,
|
|
|
- amount: 0,
|
|
|
- orderQuantity: 0,
|
|
|
- storageQuantity: e.storageQuantity,
|
|
|
- purchaseAmount: e.purchaseAmount,
|
|
|
- batch: e.batch,
|
|
|
- arr: e.arr,
|
|
|
- newJob: e.newJob,
|
|
|
- newDate: e.newDate,
|
|
|
- $cellEdit: true
|
|
|
});
|
|
|
- });
|
|
|
+ })
|
|
|
} else {
|
|
|
- this.selectionList.forEach(async e => {
|
|
|
- getMarketPrice({ code: e.code, isFreight: 0, isLabel: 0 }).then(
|
|
|
- response => {
|
|
|
- if (response.data.data.length > 0) {
|
|
|
- this.$set(e, "price", response.data.data[0].salePrice);
|
|
|
- } else {
|
|
|
- this.$set(e, "price", "0");
|
|
|
- }
|
|
|
- }
|
|
|
- );
|
|
|
- let historyData = await this.getHistoryData(e, 1); // 获得最新数据
|
|
|
- if (historyData.length > 0) {
|
|
|
- e.newJob = historyData[0].price;
|
|
|
- e.newDate = historyData[0].businesDate;
|
|
|
- } else {
|
|
|
- e.newJob = null;
|
|
|
- e.newDate = null;
|
|
|
- }
|
|
|
- if (e.batch == 0) {
|
|
|
- form = await this.getStockInfo({
|
|
|
- tradeType: "JXS",
|
|
|
- goodsId: e.id,
|
|
|
- storageId: this.form.storageId
|
|
|
- });
|
|
|
- e.storageQuantity = form.stock;
|
|
|
- e.purchaseAmount = form.purchaseAmount;
|
|
|
- e.arr = [];
|
|
|
- } else {
|
|
|
- e.storageQuantity = 0;
|
|
|
- e.purchaseAmount = 0;
|
|
|
- e.arr = await this.getLotNo({
|
|
|
+ let goodsList = []
|
|
|
+ let arr = []
|
|
|
+ arr = this.selectionList
|
|
|
+ this.selectionList.forEach(e => {
|
|
|
+ goodsList.push({
|
|
|
+ code: e.code,
|
|
|
+ itemId: e.id
|
|
|
+ })
|
|
|
+ });
|
|
|
+ salesOrderEntry({ typeId: 1, isFreight: 0, isLabel: 0, billType: "XS", tradeType: "JXS", storageId: this.form.storageId, salesOrderEntry: goodsList }).then(res => {
|
|
|
+ let data = res.data.data
|
|
|
+ arr.forEach((e, index) => {
|
|
|
+ this.dataList.push({
|
|
|
+ price: data[index].salePrice.length > 0 ? data[index].salePrice[0].salePrice : 0,
|
|
|
+ newJob: data[index].historicalProcurement.length > 0 ? data[index].historicalProcurement[0].price : null,
|
|
|
+ newDate: data[index].historicalProcurement.length > 0 ? data[index].historicalProcurement[0].businesDate : null,
|
|
|
+ storageQuantity: e.batch == 0 ? (data[index].stockGoodsDetail ? this.getStockInfo2(data[index].stockGoodsDetail).stock : 0) : 0,
|
|
|
+ purchaseAmount: e.batch == 0 ? (data[index].stockGoodsDetail ? this.getStockInfo2(data[index].stockGoodsDetail).purchaseAmount : 0) : 0,
|
|
|
+ arr: e.batch != 0 ? data[index].goodsBatch : null,
|
|
|
itemId: e.id,
|
|
|
- storageId: this.form.storageId,
|
|
|
- tradeType: "JXS"
|
|
|
+ code: e.code,
|
|
|
+ cname: e.cname,
|
|
|
+ corpId: e.corpId,
|
|
|
+ corpName: e.corpName,
|
|
|
+ brandItem: e.brandItem,
|
|
|
+ specsOne: e.specsOne,
|
|
|
+ specsTwo: e.specsTwo,
|
|
|
+ typeno: e.typeno,
|
|
|
+ unit: e.unit,
|
|
|
+ size: e.size,
|
|
|
+ priceCategory: e.goodsTypeName,
|
|
|
+ batch: e.batch,
|
|
|
+ $cellEdit: true
|
|
|
});
|
|
|
- }
|
|
|
- this.dataList.push({
|
|
|
- itemId: e.id,
|
|
|
- code: e.code,
|
|
|
- cname: e.cname,
|
|
|
- brandItem: e.brandItem,
|
|
|
- specsOne: e.specsOne,
|
|
|
- specsTwo: e.specsTwo,
|
|
|
- typeno: e.typeno,
|
|
|
- corpId: e.corpId,
|
|
|
- corpName: e.corpName,
|
|
|
- unit: e.unit,
|
|
|
- size: e.size,
|
|
|
- amount: 0,
|
|
|
- orderQuantity: 0,
|
|
|
- storageQuantity: e.storageQuantity,
|
|
|
- purchaseAmount: e.purchaseAmount,
|
|
|
- batch: e.batch,
|
|
|
- arr: e.arr,
|
|
|
- newJob: e.newJob,
|
|
|
- newDate: e.newDate,
|
|
|
- price: e.price,
|
|
|
- $cellEdit: true
|
|
|
});
|
|
|
- });
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
this.dialogVisible = false;
|
|
|
@@ -1745,8 +1378,7 @@ export default {
|
|
|
})
|
|
|
.then(() => {
|
|
|
window.open(
|
|
|
- `/api/blade-purchase-sales/orderitems/exportDealerOrder?${
|
|
|
- this.website.tokenHeader
|
|
|
+ `/api/blade-purchase-sales/orderitems/exportDealerOrder?${this.website.tokenHeader
|
|
|
}=${getToken()}`
|
|
|
);
|
|
|
})
|
|
|
@@ -1763,7 +1395,7 @@ export default {
|
|
|
},
|
|
|
importTemplate(res, file) {
|
|
|
this.openFullScreen(true);
|
|
|
- res.data.forEach(item => {});
|
|
|
+ res.data.forEach(item => { });
|
|
|
this.dataList = this.dataList.concat(res.data);
|
|
|
},
|
|
|
uploadError(err, file, fileList) {
|
|
|
@@ -1920,9 +1552,11 @@ export default {
|
|
|
.trading-form ::v-deep .el-form-item {
|
|
|
margin-bottom: 8px !important;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .el-form-item__error {
|
|
|
display: none !important;
|
|
|
}
|
|
|
+
|
|
|
::v-deep .select-component {
|
|
|
display: flex !important;
|
|
|
}
|
qukaidi