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

修改

Browse Source
product
杨世强 2 years ago
parent 9c70b9a6b5 7448c73e07
commit 94ffb3b371
25 changed files with 7706 additions and 6855 deletions
Show Stats Download Patch File Download Diff File

4
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
Unescape View File

@ -89,9 +89,9 @@ public class TradeuploadController {
Map<String,Object> materialCodeMap = new HashMap<>(); Map<String,Object> materialCodeMap = new HashMap<>();
entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap)); entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_code",entity.getMaterialCode(),materialCodeMap));
Map<String,Object> salesNameMap = new HashMap<>(); Map<String,Object> salesNameMap = new HashMap<>();
entity.setSalesName(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getSalesName(),"294090217084722181",salesNameMap)); entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesName(),salesNameMap));
Map<String,Object> licenseNoMap = new HashMap<>(); Map<String,Object> licenseNoMap = new HashMap<>();
entity.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",entity.getLicenseNo(),"294090217084722181",licenseNoMap)); entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getLicenseNo(),licenseNoMap));
entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
} }

66
SC-web/src/views/scm/basicInformation/areasetting/Form.vue
Unescape View File

@ -1,52 +1,47 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="800px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="区域名称" <el-form-item label="区域名称" prop="mName">
prop="mName" > <el-input v-model="dataForm.mName" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.mName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建时间" <el-form-item label="创建时间" prop="creatortime">
prop="creatortime" > <el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.creatortime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建人名称" <el-form-item label="创建人名称" prop="creatorusername">
prop="creatorusername" > <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
<el-input v-model="dataForm.creatorusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="修改时间" <el-form-item label="修改时间" prop="lastmodifytime">
prop="lastmodifytime" > <el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.lastmodifytime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="修改人名称" <el-form-item label="修改人名称" prop="lastmodifyusername">
prop="lastmodifyusername" > <el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
<el-input v-model="dataForm.lastmodifyusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -62,8 +57,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -79,23 +78,19 @@
lastmodifytime: '', lastmodifytime: '',
lastmodifyusername: '', lastmodifyusername: '',
}, },
rules: rules: {
{ mName: [{
mName: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
],
}, },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -184,5 +179,4 @@
}, },
}, },
} }
</script> </script>

89
SC-web/src/views/scm/basicInformation/areasetting/index.vue
Unescape View File

@ -35,29 +35,24 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="mName" label="区域名称" width="0" align="left" @selection-change="handleSelectionChange">
/> <el-table-column prop="mName" label="区域名称" width="0" align="left" />
<el-table-column prop="creatortime" label="创建时间" width="0" align="left" <el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
/> <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
/> <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" <el-table-column label="操作" fixed="right" width="100">
/>
<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -68,14 +63,22 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -89,7 +92,8 @@
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -98,12 +102,26 @@
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'mName', label: '区域名称'}, prop: 'mName',
{prop: 'creatortime', label: '创建时间'}, label: '区域名称'
{prop: 'creatorusername', label: '创建人名称'}, },
{prop: 'lastmodifytime', label: '修改时间'}, {
{prop: 'lastmodifyusername', label: '修改人名称'}, prop: 'creatortime',
label: '创建时间'
},
{
prop: 'creatorusername',
label: '创建人名称'
},
{
prop: 'lastmodifytime',
label: '修改时间'
},
{
prop: 'lastmodifyusername',
label: '修改人名称'
},
], ],
} }
}, },
@ -122,7 +140,11 @@
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -166,8 +188,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -198,8 +219,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -214,7 +234,12 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/areasetting/Areasetting/Actions/Export`, url: `/api/areasetting/Areasetting/Actions/Export`,
method: 'GET', method: 'GET',

313
SC-web/src/views/scm/basicInformation/contractfile/Form.vue
Unescape View File

@ -2,193 +2,169 @@
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" />
:content="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"/>
<div class="options"> <div class="options">
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 保 存</el-button> <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 保 存</el-button>
<el-button @click="goBack"> 取 消</el-button> <el-button @click="goBack"> 取 消</el-button>
</div> </div>
</div> </div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<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"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同类型 " <el-form-item label="合同类型 " prop="contractType">
prop="contractType" > <el-select v-model="dataForm.contractType" placeholder="请选择" clearable
<el-select v-model="dataForm.contractType" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in contractTypeOptions" :key="index"
<el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同编码" <el-form-item label="合同编码" prop="contractCode">
prop="contractCode" > <el-input v-model="dataForm.contractCode" placeholder="请输入" clearable
<el-input v-model="dataForm.contractCode" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同名称" <el-form-item label="合同名称" prop="contractName">
prop="contractName" > <el-input v-model="dataForm.contractName" placeholder="请输入" clearable
<el-input v-model="dataForm.contractName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同状态" <el-form-item label="合同状态" prop="status">
prop="status" > <el-input v-model="dataForm.status" placeholder="请输入" clearable
<el-input v-model="dataForm.status" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="开标日期" <el-form-item label="开标日期" prop="bidOpeningDate">
prop="bidOpeningDate" > <el-date-picker v-model="dataForm.bidOpeningDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.bidOpeningDate" :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="开始日期" <el-form-item label="开始日期" prop="startDate">
prop="startDate" > <el-date-picker v-model="dataForm.startDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.startDate" :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="审核日期" <el-form-item label="审核日期" prop="auditDate">
prop="auditDate" > <el-date-picker v-model="dataForm.auditDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.auditDate" :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供货完成日期" <el-form-item label="供货完成日期" prop="completionDate">
prop="completionDate" > <el-date-picker v-model="dataForm.completionDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.completionDate" :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="关闭日期" <el-form-item label="关闭日期" prop="closingDate">
prop="closingDate" > <el-date-picker v-model="dataForm.closingDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.closingDate" :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="回款周期(日)" <el-form-item label="回款周期(日)" prop="collectionCycle">
prop="collectionCycle" > <!-- <el-input v-model="dataForm.collectionCycle" placeholder="请输入" clearable
<el-input v-model="dataForm.collectionCycle" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input> -->
<el-input-number v-model="dataForm.collectionCycle" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="签订日期" <el-form-item label="签订日期" prop="signingDate">
prop="signingDate" > <el-date-picker v-model="dataForm.signingDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.signingDate" :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="截止日期" <el-form-item label="截止日期" prop="endDate">
prop="endDate" > <el-date-picker v-model="dataForm.endDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.endDate" :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供应商/客户编" <el-form-item label="供应商/客户编" prop="code">
prop="code" > <el-input v-model="dataForm.code" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.code"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供应商/客户名" <el-form-item label="供应商/客户名" prop="name">
prop="name" > <el-input v-model="dataForm.name" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.name"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="对方合同号" <el-form-item label="对方合同号" prop="contractNo">
prop="contractNo" > <el-input v-model="dataForm.contractNo" placeholder="请输入" clearable
<el-input v-model="dataForm.contractNo" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="币种 " <el-form-item label="币种 " prop="currency">
prop="currency" > <el-select v-model="dataForm.currency" placeholder="请选择" clearable
<el-input v-model="dataForm.currency" :style='{"width":"100%"}'>
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-input> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="数量" <el-form-item label="数量" prop="num">
prop="num" > <el-input-number v-model="dataForm.num" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
<el-input v-model="dataForm.num"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="金额" <el-form-item label="金额" prop="amount">
prop="amount" > <el-input-number v-model="dataForm.amount" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
<el-input v-model="dataForm.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="库存组织" <el-form-item label="库存组织" prop="organization">
prop="organization" > <el-input v-model="dataForm.organization" placeholder="请输入" clearable
<el-input v-model="dataForm.organization" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="备注" <el-form-item label="备注" prop="remark">
prop="remark" > <el-input v-model="dataForm.remark" placeholder="请输入" clearable
<el-input v-model="dataForm.remark" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -240,10 +216,8 @@
</el-col> </el-col>
--> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="集团审批" <el-form-item label="集团审批" prop="approval">
prop="approval" > <el-switch v-model="dataForm.approval" :active-value="1" :inactive-value="0">
<el-switch v-model="dataForm.approval"
:active-value="1" :inactive-value="0" >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
@ -258,86 +232,75 @@
</div> </div>
<el-table :data="dataForm.contract_item0List" size='mini'> <el-table :data="dataForm.contract_item0List" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialCode" label="物料编码"> <el-table-column prop="materialCode" label="物料编码" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.materialCode" <el-input v-model="scope.row.materialCode" placeholder="请输入"
placeholder="请输入" clearable :style='{"width":"100%"}'> clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="materialName" label="物料名称"> <el-table-column prop="materialName" label="物料名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.materialName" <el-input v-model="scope.row.materialName" placeholder="请输入"
placeholder="请输入" clearable :style='{"width":"100%"}'> clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="specification" label="规格型号"> <el-table-column prop="specification" label="规格型号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.specification" <el-input v-model="scope.row.specification" placeholder="请输入"
placeholder="请输入" clearable :style='{"width":"100%"}'> clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unit" label="单位 "> <el-table-column prop="unit" label="单位 " align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.unit" <el-input v-model="scope.row.unit" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="num" label="数量"> <el-table-column prop="num" label="数量" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.num" <el-input-number v-model="scope.row.num" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="price" label="单价"> <el-table-column prop="price" label="单价" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.price" <el-input-number v-model="scope.row.price" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="amount" label="金额"> <el-table-column prop="amount" label="金额" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.amount" <el-input-number v-model="scope.row.amount" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="税率 "> <el-table-column prop="rate" label="税率 " align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.rate" <el-input-number v-model="scope.row.rate" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="notPrice" label="不含税单价"> <el-table-column prop="notPrice" label="不含税单价" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.notPrice" <el-input-number v-model="scope.row.notPrice" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="notAmount" label="不含税金额"> <el-table-column prop="notAmount" label="不含税金额" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.notAmount" <el-input-number v-model="scope.row.notAmount" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注"> <el-table-column prop="remark" label="备注" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remark" <el-input v-model="scope.row.remark" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="50" > <el-table-column label="操作" width="50" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcontract_item0List(scope.$index)">删除</el-button> <el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delcontract_item0List(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -357,14 +320,15 @@
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="enclosure" label="附件内容"> <el-table-column prop="enclosure" label="附件内容">
<template slot-scope="scope"> <template slot-scope="scope">
<JNPF-UploadFz v-model="scope.row.enclosure" <JNPF-UploadFz v-model="scope.row.enclosure" :fileSize="5"
:fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" > sizeUnit="MB" :limit="9" buttonText="点击上传">
</JNPF-UploadFz> </JNPF-UploadFz>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="50"> <el-table-column label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcontract_item1List(scope.$index)">删除</el-button> <el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delcontract_item1List(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -384,8 +348,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -425,47 +393,67 @@
contract_item1List: [], contract_item1List: [],
}, },
activemdfrsi: '0', activemdfrsi: '0',
rules: rules: {
{ contractType: [{
contractType: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, }, ],
], contractCode: [{
contractCode: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
], contractName: [{
contractName: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
], bidOpeningDate: [{
bidOpeningDate: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, ],
}, },
], currencyOptions: [{
"fullName": "CNY",
"id": "CNY"
}, {
"fullName": "USD",
"id": "USD"
}, {
"fullName": "EUR",
"id": "EUR"
}],
contractTypeOptions: [{
"fullName": "采购合同",
"id": "1"
}, {
"fullName": "销售合同",
"id": "2"
}, },
contractTypeOptions:[{"fullName":"采购合同","id":"1"},{"fullName":"销售合同","id":"2"}, {
{"fullName":"租赁合同","id":"3"},{"fullName":"仓储合同","id":"4"},{"fullName":"运输合同","id":"5"}, "fullName": "租赁合同",
{"fullName":"施工合同","id":"6"}], "id": "3"
}, {
"fullName": "仓储合同",
"id": "4"
}, {
"fullName": "运输合同",
"id": "5"
},
{
"fullName": "施工合同",
"id": "6"
}
],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
contract_item0Exist() { contract_item0Exist() {
@ -617,5 +605,4 @@
}, },
}, },
} }
</script> </script>

194
SC-web/src/views/scm/basicInformation/contractfile/index.vue
Unescape View File

@ -40,54 +40,39 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="contractCode" label="合同编码" width="0" align="left" @selection-change="handleSelectionChange">
/> <el-table-column prop="contractCode" label="合同编码" width="0" align="left" />
<el-table-column prop="contractName" label="合同名称" width="0" align="left" <el-table-column prop="contractName" label="合同名称" width="0" align="left" />
/> <el-table-column prop="contractNo" label="对方合同号" width="0" align="left" />
<el-table-column prop="contractNo" label="对方合同号" width="0" align="left" <el-table-column label="合同类型 " width="0" prop="contractType" algin="left">
/>
<el-table-column label="合同类型 " width="0" prop="contractType" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.contractType | dynamicText(contractTypeOptions) }} {{ scope.row.contractType | dynamicText(contractTypeOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="classification" label="合同分类 " width="0" align="left" <el-table-column prop="classification" label="合同分类 " width="0" align="left" />
/> <el-table-column prop="declarationDate" label="申报日期" width="0" align="left" />
<el-table-column prop="declarationDate" label="申报日期" width="0" align="left" <el-table-column prop="name" label="供应商/客户名" width="0" align="left" />
/> <el-table-column prop="num" label="数量" width="0" align="left" />
<el-table-column prop="name" label="供应商/客户名" width="0" align="left" <el-table-column prop="amount" label="金额" width="0" align="left" />
/> <el-table-column prop="deptName" label="部门名称" width="0" align="left" />
<el-table-column prop="num" label="数量" width="0" align="left" <el-table-column prop="remark" label="备注" width="0" align="left" />
/> <el-table-column prop="creatorusername" label="录入人" width="0" align="left" />
<el-table-column prop="amount" label="金额" width="0" align="left" <el-table-column prop="status" label="合同状态" width="0" align="left" />
/> <el-table-column prop="approval" label="集团审批" width="0" align="left" />
<el-table-column prop="deptName" label="部门名称" width="0" align="left" <el-table-column label="操作" fixed="right" width="150">
/>
<el-table-column prop="remark" label="备注" width="0" align="left"
/>
<el-table-column prop="creatorusername" label="录入人" width="0" align="left"
/>
<el-table-column prop="status" label="合同状态" width="0" align="left"
/>
<el-table-column prop="approval" label="集团审批" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" <el-button type="text" @click="goDetail(scope.row.id)">详情
@click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -98,14 +83,22 @@ width="150" >
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -120,7 +113,8 @@ width="150" >
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -129,26 +123,89 @@ width="150" >
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'contractCode', label: '合同编码'}, prop: 'contractCode',
{prop: 'contractName', label: '合同名称'}, label: '合同编码'
{prop: 'contractNo', label: '对方合同号'}, },
{prop: 'contractType', label: '合同类型 '}, {
{prop: 'classification', label: '合同分类 '}, prop: 'contractName',
{prop: 'declarationDate', label: '申报日期'}, label: '合同名称'
{prop: 'name', label: '供应商/客户名'}, },
{prop: 'num', label: '数量'}, {
{prop: 'amount', label: '金额'}, prop: 'contractNo',
{prop: 'deptName', label: '部门名称'}, label: '对方合同号'
{prop: 'remark', label: '备注'}, },
{prop: 'creatorusername', label: '录入人'}, {
{prop: 'status', label: '合同状态'}, prop: 'contractType',
{prop: 'approval', label: '集团审批'}, label: '合同类型 '
},
{
prop: 'classification',
label: '合同分类 '
},
{
prop: 'declarationDate',
label: '申报日期'
},
{
prop: 'name',
label: '供应商/客户名'
},
{
prop: 'num',
label: '数量'
},
{
prop: 'amount',
label: '金额'
},
{
prop: 'deptName',
label: '部门名称'
},
{
prop: 'remark',
label: '备注'
},
{
prop: 'creatorusername',
label: '录入人'
},
{
prop: 'status',
label: '合同状态'
},
{
prop: 'approval',
label: '集团审批'
},
], ],
contractTypeOptions:[{"fullName":"采购合同","id":"1"},{"fullName":"销售合同","id":"2"}, contractTypeOptions: [{
{"fullName":"租赁合同","id":"3"},{"fullName":"仓储合同","id":"4"},{"fullName":"运输合同","id":"5"}, "fullName": "采购合同",
{"fullName":"施工合同","id":"6"}], "id": "1"
contractTypeProps:{"label":"fullName","value":"id"}, }, {
"fullName": "销售合同",
"id": "2"
},
{
"fullName": "租赁合同",
"id": "3"
}, {
"fullName": "仓储合同",
"id": "4"
}, {
"fullName": "运输合同",
"id": "5"
},
{
"fullName": "施工合同",
"id": "6"
}
],
contractTypeProps: {
"label": "fullName",
"value": "id"
},
} }
}, },
computed: { computed: {
@ -166,7 +223,11 @@ width="150" >
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -210,8 +271,7 @@ width="150" >
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -242,8 +302,7 @@ width="150" >
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -258,7 +317,12 @@ width="150" >
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/example/ContractFile/Actions/Export`, url: `/api/example/ContractFile/Actions/Export`,
method: 'GET', method: 'GET',

