Browse Source

Merge remote-tracking branch 'origin/master'

master
wangpengfei 2 years ago
parent
commit
abeea63907
  1. 4
      supervise-enterprise-ui/.env.development
  2. 77
      supervise-enterprise-ui/src/api/Yjsq/index.js
  3. 10
      supervise-enterprise-ui/src/api/portal/Upload.js
  4. 6
      supervise-enterprise-ui/src/components/uploadFile/upload_picture.vue
  5. 347
      supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue
  6. 249
      supervise-enterprise-ui/src/views/Yjsq/LookYjsq.vue
  7. 66
      supervise-enterprise-ui/src/views/Yjsq/index.vue
  8. 233
      supervise-enterprise-ui/src/views/Yjsq/upluad.vue
  9. 3
      warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue

4
supervise-enterprise-ui/.env.development

@ -2,8 +2,8 @@
ENV = 'development'
# base api
VUE_APP_BASE_API = '/api/service'
VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://8.130.39.13:8112"
VUE_APP_URL = "http://192.168.1.193:8112"
VUE_APP_URL = "http://supervise.yxtsoft.com"

77
supervise-enterprise-ui/src/api/Yjsq/index.js

@ -0,0 +1,77 @@
import request from '@/utils/request'
// 入库导入的记录
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/enterprisecentre/v1/sealrecord/listPage',
method: 'post',
data: params
})
},
// 保存列表
sealrecordSave: function(data) {
return request({
url: '/enterprisecentre/v1/sealrecord/save',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 提交列表
sealrecordSubmit: function(data) {
return request({
url: '/enterprisecentre/v1/sealrecord/submit',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 保存列表
sealrecordSave: function(data) {
return request({
url: '/enterprisecentre/v1/sealrecord/save',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 根据SID获取一条记录
fetchDetailsBySid: function(sid) {
return request({
url: '/enterprisecentre/v1/sealrecord/fetchDetailsBySid/' + sid,
method: 'get',
})
},
// 根据SID获取一条记录
delBySids: function(data) {
return request({
url: '/enterprisecentre/v1/sealrecord/delBySids',
method: 'post',
data: data,
})
},
// 根据SID获取一条记录
complete: function(data) {
return request({
url: '/enterprisecentre/v1/sealrecord/complete',
method: 'post',
data: data,
})
},
// 根据SID获取一条记录
upload: function(data) {
return request({
url: '/enterprisecentre/v1/sealrecord/upload',
method: 'post',
data: data,
})
},
}

10
supervise-enterprise-ui/src/api/portal/Upload.js

@ -4,7 +4,7 @@ import qs from 'qs'
const base = process.env.VUE_APP_URL
// 文件上传接口
export const uploadFile = '/api/customer/file/upload'
export const uploadFile = 'http://supervise.yxtsoft.com/enterprisecentre/v1/sealrecord/upload'
// export const uploadFile = process.env.VUE_APP_BASE_API + '/customer/file/upload'
@ -28,3 +28,11 @@ export function deleteFilesOss(data) {
// headers: { 'Content-Type': 'multipart/form-data' }
})
}
// 移除图片
export function upload(data) {
return request({
url: '/enterprisecentre/v1/sealrecord/upload',
method: 'post',
data:data,
})
}

6
supervise-enterprise-ui/src/components/uploadFile/upload_picture.vue

@ -54,6 +54,12 @@ export default {
uploadData: {
type: Object,
default: {}
},
MinetList: {
type: Array,
default: function () {
return []
}
}
},
data() {

347
supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue

@ -5,6 +5,7 @@
<div>{{title}}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveSubmit">提交</el-button>
<el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -22,45 +23,42 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-select v-model="formobj.industryName" class="addinputw" placeholder="请选择项目名称" style="width:100%"
@change="getHangYe">
<el-option v-for="(item,i) in industryList" :key="i" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
<el-form-item>{{ projectName }}</el-form-item>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审批编号</span>
<span slot="label">申请日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" class="trightb_item">
<el-form-item class="trightb_item">
<el-input v-model="formobj.entryName" placeholder="请输入审批编号" style="width:100%" class="addinputw"
clearable />
<el-date-picker v-model="formobj.applicant_date" type="date" style="width:100%" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请人</span>
<span slot="label">审批编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.entryName" placeholder="请输入申请人姓名" style="width:100%" class="addinputw"
<el-input v-model="formobj.code" placeholder="请输入审批编号" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印</span>
<span slot="label">申请</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.entryName" placeholder="请输入用印人姓名" style="width:100%" class="addinputw"
<el-input v-model="formobj.applicant_name" placeholder="请输入申请人姓名" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
@ -68,14 +66,13 @@
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请日期</span>
<span slot="label">用印人</span>
</el-form-item>
</el-col>
<el-col :span="8" class="trightb_item">
<el-col :span="8">
<el-form-item class="trightb_item">
<el-date-picker v-model="formobj.engaDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
<el-input v-model="formobj.user_name" placeholder="请输入用印人姓名" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
@ -85,13 +82,25 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.entryName" placeholder="请输入用印事由" style="width:100%" class="addinputw"
<el-input v-model="formobj.use_reason" placeholder="请输入用印事由" style="width:100%" class="addinputw"
clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">使用日期</span>
</el-form-item>
</el-col>
<el-col :span="8" class="trightb_item">
<el-form-item class="trightb_item">
<el-date-picker v-model="formobj.use_date" type="date" style="width:100%" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印文件名称</span>
@ -99,20 +108,29 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="formobj.econtacts" placeholder="请输入用印文件名称" style="width:100%"
<el-input v-model="formobj.use_file_name" placeholder="请输入用印文件名称" style="width:100%"
class="addinputw" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印文件(附件)</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="20">
<el-form-item class="trightb_item">
<el-input v-model="formobj.econtacts" placeholder="请输入用印文件名称" :readonly="true" style="width:100%"
class="addinputw" clearable />
<upload
class="item_input"
ref="uploadImg"
:minet-list="msg"
v-model="imgList"
@change="backDatas"
bucket="map"
:upload-data="{ type: '0001' }"
></upload>
</el-form-item>
</el-col>
</el-row>
@ -125,16 +143,14 @@
</el-col>
<el-col :span="20">
<el-form-item class="trightb_item">
<div class="info-sex">
<el-radio-group v-model="formobj.fillInDate">
<el-radio :label="0">公章</el-radio>
<el-radio :label="1">法人章</el-radio>
<el-radio :label="2">财务章</el-radio>
<el-radio :label="3">发票章</el-radio>
<el-radio :label="4">营业执照</el-radio>
<el-radio :label="5">开发许可证</el-radio>
</el-radio-group>
</div>
<el-checkbox-group v-model="checkList" @change="backcheckList">
<el-checkbox label="公章"></el-checkbox>
<el-checkbox label="法人章"></el-checkbox>
<el-checkbox label="财务章"></el-checkbox>
<el-checkbox label="发票章" ></el-checkbox>
<el-checkbox label="营业执照"></el-checkbox>
<el-checkbox label="开发许可证"></el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</el-row>
@ -159,71 +175,77 @@
</template>
<script>
// import req from '@/api/project/project'
import req from '@/api/Yjsq/index'
import upload from './upluad.vue'
export default {
components: {
upload
},
data() {
return {
title: "【新增】印鉴信息",
submitdisabled: false,
drawer: false,
formobj: {
sid: "",
entryName: "", //
industryName: "", //
industrySid: "",
typeName: "", //
typeSid: "",
creditLimit: "", //
bankName: "", //
bankSid: "",
bmanagerName: '', //
managerSid: "",
engaDate: "", //
useLimit: "", //
loanDate: "", //
useDate: "", //
signingDate: "", //
enterpriseName: "", //
enterpriseSid: "",
econtacts: "", //
remarks: "", //
regulatoryLeader: "", //
generalManager: "", //
endDate: "", //
fillInDate: "", //
project_sid:'', // sid
project_name:'', //
code:'', //
applicant_date:'',//
applicant_name:'', // name
user_name:'', //
use_date:'', // 使
use_reason:'', //
use_file_name:'', //
seal_type:'', //
file_paths:[], //
remarks:'', //
},
industryAllList: [],
industryList: [],
projectName:'桦聚面业贸易应收账款项目',
imgList: [],
msg:[],
checkList:[],
}
},
created() {
},
methods: {
addImg(){
console.log(6);
watch: {
imgList:{
deep: true,
immediate: true,
handler(newVal, oldVal) {
const aa=[]
for (var i = 0; i < newVal.length; i++) {
aa.push(newVal[i].url)
}
this.formobj.file_paths = aa
}
},
},
methods: {
saveOrUpdate() {
console.log(">>>>>>>>>saveOrUpdate", this.formobj)
if (this.formobj.sid) {
// req.updateData(this.formobj)
// .then(resp => {
// if (resp.success) {
// this.$message({
// showClose: true,
// type: 'success',
// message: resp.msg
// })
// this.handleReturn("true")
// this.$refs.multipleTable.clearSelection();
// } else {
// // resp.code
// }
// })
// .catch(() => {})
} else {
this.formobj.project_name=this.projectName
this.backcheckList()
// if (this.formobj.project_sid) {
req.sealrecordSave(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn("true")
this.clearList()
} else {
// resp.code
}
})
.catch(() => {})
// else {
// req.addInfo(this.formobj)
// .then(resp => {
// if (resp.success) {
@ -239,63 +261,103 @@
// }
// })
// .catch(() => {})
}
// }
},
delSid(){
saveSubmit(){
this.formobj.project_name=this.projectName
req.sealrecordSubmit(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn("true")
this.clearList()
} else {
}
})
.catch(() => {})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: "",
entryName: "", //
industryName: "", //
industrySid: "",
typeName: "", //
typeSid: "",
creditLimit: "", //
bankName: "", //
bankSid: "",
bmanagerName: '', //
managerSid: "",
engaDate: "",
useLimit: "",
loanDate: "",
useDate: "",
signingDate: "", //
enterpriseName: "", //
enterpriseSid: "",
econtacts: "", //
remarks: "", //
regulatoryLeader: "", //
generalManager: "", //
endDate: "", //
fillInDate: "", //
}
this.clearList()
this.$refs['dataForm'].resetFields()
this.$emit('doback')
},
showAdd(){
this.title= "【新增】印鉴信息"
},
showEdit(row) {
this.clearList()
this.title= "【修改】印鉴信息"
// req.fetchBySid(row.sid)
// .then(resp => {
// if (resp.success) {
// }
// })
// .catch(e => {
// this.formobj = row
// })
req.fetchDetailsBySid(row).then((res)=>{
if(res.code==200){
this.formobj.project_sid=res.data.project_sid
this.formobj.project_name=res.data.project_name
this.formobj.code=res.data.code
this.formobj.applicant_date=res.data.applicant_date
this.formobj.applicant_name=res.data.applicant_name
this.formobj.user_name=res.data.user_name
this.formobj.use_date=res.data.use_date
this.formobj.use_reason=res.data.use_reason
this.formobj.use_file_name=res.data.use_file_name
this.checkList=res.data.seal_type
this.formobj.file_paths=res.data.file_paths
this.formobj.remarks=res.data.remarks
let value=res.data.file_paths
for(let i=0;i<value.length;i++){
this.msg.push(value[i])
}
}
}).catch(() => {
})
},
backDatas(value) {
const aa = []
if (value.length > 0 && value != null && value != undefined) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].url)
}
}
this.formobj.file_paths = aa
},
backcheckList() {
var aa = ''
for (var i = 0; i < this.checkList.length; i++) {
aa+= this.checkList[i]+ ','
}
var str = aa.slice(0, -1);
this.formobj.seal_type = str
console.log(str);
},
getHangYe(value) {
const choose = this.industryList.filter((item) => item.dictKey === value)
this.formobj.industryName = choose[0].dictValue
this.formobj.industrySid = choose[0].dictKey
},
const choose = this.industryList.filter((item) => item.dictKey === value)
this.formobj.industryName = choose[0].dictValue
this.formobj.industrySid = choose[0].dictKey
},
clearList() {
this.formobj = {
project_sid:'',
project_name:'',
code:'',
applicant_date:'',
applicant_name:'',
user_name:'',
use_date:'',
use_reason:'',
use_file_name:'',
seal_type:'',
file_paths:[],
remarks:''
};
this.checkList=[]
this.msg=[]
this.imgList=[]
},
}
}
@ -335,38 +397,5 @@
/deep/ .el-collapse-item__content {
padding-bottom: 0;
}
/deep/ .el-radio__inner {
border-radius: 10%;
}
.info-sex ::v-deep.el-radio__input.is-checked .el-radio__inner {
border-color: #0294d7;
background-color: #fff;
}
.info-sex ::v-deep.el-radio__input.is-checked + .el-radio__label {
color: #424346;
}
.info-sex ::v-deep.el-radio__input.is-checked .el-radio__inner:after {
transform: rotate(45deg) scaleY(1);
}
.info-sex ::v-deep.el-radio__label {
color: #80838a;
}
.info-sex ::v-deep.el-radio__inner::after {
box-sizing: content-box;
content: "";
border: 1px solid #0294d7;
border-left: 0;
border-top: 0;
height: 7px;
left: 4px;
position: absolute;
top: 1px;
transform: rotate(45deg) scaleY(0);
width: 3px;
transition: transform 0.15s ease-in 0.05s;
transform-origin: center;
border-radius: unset;
background-color: transparent;
}
</style>

