meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-05-07 14:38:26 +08:00
parent 101ddbc907 a4884b8aa5
commit 29ea4df094
6 changed files with 70 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/PurchasingCenter/SupplierManagement.js
View File

@@ -17,7 +17,7 @@ export function searchData(check1, supplierName, check2, businessNature, check3,
})
}
// 增加新的数据
export function addTable(supplierName, businessNature, creationDate, registeredCapital, taxNumber, bank, account, email, address, telephone, fax, deliveryPeriod) {
export function addTable(supplierName, businessNature, creationDate, registeredCapital, taxNumber, bank, account, email, address, telephone, fax, deliveryPeriod, personNumber, Name) {
return request({
url: '',
method: 'post',
@@ -26,12 +26,12 @@ export function addTable(supplierName, businessNature, creationDate, registeredC
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_供应商_增加数据',
param: '供应商名称=' + supplierName + '&企业性质=' + businessNature + '&创立日期=' + creationDate + '&注册资本=' + registeredCapital + '&税号=' + taxNumber + '&开户行=' + bank + '&账号=' + account + '&电子信箱=' + email + '&地址=' + address + '&电话号码=' + telephone + '&传真=' + fax + '&货期=' + deliveryPeriod + '&output1=1=int=output'
param: '供应商名称=' + supplierName + '&企业性质=' + businessNature + '&创立日期=' + creationDate + '&注册资本=' + registeredCapital + '&税号=' + taxNumber + '&开户行=' + bank + '&账号=' + account + '&电子信箱=' + email + '&地址=' + address + '&电话号码=' + telephone + '&传真=' + fax + '&货期=' + deliveryPeriod + '&编辑人=' + personNumber + '&编辑人姓名=' + Name + '&output1=1=int=output'
}
})
}
export function editTable(supplierName, businessNature, creationDate, registeredCapital, taxNumber, bank, account, email, address, supplierSerialNumber, fax, deliveryPeriod, telephone) {
export function editTable(supplierName, businessNature, creationDate, registeredCapital, taxNumber, bank, account, email, address, supplierSerialNumber, fax, deliveryPeriod, telephone, personNumber, Name) {
return request({
url: '',
method: 'post',
@@ -40,7 +40,7 @@ export function editTable(supplierName, businessNature, creationDate, registered
ModularID: router.currentRoute.path,
type: '2',
name: '采购管理_供应商_修改数据',
param: '供应商名称=' + supplierName + '&企业性质=' + businessNature + '&创立日期=' + creationDate + '&注册资本=' + registeredCapital + '&税号=' + taxNumber + '&开户行=' + bank + '&账号=' + account + '&电子信箱=' + email + '&地址=' + address + '&供应商流水号=' + supplierSerialNumber + '&传真=' + fax + '&货期=' + deliveryPeriod + '&电话号码=' + telephone
param: '供应商名称=' + supplierName + '&企业性质=' + businessNature + '&创立日期=' + creationDate + '&注册资本=' + registeredCapital + '&税号=' + taxNumber + '&开户行=' + bank + '&账号=' + account + '&电子信箱=' + email + '&地址=' + address + '&供应商流水号=' + supplierSerialNumber + '&传真=' + fax + '&货期=' + deliveryPeriod + '&电话号码=' + telephone + '&编辑人=' + personNumber + '&编辑人姓名=' + Name
}
})
}

11
src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
View File

@@ -65,6 +65,11 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="入库时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.入库时间2 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope" align="center">
<el-button size="mini" type="text" @click="turnToBacklogGoods(scope.row)">转为滞货</el-button>
@@ -101,9 +106,9 @@
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">
<el-table-column label="转滞货时间" prop="仓库名称" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
{{ scope.row.转滞货时间 }}
</template>
</el-table-column>
<el-table-column label="货位名称" align="center" min-width="80">
@@ -200,7 +205,7 @@ export default {
this.searchTable1()
},
turnToBacklogGoods(row) {
this.number = 0
this.number = row.可转滞货数量
this.turnToBacklogGoods_diaable = false
this.maxNumber = row.可转滞货数量
this.materialNum = row.物料流水号

40
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -46,6 +46,16 @@
@selection-change="handleSelectionChange1"
@select="handleSelection">
<el-table-column :selectable="selectable" align="center" width="43" type="selection"/>
<el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
@@ -66,16 +76,6 @@
{{ scope.row.供货商 === '0' ? '-' : scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料类别 }}
@@ -144,17 +144,6 @@
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<!--<div class="block" style="margin: 10px 0 0 0;display: inline-block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent11"-->
<!--:page-sizes="[10, 20, 30, 40, 100]"-->
<!--:page-size="pageSize11"-->
<!--:total="total11"-->
<!--style="display:inline-block;width:800px"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange11"-->
<!--@current-change="handleCurrentChange11"/>-->
<!--</div>-->
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div style="display: inline-block;float: right;">
<el-pagination
@@ -335,7 +324,7 @@
<el-card>
<!--<h3>合同详细信息</h3>-->
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border stripe style="max-height: 500px;" height="450px" size="mini" show-summary>
<el-table-column label="物料名称" align="center" width="120" show-overflow-tooltip>
<el-table-column label="物料名称" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
@@ -612,13 +601,6 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="离线合同备注" prop="离线合同备注">-->
<!-- <el-input v-model="form2.离线合同备注" size="small" type="textarea" style="width: 550px"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button

71
src/views/PurchasingCenter/OfflineContractSearch/index.vue
View File

@@ -58,26 +58,11 @@
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<!-- <el-table-column label="离线合同名称" align="center" min-width="150">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.离线合同名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="离线合同编号" align="center" prop="离线合同编号" min-width="130" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" prop="创建日期" min-width="110" sortable="custom">
<template slot-scope="scope">
{{ scope.row.创建日期 ? scope.row.创建日期.split(' ')[0] : '-' }}
</template>
</el-table-column>
<!-- <el-table-column label="采购员" align="center" min-width="60">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.采购员 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="合同金额(元)" align="center" min-width="110">
<template slot-scope="scope">
{{ Number(scope.row.合同总额).toFixed(2) }}
@@ -103,7 +88,7 @@
{{ scope.row.采购员 }}
</template>
</el-table-column>
<el-table-column label="提交日期" align="center" prop="提交日期" min-width="110" sortable="custom">
<el-table-column label="采购日期" align="center" prop="采购日期" min-width="110" sortable="custom">
<template slot-scope="scope">
{{ scope.row.提交日期 ? scope.row.提交日期.split(' ')[0] : '-' }}
</template>
@@ -122,44 +107,42 @@
</div>
</el-card>
<el-card style="width: 50%">
<!-- <div id="offlineContract" style="background-color:white;min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">-->
<table v-show="contractDetail.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="500px">
<tr>
<th colspan="14"><h1>离线合同</h1></th>
</tr>
<tr>
<td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
<td width="80px">合同名称</td>
<td id="contractName" colspan="2" style="text-align: left;"/>
<td width="80px">供应商</td>
<td id="supplier" colspan="5" style="text-align: left;"/>
<td id="qrCode" colspan="2" rowspan="2"/>
<td style="text-align: center;" width="80px">合同名称</td>
<td id="contractName" colspan="2" style="text-align: center;"/>
<td style="text-align: center;" width="80px">供应商</td>
<td id="supplier" colspan="5" style="text-align: center;"/>
<td id="qrCode" style="text-align: center;" colspan="2" rowspan="2"/>
</tr>
<tr>
<td width="80px">合同编号</td>
<td id="contractNum" colspan="2" style="text-align: left;"/>
<td width="80px">采购员</td>
<td id="buyer" colspan="5" style="text-align: left;"/>
<td style="text-align: center;" width="80px">合同编号</td>
<td id="contractNum" colspan="2" style="text-align: center;"/>
<td style="text-align: center;" width="80px">采购员</td>
<td id="buyer" colspan="5" style="text-align: center;"/>
</tr>
<tr id="tablehead">
<td width="50px">序号</td>
<td colspan="2">名称</td>
<td>规格</td>
<td colspan="2">型号</td>
<td>数量</td>
<td colspan="2">单价</td>
<td colspan="2">合计</td>
<td>交货期</td>
<td colspan="2">备注</td>
<td style="text-align: center;" width="50px">序号</td>
<td style="text-align: center;" colspan="2">名称</td>
<td style="text-align: center;">规格</td>
<td style="text-align: center;" colspan="2">型号</td>
<td style="text-align: center;">数量</td>
<td style="text-align: center;" colspan="2">单价</td>
<td style="text-align: center;" colspan="2">合计</td>
<td style="text-align: center;">交货期</td>
<td style="text-align: center;" colspan="2">备注</td>
</tr>
<tr>
<td>总计</td>
<td id="remark" colspan="10"/>
<td id="total" colspan="2" style="text-align: left;"/>
<td/>
<td style="text-align: center;">总计</td>
<td id="remark" colspan="12" style="text-align: center;"/>
<!--<td id="total" colspan="2" style="text-align: center;"/>-->
<!--<td/>-->
</tr>
</table>
<!-- </div>-->
</el-card>
</el-row>
</div>
@@ -323,7 +306,7 @@ export default {
for (let i = 0; i < length; i++) {
tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = `<td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/>`
tr[i].innerHTML = `<td style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/><td style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/><td style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/><td style="text-align:center;height: 40px"/><td colspan="2" style="text-align:center;height: 40px"/>`
$('#tablehead').after(tr[i])
}
let total = 0
@@ -344,10 +327,10 @@ export default {
document.getElementById('contractName').innerHTML = row.离线合同名称
document.getElementById('supplier').innerHTML = row.供应商名称
document.getElementById('buyer').innerHTML = row.采购员
document.getElementById('total').innerHTML = total
document.getElementById('remark').innerHTML = row.离线合同备注
document.getElementById('total').innerHTML = ''
document.getElementById('remark').innerHTML = total + ' 元'
$('#qrCode').html(`<img id="img">`)
this.useqrcode(row.离线合同流水号) // 显示二维码
this.useqrcode(row.离线合同编号) // 显示二维码
},
useqrcode(contractNum) { // 二维码
const opts = {

14
src/views/PurchasingCenter/OfflinePartsQuery/index.vue
View File

@@ -11,8 +11,7 @@
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" border stripe size="mini" height="650" style="width: 1350px">
<el-table-column label="序号" align="center" type="index" width="55"/>
<el-table-column label="名称" align="center" width="150px">
<el-table-column label="名称" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
@@ -47,27 +46,22 @@
{{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="到货金额(元)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.到货金额 }}
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="160px">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" width="220" show-overflow-tooltip>
<el-table-column label="供应商" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="采购员" align="center" width="100">
<el-table-column label="采购员" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.采购员 }}
</template>
</el-table-column>
<el-table-column label="采购日期" align="center" width="100">
<el-table-column label="采购日期" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.创建日期 }}
</template>

93
src/views/PurchasingCenter/SupplierManagement/index.vue
View File

@@ -4,67 +4,9 @@
<el-form ref="form1" :model="form1" label-position="right" label-width="70px" class="searchForm">
<el-row>
<el-col style="width: 180px">
<!-- <el-form-item label="供应商">-->
<el-input v-model="supplierName" placeholder="供应商名称" size="small" clearable @change="fetchData"/>
<!-- </el-form-item>-->
</el-col>
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="法人">-->
<!-- <el-input v-model="businessNature" placeholder="法人" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="受托人">-->
<!-- <el-input v-model="registeredCapital" placeholder="受托人" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="邮编">-->
<!-- <el-input v-model="deliveryPeriod" placeholder="邮编" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="税号">-->
<!-- <el-input v-model="taxNumber" placeholder="税号" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="电子信箱">-->
<!-- <el-input v-model="email" placeholder="电子信箱" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="电话号码">-->
<!-- <el-input v-model="telephone" placeholder="电话号码" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="开户行">-->
<!-- <el-input v-model="bank" placeholder="开户行" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="帐号">-->
<!-- <el-input v-model="account" placeholder="帐号" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="地址">-->
<!-- <el-input v-model="address" placeholder="地址" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="传真">-->
<!-- <el-input v-model="fax" placeholder="传真" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col style="width: 250px">-->
<!-- <el-form-item label="主要产品">-->
<!-- <el-input v-model="mainProduction" placeholder="主要产品" size="small" clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col style="width: 250px;margin:0px 0 0 15px">
<!-- <el-button type="primary" size="small" icon="el-icon-search" plain @click="pageCurrent = 1;fetchData()">查询</el-button>-->
<el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="handleAdd()">供应商</el-button>
</el-col>
</el-row>
@@ -72,16 +14,20 @@
</el-card>
<el-card>
<!-- <div style="display: inline-block;margin-bottom: 5px">供应商列表</div>-->
<el-table v-loading="loading" :data="List" stripe highlight-current-row border style="width: 100%;max-height: 600px;" height="500" size="mini" @row-click="rowClick">
<el-table-column label="供应商名称" align="center" fixed="left" min-width="250">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="主要产品" align="center" min-width="150">
<el-table-column label="编辑时间" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.主要产品 }}
{{ scope.row.编辑时间 }}
</template>
</el-table-column>
<el-table-column label="编辑人" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.编辑人姓名 }}
</template>
</el-table-column>
<el-table-column label="开户行" align="center" min-width="150" show-overflow-tooltip>
@@ -129,11 +75,6 @@
{{ scope.row.注册资本 }}
</template>
</el-table-column>
<el-table-column label="邮编" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.货期 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="190">
<template slot-scope="scope">
<el-button type="text" size="mini" plain icon="el-icon-edit" @click="handleEdit(scope.row)"/>
@@ -204,15 +145,6 @@
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="邮编" prop="货期">-->
<!-- <el-input-->
<!-- v-model="form.货期"-->
<!-- size="small"-->
<!-- style="width: 200px;"-->
<!-- clearable/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="法人" prop="企业性质" size="small">
<el-input
@@ -340,6 +272,7 @@
<script>
import { searchData, addTable, editTable, deleteData, getName, addPerson, editPerson, deletePerson } from '@/api/PurchasingCenter/SupplierManagement'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -417,6 +350,12 @@ export default {
}
}
},
computed: {
...mapGetters([
'name',
'id'
])
},
mounted() {
this.fetchData()
},
@@ -469,7 +408,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
this.submitAdd_disable = true
addTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.form.电话号码, this.form.传真, this.form.货期).then(response => {
addTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.form.电话号码, this.form.传真, this.form.货期, this.id, this.name).then(response => {
if (Number(response.data.output[0].output1) === 0) {
this.$message.warning('该供应商已存在')
} else if (response.data.result[0].result === '1') {
@@ -511,7 +450,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
this.handleEdit_disable = true
editTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.supplierSerialNumber, this.form.传真, this.form.货期, this.form.电话号码).then(response => {
editTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.supplierSerialNumber, this.form.传真, this.form.货期, this.form.电话号码, this.id, this.name).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false