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

提交代码

Browse Source
product
bawei 2 years ago
parent 326d08947e
commit f1836cd407
2 changed files with 320 additions and 317 deletions
Show Stats Download Patch File Download Diff File

111
SC-web/src/views/scm/basicInformation/receiptout/index.vue
Unescape View File

@ -1,13 +1,13 @@
<template>
<div class="JNPF-common-layout">
<<<<<<< HEAD
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -20,7 +20,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="客户名称">
<el-input v-model="query.customerName" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.customerName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -47,38 +47,38 @@
</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 />
<screenfull isContainer/>
</div>
</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="documentNo" label="单据编号" width="200" sortable align="center" fixed="left" />
<el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" fixed="left" />
<el-table-column prop="amount" label="出库金额" width="120" sortable align="center" />
<el-table-column prop="num" label="出库数量" width="120" sortable align="center" />
<el-table-column label="币别" width="80" sortable prop="currency" align="center" >
<el-table-column type="index" width="50" label="序号" fixed="left" align="center"/>
<el-table-column prop="documentNo" label="单据编号" width="200" sortable align="center" fixed="left"/>
<el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" fixed="left"/>
<el-table-column prop="amount" label="出库金额" width="120" sortable align="center"/>
<el-table-column prop="num" label="出库数量" width="120" sortable 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="issueDate" label="出库日期" width="120" sortable align="center" sortable="custom" />
<el-table-column prop="sourceNo" label="来源单号" width="200" sortable align="center" />
<el-table-column label="业务类型" width="120" sortable prop="type" align="center" >
<el-table-column prop="issueDate" label="出库日期" width="120" sortable align="center" sortable="custom"/>
<el-table-column prop="sourceNo" label="来源单号" width="200" sortable align="center"/>
<el-table-column label="业务类型" width="120" sortable prop="type" align="center">
<template slot-scope="scope">
{{ scope.row.type | dynamicText(typeOptions) }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="120" sortable align="center" />
<el-table-column label="单据状态" width="120" sortable prop="status" align="center" >
<el-table-column prop="remark" label="备注" width="120" sortable align="center"/>
<el-table-column label="单据状态" width="120" sortable prop="status" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" width="120" sortable align="center" />
<el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center" />
<el-table-column prop="creatorTime" label="创建时间" width="120" sortable align="center"/>
<el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center"/>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
@ -91,15 +91,15 @@
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
@pagination="initData"/>
</div>
=======
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -125,9 +125,9 @@
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()" >导出
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -138,48 +138,49 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange" border>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" border>
<el-table-column prop="documentNo" label="单据编号" width="0" align="left"
/>
/>
<el-table-column prop="customerId" label="客户名称" width="0" align="left"
/>
/>
<el-table-column prop="amount" 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"
>
>
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="issueDate" label="出库日期" width="0" align="left"
sortable="custom" />
sortable="custom"/>
<el-table-column prop="sourceNo" label="来源单号" width="0" align="left"
/>
/>
<el-table-column label="业务类型" width="0" prop="type" algin="left"
>
>
<template slot-scope="scope">
{{ scope.row.type | dynamicText(typeOptions) }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="0" align="left"
/>
/>
<el-table-column label="单据状态" width="0" prop="status" algin="left"
>
>
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
/>
/>
<el-table-column prop="creatorUserName" label="创建人名称" width="0" align="left"
/>
/>
<el-table-column label="操作" fixed="right"
width="150" >
width="150">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)" >编辑
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
@ -189,13 +190,15 @@ width="150" >
</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"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
</div>
</div>
</template>
@ -208,13 +211,13 @@ width="150" >
import Detail from './Detail'
export default {
components: {JNPFForm, ExportBox,Detail},
components: {JNPFForm, ExportBox, Detail},
data() {
return {
detailVisible: false,
query: {
documentNo:undefined,
type:undefined,
documentNo: undefined,
type: undefined,
},
treeProps: {
children: 'children',
@ -246,12 +249,12 @@ width="150" >
{prop: 'creatorTime', label: '创建时间'},
{prop: 'creatorUserName', label: '创建人名称'},
],
typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}],
typeProps:{"label":"fullName","value":"id"},
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
currencyProps:{"label":"fullName","value":"id"},
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
statusProps:{"label":"fullName","value":"id"},
typeOptions: [{"fullName": "销售出库", "id": "0"}, {"fullName": "购销出库", "id": "1"}],
typeProps: {"label": "fullName", "value": "id"},
currencyOptions: [{"fullName": "人民币", "id": "0"}, {"fullName": "美元", "id": "1"}, {"fullName": "英镑", "id": "2"}],
currencyProps: {"label": "fullName", "value": "id"},
statusOptions: [{"fullName": "已保存", "id": "0"}, {"fullName": "审批中", "id": "1"}, {"fullName": "已审批", "id": "2"}],
statusProps: {"label": "fullName", "value": "id"},
}
},
computed: {
@ -263,7 +266,7 @@ width="150" >
this.initData()
},
methods: {
goDetail(id){
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
@ -279,15 +282,15 @@ width="150" >
let _query = {
...this.listQuery,
...this.query,
menuId:this.menuId
menuId: this.menuId
};
request({
url: `/api/receipout/Receiptout/getList`,
method: 'post',
data: _query
}).then(res => {
var _list =[];
for(let i=0;i<res.data.list.length;i++){
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i];
_list.push(_data)
}
@ -361,7 +364,7 @@ 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/receipout/Receiptout/Actions/Export`,
method: 'GET',

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

@ -1,7 +1,6 @@
<template>
<div class="JNPF-common-layout">
<<<<<<< HEAD
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
@ -93,7 +92,7 @@
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
=======
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
@ -209,7 +208,8 @@ width="150" >
<JNPF-Form5 v-if="formVisible" ref="JNPFForm5" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
</div>
</div>
</template>

Write Preview
Loading…
Cancel
Save