114
SC-web/src/views/scm/basicInformation/customer/Form.vue
Unescape View File

@ -1,89 +1,78 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="600px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户编码" <el-form-item label="客户编码" prop="supplierCd">
prop="supplierCd" > <el-input v-model="dataForm.supplierCd" placeholder="请输入客户编码" clearable
<el-input v-model="dataForm.supplierCd" :style='{"width":"100%"}'>
placeholder="请输入客户编码" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户名称" <el-form-item label="客户名称" prop="supplierNm">
prop="supplierNm" > <el-input v-model="dataForm.supplierNm" placeholder="请输入客户名称" clearable
<el-input v-model="dataForm.supplierNm" :style='{"width":"100%"}'>
placeholder="请输入客户名称" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属公司ID" <el-form-item label="所属公司ID" prop="orgId">
prop="orgId" > <el-input v-model="dataForm.orgId" placeholder="请输入所属公司ID" clearable
<el-input v-model="dataForm.orgId" :style='{"width":"100%"}'>
placeholder="请输入所属公司ID" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公司代码" <el-form-item label="公司代码" prop="orgName">
prop="orgName" > <el-input v-model="dataForm.orgName" placeholder="请输入公司代码" clearable
<el-input v-model="dataForm.orgName" :style='{"width":"100%"}'>
placeholder="请输入公司代码" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户等级" <el-form-item label="客户等级" prop="customerLevel">
prop="customerLevel" > <el-select v-model="dataForm.customerLevel" placeholder="请选择客户等级" :style='{"width":"100%"}'>
<el-select v-model="dataForm.customerLevel" <el-option v-for="(item, index) in customerLevelOptions" :key="index"
placeholder="请选择客户等级" :style='{"width":"100%"}'> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
<el-option v-for="(item, index) in customerLevelOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系人" <el-form-item label="联系人" prop="contactName">
prop="contactName" > <el-input v-model="dataForm.contactName" placeholder="请输入联系人" clearable
<el-input v-model="dataForm.contactName" :style='{"width":"100%"}'>
placeholder="请输入联系人" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地址" <el-form-item label="地址" prop="address">
prop="address" > <el-input v-model="dataForm.address" placeholder="请输入地址" clearable
<el-input v-model="dataForm.address" :style='{"width":"100%"}'>
placeholder="请输入地址" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="电话" <el-form-item label="电话" prop="contactPhone">
prop="contactPhone" > <el-input v-model="dataForm.contactPhone" placeholder="请输入电话" clearable
<el-input v-model="dataForm.contactPhone" :style='{"width":"100%"}'>
placeholder="请输入电话" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否启用" <el-form-item label="是否启用" prop="status">
prop="status" > <el-switch v-model="dataForm.status" :active-value="1" :inactive-value="0">
<el-switch v-model="dataForm.status"
:active-value="1" :inactive-value="0" >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
@ -99,8 +88,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -120,33 +113,35 @@
contactPhone: '', contactPhone: '',
status: 1, status: 1,
}, },
rules: rules: {
{ supplierCd: [{
supplierCd: [
{
required: true, required: true,
message: '请输入客户编码', message: '请输入客户编码',
trigger: 'blur' trigger: 'blur'
}, }, ],
], supplierNm: [{
supplierNm: [
{
required: true, required: true,
message: '请输入客户名称', message: '请输入客户名称',
trigger: 'blur' trigger: 'blur'
}, ],
contactPhone: [],
}, },
], customerLevelOptions: [{
contactPhone: [ "fullName": "一级",
], "id": "1"
}, }, {
customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}], "fullName": "二级",
"id": "2"
}, {
"fullName": "三级",
"id": "3"
}],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -237,5 +232,4 @@
}, },
}, },
} }
</script> </script>

140
SC-web/src/views/scm/basicInformation/customer/index.vue
Unescape View File

