yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 2ef890d014 ffd519af6b
commit f6ff1f3a9a
8 changed files with 2835 additions and 2408 deletions
Show Stats Download Patch File Download Diff File

301
SC-web/src/views/scm/basicInformation/collection/Form.vue
Unescape View File

@ -1,120 +1,99 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1000px">
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<el-form-item label="单据编号"
prop="documentNo" >
<el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly>
<el-form-item label="单据编号" prop="documentNo">
<el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称"
prop="customerName" >
<popupSelect v-model="dataForm.customerName"
placeholder="请选择" clearable field="customerName" interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="supplier_nm" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="popupSelect"
>
<el-form-item label="客户名称" prop="customerName">
<popupSelect v-model="dataForm.customerName" placeholder="请选择" clearable field="customerName"
interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="supplier_nm"
relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
@change="popupSelect">
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款金额"
prop="amountCollected" >
<el-input v-model="dataForm.amountCollected"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="收款金额" prop="amountCollected">
<el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款账户"
prop="collectionCount" >
<el-input v-model="dataForm.collectionCount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="收款账户" prop="collectionCount">
<el-input v-model="dataForm.collectionCount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款银行"
prop="collectionBank" >
<el-input v-model="dataForm.collectionBank"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="收款银行" prop="collectionBank">
<el-input v-model="dataForm.collectionBank" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款类型 "
prop="paymentType" >
<el-select v-model="dataForm.paymentType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-form-item label="收款类型 " prop="paymentType">
<el-select v-model="dataForm.paymentType" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="币别 "
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-form-item label="币别 " prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="结算类型"
prop="settlementType" >
<el-select v-model="dataForm.settlementType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-form-item label="结算类型" prop="settlementType">
<el-select v-model="dataForm.settlementType" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注信息"
prop="remark" >
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="备注信息" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款凭证"
prop="voucher" >
<JNPF-UploadFz v-model="dataForm.voucher"
:fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
<el-form-item label="收款凭证" prop="voucher">
<JNPF-UploadFz v-model="dataForm.voucher" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
</JNPF-UploadFz>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据状态 "
prop="status" >
<el-select v-model="dataForm.status"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-form-item label="单据状态 " prop="status">
<el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="制单人" prop="creatorUserName">
<el-input v-model="dataForm.creatorUserName" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
@ -127,49 +106,47 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collection_item0List" size='mini' >
<el-table :data="dataForm.collection_item0List" size='mini' show-summary>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额">
<el-table-column prop="amount" label="收款金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"200%"}'>
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserId" label="订单金额">
<el-table-column prop="creatorUserId" label="订单金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.price"
placeholder="请输入" clearable :style='{"width":"200%"}'>
<el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="已收款金额">
<el-table-column prop="creatorUserName" label="已收款金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.amountCollected"
placeholder="请输入" clearable :style='{"width":"200%"}'>
<el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteTime" label="销售订单编号">
<el-table-column prop="deleteTime" label="销售订单编号" align="center" >
<template slot-scope="scope">
<popupSelect v-model="scope.row.documentNo"
placeholder="请选择" clearable :field="'deleteTime'+scope.$index" interfaceId="393372436705378053" :columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="document_no" relationField="document_no" popupType="dialog"
popupWidth="800px" :bissId="dataForm.customerCode" @change="popupSelect2"
>
<popupSelect v-model="scope.row.documentNo" placeholder="请选择" clearable
:field="'deleteTime'+scope.$index" interfaceId="393372436705378053"
:columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="document_no"
relationField="document_no" popupType="dialog" popupWidth="800px"
:bissId="dataForm.customerCode" @change="popupSelect2">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="lastModifyUserId" label="合同编号">
<el-table-column prop="lastModifyUserId" label="合同编号" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.contractCode"
placeholder="请输入" clearable :style='{"width":"200%"}'>
<el-input v-model="scope.row.contractCode" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="lastModifyUserName" label="重量">
<el-table-column prop="lastModifyUserName" label="数量" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.num"
placeholder="请输入" clearable :style='{"width":"200%"}'>
<el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
@ -181,37 +158,36 @@
<!-- </el-select>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="lastModifyTime" label="垫资金额">
<el-table-column prop="lastModifyTime" label="垫资金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.advanceAmount"
placeholder="请输入" clearable :style='{"width":"200%"}'>
<el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserId" label="税额">
<el-table-column prop="deleteUserId" label="税额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.rate"
placeholder="请输入" clearable :style='{"width":"200%"}'>
<el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="deleteUserName" label="不含税金额">
<el-table-column prop="deleteUserName" label="不含税金额" align="center" >
<template slot-scope="scope">
<el-input v-model="scope.row.notPrice"
placeholder="请输入" clearable :style='{"width":"200%"}'>
<el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="业务日期">
<el-table-column prop="creatorTime" label="业务日期" align="center" >
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime"
placeholder="请选择" clearable :style='{"width":"200%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcollection_item0List(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delcollection_item0List(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -234,8 +210,12 @@
</template>
<script>
import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
@ -261,26 +241,132 @@
collection_item0List: [],
},
activeojnisi: '0',
rules:
rules: {},
customerNamecolumnOptions: [{
"label": "客户编码",
"value": "supplier_cd"
}, {
"label": "客户名称",
"value": "supplier_nm"
}, {
"label": "客户地点名称",
"value": "supplier_site_code"
}, {
"label": "客户等级",
"value": "customer_level"
}, ],
jg_collection_item0deleteTimecolumnOptions: [{
"label": "销售订单ID",
"value": "id"
}, {
"label": "销售订单编号",
"value": "document_no"
}, {
"label": "合同编号",
"value": "contract_code"
},
{
"label": "订单金额",
"value": "price"
}, {
"label": "已收款金额",
"value": "amount_collected"
},
{
"label": "重量",
"value": "num"
}, {
"label": "垫资金额",
"value": "advance_amount"
},
customerNamecolumnOptions:[ {"label":"客户编码","value":"supplier_cd"}, {"label":"客户名称","value":"supplier_nm"}, {"label":"客户地点名称","value":"supplier_site_code"}, {"label":"客户等级","value":"customer_level"},],
jg_collection_item0deleteTimecolumnOptions:[ {"label":"销售订单ID","value":"id"},{"label":"销售订单编号","value":"document_no"}, {"label":"合同编号","value":"contract_code"},
{"label":"订单金额","value":"price"}, {"label":"已收款金额","value":"amount_collected"},
{"label":"重量","value":"num"}, {"label":"垫资金额","value":"advance_amount"},
{"label":"税额","value":"rate"}, {"label":"不含税金额","value":"not_price"}, {"label":"业务日期","value":"creator_time"},],
paymentTypeOptions:[{"fullName":"货款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
{
"label": "税额",
"value": "rate"
}, {
"label": "不含税金额",
"value": "not_price"
}, {
"label": "业务日期",
"value": "creator_time"
},
],
paymentTypeOptions: [{
"fullName": "货款",
"id": "0"
}, {
"fullName": "运费",
"id": "1"
}, {
"fullName": "仓储",
"id": "2"
}],
currencyOptions: [{
"fullName": "人民币",
"id": "0"
}, {
"fullName": "美元",
"id": "1"
}, {
"fullName": "英镑",
"id": "2"
}],
settlementTypeOptions: [{
"fullName": "现金",
"id": "0"
}, {
"fullName": "赊购",
"id": "1"
}, {
"fullName": "网银",
"id": "2"
}, {
"fullName": "银企直连",
"id": "3"
}, {
"fullName": "银票",
"id": "4"
}, {
"fullName": "商票",
"id": "5"
}],
statusOptions: [{
"fullName": "已保存",
"id": "0"
}, {
"fullName": "审批中",
"id": "1"
}, {
"fullName": "已审批",
"id": "2"
}, {
"fullName": "已付款",
"id": "3"
}],
taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
taxRateOptions: [{
"fullName": "13",
"id": "0"
}, {
"fullName": "9",
"id": "1"
}, {
"fullName": "6",
"id": "2"
}, {
"fullName": "5",
"id": "3"
}, {
"fullName": "3",
"id": "4"
}, {
"fullName": "0",
"id": "5"
}],
}
},
computed: {},
watch: {},
created() {
},
created() {},
mounted() {},
methods: {
popupSelect(e, d) {
@ -422,5 +508,4 @@
},
},
}
</script>