249
supervise-enterprise-ui/src/views/Yjsq/LookYjsq.vue

@ -0,0 +1,249 @@
<template>
<div>
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()"
>返回</el-button
>
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="purchaseForm" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div style="margin-left: 15px;">主体信息</div>
</div>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">项目名称</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item" prop="purchaseNo">
<span>{{purchaseForm.project_name}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.applicant_date}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">审批编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="supplier" class="trightb_item">
<span>{{purchaseForm.code}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">申请人</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.applicant_name}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印人</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.user_name}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印事由</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.use_reason}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">使用日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.use_date}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印文件名称</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.use_file_name}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">用印文件(附件)</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.file_path}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">加盖何种公章</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.seal_type}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.remarks}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/Yjsq/index'
export default {
data() {
return {
viewTitle: "印鉴详细信息",
purchaseForm: {},
activeNames: ['1'],
storehouseList:[]
}
},
mounted() {
},
created() {},
methods: {
handleReturn() {
this.$emit("reloadlist");
this.$emit("doback");
},
showInfo(row) {
req.fetchDetailsBySid(row).then((res)=>{
if(res.code==200){
this.purchaseForm=res.data
}
}).catch(() => {
})
},
},
};
</script>
<style scoped>
/deep/ .el-collapse-item__header {
height: 40px;
font-weight: bold;
font-size: 16px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
}
/deep/ .el-collapse-item__content {
padding-bottom: 0;
}
.trightb {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightb_item {
padding-top: 5px;
}
.span {
margin-left: 50px;
font-size: 15px;
font-weight: 400;
}
.formadd {
padding: 10px 40px 0 40px;
font-size: 16px;
}
.formadd .title {
font-weight: bold;
font-size: 16px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
}
.first_row{
border-top: 1px solid #e0e3eb;
}
.formadd .el-row {
display: flex;
flex-wrap: wrap;
border-left: 1px solid #e0e3eb;
}
.formadd .el-row .el-col {
border-right: 1px solid #e0e3eb;
border-bottom: 1px solid #e0e3eb;
padding: 0 15px;
min-height: 42px;
line-height: 1;
}
.formadd .el-row .el-col .el-form-item {
margin-bottom: 0;
line-height: 42px;
}
.addinputw {
width: 80%;
line-height: 42px;
}
.el-input__inner {
height: 36px;
}
</style>

66
supervise-enterprise-ui/src/views/Yjsq/index.vue

@ -22,7 +22,7 @@
<div class="tit">印鉴使用列表</div>
</div>
<div class="">
<el-table v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table v-loading="listLoading" ref="Table" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column fixed width="80" label="操作" align="center">
@ -30,36 +30,40 @@
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="审批编号" prop="number" align="center" />
<el-table-column label="申请日期" prop="crudeName" align="center" />
<el-table-column label="用印文件名称" prop="existingInventory" align="center" />
<el-table-column label="项目名称" prop="project_name" align="center" />
<el-table-column label="审批编号" prop="code" align="center" />
<el-table-column label="申请人" prop="applicant_name" align="center" />
<el-table-column label="申请日期" prop="applicant_date" align="center" />
<el-table-column label="用印章人" prop="user_name" align="center" />
<el-table-column label="加盖何种公章" prop="seal_type" align="center" />
</el-table>
</div>
<div class="pages">
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
<pagination v-show="list.length > 0" :total="total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
<AddYjsq v-show="viewState ==2 || viewState ==3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- <oilTypeInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" /> -->
<LookYjsq v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" />
</div>
</template>
<script>
// import req from '@/api/oilTank/oilTank'
import req from '@/api/Yjsq/index'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import AddYjsq from './AddYjsq.vue'
// import oilTypeInfo from './oilTypeInfo.vue'
import LookYjsq from './LookYjsq.vue'
export default {
name: 'CustomerManagement',
components: {
Pagination,
ButtonBar,
AddYjsq,
LookYjsq
// oilTypeInfo,
},
@ -106,9 +110,10 @@
params: {
entryName: '',
},
total: 0
},
viewState: 1
total: 0,
viewState: 1,
sids:''
}
},
mounted() {
@ -159,11 +164,14 @@
},
//
getList() {
// this.listLoading = true
// req.listPage(this.listQuery).then((res) => {
// this.listLoading = false
// })
this.listLoading = true
req.listPage(this.listQuery).then((res) => {
if(res.code==200){
this.listLoading = false
this.list=res.data.records
this.total=res.data.total
}
})
},
//
handleReset() {
@ -175,43 +183,52 @@
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
entryName: ""
}
}
this.total=0,
this.getList()
},
//
toAdd() {
this.viewState = 2
},
toInfo() {
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row.sid)
},
//
toEdit() {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
this.$refs['divAdd'].showEdit(this.sids)
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
this.sids = element.sid
})
this.sids = aa
if (row.length > 1) {
this.$refs.Table.clearSelection()
this.$refs.Table.toggleRowSelection(row.pop())
}
},
// ID
doDel() {
const sids = []
sids.push(this.sids)
const tip = '请确认是否删除所选记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// req.delBySids(row.sid).then((response) => {
// })
req.delBySids(sids).then((res) => {
if (res.code == 200){
this.$message.success('删除成功')
this.getList()
}
})
})
},
resetState() {
@ -225,5 +242,8 @@
}
</script>
<style scoped>
/deep/ thead .el-table-column--selection .cell{
display: none;
}
</style>