@ -40,44 +40,34 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="supplierCd" label="客户编码" width="0" align="left" @selection-change="handleSelectionChange">
sortable="custom" /> <el-table-column prop="supplierCd" label="客户编码" width="0" align="left" sortable="custom" />
<el-table-column prop="supplierNm" label="客户名称" width="0" align="left" <el-table-column prop="supplierNm" label="客户名称" width="0" align="left" sortable="custom" />
sortable="custom" /> <el-table-column prop="orgId" label="所属公司ID" width="0" align="left" sortable="custom" />
<el-table-column prop="orgId" label="所属公司ID" width="0" align="left" <el-table-column prop="orgName" label="公司代码" width="0" align="left" sortable="custom" />
sortable="custom" /> <el-table-column label="客户等级" width="0" prop="customerLevel" algin="left" sortable="custom">
<el-table-column prop="orgName" label="公司代码" width="0" align="left"
sortable="custom" />
<el-table-column label="客户等级" width="0" prop="customerLevel" algin="left"
sortable="custom" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.customerLevel | dynamicText(customerLevelOptions) }} {{ scope.row.customerLevel | dynamicText(customerLevelOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="contactName" label="联系人" width="0" align="left" <el-table-column prop="contactName" label="联系人" width="0" align="left" sortable="custom" />
sortable="custom" /> <el-table-column prop="address" label="地址" width="0" align="left" sortable="custom" />
<el-table-column prop="address" label="地址" width="0" align="left" <el-table-column prop="contactPhone" label="电话" width="0" align="left" sortable="custom" />
sortable="custom" /> <el-table-column prop="status" label="是否启用" width="0" align="left" />
<el-table-column prop="contactPhone" label="电话" width="0" align="left" <el-table-column label="操作" fixed="right" width="150">
sortable="custom" />
<el-table-column prop="status" label="是否启用" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" <el-button type="text" @click="goDetail(scope.row.id)">详情
@click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -88,14 +78,22 @@ width="150" >
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -110,7 +108,8 @@ width="150" >
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -119,19 +118,57 @@ width="150" >
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'supplierCd', label: '客户编码'}, prop: 'supplierCd',
{prop: 'supplierNm', label: '客户名称'}, label: '客户编码'
{prop: 'orgId', label: '所属公司ID'}, },
{prop: 'orgName', label: '公司代码'}, {
{prop: 'customerLevel', label: '客户等级'}, prop: 'supplierNm',
{prop: 'contactName', label: '联系人'}, label: '客户名称'
{prop: 'address', label: '地址'}, },
{prop: 'contactPhone', label: '电话'}, {
{prop: 'status', label: '是否启用'}, prop: 'orgId',
label: '所属公司ID'
},
{
prop: 'orgName',
label: '公司代码'
},
{
prop: 'customerLevel',
label: '客户等级'
},
{
prop: 'contactName',
label: '联系人'
},
{
prop: 'address',
label: '地址'
},
{
prop: 'contactPhone',
label: '电话'
},
{
prop: 'status',
label: '是否启用'
},
], ],
customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}], customerLevelOptions: [{
customerLevelProps:{"label":"fullName","value":"id"}, "fullName": "一级",
"id": "1"
}, {
"fullName": "二级",
"id": "2"
}, {
"fullName": "三级",
"id": "3"
}],
customerLevelProps: {
"label": "fullName",
"value": "id"
},
} }
}, },
computed: { computed: {
@ -149,7 +186,11 @@ width="150" >
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -193,8 +234,7 @@ width="150" >
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -225,8 +265,7 @@ width="150" >
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -241,7 +280,12 @@ width="150" >
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/customer/Customer/Actions/Export`, url: `/api/customer/Customer/Actions/Export`,
method: 'GET', method: 'GET',

250
SC-web/src/views/scm/basicInformation/material/Form.vue
Unescape View File

@ -1,176 +1,163 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="1000px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" <el-form-item label="物料编码" prop="itemCode">
prop="itemCode" > <el-input v-model="dataForm.itemCode" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.itemCode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料名称" <el-form-item label="物料名称" prop="description">
prop="description" > <el-input v-model="dataForm.description" placeholder="请输入" clearable
<el-input v-model="dataForm.description" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="库存组织代码" <el-form-item label="库存组织代码" prop="organizationCode">
prop="organizationCode" > <el-input v-model="dataForm.organizationCode" placeholder="请输入" clearable
<el-input v-model="dataForm.organizationCode" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="主单位代码" <el-form-item label="主单位代码" prop="primaryUomCode">
prop="primaryUomCode" > <el-input v-model="dataForm.primaryUomCode" placeholder="请输入" clearable
<el-input v-model="dataForm.primaryUomCode" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="主单位名称" <el-form-item label="主单位名称" prop="primaryUnitOmeasure">
prop="primaryUnitOmeasure" > <el-input v-model="dataForm.primaryUnitOmeasure" placeholder="请输入" clearable
<el-input v-model="dataForm.primaryUnitOmeasure" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否可采购" <el-form-item label="是否可采购" prop="purchaseFlag">
prop="purchaseFlag" > <el-select v-model="dataForm.purchaseFlag" placeholder="请选择" clearable
<el-select v-model="dataForm.purchaseFlag" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in purchaseFlagOptions" :key="index"
<el-option v-for="(item, index) in purchaseFlagOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否可销售 " <el-form-item label="是否可销售 " prop="salesFlag">
prop="salesFlag" > <el-select v-model="dataForm.salesFlag" placeholder="请选择" clearable
<el-select v-model="dataForm.salesFlag" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in salesFlagOptions" :key="index" :label="item.fullName"
<el-option v-for="(item, index) in salesFlagOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="默认出库区" <el-form-item label="默认出库区" prop="outArea">
prop="outArea" > <popupSelect v-model="dataForm.outArea" placeholder="请选择" clearable field="outArea"
<popupSelect v-model="dataForm.outArea" interfaceId="381404161809350213" :columnOptions="outAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
placeholder="请选择" clearable field="outArea" interfaceId="381404161809350213" :columnOptions="outAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"> popupTitle="选择数据" popupWidth="800px">
</popupSelect> </popupSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="默认入库区" <el-form-item label="默认入库区" prop="inArea">
prop="inArea" > <popupSelect v-model="dataForm.inArea" placeholder="请选择" clearable field="inArea"
<popupSelect v-model="dataForm.inArea" interfaceId="381404161809350213" :columnOptions="inAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
placeholder="请选择" clearable field="inArea" interfaceId="381404161809350213" :columnOptions="inAreacolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"> popupTitle="选择数据" popupWidth="800px">
</popupSelect> </popupSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="创建人名称" <el-form-item label="创建人名称" prop="creatorusername">
prop="creatorusername" > <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
<el-input v-model="dataForm.creatorusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="创建时间" <el-form-item label="创建时间" prop="creatortime">
prop="creatortime" > <el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.creatortime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="修改人名称" <el-form-item label="修改人名称" prop="lastmodifyusername">
prop="lastmodifyusername" > <el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
<el-input v-model="dataForm.lastmodifyusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="修改时间" <el-form-item label="修改时间" prop="lastmodifytime">
prop="lastmodifytime" > <el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.lastmodifytime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="生效状态" <el-form-item label="生效状态" prop="effectiveStatus">
prop="effectiveStatus" > <el-select v-model="dataForm.effectiveStatus" placeholder="请选择" clearable
<el-select v-model="dataForm.effectiveStatus" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in effectiveStatusOptions" :key="index"
<el-option v-for="(item, index) in effectiveStatusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="处理类型" <el-form-item label="处理类型" prop="processingType">
prop="processingType" > <el-select v-model="dataForm.processingType" placeholder="请选择" clearable
<el-select v-model="dataForm.processingType" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in processingTypeOptions" :key="index"
<el-option v-for="(item, index) in processingTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="读取标记" <el-form-item label="读取标记" prop="readTag">
prop="readTag" > <el-select v-model="dataForm.readTag" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="dataForm.readTag" <el-option v-for="(item, index) in readTagOptions" :key="index" :label="item.fullName"
placeholder="请选择" clearable :style='{"width":"100%"}'> :value="item.id" :disabled="item.disabled"></el-option>
<el-option v-for="(item, index) in readTagOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="读取时间" <el-form-item label="读取时间" prop="readDate">
prop="readDate" > <el-time-picker v-model="dataForm.readDate" placeholder="请选择" clearable
<el-time-picker v-model="dataForm.readDate" :style='{"width":"100%"}' format="HH:mm:ss" value-format="HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm:ss" value-format="HH:mm:ss" :picker-options='{"selectableRange":"00:00:00-23:59:59"}'> :picker-options='{"selectableRange":"00:00:00-23:59:59"}'>
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="错误信息" <el-form-item label="错误信息" prop="errorMessage">
prop="errorMessage" > <el-input v-model="dataForm.errorMessage" placeholder="请输入" clearable
<el-input v-model="dataForm.errorMessage" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -186,8 +173,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -216,37 +207,91 @@
readDate: '', readDate: '',
errorMessage: '', errorMessage: '',
}, },
rules: rules: {
{ itemCode: [{
itemCode: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
], description: [{
description: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, ],
}, },
], purchaseFlagOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
salesFlagOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
outAreacolumnOptions: [{
"label": "库区编码",
"value": "areacode"
}, },
purchaseFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], {
salesFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], "label": "库区名称",
outAreacolumnOptions:[ {"label":"库区编号","value":"areacode"},{"label":"库区名称","value":"areaname"},{"label":"仓库名称","value":"name"},{"label":"最高库存","value":"maximum"},], "value": "areaname"
inAreacolumnOptions:[{"label":"库区编号","value":"areacode"},{"label":"库区名称","value":"areaname"},{"label":"仓库名称","value":"name"},{"label":"最高库存","value":"maximum"},], },
effectiveStatusOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], {
processingTypeOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], "label": "仓库",
readTagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], "value": "name"
},
{
"label": "最高库存",
"value": "maximum"
},],
inAreacolumnOptions: [{
"label": "库区编码",
"value": "areacode"
},
{
"label": "库区名称",
"value": "areaname"
},
{
"label": "仓库",
"value": "name"
},
{
"label": "最高库存",
"value": "maximum"
},],
effectiveStatusOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
processingTypeOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
readTagOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -335,5 +380,4 @@
}, },
}, },
} }
</script> </script>

242
SC-web/src/views/scm/basicInformation/material/index.vue
Unescape View File

@ -40,71 +40,55 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="itemCode" label="物料编码" width="0" align="left" @selection-change="handleSelectionChange">
/> <el-table-column prop="itemCode" label="物料编码" width="0" align="left" />
<el-table-column prop="description" label="物料名称" width="0" align="left" <el-table-column prop="description" label="物料名称" width="0" align="left" />
/> <el-table-column prop="outArea" label="默认出库区" width="0" align="left" />
<el-table-column prop="outArea" label="默认出库区" width="0" align="left" <el-table-column prop="inArea" label="默认入库区" width="0" align="left" />
/> <el-table-column prop="primaryUnitOmeasure" label="主单位名称" width="0" align="left" />
<el-table-column prop="inArea" label="默认入库区" width="0" align="left" <el-table-column label="是否可采购" width="0" prop="purchaseFlag" algin="left">
/>
<el-table-column prop="primaryUnitOmeasure" label="主单位名称" width="0" align="left"
/>
<el-table-column label="是否可采购" width="0" prop="purchaseFlag" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.purchaseFlag | dynamicText(purchaseFlagOptions) }} {{ scope.row.purchaseFlag | dynamicText(purchaseFlagOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否可销售 " width="0" prop="salesFlag" algin="left" <el-table-column label="是否可销售 " width="0" prop="salesFlag" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.salesFlag | dynamicText(salesFlagOptions) }} {{ scope.row.salesFlag | dynamicText(salesFlagOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
/> <el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
<el-table-column prop="creatortime" label="创建时间" width="0" align="left" <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
/> <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" <el-table-column label="生效状态" width="0" prop="effectiveStatus" algin="left">
/>
<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
/>
<el-table-column label="生效状态" width="0" prop="effectiveStatus" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.effectiveStatus | dynamicText(effectiveStatusOptions) }} {{ scope.row.effectiveStatus | dynamicText(effectiveStatusOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="处理类型" width="0" prop="processingType" algin="left" <el-table-column label="处理类型" width="0" prop="processingType" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.processingType | dynamicText(processingTypeOptions) }} {{ scope.row.processingType | dynamicText(processingTypeOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="读取标记" width="0" prop="readTag" algin="left" <el-table-column label="读取标记" width="0" prop="readTag" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.readTag | dynamicText(readTagOptions) }} {{ scope.row.readTag | dynamicText(readTagOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="readDate" label="读取时间" width="0" align="left" <el-table-column prop="readDate" label="读取时间" width="0" align="left" />
/> <el-table-column prop="errorMessage" label="错误信息" width="0" align="left" />
<el-table-column prop="errorMessage" label="错误信息" width="0" align="left" <el-table-column label="操作" fixed="right" width="100">
/>
<el-table-column label="操作" fixed="right"
width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -115,14 +99,22 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -137,7 +129,8 @@
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -146,34 +139,126 @@
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'itemCode', label: '物料编码'}, prop: 'itemCode',
{prop: 'description', label: '物料名称'}, label: '物料编码'
{prop: 'outArea', label: '默认出库区'}, },
{prop: 'inArea', label: '默认入库区'}, {
{prop: 'primaryUnitOmeasure', label: '主单位名称'}, prop: 'description',
{prop: 'purchaseFlag', label: '是否可采购'}, label: '物料名称'
{prop: 'salesFlag', label: '是否可销售 '}, },
{prop: 'creatorusername', label: '创建人名称'}, {
{prop: 'creatortime', label: '创建时间'}, prop: 'outArea',
{prop: 'lastmodifyusername', label: '修改人名称'}, label: '默认出库区'
{prop: 'lastmodifytime', label: '修改时间'}, },
{prop: 'effectiveStatus', label: '生效状态'}, {
{prop: 'processingType', label: '处理类型'}, prop: 'inArea',
{prop: 'readTag', label: '读取标记'}, label: '默认入库区'
{prop: 'readDate', label: '读取时间'}, },
{prop: 'errorMessage', label: '错误信息'}, {
prop: 'primaryUnitOmeasure',
label: '主单位名称'
},
{
prop: 'purchaseFlag',
label: '是否可采购'
},
{
prop: 'salesFlag',
label: '是否可销售 '
},
{
prop: 'creatorusername',
label: '创建人名称'
},
{
prop: 'creatortime',
label: '创建时间'
},
{
prop: 'lastmodifyusername',
label: '修改人名称'
},
{
prop: 'lastmodifytime',
label: '修改时间'
},
{
prop: 'effectiveStatus',
label: '生效状态'
},
{
prop: 'processingType',
label: '处理类型'
},
{
prop: 'readTag',
label: '读取标记'
},
{
prop: 'readDate',
label: '读取时间'
},
{
prop: 'errorMessage',
label: '错误信息'
},
], ],
purchaseFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], purchaseFlagOptions: [{
purchaseFlagProps:{"label":"fullName","value":"id"}, "fullName": "Y",
salesFlagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], "id": "Y"
salesFlagProps:{"label":"fullName","value":"id"}, }, {
effectiveStatusOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], "fullName": "N",
effectiveStatusProps:{"label":"fullName","value":"id"}, "id": "N"
processingTypeOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], }],
processingTypeProps:{"label":"fullName","value":"id"}, purchaseFlagProps: {
readTagOptions:[{"fullName":"Y","id":"Y"},{"fullName":"N","id":"N"}], "label": "fullName",
readTagProps:{"label":"fullName","value":"id"}, "value": "id"
},
salesFlagOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
salesFlagProps: {
"label": "fullName",
"value": "id"
},
effectiveStatusOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
effectiveStatusProps: {
"label": "fullName",
"value": "id"
},
processingTypeOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
processingTypeProps: {
"label": "fullName",
"value": "id"
},
readTagOptions: [{
"fullName": "Y",
"id": "Y"
}, {
"fullName": "N",
"id": "N"
}],
readTagProps: {
"label": "fullName",
"value": "id"
},
} }
}, },
computed: { computed: {
@ -191,7 +276,11 @@
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -235,8 +324,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -267,8 +355,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -283,7 +370,12 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/Material/Material/Actions/Export`, url: `/api/Material/Material/Actions/Export`,
method: 'GET', method: 'GET',

103
SC-web/src/views/scm/basicInformation/monitormanage/Form.vue
Unescape View File

@ -1,97 +1,83 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="800px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="设备名称" <el-form-item label="设备名称" prop="mName">
prop="mName" > <el-input v-model="dataForm.mName" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.mName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="设备序列号" <el-form-item label="设备序列号" prop="serialnumber">
prop="serialnumber" > <el-input v-model="dataForm.serialnumber" placeholder="请输入" clearable
<el-input v-model="dataForm.serialnumber" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="ip地址" <el-form-item label="ip地址" prop="ip">
prop="ip" > <el-input v-model="dataForm.ip" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.ip"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="端口号" <el-form-item label="端口号" prop="port">
prop="port" > <el-input v-model="dataForm.port" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.port"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="账号" <el-form-item label="账号" prop="account">
prop="account" > <el-input v-model="dataForm.account" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.account"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="密码" <el-form-item label="密码" prop="password">
prop="password" > <el-input v-model="dataForm.password" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.password"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建人名称" <el-form-item label="创建人名称" prop="creatorusername">
prop="creatorusername" > <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
<el-input v-model="dataForm.creatorusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建时间" <el-form-item label="创建时间" prop="creatortime">
prop="creatortime" > <el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.creatortime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="修改人名称" <el-form-item label="修改人名称" prop="lastmodifyusername">
prop="lastmodifyusername" > <el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
<el-input v-model="dataForm.lastmodifyusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="修改时间" <el-form-item label="修改时间" prop="lastmodifytime">
prop="lastmodifytime" > <el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.lastmodifytime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -107,8 +93,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -129,30 +119,24 @@
lastmodifyusername: '', lastmodifyusername: '',
lastmodifytime: '', lastmodifytime: '',
}, },
rules: rules: {
{ mName: [{
mName: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
], serialnumber: [{
serialnumber: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
],
}, },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -241,5 +225,4 @@
}, },
}, },
} }
</script> </script>

129
SC-web/src/views/scm/basicInformation/monitormanage/index.vue
Unescape View File

