销售修改

jg-waiwang-pro
vayne 6 months ago
parent d849766d76
commit d8a8d9cdb5

@ -36,57 +36,32 @@
</el-row>
</el-col>
<el-col :span="24">
<div
style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;"
>
<div style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;">
<el-row>
<el-col
>1采购员 录入
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/extend/supplier/subjectbasic')"
>供应商信息</span
></el-col
>
<el-col>1采购员 录入
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/extend/supplier/subjectbasic')">供应商信息</span></el-col>
<el-col>
2采购员 根据
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/contractL')"
>采购合同</span
>提交
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')"
>采购订单</span
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/contractL')">采购合同</span>提交
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')">采购订单</span>
并下发
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')"
>入库通知单</span
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')">入库通知单</span>
</el-col>
<el-col>3供应商物流人员 配送送货</el-col>
<el-col>
4仓管员 根据
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')"
>入库通知单</span
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')">入库通知单</span>
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/receiptVoucher')"
>收货凭证</span
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货凭证</span>
新增
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/warehousing/warehousingstorage')"
>入库单</span
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/warehousing/warehousingstorage')">入库单</span>
增加库存
</el-col>
</el-row>
@ -120,84 +95,46 @@
</el-row>
</el-col>
<el-col :span="24">
<div
style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;"
>
<div style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;">
<el-row>
<el-col
>1采购员 根据
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/contractL')"
>销售合同</span
>提交
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/contractL')"
>采购合同</span
></el-col
>
<el-col
>2销售员 根据
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/contractL')"
>销售合同</span
>
<el-col>1采购员 根据
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/contractL')">销售合同</span>提交
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/contractL')">采购合同</span></el-col>
<el-col>2销售员 根据
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/contractL')">销售合同</span>
提交
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/saleCenter/saleOrder')"
>销售订单</span
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/saleCenter/saleOrder')">销售订单</span>
</el-col>
<el-col
>3采购员 根据
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/saleCenter/saleOrder')"
>销售订单</span
>
<el-col>3采购员 根据
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/saleCenter/saleOrder')">销售订单</span>
提交
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')"
>采购订单</span
></el-col
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')">采购订单</span></el-col>
<el-col>4供应商物流人员 配送发货至客户</el-col>
<el-col
>5销售员 根据 客户的
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/receiptVoucher')"
>收货凭证</span
>
<el-col>5销售员 根据 客户的
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货凭证</span>
生成
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/deliveryVoucher')"
>发货凭证</span
></el-col
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span></el-col>
<el-col>
6采购员 根据 客户的
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/receiptVoucher')"
>收货凭证</span
>
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货凭证</span>
生成 收货单 增加库存
</el-col>
<el-col
>7采购员 根据
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/deliveryVoucher')"
>发货凭证</span
>
生成 发货单 减少库存</el-col
>
<el-col>7采购员 根据
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span>
生成
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/deliveryOrder')">发货单</span>
减少库存</el-col>
</el-row>
</div>
</el-col>
@ -242,36 +179,29 @@
</el-row>
</el-col>
<el-col :span="24">
<div
style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;"
>
<div style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;">
<el-row>
<el-col
>1采购员 提交
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')"
>退供单</span
></el-col
>
<el-col
>2采购经理 审核
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')"
>退供单</span
>
<el-col>1采购员 提交
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')">退供单</span></el-col>
<el-col>2采购经理 审核
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')">退供单</span>
</el-col>
<el-col>3采购员 确定
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')">退供单</span>下发
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')">出库通知单</span>
</el-col>
<el-col
>3采购员 确定
<span
style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')"
>退供单</span
>下发 出库通知单</el-col
>
<el-col>4仓管员 根据 出库通知单 进行发货</el-col>
<el-col>5仓管员 根据 发货凭证 验货出库 减少库存</el-col>
<el-col>4仓管员 根据
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')">出库通知单</span>
进行发货</el-col>
<el-col>5仓管员 根据
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span>
验货出库 减少库存</el-col>
</el-row>
</div>
</el-col>
@ -303,12 +233,18 @@
</el-row>
</el-col>
<el-col :span="24">
<div
style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;"
>
<div style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;">
<el-row>
<el-col>1销售员 根据 销售订单 提交 销售退货订单</el-col>
<el-col>2采购员 根据 销售退货订单 提交 退供单</el-col>
<el-col>1销售员 根据
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/saleCenter/saleOrder')">销售订单</span> 提交
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/saleCenter/returnCargoOrder')">销售退货订单</span></el-col>
<el-col>2采购员 根据
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/saleCenter/returnCargoOrder')">销售退货订单</span> 提交
<span style="cursor:pointer;color:#409eff;"
@click="fnGo('/scm/purchaseCenter/returnCargoOrder')">退供单</span></el-col>
<el-col>3供应商物流人员 收到货物后</el-col>
<el-col>4采购员 根据 供应商的 收货凭证 生成 发货凭证</el-col>
<el-col>
@ -322,123 +258,85 @@
</div>
<div style="clear:both;"></div>
</div>
<el-dialog
title="如何添加商品库存"
:close-on-click-modal="false"
:visible.sync="dialogVisibleA"
class="JNPF-dialog JNPF-dialog_center"
lock-scroll
append-to-body
width="750px"
>
<el-dialog title="如何添加商品库存" :close-on-click-modal="false" :visible.sync="dialogVisibleA"
class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body width="750px">
<div>
<el-row>
<el-col :span="6">
<div class="dialoga-item">
<div class="dialoga-item-num">
<img
src="@/assets/images/u51.svg"
style="width:100%;height:100%;position:absolute;left:0px;top:0px;"
/>
<img src="@/assets/images/u51.svg"
style="width:100%;height:100%;position:absolute;left:0px;top:0px;" />
<span>1</span>
</div>
<div class="dialoga-item-cnt">
<img
src="@/assets/images/u39.png"
style="width:60px;height:60px;margin: 15px 0px;"
/>
<img src="@/assets/images/u39.png"
style="width:60px;height:60px;margin: 15px 0px;" />
<div> 商品库 新建商品</div>
</div>
<div class="dialoga-item-link">
<span
style="cursor:pointer;"
@click="fnGo('/scm/productWarehouse')"
>前往新建></span
>
<span style="cursor:pointer;" @click="fnGo('/scm/productWarehouse')">></span>
</div>
</div>
</el-col>
<el-col :span="6">
<div class="dialoga-item">
<div class="dialoga-item-num">
<img
src="@/assets/images/u51.svg"
style="width:100%;height:100%;position:absolute;left:0px;top:0px;"
/>
<img src="@/assets/images/u51.svg"
style="width:100%;height:100%;position:absolute;left:0px;top:0px;" />
<span>2</span>
</div>
<div class="dialoga-item-cnt">
<img
src="@/assets/images/u40.png"
style="width:60px;height:60px;margin: 15px 0px;"
/>
<img src="@/assets/images/u40.png"
style="width:60px;height:60px;margin: 15px 0px;" />
<div> 供应商中新建供应商</div>
</div>
<div class="dialoga-item-link">
<span
style="cursor:pointer;"
@click="fnGo('/extend/supplier/subjectbasic')"
>前往新建></span
>
<span style="cursor:pointer;"
@click="fnGo('/extend/supplier/subjectbasic')">前往新建></span>
</div>
</div>
</el-col>
<el-col :span="6">
<div class="dialoga-item">
<div class="dialoga-item-num">
<img
src="@/assets/images/u51.svg"
style="width:100%;height:100%;position:absolute;left:0px;top:0px;"
/>
<img src="@/assets/images/u51.svg"
style="width:100%;height:100%;position:absolute;left:0px;top:0px;" />
<span>3</span>
</div>
<div class="dialoga-item-cnt">
<img
src="@/assets/images/u41.png"
style="width:60px;height:60px;margin: 15px 0px;"
/>
<img src="@/assets/images/u41.png"
style="width:60px;height:60px;margin: 15px 0px;" />
<div>采购订单中新建采购订单</div>
</div>
<div class="dialoga-item-link">
<span
style="cursor:pointer;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')"
>前往新建></span
>
<span style="cursor:pointer;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')">前往新建></span>
</div>
</div>
</el-col>
<el-col :span="6">
<div class="dialoga-item">
<div class="dialoga-item-num">
<img
src="@/assets/images/u51.svg"
style="width:100%;height:100%;position:absolute;left:0px;top:0px;"
/>
<img src="@/assets/images/u51.svg"
style="width:100%;height:100%;position:absolute;left:0px;top:0px;" />
<span>4</span>
</div>
<div class="dialoga-item-cnt">
<img
src="@/assets/images/u42.png"
style="width:60px;height:60px;margin: 15px 0px;"
/>
<img src="@/assets/images/u42.png"
style="width:60px;height:60px;margin: 15px 0px;" />
<div>采购入库中将商品入库</div>
</div>
<div class="dialoga-item-link">
<span
style="cursor:pointer;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')"
>前往新建></span
>
<span style="cursor:pointer;"
@click="fnGo('/scm/purchaseCenter/purchaseOrder')">前往新建></span>
</div>
</div>
</el-col>
</el-row>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisibleA = false"
>知道了</el-button
>
<el-button type="primary" @click="dialogVisibleA = false">知道了</el-button>
</span>
</el-dialog>
</div>
@ -454,7 +352,7 @@ export default {
},
computed: {},
created() {},
created() { },
methods: {
fnGo(path) {
this.$router.push(path);

@ -59,13 +59,13 @@
<el-table-column prop="deliveryCode" label="单据编号" sortable align="center" fixed="left"
width="160">
</el-table-column>
<el-table-column prop="subjectId" label="客户名称" sortable align="center" fixed="left"
<el-table-column prop="supplyName" label="客户名称" sortable align="center" fixed="left"
width="200">
</el-table-column>
<el-table-column label="单据类型" prop="deliveryType" sortable align="center" fixed="left"
<el-table-column label="单据类型" prop="deliveryType1" sortable align="center" fixed="left"
width="100">
<template slot-scope="scope">
{{ scope.row.deliveryType }}
{{ scope.row.deliveryType1 }}
</template>
</el-table-column>
<el-table-column prop="deliveryStatus1" label="单据状态" sortable align="center" fixed="left"

@ -49,7 +49,7 @@
placeholder="请选择" :disabled="judgeWrite('associateThirdSuppliers')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='associateThirdSuppliers' interfaceId="530001884988047877" :pageSize="20"
:columnOptions="associateThirdSupplierscolumnOptions" clearable
:hasPage="true" :columnOptions="associateThirdSupplierscolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
@ -87,8 +87,8 @@
:templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='vehicle_number' field='vehicleId' interfaceId="529920852288864453"
:pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
:pageSize="20" :hasPage="true" :columnOptions="vouchervehiclevehicleIdcolumnOptions"
clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
@ -102,7 +102,7 @@
:disabled="judgeWrite('supplierName')" :templateJson="interfaceRes.enterpriseId"
placeholder="请选择" propsValue="f_id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='f_full_name' field='enterpriseId'
interfaceId="522729853024209157" :pageSize="20"
interfaceId="522729853024209157" :pageSize="20" :hasPage="true"
:columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
@ -117,7 +117,7 @@
:templateJson="interfaceRes.firstSubjectBasicId" placeholder="请选择" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='firstSubjectBasicId' interfaceId="530001731111617029" :pageSize="20"
:columnOptions="firstSubjectBasicIdcolumnOptions" clearable
:hasPage="true" :columnOptions="firstSubjectBasicIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>

@ -40,7 +40,7 @@
:templateJson="interfaceRes.businessLineId" placeholder="请选择"
:disabled="judgeWrite('businessLineId')" propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='name' field='businessLineId'
interfaceId="517979330417001669" :pageSize="20"
interfaceId="517979330417001669" :pageSize="20" :hasPage="true"
:columnOptions="businessLineIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
@ -110,7 +110,7 @@
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.contractId"
placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='contractName' field='contractId'
interfaceId="531872211288459717" :pageSize="20"
interfaceId="531872211288459717" :pageSize="20" :hasPage="true"
:columnOptions="contractIdcolumnOptions" clearable :style='{ "width": "100%" }'
@click.native="relationBusinessLine">
</JnpfPopupSelect>
@ -373,7 +373,7 @@
placeholder="请选择" :disabled="judgeWrite('firstSubjectBasicId')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='firstSubjectBasicId' interfaceId="522693551289534725" :pageSize="20"
:columnOptions="firstSubjectBasicIdcolumnOptions" clearable
:columnOptions="firstSubjectBasicIdcolumnOptions" clearable :hasPage="true"
:style='{ "width": "100%" }' @change="getCustomName">
</JnpfPopupSelect>
</jnpf-form-tip-item>
@ -419,7 +419,7 @@
:templateJson="interfaceRes.enterpriseId" placeholder="请选择"
:disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
field='enterpriseId' interfaceId="522729853024209157" :pageSize="20"
field='enterpriseId' interfaceId="522729853024209157" :pageSize="20" :hasPage="true"
:columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
@ -432,7 +432,7 @@
:templateJson="interfaceRes.deliveryWarehouse" placeholder="请选择"
:disabled="judgeWrite('deliveryWarehouse')" propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='name' field='deliveryWarehouse'
interfaceId="522701377537837317" :pageSize="20"
interfaceId="522701377537837317" :pageSize="20" :hasPage="true"
:columnOptions="deliveryWarehousecolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
@ -447,7 +447,7 @@
:disabled="judgeWrite('deliveryAddress')" propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField='addressDetail'
field='deliveryAddress' interfaceId="522724961224231173" :pageSize="20"
:columnOptions="deliveryAddresscolumnOptions" clearable
:hasPage="true" :columnOptions="deliveryAddresscolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>

@ -70,7 +70,7 @@
<el-table :data="dataForm.saleOrderInfo" size="mini">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="销售订单" v-if="judgeShow('warehousingproduct-productName')"
prop="code">
prop="code" width="210">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('warehousingproductList-productName')">*</span>销售订单
@ -563,10 +563,7 @@
<template slot-scope="scope">
<JnpfInput v-model="scope.row.batchNo" @change="
changeData('warehousingproduct-batchNo', scope.$index)
" placeholder="请输入" :disabled="
judgeWrite('warehousingproductList') ||
judgeWrite('warehousingproductList-batchNo')
" clearable :style="{ width: '100%' }">
" placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
@ -584,10 +581,8 @@
scope.$index
)
" :startTime="dateTime(false, 1, 1, '', '')"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" :disabled="
judgeWrite('warehousingproductList') ||
judgeWrite('warehousingproductList-produceDate')
" clearable :style="{ width: '100%' }" type="date" format="yyyy-MM-dd">
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" :disabled="true"
clearable :style="{ width: '100%' }" type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</template>
</el-table-column>

@ -140,7 +140,7 @@
@change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.warehouseId" placeholder="请选择" hasPage propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
field='warehouseId' interfaceId="529573170819104773" :pageSize="20"
field='warehouseId' interfaceId="529617754022498181" :pageSize="20"
:columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>

@ -71,7 +71,7 @@
@change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
disabled :templateJson="interfaceRes.warehouseId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField="name" field="warehouseId" interfaceId="529573170819104773"
relationField="name" field="warehouseId" interfaceId="529617754022498181"
:pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable
:style="{ width: '100%' }">
</JnpfPopupSelect>

Loading…
Cancel
Save