222
SC-web/src/views/scm/basicInformation/collection/index.vue
Unescape View File

@ -20,75 +20,70 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="primary" icon="el-icon-plus" @click="confirmprice()">认款
<el-button type="text" icon="el-icon-check" @click="exportData()">审核
</el-button>
<el-button type="text" icon="el-icon-close" @click="exportData()">弃审
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">提交
</el-button>
<el-button type="text" icon="el-icon-check" @click="confirmprice()">认款
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="reset()"/>
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
</el-tooltip>
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange">
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
/>
<el-table-column prop="customerName" label="客户名称" width="0" align="left"
/>
<el-table-column label="币别 " width="0" prop="currency" algin="left"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentNo" label="单据编号" fixed="left" sortable width="200" align="center" />
<el-table-column prop="customerName" label="客户名称" fixed="left" sortable width="200" align="center" />
<el-table-column label="币别 " width="80" sortable prop="currency" align="center" >
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="收款金额" width="0" align="left"
/>
<el-table-column prop="collectionCount" label="收款账户" width="0" align="left"
/>
<el-table-column prop="collectionBank" label="收款银行" width="0" align="left"
/>
<el-table-column label="收款类型 " width="0" prop="paymentType" algin="left"
>
<el-table-column prop="amountCollected" sortable label="收款金额" width="150" align="center" />
<el-table-column prop="collectionCount" sortable label="收款账户" width="150" align="center" />
<el-table-column prop="collectionBank" sortable label="收款银行" width="150" align="center" />
<el-table-column label="收款类型" sortable width="150" prop="paymentType" align="center" >
<template slot-scope="scope">
{{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
</template>
</el-table-column>
<el-table-column label="结算类型" width="0" prop="settlementType" algin="left"
>
<el-table-column label="结算类型" sortable width="150" prop="settlementType" align="center" >
<template slot-scope="scope">
{{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
</template>
</el-table-column>
<el-table-column label="单据状态 " width="0" prop="status" algin="left"
>
<el-table-column label="单据状态" sortable width="150" prop="status" align="center" >
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="150" >
<el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" />
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)" >编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -99,14 +94,22 @@ width="150" >
<script>
import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form'
import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail'
export default {
components: {JNPFForm, ExportBox,Detail},
components: {
JNPFForm,
ExportBox,
Detail
},
data() {
return {
detailVisible: false,
@ -120,7 +123,8 @@ width="150" >
},
list: [],
listLoading: true,
multipleSelection: [], total: 0,
multipleSelection: [],
total: 0,
listQuery: {
currentPage: 1,
pageSize: 20,
@ -129,26 +133,115 @@ width="150" >
},
formVisible: false,
exportBoxVisible: false,
columnList: [
{prop: 'documentNo', label: '单据编号'},
{prop: 'customerName', label: '客户名称'},
{prop: 'currency', label: '币别 '},
{prop: 'amountCollected', label: '收款金额'},
{prop: 'collectionCount', label: '收款账户'},
{prop: 'collectionBank', label: '收款银行'},
{prop: 'paymentType', label: '收款类型 '},
{prop: 'settlementType', label: '结算类型'},
{prop: 'status', label: '单据状态 '},
{prop: 'creatorUserName', label: '制单人'},
columnList: [{
prop: 'documentNo',
label: '单据编号'
},
{
prop: 'customerName',
label: '客户名称'
},
{
prop: 'currency',
label: '币别 '
},
{
prop: 'amountCollected',
label: '收款金额'
},
{
prop: 'collectionCount',
label: '收款账户'
},
{
prop: 'collectionBank',
label: '收款银行'
},
{
prop: 'paymentType',
label: '收款类型 '
},
{
prop: 'settlementType',
label: '结算类型'
},
{
prop: 'status',
label: '单据状态 '
},
{
prop: 'creatorUserName',
label: '制单人'
},
],
paymentTypeOptions:[{"fullName":"货款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
paymentTypeProps:{"label":"fullName","value":"id"},
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
currencyProps:{"label":"fullName","value":"id"},
settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
settlementTypeProps:{"label":"fullName","value":"id"},
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
statusProps:{"label":"fullName","value":"id"},
paymentTypeOptions: [{
"fullName": "货款",
"id": "0"
}, {
"fullName": "运费",
"id": "1"
}, {
"fullName": "仓储",
"id": "2"
}],
paymentTypeProps: {
"label": "fullName",
"value": "id"
},
currencyOptions: [{
"fullName": "人民币",
"id": "0"
}, {
"fullName": "美元",
"id": "1"
}, {
"fullName": "英镑",
"id": "2"
}],
currencyProps: {
"label": "fullName",
"value": "id"
},
settlementTypeOptions: [{
"fullName": "现金",
"id": "0"
}, {
"fullName": "赊购",
"id": "1"
}, {
"fullName": "网银",
"id": "2"
}, {
"fullName": "银企直连",
"id": "3"
}, {
"fullName": "银票",
"id": "4"
}, {
"fullName": "商票",
"id": "5"
}],
settlementTypeProps: {
"label": "fullName",
"value": "id"
},
statusOptions: [{
"fullName": "已保存",
"id": "0"
}, {
"fullName": "审批中",
"id": "1"
}, {
"fullName": "已审批",
"id": "2"
}, {
"fullName": "已付款",
"id": "3"
}],
statusProps: {
"label": "fullName",
"value": "id"
},
}
},
computed: {
@ -166,7 +259,11 @@ width="150" >
this.$refs.Detail.init(id)
})
},
sortChange({column, prop, order}) {
sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
@ -210,8 +307,7 @@ width="150" >
}
});
})
}).catch(() => {
});
}).catch(() => {});
},
handleSelectionChange(val) {
const res = val.map(item => item.id)
@ -242,8 +338,7 @@ width="150" >
}
});
})
}).catch(() => {
})
}).catch(() => {})
},
confirmprice() {
if (!this.multipleSelection.length) {
@ -287,7 +382,12 @@ width="150" >
})
},
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({
url: `/api/collection/Collection/Actions/Export`,
method: 'GET',

1
SC-web/src/views/scm/basicInformation/payment/index.vue
Unescape View File

@ -44,6 +44,7 @@
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="paymentno" label="来源单号" fixed="left" sortable width="200" align="center" />
<el-table-column prop="documentno" label="单据编号" fixed="left" sortable width="200" align="center" />
<el-table-column prop="suppliername" label="供应商" fixed="left" sortable width="150" align="center" />

115
SC-web/src/views/scm/basicInformation/poundlist/Form.vue
Unescape View File

@ -1,23 +1,21 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1200px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
label-position="right">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="12">
<el-form-item label="物料编码" prop="materialCode">
<popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable
field="materialCode" interfaceId="381037852907038533" :columnOptions="materialCodecolumnOptions" propsValue="item_code" relationField="item_code" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
<popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable field="materialCode"
interfaceId="381037852907038533" :columnOptions="materialCodecolumnOptions" propsValue="item_code"
relationField="item_code" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
</popup-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="dataForm.materialName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-input v-model="dataForm.materialName" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
@ -25,16 +23,15 @@
<el-col :span="12">
<el-form-item label="销售合同" prop="salesName">
<popup-select v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
</popup-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="dataForm.customerName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-input v-model="dataForm.customerName" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
@ -42,8 +39,8 @@
<el-col :span="12">
<el-form-item label="是否垫资" prop="advance">
<el-select v-model="dataForm.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
@ -57,10 +54,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="运输方式" prop="transportType">
<el-select v-model="dataForm.transportType" placeholder="请选择" clearable
:style='{"width":"100%"}'>
<el-option v-for="(item, index) in transportTypeOptions" :key="index"
:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
<el-select v-model="dataForm.transportType" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
@ -75,16 +71,15 @@
<el-col :span="12">
<el-form-item label="车号" prop="licenseNo">
<popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="ticketno" relationField="ticketno" popupType="dialog"
popupTitle="选择数据" popupWidth="800px">
interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="ticketno"
relationField="ticketno" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="业务员名称" prop="businessName">
<el-input v-model="dataForm.businessName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-input v-model="dataForm.businessName" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
@ -133,8 +128,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="司机名称" prop="driverName">
<el-input v-model="dataForm.driverName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-input v-model="dataForm.driverName" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
@ -148,25 +142,22 @@
</el-col>
<el-col :span="24">
<el-form-item label="制单人" prop="creatorusername">
<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商名称" prop="supplierName">
<el-input v-model="dataForm.supplierName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-input v-model="dataForm.supplierName" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="采购合同" prop="purchaseName">
<relationForm v-model="dataForm.purchaseName" placeholder="请选择" clearable
field="purchaseName" modelId="294090217084722181"
:columnOptions="purchaseNamecolumnOptions" relationField="selectField121">
<relationForm v-model="dataForm.purchaseName" placeholder="请选择" clearable field="purchaseName"
modelId="294090217084722181" :columnOptions="purchaseNamecolumnOptions" relationField="selectField121">
</relationForm>
</el-form-item>
@ -174,69 +165,62 @@
<el-col :span="12">
<el-form-item label="单位" prop="unit">
<el-select v-model="dataForm.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结算重量" prop="settlement">
<el-input v-model="dataForm.settlement" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-input v-model="dataForm.settlement" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="采购单价" prop="purchasePrice">
<el-input v-model="dataForm.purchasePrice" placeholder="请输入" clearable
:style='{"width":"100%"}'>
<el-input v-model="dataForm.purchasePrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="进项票日期" prop="inputDate">
<el-date-picker v-model="dataForm.inputDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp">
<el-date-picker v-model="dataForm.inputDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="datetime" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="销项票日期" prop="outputDate">
<el-date-picker v-model="dataForm.outputDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp">
<el-date-picker v-model="dataForm.outputDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="datetime" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="付款日期" prop="payDate">
<el-date-picker v-model="dataForm.payDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp">
<el-date-picker v-model="dataForm.payDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="datetime" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="回款日期" prop="paymentDate">
<el-date-picker v-model="dataForm.paymentDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp">
<el-date-picker v-model="dataForm.paymentDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="datetime" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="磅单日期" prop="poundDate">
<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
value-format="timestamp">
<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="datetime" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</el-form-item>
@ -339,10 +323,23 @@
trigger: ["blur", "change"]
}, ],
},
materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"},
{"label":"物料名称","value":"description"},
{"label":"库存组织","value":"organization_id"},
{"label":"默认库区","value":"areaname"},],
materialCodecolumnOptions: [{
"label": "物料编码",
"value": "item_code"
},
{
"label": "物料名称",
"value": "description"
},
{
"label": "库存组织",
"value": "organization_id"
},
{
"label": "默认库区",
"value": "areaname"
},
],
salesNamecolumnOptions: [{
"label": "合同编码",
"value": "contract_code"
@ -358,7 +355,8 @@
{
"label": "供应商/客户名称",
"value": "name"
},],
},
],
advanceOptions: [{
"fullName": "是",
"id": "1"
@ -399,7 +397,8 @@
{
"label": "创建时间",
"value": "f_creatortime"
},],
},
],
purchaseNamecolumnOptions: [{
"label": "事件等级",
"value": "selectField121"

73
SC-web/src/views/scm/basicInformation/poundlist/index.vue
Unescape View File

@ -20,12 +20,16 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">生成采购
</el-button>
<el-button type="text" icon="el-icon-close" @click="exportData()">生成销售
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -35,40 +39,41 @@
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange">
<el-table-column prop="licenseNo" label="车号" width="0" align="left" />
<el-table-column prop="customerName" label="客户名称" width="0" align="left" />
<el-table-column prop="salesName" label="销售合同" width="0" align="left" />
<el-table-column prop="supplierName" label="供应商名称" width="0" align="left" />
<el-table-column prop="purchaseName" label="采购合同" width="0" align="left" />
<el-table-column prop="materialCode" label="物料编码" width="0" align="left" />
<el-table-column prop="materialName" label="物料名称" width="0" align="left" />
<el-table-column label="是否垫资" width="0" prop="advance" algin="left">
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="licenseNo" label="车号" fixed="left" sortable width="120" align="center" />
<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" />
<el-table-column prop="salesName" label="销售合同" sortable width="150" align="center" />
<el-table-column prop="supplierName" label="供应商名称" sortable width="150" align="center" />
<el-table-column prop="purchaseName" label="采购合同" sortable width="150" align="center" />
<el-table-column prop="materialCode" label="物料编码" sortable width="150" align="center" />
<el-table-column prop="materialName" label="物料名称" sortable width="150" align="center" />
<el-table-column prop="advance" label="是否垫资" sortable width="100" align="center" >
<template slot-scope="scope">
{{ scope.row.advance | dynamicText(advanceOptions) }}
</template>
</el-table-column>
<el-table-column label="单位" width="0" prop="unit" algin="left">
<el-table-column prop="unit" label="单位" sortable width="100" align="center" >
<template slot-scope="scope">
{{ scope.row.unit | dynamicText(unitOptions) }}
</template>
</el-table-column>
<el-table-column prop="grossWeight" label="毛重" width="0" align="left" />
<el-table-column prop="tareWeight" label="皮重" width="0" align="left" />
<el-table-column prop="buckleWeight" label="扣重" width="0" align="left" />
<el-table-column prop="netWeight" label="净重" width="0" align="left" />
<el-table-column prop="settlement" label="结算重量" width="0" align="left" />
<el-table-column prop="purchasePrice" label="采购单价" width="0" align="left" />
<el-table-column prop="salesPrice" label="销售价格" width="0" align="left" />
<el-table-column prop="inputDate" label="进项票日期" width="0" align="left" />
<el-table-column prop="outputDate" label="销项票日期" width="0" align="left" />
<el-table-column prop="payDate" label="付款日期" width="0" align="left" />
<el-table-column prop="paymentDate" label="回款日期" width="0" align="left" />
<el-table-column prop="poundDate" label="磅单日期" width="0" align="left" />
<el-table-column prop="businessName" label="业务员" width="0" align="left" />
<el-table-column prop="remark" label="备注" width="0" align="left" />
<el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
<el-table-column prop="grossWeight" sortable label="毛重" width="100" align="center" />
<el-table-column prop="tareWeight" sortable label="皮重" width="100" align="center" />
<el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
<el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
<el-table-column prop="settlement" sortable label="结算重量" width="100" align="center" />
<el-table-column prop="purchasePrice" sortable label="采购单价" width="100" align="center" />
<el-table-column prop="salesPrice" sortable label="销售价格" width="100" align="center" />
<el-table-column prop="inputDate" sortable label="进项票日期" width="150" align="center" />
<el-table-column prop="outputDate" sortable label="销项票日期" width="150" align="center" />
<el-table-column prop="payDate" sortable label="付款日期" width="150" align="center" />
<el-table-column prop="paymentDate" sortable label="回款日期" width="150" align="center" />
<el-table-column prop="poundDate" sortable label="磅单日期" width="150" align="center" />
<el-table-column prop="businessName" sortable label="业务员" width="150" align="center" />
<el-table-column prop="remark" sortable label="备注" width="150" align="center" />
<el-table-column prop="poundPictures" label="磅单图片" width="150" align="center">
<template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
<el-popover placement="bottom" trigger="click" width="1000">
@ -83,7 +88,7 @@
</span>
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
<el-table-column prop="vehiclePictures" label="车辆图片" width="150" align="center">
<template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
<el-popover placement="bottom" trigger="click" width="1000">
@ -98,7 +103,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<el-table-column label="操作" fixed="right" width="100" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
@ -327,6 +332,16 @@
}).then(res => {
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
res.data.list[i].inputDate = res.data.list[i].inputDate ? res.data.list[i].inputDate.substring(0,
10) : '';
res.data.list[i].outputDate = res.data.list[i].outputDate ? res.data.list[i].outputDate
.substring(0, 10) : '';
res.data.list[i].payDate = res.data.list[i].payDate ? res.data.list[i].payDate
.substring(0, 10) : '';
res.data.list[i].paymentDate = res.data.list[i].paymentDate ? res.data.list[i].paymentDate
.substring(0, 10) : '';
res.data.list[i].poundDate = res.data.list[i].poundDate ? res.data.list[i].poundDate
.substring(0, 10) : '';
let _data = res.data.list[i];
_list.push(_data)
}

532
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -1,156 +1,126 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1000px">
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<el-form-item label="单据编号"
prop="documentNo" >
<el-input v-model="dataForm.documentNo"
placeholder="系统自动生成" readonly >
<el-form-item label="单据编号" prop="documentNo">
<el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同名称"
prop="contractName" >
<popupSelect v-model="dataForm.contractName"
placeholder="请选择" clearable field="contractName" interfaceId="391146878474963333" :columnOptions="contractNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="popupSelectChange"
>
<el-form-item label="合同名称" prop="contractName">
<popupSelect v-model="dataForm.contractName" placeholder="请选择" clearable field="contractName"
interfaceId="391146878474963333" :columnOptions="contractNamecolumnOptions" propsValue="contract_name"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
@change="popupSelectChange">
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="币别"
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-form-item label="币别" prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="对方合同"
prop="contractNo" >
<el-input v-model="dataForm.contractNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="对方合同" prop="contractNo">
<el-input v-model="dataForm.contractNo" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="垫资金额"
prop="advanceAmount" >
<el-input v-model="dataForm.advanceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="垫资金额" prop="advanceAmount">
<el-input v-model="dataForm.advanceAmount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="数量"
prop="num" >
<el-input v-model="dataForm.num"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="数量" prop="num">
<el-input v-model="dataForm.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额"
prop="price" >
<el-input v-model="dataForm.price"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="金额" prop="price">
<el-input v-model="dataForm.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不含税金额"
prop="notPrice" >
<el-input v-model="dataForm.notPrice"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="不含税金额" prop="notPrice">
<el-input v-model="dataForm.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注信息"
prop="remark" >
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="备注信息" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称"
prop="costomerName" >
<el-input v-model="dataForm.costomerName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="客户名称" prop="costomerName">
<el-input v-model="dataForm.costomerName" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="已回款金额"
prop="amountCollected" >
<el-input v-model="dataForm.amountCollected"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="已回款金额" prop="amountCollected">
<el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票数量"
prop="invoiceNum" >
<el-input v-model="dataForm.invoiceNum"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="发票数量" prop="invoiceNum">
<el-input v-model="dataForm.invoiceNum" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发票金额"
prop="invoiceAmount" >
<el-input v-model="dataForm.invoiceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="发票金额" prop="invoiceAmount">
<el-input v-model="dataForm.invoiceAmount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="来源系统"
prop="sourceSystem" >
<el-select v-model="dataForm.sourceSystem"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in sourceSystemOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-form-item label="来源系统" prop="sourceSystem">
<el-select v-model="dataForm.sourceSystem" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in sourceSystemOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据状态 "
prop="status" >
<el-select v-model="dataForm.status"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-form-item label="单据状态 " prop="status">
<el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
placeholder="系统自动生成" readonly >
<el-form-item label="制单人" prop="creatorUserName">
<el-input v-model="dataForm.creatorUserName" placeholder="系统自动生成" readonly>
</el-input>
</el-form-item>
@ -167,86 +137,83 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseNum" label="车牌号">
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseNum"
placeholder="请选择" clearable :field="'licenseNum'+scope.$index" interfaceId="391151974030035653"
:bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions" propsValue="license_no"
relationField="license_no" popupType="dialog" @change="popupSelectChange2"
popupWidth="800px"
>
<popupSelect v-model="scope.row.licenseNum" placeholder="请选择" clearable
:field="'licenseNum'+scope.$index" interfaceId="391151974030035653"
:bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions"
propsValue="license_no" relationField="license_no" popupType="dialog"
@change="popupSelectChange2" popupWidth="800px">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope">
<el-input v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.materialName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="poundType" label="类型">
<template slot-scope="scope">
<el-select v-model="scope.row.poundType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-select v-model="scope.row.poundType" placeholder="请选择" clearable
:style='{"width":"100%"}'>
<el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="netWeight" label="净重">
<template slot-scope="scope">
<el-input v-model="scope.row.netWeight"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.netWeight" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="单位">
<template slot-scope="scope">
<el-select v-model="scope.row.unit"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-select v-model="scope.row.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="advance" label="是否垫资">
<template slot-scope="scope">
<el-select v-model="scope.row.advance"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-select v-model="scope.row.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="含税单价">
<template slot-scope="scope">
<el-input v-model="scope.row.unitPrice"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.unitPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="settlement" label="结算重量">
<template slot-scope="scope">
<el-input v-model="scope.row.settlement"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.settlement" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率 ">
<template slot-scope="scope">
<el-select v-model="scope.row.rate"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-select v-model="scope.row.rate" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="price" label="金额">
<template slot-scope="scope">
<el-input v-model="scope.row.price"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="noPrice" label="不含税金额">
<template slot-scope="scope">
<el-input v-model="scope.row.noPrice"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.noPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
@ -262,14 +229,15 @@
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片">
<template slot-scope="scope">
<el-input v-model="scope.row.vehiclePictures"
placeholder="请输入" clearable :style='{"width":"300%"}'>
<el-input v-model="scope.row.vehiclePictures" placeholder="请输入" clearable
:style='{"width":"300%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delsalesorder_item0List(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delsalesorder_item0List(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -289,35 +257,34 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="出库单号">
<template slot-scope="scope">
<el-input v-model="scope.row.documentNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.documentNo" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="issueDate" label="出库日期 ">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.issueDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<el-date-picker v-model="scope.row.issueDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="num" label="出库数量">
<template slot-scope="scope">
<el-input v-model="scope.row.num"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="amount" label="出库金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptoutsoitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delreceiptoutsoitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -337,29 +304,30 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="paymentType" label="收款类型 ">
<template slot-scope="scope">
<el-select v-model="scope.row.paymentType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-select v-model="scope.row.paymentType" placeholder="请选择" clearable
:style='{"width":"100%"}'>
<el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="收款金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amountCollected"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcollectionsoitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delcollectionsoitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -379,86 +347,86 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="invoiceNo" label="发票编号">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.invoiceNo" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceCode" label="发票代码">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceCode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.invoiceCode" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="involceAmount" label="发票金额">
<template slot-scope="scope">
<el-input v-model="scope.row.involceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.involceAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceQuantity" label="发票数量">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceQuantity"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.invoiceQuantity" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="taxRate" label="税率 ">
<template slot-scope="scope">
<el-select v-model="scope.row.taxRate"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-select v-model="scope.row.taxRate" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="amountNotTax" label="不含税金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amountNotTax"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.amountNotTax" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="taxAmount" label="税额">
<template slot-scope="scope">
<el-input v-model="scope.row.taxAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.taxAmount" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceStatus" label="发票状态 ">
<template slot-scope="scope">
<el-select v-model="scope.row.invoiceStatus"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-select v-model="scope.row.invoiceStatus" placeholder="请选择" clearable
:style='{"width":"100%"}'>
<el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.creatorUserName" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceDate" label="开票日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.invoiceDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<el-date-picker v-model="scope.row.invoiceDate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="attachMent" label="发票附件 ">
<template slot-scope="scope">
<JNPF-UploadFz v-model="scope.row.attachMent"
:fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
<JNPF-UploadFz v-model="scope.row.attachMent" :fileSize="5" sizeUnit="MB" :limit="9"
buttonText="点击上传">
</JNPF-UploadFz>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item0soitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delarinvoices_item0soitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -480,35 +448,35 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="退货单号">
<template slot-scope="scope">
<el-input v-model="scope.row.documentNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.documentNo" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="refundNum" label="退货数量">
<template slot-scope="scope">
<el-input v-model="scope.row.refundNum"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.refundNum" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="refundAmount" label="退款金额">
<template slot-scope="scope">
<el-input v-model="scope.row.refundAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.refundAmount" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="退货日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delsalesbacksoitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delsalesbacksoitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -528,43 +496,44 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentno" label="付款单号">
<template slot-scope="scope">
<el-input v-model="scope.row.documentno"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.documentno" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="settlementtype" label="付款方式">
<template slot-scope="scope">
<el-select v-model="scope.row.settlementtype"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in settlementtypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-select v-model="scope.row.settlementtype" placeholder="请选择" clearable
:style='{"width":"100%"}'>
<el-option v-for="(item, index) in settlementtypeOptions" :key="index"
:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="duedate" label="付款日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.duedate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<el-date-picker v-model="scope.row.duedate" placeholder="请选择" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="paymentamount" label="付款金额">
<template slot-scope="scope">
<el-input v-model="scope.row.paymentamount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.paymentamount" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpaymentsoitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delpaymentsoitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -589,8 +558,12 @@
</template>
<script>
import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
@ -624,39 +597,207 @@
paymentsoitemList: [],
},
activexvlbvm: '0',
rules:
{
contractName: [
{
rules: {
contractName: [{
required: true,
message: '请选择',
trigger: 'change'
}, ],
},
],
},
contractNamecolumnOptions:[ {"label":"合同编码","value":"contract_code"}, {"label":"合同名称","value":"contract_name"}, {"label":"合同类型","value":"contract_type"}, {"label":"供应商/客户名称","value":"name"},],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
contractNamecolumnOptions: [{
"label": "合同编码",
"value": "contract_code"
}, {
"label": "合同名称",
"value": "contract_name"
}, {
"label": "合同类型",
"value": "contract_type"
}, {
"label": "供应商/客户名称",
"value": "name"
}, ],
currencyOptions: [{
"fullName": "人民币",
"id": "0"
}, {
"fullName": "美元",
"id": "1"
}, {
"fullName": "英镑",
"id": "2"
}],
sourceSystemOptions: [{
"fullName": "人工创建",
"id": "0"
}, {
"fullName": "商城平台",
"id": "1"
}],
statusOptions: [{
"fullName": "已保存",
"id": "0"
}, {
"fullName": "开票中",
"id": "1"
}, {
"fullName": "付款申请",
"id": "2"
}, {
"fullName": "待回款",
"id": "3"
}, {
"fullName": "回款中",
"id": "4"
}, {
"fullName": "归档",
"id": "5"
}],
salesorder_item0licenseNumcolumnOptions:[ {"label":"车牌号","value":"license_no"}, {"label":"物料名称","value":"material_name"},{"label":"磅单类型","value":"pound_type"},{"label":"净重","value":"net_weight"},
{"label":"计量单位","value":"unit"}, {"label":"是否垫资","value":"advance"},{"label":"销售单价","value":"sales_price"},
{"label":"结算重量","value":"settlement"}, {"label":"税率","value":"rate"}, {"label":"备注","value":"remark"},
{"label":"磅单图片","value":"pound_pictures"},{"label":"车辆图片","value":"vehicle_pictures"}, ],
poundTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其他","id":"1"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
invoiceStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"红冲","id":"1"},{"fullName":"作废","id":"2"}],
settlementtypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
salesorder_item0licenseNumcolumnOptions: [{
"label": "车牌号",
"value": "license_no"
}, {
"label": "物料名称",
"value": "material_name"
}, {
"label": "磅单类型",
"value": "pound_type"
}, {
"label": "净重",
"value": "net_weight"
},
{
"label": "计量单位",
"value": "unit"
}, {
"label": "是否垫资",
"value": "advance"
}, {
"label": "销售单价",
"value": "sales_price"
},
{
"label": "结算重量",
"value": "settlement"
}, {
"label": "税率",
"value": "rate"
}, {
"label": "备注",
"value": "remark"
},
{
"label": "磅单图片",
"value": "pound_pictures"
}, {
"label": "车辆图片",
"value": "vehicle_pictures"
},
],
poundTypeOptions: [{
"fullName": "贸易",
"id": "0"
}, {
"fullName": "其他",
"id": "1"
}],
unitOptions: [{
"fullName": "吨",
"id": "0"
}, {
"fullName": "千克",
"id": "1"
}],
advanceOptions: [{
"fullName": "否",
"id": "0"
}, {
"fullName": "是",
"id": "1"
}],
rateOptions: [{
"fullName": "13",
"id": "0"
}, {
"fullName": "9",
"id": "1"
}, {
"fullName": "6",
"id": "2"
}, {
"fullName": "5",
"id": "3"
}, {
"fullName": "3",
"id": "4"
}, {
"fullName": "0",
"id": "5"
}],
paymentTypeOptions: [{
"fullName": "贷款",
"id": "0"
}, {
"fullName": "运费",
"id": "1"
}, {
"fullName": "仓储",
"id": "2"
}],
taxRateOptions: [{
"fullName": "13",
"id": "0"
}, {
"fullName": "9",
"id": "1"
}, {
"fullName": "6",
"id": "2"
}, {
"fullName": "5",
"id": "3"
}, {
"fullName": "3",
"id": "4"
}, {
"fullName": "0",
"id": "5"
}],
invoiceStatusOptions: [{
"fullName": "正常",
"id": "0"
}, {
"fullName": "红冲",
"id": "1"
}, {
"fullName": "作废",
"id": "2"
}],
settlementtypeOptions: [{
"fullName": "现金",
"id": "0"
}, {
"fullName": "赊购",
"id": "1"
}, {
"fullName": "网银",
"id": "2"
}, {
"fullName": "银企直连",
"id": "3"
}, {
"fullName": "银票",
"id": "4"
}, {
"fullName": "商票",
"id": "5"
}],
}
},
computed: {},
watch: {},
created() {
},
created() {},
mounted() {},
methods: {
popupSelectChange(e, d) {
@ -943,5 +1084,4 @@
},
},
}
</script>