@ -35,39 +35,29 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="mName" label="设备名称" width="0" align="left" @selection-change="handleSelectionChange">
/> <el-table-column prop="mName" label="设备名称" width="0" align="left" />
<el-table-column prop="serialnumber" label="设备序列号" width="0" align="left" <el-table-column prop="serialnumber" label="设备序列号" width="0" align="left" />
/> <el-table-column prop="ip" label="ip地址" width="0" align="left" />
<el-table-column prop="ip" label="ip地址" width="0" align="left" <el-table-column prop="port" label="端口号" width="0" align="left" />
/> <el-table-column prop="account" label="账号" width="0" align="left" />
<el-table-column prop="port" label="端口号" width="0" align="left" <el-table-column prop="password" label="密码" width="0" align="left" />
/> <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
<el-table-column prop="account" label="账号" width="0" align="left" <el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
/> <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
<el-table-column prop="password" label="密码" width="0" align="left" <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
/> <el-table-column label="操作" fixed="right" width="100">
<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left"
/>
<el-table-column prop="creatortime" label="创建时间" width="0" align="left"
/>
<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left"
/>
<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -78,14 +68,22 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -99,7 +97,8 @@
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -108,17 +107,46 @@
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'mName', label: '设备名称'}, prop: 'mName',
{prop: 'serialnumber', label: '设备序列号'}, label: '设备名称'
{prop: 'ip', label: 'ip地址'}, },
{prop: 'port', label: '端口号'}, {
{prop: 'account', label: '账号'}, prop: 'serialnumber',
{prop: 'password', label: '密码'}, label: '设备序列号'
{prop: 'creatorusername', label: '创建人名称'}, },
{prop: 'creatortime', label: '创建时间'}, {
{prop: 'lastmodifyusername', label: '修改人名称'}, prop: 'ip',
{prop: 'lastmodifytime', label: '修改时间'}, label: 'ip地址'
},
{
prop: 'port',
label: '端口号'
},
{
prop: 'account',
label: '账号'
},
{
prop: 'password',
label: '密码'
},
{
prop: 'creatorusername',
label: '创建人名称'
},
{
prop: 'creatortime',
label: '创建时间'
},
{
prop: 'lastmodifyusername',
label: '修改人名称'
},
{
prop: 'lastmodifytime',
label: '修改时间'
},
], ],
} }
}, },
@ -137,7 +165,11 @@
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -181,8 +213,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -213,8 +244,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -229,7 +259,12 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/monitormanage/Monitormanage/Actions/Export`, url: `/api/monitormanage/Monitormanage/Actions/Export`,
method: 'GET', method: 'GET',

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

@ -1,271 +1,242 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="800px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" <el-form-item label="物料编码" prop="materialCode">
prop="materialCode" > <relationForm v-model="dataForm.materialCode" placeholder="请选择" clearable
<relationForm v-model="dataForm.materialCode" field="materialCode" modelId="294090217084722181"
placeholder="请选择" clearable field="materialCode" modelId ="294090217084722181" :columnOptions="materialCodecolumnOptions" relationField="selectField121" > :columnOptions="materialCodecolumnOptions" relationField="selectField121">
</relationForm> </relationForm>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料名称" <el-form-item label="物料名称" prop="materialName">
prop="materialName" > <el-input v-model="dataForm.materialName" placeholder="请输入" clearable
<el-input v-model="dataForm.materialName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销售合同" <el-form-item label="销售合同" prop="salesName">
prop="salesName" > <relationForm v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
<relationForm v-model="dataForm.salesName" modelId="294090217084722181" :columnOptions="salesNamecolumnOptions"
placeholder="请选择" clearable field="salesName" modelId ="294090217084722181" :columnOptions="salesNamecolumnOptions" relationField="selectField121" > relationField="selectField121">
</relationForm> </relationForm>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户名称" <el-form-item label="客户名称" prop="customerName">
prop="customerName" > <el-input v-model="dataForm.customerName" placeholder="请输入" clearable
<el-input v-model="dataForm.customerName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否垫资" <el-form-item label="是否垫资" prop="advance">
prop="advance" > <el-select v-model="dataForm.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="dataForm.advance" <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
placeholder="请选择" clearable :style='{"width":"100%"}'> :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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销售价格" <el-form-item label="销售价格" prop="salesPrice">
prop="salesPrice" > <el-input-number v-model="dataForm.salesPrice" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.salesPrice"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="运输方式" <el-form-item label="运输方式" prop="transportType">
prop="transportType" > <el-select v-model="dataForm.transportType" placeholder="请选择" clearable
<el-select v-model="dataForm.transportType" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in transportTypeOptions" :key="index"
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="运费" <el-form-item label="运费" prop="departmentId">
prop="departmentId" > <el-input-number v-model="dataForm.departmentId" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.departmentId"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车号" <el-form-item label="车号" prop="licenseNo">
prop="licenseNo" > <relationForm v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
<relationForm v-model="dataForm.licenseNo" modelId="294090217084722181" :columnOptions="licenseNocolumnOptions"
placeholder="请选择" clearable field="licenseNo" modelId ="294090217084722181" :columnOptions="licenseNocolumnOptions" relationField="selectField122" > relationField="selectField122">
</relationForm> </relationForm>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="业务员名称" <el-form-item label="业务员名称" prop="businessName">
prop="businessName" > <el-input v-model="dataForm.businessName" placeholder="请输入" clearable
<el-input v-model="dataForm.businessName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="磅单图片" <el-form-item label="磅单图片" prop="poundPictures">
prop="poundPictures" > <JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
<JNPF-UploadImg v-model="dataForm.poundPictures"
:fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg> </JNPF-UploadImg>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="皮重" <el-form-item label="皮重" prop="tareWeight">
prop="tareWeight" > <el-input-number v-model="dataForm.tareWeight" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.tareWeight"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="毛重" <el-form-item label="毛重" prop="grossWeight">
prop="grossWeight" > <el-input-number v-model="dataForm.grossWeight" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.grossWeight"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="扣重" <el-form-item label="扣重" prop="buckleWeight">
prop="buckleWeight" > <el-input-number v-model="dataForm.buckleWeight" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.buckleWeight"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="净重" <el-form-item label="净重" prop="netWeight">
prop="netWeight" > <el-input-number v-model="dataForm.netWeight" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.netWeight"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" <el-form-item label="备注" prop="remark">
prop="remark" > <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="司机名称" <el-form-item label="司机名称" prop="driverName">
prop="driverName" > <el-input v-model="dataForm.driverName" placeholder="请输入" clearable
<el-input v-model="dataForm.driverName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="车辆图片" <el-form-item label="车辆图片" prop="vehiclePictures">
prop="vehiclePictures" > <JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
<JNPF-UploadImg v-model="dataForm.vehiclePictures"
:fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg> </JNPF-UploadImg>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="制单人" <el-form-item label="制单人" prop="creatorusername">
prop="creatorusername" > <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
<el-input v-model="dataForm.creatorusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商名称" <el-form-item label="供应商名称" prop="supplierName">
prop="supplierName" > <el-input v-model="dataForm.supplierName" placeholder="请输入" clearable
<el-input v-model="dataForm.supplierName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="采购合同" <el-form-item label="采购合同" prop="purchaseName">
prop="purchaseName" > <relationForm v-model="dataForm.purchaseName" placeholder="请选择" clearable
<relationForm v-model="dataForm.purchaseName" field="purchaseName" modelId="294090217084722181"
placeholder="请选择" clearable field="purchaseName" modelId ="294090217084722181" :columnOptions="purchaseNamecolumnOptions" relationField="selectField121" > :columnOptions="purchaseNamecolumnOptions" relationField="selectField121">
</relationForm> </relationForm>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="单位" <el-form-item label="单位" prop="unit">
prop="unit" > <el-select v-model="dataForm.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="dataForm.unit" <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
placeholder="请选择" clearable :style='{"width":"100%"}'> :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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="结算重量" <el-form-item label="结算重量" prop="settlement">
prop="settlement" > <el-input v-model="dataForm.settlement" placeholder="请输入" clearable
<el-input v-model="dataForm.settlement" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="采购单价" <el-form-item label="采购单价" prop="purchasePrice">
prop="purchasePrice" > <el-input v-model="dataForm.purchasePrice" placeholder="请输入" clearable
<el-input v-model="dataForm.purchasePrice" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="进项票日期" <el-form-item label="进项票日期" prop="inputDate">
prop="inputDate" > <el-date-picker v-model="dataForm.inputDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.inputDate" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销项票日期" <el-form-item label="销项票日期" prop="outputDate">
prop="outputDate" > <el-date-picker v-model="dataForm.outputDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.outputDate" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="付款日期" <el-form-item label="付款日期" prop="payDate">
prop="payDate" > <el-date-picker v-model="dataForm.payDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.payDate" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="回款日期" <el-form-item label="回款日期" prop="paymentDate">
prop="paymentDate" > <el-date-picker v-model="dataForm.paymentDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.paymentDate" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="磅单日期" <el-form-item label="磅单日期" prop="poundDate">
prop="poundDate" > <el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.poundDate" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -281,8 +252,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -322,79 +297,94 @@
paymentDate: '', paymentDate: '',
poundDate: '', poundDate: '',
}, },
rules: rules: {
{ materialCode: [{
materialCode: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, }, ],
], salesName: [{
salesName: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, }, ],
], licenseNo: [{
licenseNo: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, }, ],
], poundPictures: [{
poundPictures: [
{
required: true, required: true,
message: '请至少选择一个', message: '请至少选择一个',
trigger: 'click' trigger: 'click'
}, }, ],
], tareWeight: [{
tareWeight: [
{
required: true, required: true,
message: '数字文本', message: '数字文本',
trigger: ["blur", "change"] trigger: ["blur", "change"]
}, }, ],
], grossWeight: [{
grossWeight: [
{
required: true, required: true,
message: '数字文本', message: '数字文本',
trigger: ["blur", "change"] trigger: ["blur", "change"]
}, }, ],
], buckleWeight: [{
buckleWeight: [
{
required: true, required: true,
message: '数字文本', message: '数字文本',
trigger: ["blur", "change"] trigger: ["blur", "change"]
}, }, ],
], netWeight: [{
netWeight: [
{
required: true, required: true,
message: '数字文本', message: '数字文本',
trigger: ["blur", "change"] trigger: ["blur", "change"]
}, ],
}, },
], materialCodecolumnOptions: [{
}, "label": "事件等级",
materialCodecolumnOptions:[ {"label":"事件等级","value":"selectField121"},], "value": "selectField121"
salesNamecolumnOptions:[ {"label":"事件等级","value":"selectField121"},], }, ],
advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}], salesNamecolumnOptions: [{
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}], "label": "事件等级",
licenseNocolumnOptions:[ {"label":"事件级别","value":"selectField122"},], "value": "selectField121"
purchaseNamecolumnOptions:[ {"label":"事件等级","value":"selectField121"},], }, ],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], advanceOptions: [{
"fullName": "是",
"id": "1"
}, {
"fullName": "否",
"id": "0"
}],
transportTypeOptions: [{
"fullName": "汽运",
"id": "0"
}, {
"fullName": "船运",
"id": "1"
}, {
"fullName": "火车",
"id": "2"
}],
licenseNocolumnOptions: [{
"label": "事件级别",
"value": "selectField122"
}, ],
purchaseNamecolumnOptions: [{
"label": "事件等级",
"value": "selectField121"
}, ],
unitOptions: [{
"fullName": "吨",
"id": "0"
}, {
"fullName": "千克",
"id": "1"
}],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -487,5 +477,4 @@
}, },
}, },
} }
</script> </script>

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

@ -35,73 +35,80 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="licenseNo" label="车号" width="0" align="left" @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="customerName" label="客户名称" width="0" align="left" />
/> <el-table-column prop="salesName" 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="supplierName" 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 prop="purchaseName" label="采购合同" width="0" align="left" <el-table-column label="是否垫资" width="0" prop="advance" algin="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"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.advance | dynamicText(advanceOptions) }} {{ scope.row.advance | dynamicText(advanceOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" width="0" prop="unit" algin="left" <el-table-column label="单位" width="0" prop="unit" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.unit | dynamicText(unitOptions) }} {{ scope.row.unit | dynamicText(unitOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="grossWeight" 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="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="buckleWeight" 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="netWeight" 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="settlement" 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="purchasePrice" 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="salesPrice" 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="inputDate" label="进项票日期" width="0" align="left" <el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
/> <template slot-scope="scope">
<el-table-column prop="outputDate" label="销项票日期" width="0" align="left" <span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
/> <el-popover placement="bottom" trigger="click" width="1000">
<el-table-column prop="payDate" label="付款日期" width="0" align="left" <img :src="`/dev${item.url}`" width="100%" />
/> <img
<el-table-column prop="paymentDate" label="回款日期" width="0" align="left" slot="reference"
/> :src="`/dev${item.url}`"
<el-table-column prop="poundDate" label="磅单日期" width="0" align="left" :alt="`/dev${item.url}`"
/> style="max-height: 70px;max-width: 70px; padding: 5px"
<el-table-column prop="businessName" label="业务员名称" width="0" align="left"
/> />
<el-table-column prop="remark" label="备注" width="0" align="left" </el-popover>
</span>
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
<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">
<img :src="`/dev${item.url}`" width="100%" />
<img
slot="reference"
:src="`/dev${item.url}`"
:alt="`/dev${item.url}`"
style="max-height: 70px;max-width: 70px; padding: 5px"
/> />
<el-table-column label="操作" fixed="right" </el-popover>
width="100" > </span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -112,14 +119,22 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -133,7 +148,8 @@
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -142,37 +158,135 @@
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'licenseNo', label: '车号'}, prop: 'licenseNo',
{prop: 'customerName', label: '客户名称'}, label: '车号'
{prop: 'salesName', label: '销售合同'}, },
{prop: 'supplierName', label: '供应商名称'}, {
{prop: 'purchaseName', label: '采购合同'}, prop: 'customerName',
{prop: 'materialCode', label: '物料编码'}, label: '客户名称'
{prop: 'materialName', label: '物料名称'}, },
{prop: 'advance', label: '是否垫资'}, {
{prop: 'unit', label: '单位'}, prop: 'salesName',
{prop: 'grossWeight', label: '毛重'}, label: '销售合同'
{prop: 'tareWeight', label: '皮重'}, },
{prop: 'buckleWeight', label: '扣重'}, {
{prop: 'netWeight', label: '净重'}, prop: 'supplierName',
{prop: 'settlement', label: '结算重量'}, label: '供应商名称'
{prop: 'purchasePrice', label: '采购单价'}, },
{prop: 'salesPrice', label: '销售价格'}, {
{prop: 'inputDate', label: '进项票日期'}, prop: 'purchaseName',
{prop: 'outputDate', label: '销项票日期'}, label: '采购合同'
{prop: 'payDate', label: '付款日期'}, },
{prop: 'paymentDate', label: '回款日期'}, {
{prop: 'poundDate', label: '磅单日期'}, prop: 'materialCode',
{prop: 'businessName', label: '业务员名称'}, label: '物料编码'
{prop: 'remark', label: '备注'}, },
{
prop: 'materialName',
label: '物料名称'
},
{
prop: 'advance',
label: '是否垫资'
},
{
prop: 'unit',
label: '单位'
},
{
prop: 'grossWeight',
label: '毛重'
},
{
prop: 'tareWeight',
label: '皮重'
},
{
prop: 'buckleWeight',
label: '扣重'
},
{
prop: 'netWeight',
label: '净重'
},
{
prop: 'settlement',
label: '结算重量'
},
{
prop: 'purchasePrice',
label: '采购单价'
},
{
prop: 'salesPrice',
label: '销售价格'
},
{
prop: 'inputDate',
label: '进项票日期'
},
{
prop: 'outputDate',
label: '销项票日期'
},
{
prop: 'payDate',
label: '付款日期'
},
{
prop: 'paymentDate',
label: '回款日期'
},
{
prop: 'poundDate',
label: '磅单日期'
},
{
prop: 'businessName',
label: '业务员名称'
},
{
prop: 'remark',
label: '备注'
},
], ],
advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}], advanceOptions: [{
advanceProps:{"label":"fullName","value":"id"}, "fullName": "是",
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}], "id": "1"
transportTypeProps:{"label":"fullName","value":"id"}, }, {
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], "fullName": "否",
unitProps:{"label":"fullName","value":"id"}, "id": "0"
}],
advanceProps: {
"label": "fullName",
"value": "id"
},
transportTypeOptions: [{
"fullName": "汽运",
"id": "0"
}, {
"fullName": "船运",
"id": "1"
}, {
"fullName": "火车",
"id": "2"
}],
transportTypeProps: {
"label": "fullName",
"value": "id"
},
unitOptions: [{
"fullName": "吨",
"id": "0"
}, {
"fullName": "千克",
"id": "1"
}],
unitProps: {
"label": "fullName",
"value": "id"
},
} }
}, },
computed: { computed: {
@ -190,7 +304,11 @@
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -234,8 +352,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -266,8 +383,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -282,7 +398,12 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/poundlist/Poundlist/Actions/Export`, url: `/api/poundlist/Poundlist/Actions/Export`,
method: 'GET', method: 'GET',

294
SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
Unescape View File