233
supervise-enterprise-ui/src/views/Yjsq/upluad.vue

@ -0,0 +1,233 @@
<template>
<div>
<el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken" :action="uploadFile"
:accept="accept" list-type="picture-card" :file-list="files" :on-remove="removeImage"
:on-preview="handlePictureCardPreview" :on-progress="uploadProgrees"
:on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
<i class="el-icon-plus avatar-uploader-icon" />
</el-upload>
<el-dialog :visible.sync="dialogVisible" title="查看图片">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
</div>
</template>
<script>
export default {
model: {
prop: 'name',
event: 'change'
},
props: {
placeholder: {
type: String,
default: ''
},
bucket: {
type: String,
default: 'abc'
},
//
width: {
type: String,
default: '270px'
},
// limit: {
// type: Number,
// default: ''
// },
accept: {
type: String,
default: '.jpg,.jpeg,.png,.JPG,.JPEG,'
},
//
name: {
type: Array,
required: true
},
uploadData: {
type: Object,
default: {}
},
MinetList: {
type: Array,
default: function () {
return []
}
}
},
data() {
return {
dialogImageUrl: '',
dialogVisible: false,
accessToken: null,
fileList_FuJian: [],
enclosure: '',
file_add: '',
file_catch: '',
files: [],
files_list: [],
filedUrl: '',
isview: false,
nameArr: '',
loadding: false,
uploadFile:
"http://supervise.yxtsoft.com/enterprisecentre/v1/sealrecord/upload",
}
},
watch: {
name: {
deep: true,
immediate: true,
handler(newVal, oldVal) {
this.files = newVal
}
},
MinetList: {
deep: true,
immediate: true,
handler(newVal, oldVal) {
let copy = newVal.slice();
console.log(copy);
if (copy !== undefined) {
// this.files = []
for (var i = 0; i < copy.length; i++) {
this.files.push({
url: copy[i]
})
}
}
}
},
},
mounted() {
// this.Init()
},
created() {
},
methods: {
showImg(imgList) {
this.files = imgList
},
view() {
// window.open(this.filedUrl)
},
//
Init() {
},
handlePictureCardPreview(file) {
this.dialogVisible = true
this.dialogImageUrl = file.url
},
// --
uploadImgSuccess_FuJian(response, file, fileList) {
console.log('您选择的file:', file)
if (file.response.code === '200') {
this.loadding = false
//
this.filedUrl = file.response.data
// var uid = file.response.data
this.files.push({
url: file.response.data,
name: file.name,
size: file.size,
// sid: file.response.data.sid
})
console.log( this.files);
this.$emit('change', this.files)
this.$emit('eett', this.files)
}
},
removeImage(file, ImageFileList) {
this.files.splice(this.files.indexOf(file), 1)
const imgFiles = []
this.files.forEach((o) => {
imgFiles.push(o.url)
})
this.$emit('fileChange', this.files)
console.log(this.files);
},
handleRemove(file, fileList) {
console.log('file:' + JSON.stringify(file))
console.log('fileList:' + JSON.stringify(fileList))
this.enclosure = ''
// 1. id(this.file_add)
this.getNewFileId(fileList)
// 2. id(this.file_catch)
this.getCatchFileId(file)
// 3. id
this.getFileId()
// 4. id
this.$emit('change', this.enclosure)
},
// this.file_add(id)
getNewFileId(fileList) {
// debugger
this.file_add = ''
for (var i = 0; i < fileList.length; i++) {
if (fileList[i].response && fileList[i].response.code === '200') {
this.file_add = this.file_add + fileList[i].response.data + ','
}
}
if (this.file_add !== '') {
this.file_add = this.file_add.substring(0, this.file_add.length - 1)
}
// console.log('1. this.file_add: ' + this.file_add)
},
// this.file_catchid
getCatchFileId(file) {
for (var i = 0; i < this.files_list.length; i++) {
if (this.file_catch !== '') {
// 1. id
if (this.files_list[i].name === file.name) {
// 2. file_catchfils_arry
var fils_arry = this.file_catch.split(',')
// 3. fils_arry this.files_list[i].id
var arry = []
fils_arry.forEach((element) => {
//
if (element !== this.files_list[i].id) {
arry.push(element)
}
})
// 4. file_catch
this.file_catch = arry.join(',')
}
}
}
// console.log('2. this.file_catch:' + this.file_catch)
},
// id
getFileId() {
// console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
if (this.file_catch !== '') {
if (this.file_add !== '') {
this.enclosure = this.file_catch + ',' + this.file_add
} else {
this.enclosure = this.file_catch
}
} else {
this.enclosure = this.file_add
}
},
//
uploadError() {
this.loadding = false
},
uploadProgrees(event, file, fileList) {
if (Number(event.percent) > 0) {
this.loadding = true
}
// console.log('event:', event)
}
},
}
</script>
<style scoped></style>

3
warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue

@ -663,6 +663,7 @@ export default {
}
},
backDatas(value) {
console.log(value);
const aa = []
if (value.length > 0 && value != null && value != undefined) {
for (var i = 0; i < value.length; i++) {
@ -670,7 +671,7 @@ export default {
}
}
this.form.pics = aa
console.log(this.form.pics);
},
backData(value) {
this.form.picUrl = value[0].response.data

Loading…
Cancel
Save