yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

55

master
liupopo 2 years ago
parent
bf7dc051c9
commit
f71731b93a
4 changed files with 207 additions and 305 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 407
      supervise-customer-ui/src/views/purchaserequisition/listofcheck/PrUploadXlsx.vue
  2. 92
      supervise-customer-ui/src/views/purchaserequisition/listofcheck/index.vue
  3. 11
      yxt-supervise-cyf/docs/sheji/hy/jh20230504.txt
  4. 2
      yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/resources/application.yml

407
supervise-customer-ui/src/views/purchaserequisition/listofcheck/PrUploadXlsx.vue
View File

@ -1,191 +1,194 @@
<template>
<div class="app-container">
<!-- 标题按钮部分开始 -->
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{ viewTitle }}</div>
<!-- start 添加修改按钮 -->
<div style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<el-button type="text" @click="handleDownload"><span style="border-bottom: 1px solid blue">下载Excel示例表样</span></el-button>
<div style="margin-left: 10px;margin-right: 10px">
<el-upload
ref="upload"
class="upload-demo"
accept=".xls"
:action="updateAction"
:file-list="fileList"
:on-progress="handleProgress"
:on-success="handleSuccess"
:multiple="false"
:show-file-list="false"
:limit="1"
>
<el-button type="primary" size="small">上传采购订单excel文件</el-button>
</el-upload>
<div>
<el-drawer :visible.sync="drawerUploadXlsxShow" size="85%" :with-header="false" :before-close="drawerUploadXlsxClose">
<div class="app-container">
<!-- 标题按钮部分开始 -->
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{ viewTitle }}</div>
<!-- start 添加修改按钮 -->
<div style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<el-button type="text" @click="handleDownload"><span style="border-bottom: 1px solid blue">下载Excel示例表样</span></el-button>
<div style="margin-left: 10px;margin-right: 10px">
<el-upload
ref="upload"
class="upload-demo"
accept=".xls"
:action="updateAction"
:file-list="fileList"
:on-progress="handleProgress"
:on-success="handleSuccess"
:multiple="false"
:show-file-list="false"
:limit="1"
>
<el-button type="primary" size="small">上传采购订单excel文件</el-button>
</el-upload>
</div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<!-- 标题按钮部分结束 -->
<!-- Start 新增修改部分 -->
<div class="listconadd" style="padding: 20px;">
<el-collapse v-model="collOrderInfoActiveNames">
<el-collapse-item title="订单详情" name="1">
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd" style="padding: 0px;">
<div class="title">
<div>采购订单信息</div>
<!-- 标题按钮部分结束 -->
<!-- Start 新增修改部分 -->
<div class="listconadd" style="padding: 20px;">
<el-collapse v-model="collOrderInfoActiveNames">
<el-collapse-item title="订单详情" name="1">
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd" style="padding: 0px;">
<div class="title">
<div>采购订单信息</div>
</div>
<el-row>
<el-col :span="3" class="tleftb"><span>订单编号</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.code }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>填单人</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.buyerName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>填单时间</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.purchaseDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>供货单位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.supplierName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>仓位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.warehousePosition }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>到货日期</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.arrivalDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>采购员</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.buyerName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>入库单位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.purchasingDeptName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>单据到效期</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.expiryDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>要货单位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.purchasingDeptName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>入库仓位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.warehousePosition }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>完成状态</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.completionStatus }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>采购商品明细</div>
<div>
<span style="padding-right: 20px">合计数量:{{ totalQuantity }}</span>
<span>合计金额:{{ amountInTotal }}</span>
</div>
</div>
<el-table :data="prolist" :index="index" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
<el-table-column label="商品代码" align="center" width="100" prop="proCode" />
<el-table-column label="商品名称" align="center" prop="proName" />
<el-table-column label="品类编码" align="center" width="100" prop="categoryKey" />
<el-table-column label="品类名称" align="center" width="100" prop="category" />
<el-table-column label="品牌编码" align="center" width="100" prop="brandCode" />
<el-table-column label="品牌名称" align="center" width="100" prop="brand" />
<el-table-column label="合计(元)" align="center" width="150" prop="totalPrice" />
<el-table-column label="数量" align="center" width="100" prop="number" />
<el-table-column label="包装规格" align="center" width="150" prop="packageSpec" />
</el-table>
</el-form>
</el-collapse-item>
</el-collapse>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>供应商信息检测</span>
<el-button style="float: right; padding: 3px 0" type="text" @click="checkSupplier">重新检测</el-button>
</div>
<el-row>
<el-col :span="3" class="tleftb"><span>订单编号</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.code }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>填单人</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.buyerName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>填单时间</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.purchaseDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>供货单位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.supplierName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>仓位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.warehousePosition }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>到货日期</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.arrivalDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>采购员</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.buyerName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>入库单位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.purchasingDeptName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>单据到效期</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.expiryDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>要货单位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.purchasingDeptName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>入库仓位</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.warehousePosition }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>完成状态</span></el-col>
<el-col :span="5" class="trightb">
<el-form-item>
<span>{{ formobj.completionStatus }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>采购商品明细</div>
<div>
<span style="padding-right: 20px">合计数量:{{ totalQuantity }}</span>
<span>合计金额:{{ amountInTotal }}</span>
<div>
<div v-if="supplierCheckState==0">{{ supplierCheckMsg }}</div>
<div v-else-if="supplierCheckState==1">
<el-table :data="supplierChecklist" :index="index" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
<el-table-column label="供应商编码" align="center" width="150" prop="supplierCode" />
<el-table-column label="供应商名称" align="center" prop="supplierName" />
<el-table-column label="供应商统一编码" align="center" width="150" prop="supplierCodeUnified" />
<el-table-column label="状态" align="center" width="150" prop="resState" />
<el-table-column label="检测结果" align="center" width="300" prop="msg" />
</el-table>
</div>
<div v-else> <el-alert title="供应商信息正常!" show-icon type="success" effect="dark" :closable="false" /></div>
</div>
<el-table :data="prolist" :index="index" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
<el-table-column label="商品代码" align="center" width="100" prop="proCode" />
<el-table-column label="商品名称" align="center" prop="proName" />
<el-table-column label="品类编码" align="center" width="100" prop="categoryKey" />
<el-table-column label="品类名称" align="center" width="100" prop="category" />
<el-table-column label="品牌编码" align="center" width="100" prop="brandCode" />
<el-table-column label="品牌名称" align="center" width="100" prop="brand" />
<el-table-column label="合计(元)" align="center" width="150" prop="totalPrice" />
<el-table-column label="数量" align="center" width="100" prop="number" />
<el-table-column label="包装规格" align="center" width="150" prop="packageSpec" />
</el-table>
</el-form>
</el-collapse-item>
</el-collapse>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>供应商信息检测</span>
<el-button style="float: right; padding: 3px 0" type="text" @click="checkSupplier">重新检测</el-button>
</div>
<div>
<div v-if="supplierCheckState==0">{{ supplierCheckMsg }}</div>
<div v-else-if="supplierCheckState==1">
<el-table :data="supplierChecklist" :index="index" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
<el-table-column label="供应商编码" align="center" width="150" prop="supplierCode" />
<el-table-column label="供应商名称" align="center" prop="supplierName" />
<el-table-column label="供应商统一编码" align="center" width="150" prop="supplierCodeUnified" />
<el-table-column label="状态" align="center" width="150" prop="resState" />
<el-table-column label="检测结果" align="center" width="300" prop="msg" />
</el-table>
</div>
<div v-else> <el-alert title="供应商信息正常!" show-icon type="success" effect="dark" :closable="false" /></div>
</div>
</el-card>
<el-card class="box-card" style="margin-top: 5px;">
<div slot="header" class="clearfix">
<span>商品信息检测</span>
<el-button style="float: right; padding: 3px 0" type="text" @click="checkPro">重新检测</el-button>
</div>
<div>
<div v-if="proCheckState==0">{{ proCheckMsg }}</div>
<div v-else-if="proCheckState==1">
<el-table :data="proChecklist" :index="index" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
<el-table-column label="商品代码" align="center" width="100" prop="productCode" />
<el-table-column label="商品名称" align="center" prop="productName" />
<el-table-column label="品类编码" align="center" width="100" prop="categoryCode" />
<el-table-column label="品类名称" align="center" width="100" prop="categoryName" />
<el-table-column label="品牌编码" align="center" width="100" prop="brandCode" />
<el-table-column label="品牌名称" align="center" width="100" prop="brandName" />
<el-table-column label="状态" align="center" width="150" prop="resState" />
<el-table-column label="检测结果" align="center" width="300" prop="msg" />
</el-table>
</div>
<div v-else> <el-alert title="所有商品信息正常!" show-icon type="success" effect="dark" :closable="false" /></div>
</el-card>
<el-card class="box-card" style="margin-top: 5px;">
<div slot="header" class="clearfix">
<span>商品信息检测</span>
<el-button style="float: right; padding: 3px 0" type="text" @click="checkPro">重新检测</el-button>
</div>
<div>
<div v-if="proCheckState==0">{{ proCheckMsg }}</div>
<div v-else-if="proCheckState==1">
<el-table :data="proChecklist" :index="index" border style="width: 100%">
<el-table-column fixed label="序号" width="60px" type="index" :index="index + 1" align="center" />
<el-table-column label="商品代码" align="center" width="100" prop="productCode" />
<el-table-column label="商品名称" align="center" prop="productName" />
<el-table-column label="品类编码" align="center" width="100" prop="categoryCode" />
<el-table-column label="品类名称" align="center" width="100" prop="categoryName" />
<el-table-column label="品牌编码" align="center" width="100" prop="brandCode" />
<el-table-column label="品牌名称" align="center" width="100" prop="brandName" />
<el-table-column label="状态" align="center" width="150" prop="resState" />
<el-table-column label="检测结果" align="center" width="300" prop="msg" />
</el-table>
</div>
<div v-else> <el-alert title="所有商品信息正常!" show-icon type="success" effect="dark" :closable="false" /></div>
</div>
</el-card>
</div>
</el-card>
</div>
<!-- End 添加修改部分 -->
</div>
<!-- End 添加修改部分 -->
</div>
</el-drawer></div>
</template>
<script>
@ -205,6 +208,7 @@
fileList: [],
totalQuantity: '', // 合计数量
amountInTotal: '', // 合计金额
drawerUploadXlsxShow: false,
formobj: {
sid: '',
code: '', // 单号
@ -241,6 +245,10 @@
},
created() {},
methods: {
drawerUploadXlsxClose() {
console.log('DDDD')
this.drawerUploadXlsxShow = false
},
handleReturn() {
this.formobj = {
sid: '',
@ -292,49 +300,18 @@
// _this.fullscreenloading.text = '上传完成，正在导入数据库'
// }
},
// handleSuccess(resp, file, fileList) {
// // if (this.fullscreenloading) this.fullscreenloading.close()
// // this.fullscreenloading = null
// console.log('222', resp)
// // const rdata = resp.data
// // const _this = this
// // _this.fullscreenloading.text = '数据导入完成，进行汇总'
// // _this.uploadResultMesssage = '共导入数据：' + rdata.allNum + ' 条；符合监管条件的数据：' + rdata.validNum + ' 条；用时：' + rdata.durations + ' 毫秒。'
// // kchz()
// // .then(res => {
// // if (this.fullscreenloading) this.fullscreenloading.close()
// // this.fullscreenloading = null
// // console.log('333', res)
// // _this.hzFilePath = res.data
// // })
// // .catch(e => {
// // if (this.fullscreenloading) this.fullscreenloading.close()
// // this.fullscreenloading = null
// // })
// // // kchzyc()
// // // .then(res => {
// // // if (this.fullscreenloading) this.fullscreenloading.close()
// // // this.fullscreenloading = null
// // // console.log('444', res)
// // // _this.ychzFilePath = res.data
// // // })
// // // .catch(e => {
// // // if (this.fullscreenloading) this.fullscreenloading.close()
// // // this.fullscreenloading = null
// // // })
// },
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【审核编号】'
},
showEdit(row) {
showEditInfo(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【审核编号】'
this.drawerUploadXlsxShow = true
req
.fetchBySid(row.sid)
.then(resp => {

92
supervise-customer-ui/src/views/purchaserequisition/listofcheck/index.vue
View File

@ -26,9 +26,7 @@
</el-table>
</div>
</div>
<el-drawer :visible.sync="drawerUploadXlsx" size="85%" :with-header="false" :before-close="drawerUploadXlsxClose">
<upload-xlsx ref="draweruploadxlsx" @doback="drawerUploadXlsxClose" @reloadlist="loadList" />
</el-drawer>
<upload-xlsx ref="drUploadXlsx" @doback="drawerUploadXlsxClose" @reloadlist="loadList" />
</div>
</template>
@ -134,7 +132,8 @@
},
showEditDrawer(row) {
this.drawerUploadXlsx = true
this.$refs['draweruploadxlsx'].showEdit(row)
console.log('jjj', this.$refs)
this.$refs['drUploadXlsx'].showEditInfo(row)
},
// 搜索条件效果
clicksearchShow() {
@ -199,91 +198,6 @@
this.$router.go(-1)
// this.$emit('doback')
},
handleProgress(event, file, fileList) {
// this.progressFlag = true; // 显示进度条
// this.loadProgress = parseInt(event.percent); // 动态获取文件上传进度
// if (this.loadProgress >= 100) {
// this.loadProgress = 100
// setTimeout( () => {this.progressFlag = false}, 1000) // 一秒后关闭进度条
// }
// const _this = this
// this.fullscreenloading = this.$loading({
// lock: true,
// text: '文件正在上传',
// spinner: 'el-icon-loading',
// background: 'rgba(0, 0, 0, 0.7)'
// })
// console.log('111', event.percent)
// if (event.percent >= 100) {
// _this.fullscreenloading.text = '上传完成，正在导入数据库'
// }
},
// handleSuccess(resp, file, fileList) {
// // if (this.fullscreenloading) this.fullscreenloading.close()
// // this.fullscreenloading = null
// console.log('222', resp)
// // const rdata = resp.data
// // const _this = this
// // _this.fullscreenloading.text = '数据导入完成，进行汇总'
// // _this.uploadResultMesssage = '共导入数据：' + rdata.allNum + ' 条；符合监管条件的数据：' + rdata.validNum + ' 条；用时：' + rdata.durations + ' 毫秒。'
// // kchz()
// // .then(res => {
// // if (this.fullscreenloading) this.fullscreenloading.close()
// // this.fullscreenloading = null
// // console.log('333', res)
// // _this.hzFilePath = res.data
// // })
// // .catch(e => {
// // if (this.fullscreenloading) this.fullscreenloading.close()
// // this.fullscreenloading = null
// // })
// // // kchzyc()
// // // .then(res => {
// // // if (this.fullscreenloading) this.fullscreenloading.close()
// // // this.fullscreenloading = null
// // // console.log('444', res)
// // // _this.ychzFilePath = res.data
// // // })
// // // .catch(e => {
// // // if (this.fullscreenloading) this.fullscreenloading.close()
// // // this.fullscreenloading = null
// // // })
// },
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【审核编号】'
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【审核编号】'
req
.fetchBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
if (this.formobj.pros.length > 0) {
this.totalQuantity = this.formobj.pros.length
var aa = 0
for (var i = 0; i < this.formobj.pros.length; i++) {
if (this.formobj.pros[i].totalPrice !== '') {
aa = parseFloat(aa) + parseFloat(this.formobj.pros[i].totalPrice)
}
}
this.amountInTotal = aa
}
} else {
// 根据resp.code进行异常情况处理
}
})
.catch(e => {
this.formobj = row
})
},
downCheckExcel() {
window.location.href = process.env.VUE_APP_BASE_API + '/v1/productnum/products?code=' + this.formobj.code
},

11
yxt-supervise-cyf/docs/sheji/hy/jh20230504.txt
View File

@ -0,0 +1,11 @@
库存原油，原料
出入库管理
1。油罐增删改查
2。原油类型增删改查
3。流量计（对应油罐，管线管路图）
登记入库信息（选油罐（带入原油类型），数量，时间）
查看库存信息
登记出库信息（

2
yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/resources/application.yml
View File

@ -20,7 +20,7 @@ spring:
server:
port: 7101
port: 7109
max-http-header-size: 102400
undertow:
max-http-post-size: -1

Write Preview
Loading…
Cancel
Save