@ -1,171 +1,149 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="1000px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据编号" <el-form-item label="单据编号" prop="documentno">
prop="documentno" > <el-input v-model="dataForm.documentno" placeholder="请输入" clearable
<el-input v-model="dataForm.documentno" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供应商名称" <el-form-item label="供应商名称" prop="suppliername">
prop="suppliername" > <el-input v-model="dataForm.suppliername" placeholder="请输入" clearable
<el-input v-model="dataForm.suppliername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同名称" <el-form-item label="合同名称" prop="contractname">
prop="contractname" > <el-input v-model="dataForm.contractname" placeholder="请输入" clearable
<el-input v-model="dataForm.contractname" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="制单人" <el-form-item label="制单人" prop="creatorusername">
prop="creatorusername" > <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
<el-input v-model="dataForm.creatorusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="采购部门" <el-form-item label="采购部门" prop="departmentId">
prop="departmentId" > <dep-select v-model="dataForm.departmentId" placeholder="请选择" clearable>
<dep-select v-model="dataForm.departmentId"
placeholder="请选择" clearable >
</dep-select> </dep-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="对方合同号" <el-form-item label="对方合同号" prop="contractno">
prop="contractno" > <el-input v-model="dataForm.contractno" placeholder="请输入" clearable
<el-input v-model="dataForm.contractno" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="数量" <el-form-item label="数量" prop="num">
prop="num" > <el-input-number v-model="dataForm.num" placeholder="数字文本" :step="1"
<el-input-number v-model="dataForm.num" controls-position='right'>
placeholder="数字文本" :step="1" controls-position='right' >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="金额" <el-form-item label="金额" prop="amount">
prop="amount" > <el-input v-model="dataForm.amount" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="不含税金额" <el-form-item label="不含税金额" prop="notamount">
prop="notamount" > <el-input v-model="dataForm.notamount" placeholder="请输入" clearable
<el-input v-model="dataForm.notamount" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="币别 " <el-form-item label="币别 " prop="currency">
prop="currency" > <el-select v-model="dataForm.currency" placeholder="请选择" clearable
<el-select v-model="dataForm.currency" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName"
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-form-item label="备注" <el-form-item label="备注" prop="remark">
prop="remark" > <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="ERP订单号" <el-form-item label="ERP订单号" prop="erpno">
prop="erpno" > <el-input v-model="dataForm.erpno" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.erpno"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="已付款金额" <el-form-item label="已付款金额" prop="payprice">
prop="payprice" > <el-input v-model="dataForm.payprice" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.payprice"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="发票数量" <el-form-item label="发票数量" prop="invoicenum">
prop="invoicenum" > <el-input v-model="dataForm.invoicenum" placeholder="请输入" clearable
<el-input v-model="dataForm.invoicenum" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="发票金额" <el-form-item label="发票金额" prop="invoiceamount">
prop="invoiceamount" > <el-input v-model="dataForm.invoiceamount" placeholder="请输入" clearable
<el-input v-model="dataForm.invoiceamount" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="垫资金额" <el-form-item label="垫资金额" prop="advanceamount">
prop="advanceamount" > <el-input v-model="dataForm.advanceamount" placeholder="请输入" clearable
<el-input v-model="dataForm.advanceamount" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单据状态" <el-form-item label="单据状态" prop="status">
prop="status" > <el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="dataForm.status" <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName"
placeholder="请选择" clearable :style='{"width":"100%"}'> :value="item.id" :disabled="item.disabled"></el-option>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="制单时间" <el-form-item label="制单时间" prop="creatortime">
prop="creatortime" > <el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.creatortime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -182,95 +160,104 @@
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licensenum" label="车牌号"> <el-table-column prop="licensenum" label="车牌号">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.licensenum" <el-input v-model="scope.row.licensenum" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="materialname" label="物料名称"> <el-table-column prop="materialname" label="物料名称">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.materialname" <el-input v-model="scope.row.materialname" placeholder="请输入"
placeholder="请输入" clearable :style='{"width":"100%"}'> clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="pounttype" label="类型 "> <el-table-column prop="pounttype" label="类型 ">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.pounttype" <el-select v-model="scope.row.pounttype" placeholder="请选择" clearable
placeholder="请选择" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
<el-option v-for="(item, index) in pounttypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> <el-option v-for="(item, index) in pounttypeOptions"
:key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="netweight" label="净重"> <el-table-column prop="netweight" label="净重">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.netweight" <el-input v-model="scope.row.netweight" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unit" label="单位"> <el-table-column prop="unit" label="单位">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.unit" <el-select v-model="scope.row.unit" placeholder="请选择" clearable
placeholder="请选择" clearable :style='{"width":"100%"}'> :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-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="advance" label="是否垫资"> <el-table-column prop="advance" label="是否垫资">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.advance" <el-select v-model="scope.row.advance" placeholder="请选择" clearable
placeholder="请选择" clearable :style='{"width":"100%"}'> :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-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="price" label="单价"> <el-table-column prop="price" label="单价">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.price" <el-input v-model="scope.row.price" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="settlement" label="结算重量"> <el-table-column prop="settlement" label="结算重量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.settlement" <el-input v-model="scope.row.settlement" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="rate" label="税率 "> <el-table-column prop="rate" label="税率 ">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.rate" <el-select v-model="scope.row.rate" placeholder="请选择" clearable
placeholder="请选择" clearable :style='{"width":"100%"}'> :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-option v-for="(item, index) in rateOptions" :key="index"
:label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="amount" label="金额"> <el-table-column prop="amount" label="金额">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.amount" <el-input v-model="scope.row.amount" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="notamount" label="不含税金额"> <el-table-column prop="notamount" label="不含税金额">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.notamount" <el-input v-model="scope.row.notamount" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注"> <el-table-column prop="remark" label="备注">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remark" <el-input v-model="scope.row.remark" placeholder="请输入" clearable
placeholder="请输入" clearable :style='{"width":"100%"}'> :style='{"width":"100%"}'>
</el-input> </el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="50"> <el-table-column label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpurchaseorder_item0List(scope.$index)">删除</el-button> <el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delpurchaseorder_item0List(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -293,8 +280,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -325,22 +316,82 @@
purchaseorder_item0List: [], purchaseorder_item0List: [],
}, },
activebgsnko: '0', activebgsnko: '0',
rules: rules: {},
{ currencyOptions: [{
}, "fullName": "人民币",
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], "id": "0"
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待付款","id":"3"},{"fullName":"付款中","id":"4"},{"fullName":"归档","id":"5"}], }, {
"fullName": "美元",
"id": "1"
}, {
"fullName": "英镑",
"id": "2"
}],
statusOptions: [{
"fullName": "已保存",
"id": "0"
}, {
"fullName": "开票中",
"id": "1"
}, {
"fullName": "付款申请",
"id": "2"
}, {
"fullName": "待付款",
"id": "3"
}, {
"fullName": "付款中",
"id": "4"
}, {
"fullName": "归档",
"id": "5"
}],
pounttypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其他","id":"1"}], pounttypeOptions: [{
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], "fullName": "贸易",
advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}], "id": "0"
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"}], }, {
"fullName": "其他",
"id": "1"
}],
unitOptions: [{
"fullName": "吨",
"id": "0"
}, {
"fullName": "千克",
"id": "1"
}],
advanceOptions: [{
"fullName": "是",
"id": "1"
}, {
"fullName": "否",
"id": "0"
}],
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"
}],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
purchaseorder_item0Exist() { purchaseorder_item0Exist() {
@ -463,5 +514,4 @@
}, },
}, },
} }
</script> </script>

202
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -35,55 +35,41 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="documentno" label="单据编号" width="0" align="left" @selection-change="handleSelectionChange">
/> <el-table-column prop="documentno" label="单据编号" width="0" align="left" />
<el-table-column prop="erpno" label="ERP订单号" width="0" align="left" <el-table-column prop="erpno" label="ERP订单号" width="0" align="left" />
/> <el-table-column prop="contractname" label="合同名称" width="0" align="left" />
<el-table-column prop="contractname" label="合同名称" width="0" align="left" <el-table-column prop="suppliername" label="供应商名称" width="0" align="left" />
/> <el-table-column prop="amount" label="金额" width="0" align="left" />
<el-table-column prop="suppliername" 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">
<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"> <template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }} {{ scope.row.currency | dynamicText(currencyOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payprice" label="已付款金额" width="0" align="left" <el-table-column prop="payprice" label="已付款金额" width="0" align="left" />
/> <el-table-column prop="invoicenum" 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 prop="advanceamount" label="垫资金额" width="0" align="left" />
<el-table-column prop="invoiceamount" label="发票金额" width="0" align="left" <el-table-column prop="creatortime" label="制单时间" width="0" align="left" />
/> <el-table-column label="单据状态" width="0" prop="status" algin="left">
<el-table-column prop="advanceamount" label="垫资金额" width="0" align="left"
/>
<el-table-column prop="creatortime" label="制单时间" width="0" align="left"
/>
<el-table-column label="单据状态" width="0" prop="status" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }} {{ scope.row.status | dynamicText(statusOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creatorusername" label="制单人" width="0" align="left" <el-table-column prop="creatorusername" label="制单人" width="0" align="left" />
/> <el-table-column label="操作" fixed="right" width="100">
<el-table-column label="操作" fixed="right"
width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -94,14 +80,22 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -115,7 +109,8 @@
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -124,26 +119,100 @@
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'documentno', label: '单据编号'}, prop: 'documentno',
{prop: 'erpno', label: 'ERP订单号'}, label: '单据编号'
{prop: 'contractname', label: '合同名称'}, },
{prop: 'suppliername', label: '供应商名称'}, {
{prop: 'amount', label: '金额'}, prop: 'erpno',
{prop: 'num', label: '数量'}, label: 'ERP订单号'
{prop: 'currency', label: '币别 '}, },
{prop: 'payprice', label: '已付款金额'}, {
{prop: 'invoicenum', label: '发票数量'}, prop: 'contractname',
{prop: 'invoiceamount', label: '发票金额'}, label: '合同名称'
{prop: 'advanceamount', label: '垫资金额'}, },
{prop: 'creatortime', label: '制单时间'}, {
{prop: 'status', label: '单据状态'}, prop: 'suppliername',
{prop: 'creatorusername', label: '制单人'}, label: '供应商名称'
},
{
prop: 'amount',
label: '金额'
},
{
prop: 'num',
label: '数量'
},
{
prop: 'currency',
label: '币别 '
},
{
prop: 'payprice',
label: '已付款金额'
},
{
prop: 'invoicenum',
label: '发票数量'
},
{
prop: 'invoiceamount',
label: '发票金额'
},
{
prop: 'advanceamount',
label: '垫资金额'
},
{
prop: 'creatortime',
label: '制单时间'
},
{
prop: 'status',
label: '单据状态'
},
{
prop: 'creatorusername',
label: '制单人'
},
], ],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}], currencyOptions: [{
currencyProps:{"label":"fullName","value":"id"}, "fullName": "人民币",
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待付款","id":"3"},{"fullName":"付款中","id":"4"},{"fullName":"归档","id":"5"}], "id": "0"
statusProps:{"label":"fullName","value":"id"}, }, {
"fullName": "美元",
"id": "1"
}, {
"fullName": "英镑",
"id": "2"
}],
currencyProps: {
"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: { computed: {
@ -161,7 +230,11 @@
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -205,8 +278,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -237,8 +309,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -253,7 +324,12 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/purchaseorder/Purchaseorder/Actions/Export`, url: `/api/purchaseorder/Purchaseorder/Actions/Export`,
method: 'GET', method: 'GET',

140
SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
Unescape View File

@ -1,126 +1,108 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="600px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="库区编码" <el-form-item label="库区编码" prop="areacode">
prop="areacode" > <el-input v-model="dataForm.areacode" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.areacode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="库区名称" <el-form-item label="库区名称" prop="areaname">
prop="areaname" > <el-input v-model="dataForm.areaname" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.areaname"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="最高库存" <el-form-item label="最高库存" prop="maximum">
prop="maximum" > <el-input-number v-model="dataForm.maximum" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.maximum"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="安全库存" <el-form-item label="安全库存" prop="safety">
prop="safety" > <el-input-number v-model="dataForm.safety" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.safety"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="最低库存" <el-form-item label="最低库存" prop="minimum">
prop="minimum" > <el-input-number v-model="dataForm.minimum" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.minimum"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="计量单位" <el-form-item label="计量单位" prop="unit">
prop="unit" > <el-select v-model="dataForm.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="dataForm.unit" <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
placeholder="请选择" clearable :style='{"width":"100%"}'> :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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="仓库" <el-form-item label="仓库" prop="warehouseId">
prop="warehouseId" > <popupSelect v-model="dataForm.warehouseId" placeholder="请选择" clearable field="warehouseId"
<popupSelect v-model="dataForm.warehouseId" interfaceId="380988259175524165" :columnOptions="warehouseIdcolumnOptions"
placeholder="请选择" clearable field="warehouseId" interfaceId="380988259175524165" :columnOptions="warehouseIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog" propsValue="id" relationField="name" popupType="dialog" popupTitle="选择数据"
popupTitle="选择数据" popupWidth="800px"> popupWidth="800px">
</popupSelect> </popupSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="组织" <el-form-item label="组织" prop="orgnizeId">
prop="orgnizeId" > <com-select v-model="dataForm.orgnizeId" placeholder="请选择" clearable>
<com-select v-model="dataForm.orgnizeId"
placeholder="请选择" clearable >
</com-select> </com-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="部门" <el-form-item label="部门" prop="departmentId">
prop="departmentId" > <dep-select v-model="dataForm.departmentId" placeholder="请选择" clearable>
<dep-select v-model="dataForm.departmentId"
placeholder="请选择" clearable >
</dep-select> </dep-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建时间" <el-form-item label="创建时间" prop="creatortime">
prop="creatortime" > <el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.creatortime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建人名称" <el-form-item label="创建人名称" prop="creatorusername">
prop="creatorusername" > <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
<el-input v-model="dataForm.creatorusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="修改时间" <el-form-item label="修改时间" prop="lastmodifytime">
prop="lastmodifytime" > <el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.lastmodifytime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="修改人名称" <el-form-item label="修改人名称" prop="lastmodifyusername">
prop="lastmodifyusername" > <el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
<el-input v-model="dataForm.lastmodifyusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -136,8 +118,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -161,25 +147,36 @@
lastmodifytime: '', lastmodifytime: '',
lastmodifyusername: '', lastmodifyusername: '',
}, },
rules: rules: {
{ areacode: [{
areacode: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, ],
}, },
], unitOptions: [{
}, "fullName": "吨",
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], "id": "0"
warehouseIdcolumnOptions:[ {"label":"ID","value":"id"}, {"label":"仓库号","value":"code"}, {"label":"仓库名称","value":"name"},], }, {
"fullName": "千克",
"id": "1"
}],
warehouseIdcolumnOptions: [{
"label": "ID",
"value": "id"
}, {
"label": "仓库号",
"value": "code"
}, {
"label": "仓库名称",
"value": "name"
}, ],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -270,5 +267,4 @@
}, },
}, },
} }
</script> </script>

166
SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
Unescape View File

@ -40,49 +40,36 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="areacode" label="库区编码" width="0" align="left" @selection-change="handleSelectionChange">
/> <el-table-column prop="areacode" label="库区编码" width="0" align="left" />
<el-table-column prop="areaname" label="库区名称" width="0" align="left" <el-table-column prop="areaname" label="库区名称" width="0" align="left" />
/> <el-table-column prop="maximum" label="最高库存" width="0" align="left" />
<el-table-column prop="maximum" label="最高库存" width="0" align="left" <el-table-column prop="safety" label="安全库存" width="0" align="left" />
/> <el-table-column prop="minimum" label="最低库存" width="0" align="left" />
<el-table-column prop="safety" label="安全库存" width="0" align="left" <el-table-column label="计量单位" width="0" prop="unit" algin="left">
/>
<el-table-column prop="minimum" label="最低库存" width="0" align="left"
/>
<el-table-column label="计量单位" width="0" prop="unit" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.unit | dynamicText(unitOptions) }} {{ scope.row.unit | dynamicText(unitOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseId" label="仓库" width="0" align="left" <el-table-column prop="warehouseId" label="仓库" width="0" align="left" />
/> <el-table-column prop="orgnizeId" label="组织" width="0" align="left" />
<el-table-column prop="orgnizeId" label="组织" width="0" align="left" <el-table-column prop="departmentId" label="部门" width="0" align="left" />
/> <el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
<el-table-column prop="departmentId" label="部门" width="0" align="left" <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
/> <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
<el-table-column prop="creatortime" label="创建时间" width="0" align="left" <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
/> <el-table-column label="操作" fixed="right" width="100">
<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left"
/>
<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
/>
<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -93,14 +80,22 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -115,7 +110,8 @@
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -124,23 +120,70 @@
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'areacode', label: '库区编码'}, prop: 'areacode',
{prop: 'areaname', label: '库区名称'}, label: '库区编码'
{prop: 'maximum', label: '最高库存'}, },
{prop: 'safety', label: '安全库存'}, {
{prop: 'minimum', label: '最低库存'}, prop: 'areaname',
{prop: 'unit', label: '计量单位'}, label: '库区名称'
{prop: 'warehouseId', label: '仓库'}, },
{prop: 'orgnizeId', label: '组织'}, {
{prop: 'departmentId', label: '部门'}, prop: 'maximum',
{prop: 'creatortime', label: '创建时间'}, label: '最高库存'
{prop: 'creatorusername', label: '创建人名称'}, },
{prop: 'lastmodifytime', label: '修改时间'}, {
{prop: 'lastmodifyusername', label: '修改人名称'}, prop: 'safety',
label: '安全库存'
},
{
prop: 'minimum',
label: '最低库存'
},
{
prop: 'unit',
label: '计量单位'
},
{
prop: 'warehouseId',
label: '仓库'
},
{
prop: 'orgnizeId',
label: '组织'
},
{
prop: 'departmentId',
label: '部门'
},
{
prop: 'creatortime',
label: '创建时间'
},
{
prop: 'creatorusername',
label: '创建人名称'
},
{
prop: 'lastmodifytime',
label: '修改时间'
},
{
prop: 'lastmodifyusername',
label: '修改人名称'
},
], ],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], unitOptions: [{
unitProps:{"label":"fullName","value":"id"}, "fullName": "吨",
"id": "0"
}, {
"fullName": "千克",
"id": "1"
}],
unitProps: {
"label": "fullName",
"value": "id"
},
} }
}, },
computed: { computed: {
@ -158,7 +201,11 @@
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -202,8 +249,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -234,8 +280,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -250,7 +295,12 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/reservoirarea/Reservoirarea/Actions/Export`, url: `/api/reservoirarea/Reservoirarea/Actions/Export`,
method: 'GET', method: 'GET',

132
SC-web/src/views/scm/basicInformation/supplier/Form.vue
Unescape View File

@ -1,114 +1,103 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="1000px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="24"> <el-col :span="24">
<el-form-item label-width="0"> <el-form-item label-width="0">
<JNPF-Text :style='{"width":"100%"}' <JNPF-Text :style='{"width":"100%"}'
:textStyle='{"color":"#000000","font-weight":"bold","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="供应商编辑"> :textStyle='{"color":"#000000","font-weight":"bold","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}'
value="供应商编辑">
</JNPF-Text> </JNPF-Text>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商编码" <el-form-item label="供应商编码" prop="supplierCode">
prop="supplierCode" > <el-input v-model="dataForm.supplierCode" placeholder="请输入供应商编码" clearable
<el-input v-model="dataForm.supplierCode" :style='{"width":"100%"}'>
placeholder="请输入供应商编码" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商名称" <el-form-item label="供应商名称" prop="supplierName">
prop="supplierName" > <el-input v-model="dataForm.supplierName" placeholder="请输入供应商名称" clearable
<el-input v-model="dataForm.supplierName" :style='{"width":"100%"}'>
placeholder="请输入供应商名称" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地点ID" <el-form-item label="地点ID" prop="supplierSiteId">
prop="supplierSiteId" > <el-input v-model="dataForm.supplierSiteId" placeholder="请输入供应商地点ID" clearable
<el-input v-model="dataForm.supplierSiteId" :style='{"width":"100%"}'>
placeholder="请输入供应商地点ID" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地点名称" <el-form-item label="地点名称" prop="supplierSiteCode">
prop="supplierSiteCode" > <el-input v-model="dataForm.supplierSiteCode" placeholder="请输入供应商地点名称" clearable
<el-input v-model="dataForm.supplierSiteCode" :style='{"width":"100%"}'>
placeholder="请输入供应商地点名称" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属公司编码" <el-form-item label="所属公司编码" prop="companyId">
prop="companyId" > <el-input v-model="dataForm.companyId" placeholder="请输入所属公司编码" clearable
<el-input v-model="dataForm.companyId" :style='{"width":"100%"}'>
placeholder="请输入所属公司编码" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属公司名称" <el-form-item label="所属公司名称" prop="companyName">
prop="companyName" > <el-input v-model="dataForm.companyName" placeholder="请输入公司名称" clearable
<el-input v-model="dataForm.companyName" :style='{"width":"100%"}'>
placeholder="请输入公司名称" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系人" <el-form-item label="联系人" prop="contactName">
prop="contactName" > <el-input v-model="dataForm.contactName" placeholder="请输入联系人" clearable
<el-input v-model="dataForm.contactName" :style='{"width":"100%"}'>
placeholder="请输入联系人" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话" <el-form-item label="联系电话" prop="contactPhone">
prop="contactPhone" > <el-input v-model="dataForm.contactPhone" placeholder="请输入联系电话" clearable
<el-input v-model="dataForm.contactPhone" :style='{"width":"100%"}'>
placeholder="请输入联系电话" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="供应商等级" <el-form-item label="供应商等级" prop="supplierLevel">
prop="supplierLevel" > <el-select v-model="dataForm.supplierLevel" placeholder="请选择" clearable
<el-select v-model="dataForm.supplierLevel" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in supplierLevelOptions" :key="index"
<el-option v-for="(item, index) in supplierLevelOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地址" <el-form-item label="地址" prop="address">
prop="address" > <el-input v-model="dataForm.address" placeholder="请输入地址" clearable
<el-input v-model="dataForm.address" :style='{"width":"100%"}'>
placeholder="请输入地址" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="启用" <el-form-item label="启用" prop="status">
prop="status" > <el-switch v-model="dataForm.status" :active-value="1" :inactive-value="0">
<el-switch v-model="dataForm.status"
:active-value="1" :inactive-value="0" >
</el-switch> </el-switch>
</el-form-item> </el-form-item>
@ -124,8 +113,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -147,31 +140,37 @@
address: '', address: '',
status: 1, status: 1,
}, },
rules: rules: {
{ supplierCode: [{
supplierCode: [
{
required: true, required: true,
message: '请输入供应商编码', message: '请输入供应商编码',
trigger: 'blur' trigger: 'blur'
}, }, ],
], supplierName: [{
supplierName: [
{
required: true, required: true,
message: '请输入供应商名称', message: '请输入供应商名称',
trigger: 'blur' trigger: 'blur'
}, ],
}, },
], supplierLevelOptions: [{
}, "fullName": "一级",
supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}], "id": "1"
}, {
"fullName": "二级",
"id": "2"
}, {
"fullName": "三级",
"id": "3"
}, {
"fullName": "四级",
"id": "4"
}],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -262,5 +261,4 @@
}, },
}, },
} }
</script> </script>