216
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -11,10 +11,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="单据状态 ">
<el-select v-model="query.status" placeholder="请选择"
clearable>
<el-option v-for="(item, index) in statusOptions" :key="index"
:label="item.fullName" :value="item.id"
<el-select v-model="query.status" placeholder="请选择" clearable>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
@ -30,71 +28,69 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">发货
</el-button>
<el-button type="text" icon="el-icon-close" @click="exportData()">发票录入
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">回款
</el-button>
<el-button type="text" icon="el-icon-close" @click="exportData()">归档
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">退货
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="reset()"/>
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
</el-tooltip>
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange">
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
/>
<el-table-column prop="costomerName" label="客户名称" width="0" align="left"
/>
<el-table-column prop="price" label="金额" width="0" align="left"
/>
<el-table-column prop="num" label="数量" width="0" align="left"
/>
<el-table-column label="币别" width="0" prop="currency" algin="left"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentNo" label="单据编号" sortable fixed="left" width="200" align="center" />
<el-table-column prop="costomerName" label="客户名称" sortable fixed="left" width="150" align="center" />
<el-table-column prop="price" label="金额" sortable width="150" align="center" />
<el-table-column prop="num" label="数量" sortable width="150" align="center" />
<el-table-column label="币别" width="100" sortable prop="currency" align="center" >
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="已回款金额" width="0" align="left"
/>
<el-table-column prop="invoiceNum" label="发票数量" width="0" align="left"
/>
<el-table-column prop="invoiceAmount" label="发票金额" width="0" align="left"
/>
<el-table-column label="来源系统" width="0" prop="sourceSystem" algin="left"
>
<el-table-column prop="amountCollected" sortable label="已回款金额" width="150" align="center" />
<el-table-column prop="invoiceNum" sortable label="发票数量" width="150" align="center" />
<el-table-column prop="invoiceAmount" sortable label="发票金额" width="150" align="center" />
<el-table-column label="来源系统" width="150" sortable prop="sourceSystem" align="center" >
<template slot-scope="scope">
{{ scope.row.sourceSystem | dynamicText(sourceSystemOptions) }}
</template>
</el-table-column>
<el-table-column label="单据状态 " width="0" prop="status" algin="left"
>
<el-table-column label="单据状态 " width="150" sortable prop="status" align="center" >
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="150" >
<el-table-column prop="creatorUserName" label="制单人" sortable width="150" align="center" />
<el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)" >编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -105,14 +101,22 @@ width="150" >
<script>
import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form'
import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail'
export default {
components: {JNPFForm, ExportBox,Detail},
components: {
JNPFForm,
ExportBox,
Detail
},
data() {
return {
detailVisible: false,
@ -127,7 +131,8 @@ width="150" >
},
list: [],
listLoading: true,
multipleSelection: [], total: 0,
multipleSelection: [],
total: 0,
listQuery: {
currentPage: 1,
pageSize: 20,
@ -136,25 +141,99 @@ width="150" >
},
formVisible: false,
exportBoxVisible: false,
columnList: [
{prop: 'documentNo', label: '单据编号'},
{prop: 'costomerName', label: '客户名称'},
{prop: 'price', label: '金额'},
{prop: 'num', label: '数量'},
{prop: 'currency', label: '币别'},
{prop: 'amountCollected', label: '已回款金额'},
{prop: 'invoiceNum', label: '发票数量'},
{prop: 'invoiceAmount', label: '发票金额'},
{prop: 'sourceSystem', label: '来源系统'},
{prop: 'status', label: '单据状态 '},
{prop: 'creatorUserName', label: '制单人'},
columnList: [{
prop: 'documentNo',
label: '单据编号'
},
{
prop: 'costomerName',
label: '客户名称'
},
{
prop: 'price',
label: '金额'
},
{
prop: 'num',
label: '数量'
},
{
prop: 'currency',
label: '币别'
},
{
prop: 'amountCollected',
label: '已回款金额'
},
{
prop: 'invoiceNum',
label: '发票数量'
},
{
prop: 'invoiceAmount',
label: '发票金额'
},
{
prop: 'sourceSystem',
label: '来源系统'
},
{
prop: 'status',
label: '单据状态 '
},
{
prop: 'creatorUserName',
label: '制单人'
},
],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
currencyProps:{"label":"fullName","value":"id"},
sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}],
sourceSystemProps:{"label":"fullName","value":"id"},
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
statusProps:{"label":"fullName","value":"id"},
currencyOptions: [{
"fullName": "人民币",
"id": "0"
}, {
"fullName": "美元",
"id": "1"
}, {
"fullName": "英镑",
"id": "2"
}],
currencyProps: {
"label": "fullName",
"value": "id"
},
sourceSystemOptions: [{
"fullName": "人工创建",
"id": "0"
}, {
"fullName": "商城平台",
"id": "1"
}],
sourceSystemProps: {
"label": "fullName",
"value": "id"
},
statusOptions: [{
"fullName": "已保存",
"id": "0"
}, {
"fullName": "开票中",
"id": "1"
}, {
"fullName": "付款申请",
"id": "2"
}, {
"fullName": "待回款",
"id": "3"
}, {
"fullName": "回款中",
"id": "4"
}, {
"fullName": "归档",
"id": "5"
}],
statusProps: {
"label": "fullName",
"value": "id"
},
}
},
computed: {
@ -172,7 +251,11 @@ width="150" >
this.$refs.Detail.init(id)
})
},
sortChange({column, prop, order}) {
sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
@ -216,8 +299,7 @@ width="150" >
}
});
})
}).catch(() => {
});
}).catch(() => {});
},
handleSelectionChange(val) {
const res = val.map(item => item.id)
@ -248,8 +330,7 @@ width="150" >
}
});
})
}).catch(() => {
})
}).catch(() => {})
},
addOrUpdateHandle(id, isDetail) {
this.formVisible = true
@ -264,7 +345,12 @@ width="150" >
})
},
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({
url: `/api/saleorder/Saleorder/Actions/Export`,
method: 'GET',

45
SC-web/src/views/scm/basicInformation/tradeupload/index.vue
Unescape View File

@ -20,7 +20,7 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
@ -35,33 +35,34 @@
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange">
<el-table-column prop="licenseNo" label="车号" width="0" align="left" />
<el-table-column prop="materialName" label="物料名称" width="0" align="left" />
<el-table-column prop="grossWeight" label="毛重" width="0" align="left" />
<el-table-column prop="tareWeight" label="皮重" width="0" align="left" />
<el-table-column prop="buckleWeight" label="扣重" width="0" align="left" />
<el-table-column prop="netWeight" label="净重" width="0" align="left" />
<el-table-column prop="driverName" label="司机名称" width="0" align="left" />
<el-table-column prop="customerName" label="客户名称" width="0" align="left" />
<el-table-column prop="salesName" label="销售合同" width="0" align="left" />
<el-table-column label="是否垫资" width="0" prop="advance" algin="left">
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="licenseNo" label="车号" fixed="left" sortable width="120" align="center" />
<el-table-column prop="materialName" label="物料名称" fixed="left" sortable sortable width="150" align="center" />
<el-table-column prop="grossWeight" label="毛重" width="100" sortable align="center" />
<el-table-column prop="tareWeight" label="皮重" width="100" sortable align="center" />
<el-table-column prop="buckleWeight" label="扣重" width="100" sortable align="center" />
<el-table-column prop="netWeight" label="净重" width="100" sortable align="center" />
<el-table-column prop="driverName" label="司机名称" width="120" sortable align="center" />
<el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" />
<el-table-column prop="salesName" label="销售合同" width="150" sortable align="center" />
<el-table-column prop="advance" label="是否垫资" width="120" sortable align="center" >
<template slot-scope="scope">
{{ scope.row.advance | dynamicText(advanceOptions) }}
</template>
</el-table-column>
<el-table-column label="运输方式" width="0" prop="transportType" algin="left">
<el-table-column prop="transportType" label="运输方式" sortable width="100" align="center" >
<template slot-scope="scope">
{{ scope.row.transportType | dynamicText(transportTypeOptions) }}
</template>
</el-table-column>
<el-table-column prop="departmentId" label="运费" width="0" align="left" />
<el-table-column prop="salesPrice" label="销售价格" width="0" align="left" />
<el-table-column prop="creatorusername" label="制单人" width="0" align="left" />
<el-table-column prop="businessName" label="业务员" width="0" align="left" />
<el-table-column prop="remark" label="备注" width="0" align="left" />
<el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
<el-table-column prop="departmentId" label="运费" sortable width="100" align="center" />
<el-table-column prop="salesPrice" label="销售价格" sortable width="100" align="center" />
<el-table-column prop="creatorusername" label="制单人" sortable width="150" align="center" />
<el-table-column prop="businessName" label="业务员" sortable width="150" align="center" />
<el-table-column prop="remark" label="备注" sortable width="150" align="center" />
<el-table-column prop="poundPictures" label="磅单图片" width="150" align="center">
<template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
<el-popover placement="bottom" trigger="click" width="1000">
@ -76,7 +77,7 @@
</span>
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
<el-table-column prop="vehiclePictures" label="车辆图片" width="150" align="center">
<template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
<el-popover placement="bottom" trigger="click" width="1000">
@ -91,7 +92,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<el-table-column label="操作" fixed="right" width="100" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>

Write Preview
Loading…
Cancel
Save