156
SC-web/src/views/scm/basicInformation/supplier/index.vue
Unescape View File

@ -40,31 +40,22 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="supplierCode" label="供应商编码" width="0" align="left" @selection-change="handleSelectionChange">
sortable="custom" /> <el-table-column prop="supplierCode" label="供应商编码" width="0" align="left" sortable="custom" />
<el-table-column prop="supplierName" label="供应商名称" width="0" align="left" <el-table-column prop="supplierName" label="供应商名称" width="0" align="left" sortable="custom" />
sortable="custom" /> <el-table-column prop="supplierSiteId" label="地点ID" width="0" align="left" sortable="custom" />
<el-table-column prop="supplierSiteId" label="地点ID" width="0" align="left" <el-table-column prop="supplierSiteCode" label="地点名称" width="0" align="left" sortable="custom" />
sortable="custom" /> <el-table-column prop="companyId" label="所属公司编码" width="0" align="left" sortable="custom" />
<el-table-column prop="supplierSiteCode" label="地点名称" width="0" align="left" <el-table-column prop="companyName" label="所属公司名称" width="0" align="left" sortable="custom" />
sortable="custom" /> <el-table-column prop="contactName" label="联系人" width="0" align="left" sortable="custom" />
<el-table-column prop="companyId" label="所属公司编码" width="0" align="left" <el-table-column prop="contactPhone" label="联系电话" width="0" align="left" sortable="custom" />
sortable="custom" /> <el-table-column label="供应商等级" width="0" prop="supplierLevel" algin="left" sortable="custom">
<el-table-column prop="companyName" label="所属公司名称" width="0" align="left"
sortable="custom" />
<el-table-column prop="contactName" label="联系人" width="0" align="left"
sortable="custom" />
<el-table-column prop="contactPhone" label="联系电话" width="0" align="left"
sortable="custom" />
<el-table-column label="供应商等级" width="0" prop="supplierLevel" algin="left"
sortable="custom" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.supplierLevel | dynamicText(supplierLevelOptions) }} {{ scope.row.supplierLevel | dynamicText(supplierLevelOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="地址" width="0" align="left" <el-table-column prop="address" label="地址" width="0" align="left" sortable="custom" />
sortable="custom" />
<!-- <el-table-column prop="status" label="启用" width="0" align="left" <!-- <el-table-column prop="status" label="启用" width="0" align="left"
sortable="custom" /> --> sortable="custom" /> -->
@ -77,21 +68,19 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" <el-table-column label="操作" fixed="right" width="150">
width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" <el-button type="text" @click="goDetail(scope.row.id)">详情
@click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -102,14 +91,22 @@ width="150" >
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -124,7 +121,8 @@ width="150" >
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -133,21 +131,68 @@ width="150" >
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'supplierCode', label: '供应商编码'}, prop: 'supplierCode',
{prop: 'supplierName', label: '供应商名称'}, label: '供应商编码'
{prop: 'supplierSiteId', label: '地点ID'}, },
{prop: 'supplierSiteCode', label: '地点名称'}, {
{prop: 'companyId', label: '所属公司编码'}, prop: 'supplierName',
{prop: 'companyName', label: '所属公司名称'}, label: '供应商名称'
{prop: 'contactName', label: '联系人'}, },
{prop: 'contactPhone', label: '联系电话'}, {
{prop: 'supplierLevel', label: '供应商等级'}, prop: 'supplierSiteId',
{prop: 'address', label: '地址'}, label: '地点ID'
{prop: 'status', label: '启用'}, },
{
prop: 'supplierSiteCode',
label: '地点名称'
},
{
prop: 'companyId',
label: '所属公司编码'
},
{
prop: 'companyName',
label: '所属公司名称'
},
{
prop: 'contactName',
label: '联系人'
},
{
prop: 'contactPhone',
label: '联系电话'
},
{
prop: 'supplierLevel',
label: '供应商等级'
},
{
prop: 'address',
label: '地址'
},
{
prop: 'status',
label: '启用'
},
], ],
supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}], supplierLevelOptions: [{
supplierLevelProps:{"label":"fullName","value":"id"}, "fullName": "一级",
"id": "1"
}, {
"fullName": "二级",
"id": "2"
}, {
"fullName": "三级",
"id": "3"
}, {
"fullName": "四级",
"id": "4"
}],
supplierLevelProps: {
"label": "fullName",
"value": "id"
},
} }
}, },
computed: { computed: {
@ -165,7 +210,11 @@ width="150" >
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -209,8 +258,7 @@ width="150" >
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -241,8 +289,7 @@ width="150" >
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -257,7 +304,12 @@ width="150" >
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/supplier/Supplier/Actions/Export`, url: `/api/supplier/Supplier/Actions/Export`,
method: 'GET', method: 'GET',

265
SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
Unescape View File

@ -1,10 +1,9 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="800px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="12" > <el-col :span="12" >
<el-form-item label="物料编码" <el-form-item label="物料编码"
@ -16,7 +15,7 @@
</popupSelect> </popupSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12" > <el-col :span="12" >
<el-form-item label="物料名称" <el-form-item label="物料名称"
prop="materialName" > prop="materialName" >
<el-input v-model="dataForm.materialName" <el-input v-model="dataForm.materialName"
@ -24,167 +23,143 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
<el-col :span="12" > <!-- <el-col :span="12" >
<el-form-item label="物料名称" <el-form-item label="物料名称"
> >
<popupAttr <popupAttr
relationField="materialCode" showField="description" > relationField="materialCode" showField="description" >
v-model="dataForm.materialCode"
</popupAttr> </popupAttr>
</el-form-item> </el-form-item>
</el-col> </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销售合同" <el-form-item label="销售合同" prop="salesName">
prop="salesName" > <popupSelect v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
<relationForm v-model="dataForm.salesName" interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
placeholder="请选择" clearable field="salesName" modelId ="294090217084722181" :columnOptions="salesNamecolumnOptions" relationField="selectField121" > popupTitle="选择数据" popupWidth="800px">
</popupSelect>
</relationForm>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="客户名称" <el-form-item label="客户名称" prop="customerName">
prop="customerName" > <el-input v-model="dataForm.customerName" placeholder="请输入" clearable
<el-input v-model="dataForm.customerName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否垫资" <el-form-item label="是否垫资" prop="advance">
prop="advance" > <el-select v-model="dataForm.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="dataForm.advance" <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
placeholder="请选择" clearable :style='{"width":"100%"}'> :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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="销售价格" <el-form-item label="销售价格" prop="salesPrice">
prop="salesPrice" > <el-input-number v-model="dataForm.salesPrice" placeholder="数字文本" :step="1">
<el-input v-model="dataForm.salesPrice"
placeholder="数字文本" clearable :style='{"width":"100%"}' >
</el-input> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="运输方式" <el-form-item label="运输方式" prop="transportType">
prop="transportType" > <el-select v-model="dataForm.transportType" placeholder="请选择" clearable
<el-select v-model="dataForm.transportType" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in transportTypeOptions" :key="index"
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="运费" <el-form-item label="运费" prop="departmentId">
prop="departmentId" > <el-input-number v-model="dataForm.departmentId" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.departmentId"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车号" <el-form-item label="车号" prop="licenseNo">
prop="licenseNo" > <popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
<relationForm v-model="dataForm.licenseNo" interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
placeholder="请选择" clearable field="licenseNo" modelId ="294090217084722181" :columnOptions="licenseNocolumnOptions" relationField="selectField122" > popupTitle="选择数据" popupWidth="800px">
</relationForm> </popupSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="业务员名称" <el-form-item label="业务员名称" prop="businessName">
prop="businessName" > <el-input v-model="dataForm.businessName" placeholder="请输入" clearable
<el-input v-model="dataForm.businessName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="磅单图片" <el-form-item label="磅单图片" prop="poundPictures">
prop="poundPictures" > <JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
<JNPF-UploadImg v-model="dataForm.poundPictures"
:fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg> </JNPF-UploadImg>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="皮重" <el-form-item label="皮重" prop="tareWeight">
prop="tareWeight" > <el-input-number v-model="dataForm.tareWeight" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.tareWeight"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="毛重" <el-form-item label="毛重" prop="grossWeight">
prop="grossWeight" > <el-input-number v-model="dataForm.grossWeight" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.grossWeight"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="扣重" <el-form-item label="扣重" prop="buckleWeight">
prop="buckleWeight" > <el-input-number v-model="dataForm.buckleWeight" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.buckleWeight"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="净重" <el-form-item label="净重" prop="netWeight">
prop="netWeight" > <el-input-number v-model="dataForm.netWeight" placeholder="数字文本" :step="1">
<el-input-number v-model="dataForm.netWeight"
placeholder="数字文本" :step="1" >
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" <el-form-item label="备注" prop="remark">
prop="remark" > <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="司机名称" <el-form-item label="司机名称" prop="driverName">
prop="driverName" > <el-input v-model="dataForm.driverName" placeholder="请输入" clearable
<el-input v-model="dataForm.driverName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="车辆图片" <el-form-item label="车辆图片" prop="vehiclePictures">
prop="vehiclePictures" > <JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
<JNPF-UploadImg v-model="dataForm.vehiclePictures"
:fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg> </JNPF-UploadImg>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="制单人" <el-form-item label="制单人" prop="creatorusername">
prop="creatorusername" > <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
<el-input v-model="dataForm.creatorusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -200,8 +175,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -231,29 +210,22 @@
vehiclePictures: [], vehiclePictures: [],
creatorusername: '', creatorusername: '',
}, },
rules: rules: {
{ materialCode: [{
materialCode: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, }, ],
], salesName: [{
salesName: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, }, ],
], licenseNo: [{
licenseNo: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}, }, ],
],
// poundPictures: [ // poundPictures: [
// { // {
// required: true, // required: true,
@ -261,47 +233,95 @@
// trigger: 'click' // trigger: 'click'
// }, // },
// ], // ],
tareWeight: [ tareWeight: [{
{
required: true, required: true,
message: '数字文本', message: '数字文本',
trigger: ["blur", "change"] trigger: ["blur", "change"]
}, }, ],
], grossWeight: [{
grossWeight: [
{
required: true, required: true,
message: '数字文本', message: '数字文本',
trigger: ["blur", "change"] trigger: ["blur", "change"]
}, }, ],
], buckleWeight: [{
buckleWeight: [
{
required: true, required: true,
message: '数字文本', message: '数字文本',
trigger: ["blur", "change"] trigger: ["blur", "change"]
}, }, ],
], netWeight: [{
netWeight: [
{
required: true, required: true,
message: '数字文本', message: '数字文本',
trigger: ["blur", "change"] trigger: ["blur", "change"]
}, ],
},
materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"},
{"label":"物料名称","value":"description"},
{"label":"库存组织","value":"organization_id"},
{"label":"默认库区","value":"areaname"},],
salesNamecolumnOptions: [{
"label": "合同编码",
"value": "contract_code"
},
{
"label": "合同名称",
"value": "contract_name"
},
{
"label": "合同类型",
"value": "contract_type"
}, },
], {
"label": "供应商/客户名称",
"value": "name"
},],
advanceOptions: [{
"fullName": "是",
"id": "1"
}, {
"fullName": "否",
"id": "0"
}],
transportTypeOptions: [{
"fullName": "汽运",
"id": "0"
}, {
"fullName": "船运",
"id": "1"
}, {
"fullName": "火车",
"id": "2"
}],
licenseNocolumnOptions: [{
"label": "车牌号",
"value": "ticketno"
},
{
"label": "司机",
"value": "drivername"
},
{
"label": "车辆照片",
"value": "vehiclephotos"
},
{
"label": "手机号",
"value": "contact"
}, },
materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"}, {"label":"物料名称","value":"description"}, {"label":"库存组织","value":"organization_id"}, {"label":"默认库区","value":"areaname"},], {
salesNamecolumnOptions:[ {"label":"事件等级","value":"selectField121"},], "label": "创建人",
advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}], "value": "f_creatorusername"
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}], },
licenseNocolumnOptions:[ {"label":"事件级别","value":"selectField122"},], {
"label": "创建时间",
"value": "f_creatortime"
},],
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -394,5 +414,4 @@
}, },
}, },
} }
</script> </script>

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

@ -35,59 +35,73 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="licenseNo" label="车号" width="0" align="left" @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="materialName" label="物料名称" width="0" align="left" />
/> <el-table-column prop="grossWeight" 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="tareWeight" 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="buckleWeight" 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="netWeight" label="净重" width="0" align="left" <el-table-column label="是否垫资" width="0" prop="advance" algin="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"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.advance | dynamicText(advanceOptions) }} {{ scope.row.advance | dynamicText(advanceOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="运输方式" width="0" prop="transportType" algin="left" <el-table-column label="运输方式" width="0" prop="transportType" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.transportType | dynamicText(transportTypeOptions) }} {{ scope.row.transportType | dynamicText(transportTypeOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="departmentId" label="运费" width="0" align="left" <el-table-column prop="departmentId" label="运费" width="0" align="left" />
/> <el-table-column prop="salesPrice" 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="creatorusername" 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="businessName" label="业务员名称" width="0" align="left" <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">
<img :src="`/dev${item.url}`" width="100%" />
<img
slot="reference"
:src="`/dev${item.url}`"
:alt="`/dev${item.url}`"
style="max-height: 70px;max-width: 70px; padding: 5px"
/> />
<el-table-column prop="remark" label="备注" width="0" align="left" </el-popover>
</span>
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
<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">
<img :src="`/dev${item.url}`" width="100%" />
<img
slot="reference"
:src="`/dev${item.url}`"
:alt="`/dev${item.url}`"
style="max-height: 70px;max-width: 70px; padding: 5px"
/> />
<el-table-column label="操作" fixed="right" </el-popover>
width="100" > </span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -98,14 +112,22 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -119,7 +141,8 @@
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -128,28 +151,96 @@
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'licenseNo', label: '车号'}, prop: 'licenseNo',
{prop: 'materialName', label: '物料名称'}, label: '车号'
{prop: 'grossWeight', label: '毛重'}, },
{prop: 'tareWeight', label: '皮重'}, {
{prop: 'buckleWeight', label: '扣重'}, prop: 'materialName',
{prop: 'netWeight', label: '净重'}, label: '物料名称'
{prop: 'driverName', label: '司机名称'}, },
{prop: 'customerName', label: '客户名称'}, {
{prop: 'salesName', label: '销售合同'}, prop: 'grossWeight',
{prop: 'advance', label: '是否垫资'}, label: '毛重'
{prop: 'transportType', label: '运输方式'}, },
{prop: 'departmentId', label: '运费'}, {
{prop: 'salesPrice', label: '销售价格'}, prop: 'tareWeight',
{prop: 'creatorusername', label: '制单人'}, label: '皮重'
{prop: 'businessName', label: '业务员名称'}, },
{prop: 'remark', label: '备注'}, {
prop: 'buckleWeight',
label: '扣重'
},
{
prop: 'netWeight',
label: '净重'
},
{
prop: 'driverName',
label: '司机名称'
},
{
prop: 'customerName',
label: '客户名称'
},
{
prop: 'salesName',
label: '销售合同'
},
{
prop: 'advance',
label: '是否垫资'
},
{
prop: 'transportType',
label: '运输方式'
},
{
prop: 'departmentId',
label: '运费'
},
{
prop: 'salesPrice',
label: '销售价格'
},
{
prop: 'creatorusername',
label: '制单人'
},
{
prop: 'businessName',
label: '业务员名称'
},
{
prop: 'remark',
label: '备注'
},
], ],
advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}], advanceOptions: [{
advanceProps:{"label":"fullName","value":"id"}, "fullName": "是",
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}], "id": "1"
transportTypeProps:{"label":"fullName","value":"id"}, }, {
"fullName": "否",
"id": "0"
}],
advanceProps: {
"label": "fullName",
"value": "id"
},
transportTypeOptions: [{
"fullName": "汽运",
"id": "0"
}, {
"fullName": "船运",
"id": "1"
}, {
"fullName": "火车",
"id": "2"
}],
transportTypeProps: {
"label": "fullName",
"value": "id"
},
} }
}, },
computed: { computed: {
@ -167,7 +258,11 @@
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -211,8 +306,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -243,8 +337,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -259,7 +352,12 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/tradeupload/Tradeupload/Actions/Export`, url: `/api/tradeupload/Tradeupload/Actions/Export`,
method: 'GET', method: 'GET',

80
SC-web/src/views/scm/basicInformation/vehicle/Form.vue
Unescape View File

@ -1,50 +1,45 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="600px">
<el-row :gutter="15" class=""> <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"> <template v-if="!loading">
<el-col :span="24" > <!-- <el-col :span="24">
<el-form-item label-width="0"> <el-form-item label-width="0">
<JNPF-Text :style='{"width":"100%"}' <JNPF-Text :style='{"width":"100%"}'
:textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="车辆信息"> :textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}'
value="车辆信息">
</JNPF-Text> </JNPF-Text>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="车牌号" <el-form-item label="车牌号" prop="ticketno">
prop="ticketno" > <el-input v-model="dataForm.ticketno" placeholder="请输入车牌号" clearable
<el-input v-model="dataForm.ticketno" :style='{"width":"100%"}'>
placeholder="请输入车牌号" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="司机名称" <el-form-item label="司机名称" prop="drivername">
prop="drivername" > <el-input v-model="dataForm.drivername" placeholder="请输入司机名称" clearable
<el-input v-model="dataForm.drivername" :style='{"width":"100%"}'>
placeholder="请输入司机名称" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="手机号" <el-form-item label="手机号" prop="contact">
prop="contact" > <el-input v-model="dataForm.contact" placeholder="请输入手机号" clearable
<el-input v-model="dataForm.contact" :style='{"width":"100%"}'>
placeholder="请输入手机号" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="车辆照片" <el-form-item label="车辆照片" prop="vehiclephotos">
prop="vehiclephotos" > <JNPF-UploadImg v-model="dataForm.vehiclephotos" :fileSize="5" sizeUnit="MB" :limit="9">
<JNPF-UploadImg v-model="dataForm.vehiclephotos"
:fileSize="5" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg> </JNPF-UploadImg>
</el-form-item> </el-form-item>
@ -78,8 +73,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -92,34 +91,36 @@
ticketno: '', ticketno: '',
drivername: '', drivername: '',
contact: '', contact: '',
vehiclephotos : [{"name":"006-1 (3).jpg","url":"/api/file/Image/annex/20230105_380637081082287813.jpg","fileId":"20230105_380637081082287813.jpg"},{"name":"微信图片_20220617141029.jpg","url":"/api/file/Image/annex/20230105_380637561959241413.jpg","fileId":"20230105_380637561959241413.jpg"}], vehiclephotos: [{
"name": "006-1 (3).jpg",
"url": "/api/file/Image/annex/20230105_380637081082287813.jpg",
"fileId": "20230105_380637081082287813.jpg"
}, {
"name": "微信图片_20220617141029.jpg",
"url": "/api/file/Image/annex/20230105_380637561959241413.jpg",
"fileId": "20230105_380637561959241413.jpg"
}],
creatorusername: '', creatorusername: '',
creatortime: "", creatortime: "",
}, },
rules: rules: {
{ ticketno: [{
ticketno: [
{
required: true, required: true,
message: '请输入车牌号', message: '请输入车牌号',
trigger: 'blur' trigger: 'blur'
}, }, ],
], drivername: [{
drivername: [
{
required: true, required: true,
message: '请输入司机名称', message: '请输入司机名称',
trigger: 'blur' trigger: 'blur'
}, }, ],
],
}, },
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -210,5 +211,4 @@
}, },
}, },
} }
</script> </script>

4
SC-web/src/views/scm/basicInformation/vehicle/index.vue
Unescape View File

@ -47,10 +47,9 @@
<el-table-column prop="drivername" label="司机名称" width="0" align="left" /> <el-table-column prop="drivername" label="司机名称" width="0" align="left" />
<el-table-column prop="contact" label="手机号" width="0" align="left" /> <el-table-column prop="contact" label="手机号" width="0" align="left" />
<el-table-column prop="vehiclephotos" label="车辆照片" width="0" align="left"> <el-table-column prop="vehiclephotos" label="车辆照片" width="0" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.vehiclephotos)" :key="index"> <span v-for="(item,index) in JSON.parse(scope.row.vehiclephotos)" :key="index">
<el-popover placement="left" trigger="click" width="300"> <el-popover placement="bottom" trigger="click" width="1000">
<img :src="`/dev${item.url}`" width="100%" /> <img :src="`/dev${item.url}`" width="100%" />
<img <img
slot="reference" slot="reference"
@ -61,7 +60,6 @@
</el-popover> </el-popover>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creatorusername" label="录入人" width="0" align="left" /> <el-table-column prop="creatorusername" label="录入人" width="0" align="left" />
<el-table-column prop="creatortime" label="创建时间" width="0" align="left" /> <el-table-column prop="creatortime" label="创建时间" width="0" align="left" />

217
SC-web/src/views/scm/basicInformation/warehouse/Form.vue
Unescape View File

@ -1,130 +1,120 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
: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="800px">
<el-row :gutter="15" class=""> <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="150px"
label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="仓库编码" <el-form-item label="仓库编码" prop="code">
prop="code" > <el-input v-model="dataForm.code" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.code"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="公司代码" <el-form-item label="公司代码" prop="companyCode">
prop="companyCode" > <el-input v-model="dataForm.companyCode" placeholder="请输入" clearable
<el-input v-model="dataForm.companyCode" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="公司名称" <el-form-item label="公司名称" prop="companyName">
prop="companyName" > <el-input v-model="dataForm.companyName" placeholder="请输入" clearable
<el-input v-model="dataForm.companyName" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="仓库位置" <el-form-item label="仓库位置" prop="location">
prop="location" > <el-input v-model="dataForm.location" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.location"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="仓库类型" <el-form-item label="仓库类型" prop="type">
prop="type" > <el-select v-model="dataForm.type" placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-select v-model="dataForm.type" <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName"
placeholder="请选择" clearable :style='{"width":"100%"}'> :value="item.id" :disabled="item.disabled"></el-option>
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="ERP库存组织" <el-form-item label="ERP库存组织" prop="organization">
prop="organization" > <el-select v-model="dataForm.organization" placeholder="请选择" clearable
<el-select v-model="dataForm.organization" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in organizationOptions" :key="index"
<el-option v-for="(item, index) in organizationOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="ERP子库" <el-form-item label="ERP子库" prop="sublibrary">
prop="sublibrary" > <el-select v-model="dataForm.sublibrary" placeholder="请选择" clearable
<el-select v-model="dataForm.sublibrary" :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}'> <el-option v-for="(item, index) in sublibraryOptions" :key="index"
<el-option v-for="(item, index) in sublibraryOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option> :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="激活状态 " <el-form-item label="激活状态 " prop="activestate">
prop="activestate" > <!-- <el-radio-group v-model="dataForm.activestate" size="small">
<el-radio-group v-model="dataForm.activestate" <el-radio v-for="(item, index) in activestateOptions" :key="index" :label="item.id"
size="small" > :disabled="item.disabled">
<el-radio v-for="(item, index) in activestateOptions" :key="index" :label="item.id" :disabled="item.disabled" >
{{item.fullName}} {{item.fullName}}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group> -->
<el-switch v-model="dataForm.activestate" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" <el-form-item label="备注" prop="remark">
prop="remark" > <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建人名称" <el-form-item label="创建人名称" prop="creatorusername">
prop="creatorusername" > <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
<el-input v-model="dataForm.creatorusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建时间" <el-form-item label="创建时间" prop="creatortime">
prop="creatortime" > <el-date-picker v-model="dataForm.creatortime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.creatortime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="修改人名称" <el-form-item label="修改人名称" prop="lastmodifyusername">
prop="lastmodifyusername" > <el-input v-model="dataForm.lastmodifyusername" placeholder="请输入" clearable
<el-input v-model="dataForm.lastmodifyusername" :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="修改时间" <el-form-item label="修改时间" prop="lastmodifytime">
prop="lastmodifytime" > <el-date-picker v-model="dataForm.lastmodifytime" placeholder="请选择" clearable
<el-date-picker v-model="dataForm.lastmodifytime" :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" > value-format="timestamp">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -140,8 +130,12 @@
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import {
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
export default { export default {
components: {}, components: {},
props: [], props: [],
@ -158,55 +152,99 @@
type: "", type: "",
organization: "", organization: "",
sublibrary: "", sublibrary: "",
activestate : "2", activestate: "1",
remark: '', remark: '',
creatorusername: '', creatorusername: '',
creatortime: '', creatortime: '',
lastmodifyusername: '', lastmodifyusername: '',
lastmodifytime: '', lastmodifytime: '',
}, },
rules: rules: {
{ code: [{
code: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
], type: [{
type: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
], organization: [{
organization: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, }, ],
], sublibrary: [{
sublibrary: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}, ],
}, },
], typeOptions: [{
}, "fullName": "原料库",
typeOptions:[{"fullName":"原料库","id":"0"},{"fullName":"中间库","id":"1"},{"fullName":"成品库","id":"2"},{"fullName":"副产品库","id":"3"},{"fullName":"废次品库","id":"4"},{"fullName":"备件辅材库","id":"5"},{"fullName":"贸易虚拟库","id":"6"},{"fullName":"仓储库","id":"7"},{"fullName":"能源库","id":"8"},{"fullName":"其他库","id":"9"},{"fullName":"帐外库","id":"10"}], "id": "0"
organizationOptions:[{"fullName":"济钢集团","id":"0"},{"fullName":"日照","id":"1"}], }, {
sublibraryOptions:[{"fullName":"城市矿产钢材库","id":"0"},{"fullName":"黄河爆破待发库","id":"1"},{"fullName":"黄河爆破完工库","id":"2"}], "fullName": "中间库",
activestateOptions:[{"fullName":"激活","id":"1"},{"fullName":"未激活","id":"0"}], "id": "1"
}, {
"fullName": "成品库",
"id": "2"
}, {
"fullName": "副产品库",
"id": "3"
}, {
"fullName": "废次品库",
"id": "4"
}, {
"fullName": "备件辅材库",
"id": "5"
}, {
"fullName": "贸易虚拟库",
"id": "6"
}, {
"fullName": "仓储库",
"id": "7"
}, {
"fullName": "能源库",
"id": "8"
}, {
"fullName": "其他库",
"id": "9"
}, {
"fullName": "帐外库",
"id": "10"
}],
organizationOptions: [{
"fullName": "济钢集团",
"id": "0"
}, {
"fullName": "日照",
"id": "1"
}],
sublibraryOptions: [{
"fullName": "城市矿产钢材库",
"id": "0"
}, {
"fullName": "黄河爆破待发库",
"id": "1"
}, {
"fullName": "黄河爆破完工库",
"id": "2"
}],
/* activestateOptions: [{
"fullName": "激活",
"id": "1"
}, {
"fullName": "未激活",
"id": "0"
}], */
} }
}, },
computed: {}, computed: {},
watch: {}, watch: {},
created() { created() {},
},
mounted() {}, mounted() {},
methods: { methods: {
clearData(data) { clearData(data) {
@ -295,5 +333,4 @@
}, },
}, },
} }
</script> </script>

241
SC-web/src/views/scm/basicInformation/warehouse/index.vue
Unescape View File

@ -6,11 +6,9 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="激活状态 "> <el-form-item label="激活状态 ">
<el-select v-model="query.activestate" placeholder="请选择" <el-select v-model="query.activestate" placeholder="请选择" clearable>
clearable>
<el-option v-for="(item, index) in activestateOptions" :key="index" <el-option v-for="(item, index) in activestateOptions" :key="index"
:label="item.fullName" :value="item.id" :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
:disabled="item.disabled"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -45,61 +43,48 @@
<screenfull isContainer /> <screenfull isContainer />
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c @selection-change="handleSelectionChange"> <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<el-table-column prop="code" label="仓库编码" width="0" align="left" @selection-change="handleSelectionChange">
/> <el-table-column prop="code" label="仓库编码" width="0" align="left" />
<el-table-column label="激活状态 " width="0" prop="activestate" algin="left" <el-table-column label="激活状态 " width="0" prop="activestate" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.activestate | dynamicText(activestateOptions) }} {{ scope.row.activestate | dynamicText(activestateOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="companyCode" label="公司代码" width="0" align="left" <el-table-column prop="companyCode" label="公司代码" width="0" align="left" />
/> <el-table-column prop="companyName" label="公司名称" width="0" align="left" />
<el-table-column prop="companyName" label="公司名称" width="0" align="left" <el-table-column label="仓库类型" width="0" prop="type" algin="left">
/>
<el-table-column label="仓库类型" width="0" prop="type" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.type | dynamicText(typeOptions) }} {{ scope.row.type | dynamicText(typeOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="ERP库存组织" width="0" prop="organization" algin="left" <el-table-column label="ERP库存组织" width="0" prop="organization" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.organization | dynamicText(organizationOptions) }} {{ scope.row.organization | dynamicText(organizationOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="ERP子库" width="0" prop="sublibrary" algin="left" <el-table-column label="ERP子库" width="0" prop="sublibrary" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.sublibrary | dynamicText(sublibraryOptions) }} {{ scope.row.sublibrary | dynamicText(sublibraryOptions) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="location" label="仓库位置" width="0" align="left" <el-table-column prop="location" label="仓库位置" width="0" align="left" />
/> <el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" <el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
/> <el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" />
<el-table-column prop="creatortime" label="创建时间" width="0" align="left" <el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
/> <el-table-column prop="remark" label="备注" width="0" align="left" />
<el-table-column prop="lastmodifyusername" label="修改人名称" width="0" align="left" <el-table-column label="操作" fixed="right" width="100">
/>
<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left"
/>
<el-table-column prop="remark" label="备注" width="0" align="left"
/>
<el-table-column label="操作" fixed="right"
width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@click="addOrUpdateHandle(scope.row.id)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" /> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
@ -110,14 +95,22 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import JNPFForm from './Form' import JNPFForm from './Form'
import ExportBox from './ExportBox' import ExportBox from './ExportBox'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import Detail from './Detail' import Detail from './Detail'
export default { export default {
components: {JNPFForm, ExportBox,Detail}, components: {
JNPFForm,
ExportBox,
Detail
},
data() { data() {
return { return {
detailVisible: false, detailVisible: false,
@ -132,7 +125,8 @@
}, },
list: [], list: [],
listLoading: true, listLoading: true,
multipleSelection: [], total: 0, multipleSelection: [],
total: 0,
listQuery: { listQuery: {
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@ -141,29 +135,133 @@
}, },
formVisible: false, formVisible: false,
exportBoxVisible: false, exportBoxVisible: false,
columnList: [ columnList: [{
{prop: 'code', label: '仓库编码'}, prop: 'code',
{prop: 'activestate', label: '激活状态 '}, label: '仓库编码'
{prop: 'companyCode', label: '公司代码'}, },
{prop: 'companyName', label: '公司名称'}, {
{prop: 'type', label: '仓库类型'}, prop: 'activestate',
{prop: 'organization', label: 'ERP库存组织'}, label: '激活状态 '
{prop: 'sublibrary', label: 'ERP子库'}, },
{prop: 'location', label: '仓库位置'}, {
{prop: 'creatorusername', label: '创建人名称'}, prop: 'companyCode',
{prop: 'creatortime', label: '创建时间'}, label: '公司代码'
{prop: 'lastmodifyusername', label: '修改人名称'}, },
{prop: 'lastmodifytime', label: '修改时间'}, {
{prop: 'remark', label: '备注'}, prop: 'companyName',
label: '公司名称'
},
{
prop: 'type',
label: '仓库类型'
},
{
prop: 'organization',
label: 'ERP库存组织'
},
{
prop: 'sublibrary',
label: 'ERP子库'
},
{
prop: 'location',
label: '仓库位置'
},
{
prop: 'creatorusername',
label: '创建人名称'
},
{
prop: 'creatortime',
label: '创建时间'
},
{
prop: 'lastmodifyusername',
label: '修改人名称'
},
{
prop: 'lastmodifytime',
label: '修改时间'
},
{
prop: 'remark',
label: '备注'
},
], ],
typeOptions:[{"fullName":"原料库","id":"0"},{"fullName":"中间库","id":"1"},{"fullName":"成品库","id":"2"},{"fullName":"副产品库","id":"3"},{"fullName":"废次品库","id":"4"},{"fullName":"备件辅材库","id":"5"},{"fullName":"贸易虚拟库","id":"6"},{"fullName":"仓储库","id":"7"},{"fullName":"能源库","id":"8"},{"fullName":"其他库","id":"9"},{"fullName":"帐外库","id":"10"}], typeOptions: [{
typeProps:{"label":"fullName","value":"id"}, "fullName": "原料库",
organizationOptions:[{"fullName":"济钢集团","id":"0"},{"fullName":"日照","id":"1"}], "id": "0"
organizationProps:{"label":"fullName","value":"id"}, }, {
sublibraryOptions:[{"fullName":"城市矿产钢材库","id":"0"},{"fullName":"黄河爆破待发库","id":"1"},{"fullName":"黄河爆破完工库","id":"2"}], "fullName": "中间库",
sublibraryProps:{"label":"fullName","value":"id"}, "id": "1"
activestateOptions:[{"fullName":"激活","id":"1"},{"fullName":"未激活","id":"0"}], }, {
activestateProps:{"label":"fullName","value":"id"}, "fullName": "成品库",
"id": "2"
}, {
"fullName": "副产品库",
"id": "3"
}, {
"fullName": "废次品库",
"id": "4"
}, {
"fullName": "备件辅材库",
"id": "5"
}, {
"fullName": "贸易虚拟库",
"id": "6"
}, {
"fullName": "仓储库",
"id": "7"
}, {
"fullName": "能源库",
"id": "8"
}, {
"fullName": "其他库",
"id": "9"
}, {
"fullName": "帐外库",
"id": "10"
}],
typeProps: {
"label": "fullName",
"value": "id"
},
organizationOptions: [{
"fullName": "济钢集团",
"id": "0"
}, {
"fullName": "日照",
"id": "1"
}],
organizationProps: {
"label": "fullName",
"value": "id"
},
sublibraryOptions: [{
"fullName": "城市矿产钢材库",
"id": "0"
}, {
"fullName": "黄河爆破待发库",
"id": "1"
}, {
"fullName": "黄河爆破完工库",
"id": "2"
}],
sublibraryProps: {
"label": "fullName",
"value": "id"
},
activestateOptions: [{
"fullName": "激活",
"id": "1"
}, {
"fullName": "未激活",
"id": "0"
}],
activestateProps: {
"label": "fullName",
"value": "id"
},
} }
}, },
computed: { computed: {
@ -181,7 +279,11 @@
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({
column,
prop,
order
}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -225,8 +327,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {});
});
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
const res = val.map(item => item.id) const res = val.map(item => item.id)
@ -257,8 +358,7 @@
} }
}); });
}) })
}).catch(() => { }).catch(() => {})
})
}, },
addOrUpdateHandle(id, isDetail) { addOrUpdateHandle(id, isDetail) {
this.formVisible = true this.formVisible = true
@ -273,7 +373,12 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {
...data,
...this.listQuery,
...this.query,
menuId: this.menuId
}
request({ request({
url: `/api/warehouse/Warehouse/Actions/Export`, url: `/api/warehouse/Warehouse/Actions/Export`,
method: 'GET', method: 'GET',

Write Preview
Loading…
Cancel
Save