Skip to content

GitLab

Commit 10da433b authored by 柳 佳乐's avatar 柳 佳乐
Browse files

20221117

parent 87484d08
Hide whitespace changes
Inline Side-by-side
.env.development
View file @ 10da433b
...@@ -3,7 +3,7 @@ ENV = 'development' ...@@ -3,7 +3,7 @@ ENV = 'development'
# base api 后端url # base api 后端url
#VUE_APP_BASE_API = 'http://192.168.10.107:7080' #VUE_APP_BASE_API = 'http://192.168.10.107:7080'
# VUE_APP_BASE_API = 'http://192.168.10.109:11523' VUE_APP_BASE_API = 'http://192.168.10.109:11523'
VUE_APP_BASE_API = 'http://www.aishuhong.com:11549/prod-api/' #VUE_APP_BASE_API = 'http://www.aishuhong.com:11549/prod-api/'
#VUE_APP_BASE_API = 'http://192.168.31.100:7081' #VUE_APP_BASE_API = 'http://192.168.31.100:7081'
src/views/assets/administration/administrationselect.vue
View file @ 10da433b
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
addDTO: { addDTO: {
fixedId: null, //资产ID fixedId: null, //资产ID
useState: 0, useState: 0,
startRemarks: null, //借用备注 startRemarks: '', //借用备注
useStartTime: null, //借用时间 useStartTime: null, //借用时间
userId: null //使用人 userId: null //使用人
}, },
...@@ -242,7 +242,7 @@ export default { ...@@ -242,7 +242,7 @@ export default {
this.addDTO = { this.addDTO = {
fixedId: null, //资产ID fixedId: null, //资产ID
useState: 0, useState: 0,
startRemarks: null, //借用备注 startRemarks: '', //借用备注
useStartTime: null, //借用时间 useStartTime: null, //借用时间
userId: null //使用人 userId: null //使用人
}; };
......
src/views/expense/expenseList.vue
View file @ 10da433b
...@@ -66,14 +66,18 @@ ...@@ -66,14 +66,18 @@
<el-button <el-button
type="success" type="success"
icon="el-icon-download" icon="el-icon-download"
v-if="isgetid"
@click="Reimbursement()" @click="Reimbursement()"
>添加发票单</el-button >添加发票单</el-button
> >
<el-button type="warning" v-if="!isgetid" @click="Reimbursement()"
>返回</el-button
>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<!-- 表格区域 --> <!-- 表格区域 -->
<div class="drawer" v-show="isgetid == 0" style="margin-left: 15px"> <div class="drawer" v-show="isgetid" style="margin-left: 15px">
<el-table <el-table
:data="invoicegetList" :data="invoicegetList"
border border
...@@ -179,19 +183,121 @@ ...@@ -179,19 +183,121 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="24">
<!-- 分页 --> <!-- 分页 -->
<div class="foot_yi"> <div class="foot_yi">
<el-pagination <el-pagination
@current-change="getincomeSelectlist" @current-change="handleCurrentChange"
layout="total, prev, pager, next" layout="total, prev, pager, next"
:total="invoicegetList.total" :total="total"
:current-page="invoiceQruey.pages" :current-page.sync="invoiceQruey.pageNum"
:page-size="invoiceQruey.pageSize"
></el-pagination> ></el-pagination>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<!-- 添加区域 -->
<div class="getadd" v-show="!isgetid" style="margin-left: 5%">
<el-row v-loading="loading" element-loading-text="提交中。。。">
<el-col :xl="8" :lg="10" :md="8" :sm="12" :xs="24">
<el-form
style="width: 100%; margin: 30px 0px"
:model="addTO"
:rules="rules"
ref="addTO"
label-width="80px"
class="demo-ruleForm"
>
<el-form-item label="发票代码" prop="code">
<el-input
v-model="addTO.code"
maxlength="12"
minlength="12"
onkeyup="this.value=this.value.replace(/\D|^/g,'')"
></el-input>
</el-form-item>
<el-form-item label="发票号码" prop="number">
<el-input
v-model="addTO.number"
maxlength="8"
minlength="8"
onkeyup="this.value=this.value.replace(/\D|^/g,'')"
></el-input>
</el-form-item>
<el-form-item label="发票时间" required prop="time">
<el-date-picker
v-model="addTO.time"
type="datetime"
placeholder="选择日期时间"
@change="timestampToTime1()"
></el-date-picker>
</el-form-item>
<el-form-item label="发票类型" prop="category">
<el-select v-model="addTO.category" placeholder="请选择">
<el-option
v-for="item in categoryOptions"
:key="item.value"
:label="item.category"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="发票类别" prop="type">
<el-select v-model="addTO.type" placeholder="请选择">
<el-option
v-for="item in typeOptions"
:key="item.value"
:label="item.type"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="发票金额" prop="mone">
<el-input v-model="addTO.mone"></el-input>
</el-form-item>
<el-form-item>
<el-button
type="success"
icon="el-icon-folder-checked"
@click="getlistForm()"
>立即创建</el-button
>
<el-button type="info" icon="el-icon-refresh" @click="delectdd"
>重置信息</el-button
>
</el-form-item>
</el-form>
</el-col>
<el-col :xs="4" :sm="6" :md="8" :lg="10" :xl="11">
<el-upload
class="upload-demo"
ref="upload"
:file-list="fileList"
:action="action"
:auto-upload="false"
:data="proutlist"
:on-change="onChange"
:on-remove="delfile"
:on-success="fileSuccess"
:limit="1"
style="margin-left: 90px"
>
<el-button
slot="trigger"
size="small"
type="primary"
style="margin-left: 20px; margin-top: 40px"
>选取文件</el-button
>
<div slot="tip" class="el-upload__tip">
只能上传jpg/png/pdf文件，且不超过500kb
</div>
</el-upload>
</el-col>
</el-row>
</div>
</div> </div>
</template> </template>
...@@ -250,11 +356,65 @@ export default { ...@@ -250,11 +356,65 @@ export default {
total: 0, total: 0,
invoicegetList: [], invoicegetList: [],
srcList: [], srcList: [],
isgetid: true, //表格区域的切换
//添加发票的数据
addTO: {
category: null,
code: null,
companyId: null,
mone: null,
number: null,
status: 0,
time: null,
type: null,
},
rules: {
time: [
{ required: true, message: "请输入发票时间", trigger: "change" },
],
number: [
{
required: true,
validator: Invoice_No,
trigger: "change",
},
],
code: [{ required: true, validator: Invoice_code, trigger: "change" }],
category: [
{
required: true,
message: "请至少选择一个发票类型",
trigger: "change",
},
],
type: [
{
required: true,
message: "请至少选择一个发票类别",
trigger: "change",
},
],
mone: [
{
required: true,
validator: money,
trigger: "change",
},
],
},
fileList: [],
action:null,
proutlist: {
Id: 1,
status: 0,
},
loading:false
}; };
}, },
created() { created() {
this.invoiceQruey.companyId = this.$store.getters.companyId; this.invoiceQruey.companyId = this.$store.getters.companyId;
this.invoiceQruey.userId = this.$store.getters.urId; this.invoiceQruey.userId = this.$store.getters.urId;
this.action = process.env.VUE_APP_BASE_API + "/file/uploadFile";
this.getincomeSelectlist(); this.getincomeSelectlist();
}, },
methods: { methods: {
...@@ -274,7 +434,11 @@ export default { ...@@ -274,7 +434,11 @@ export default {
this.getincomeSelectlist(); this.getincomeSelectlist();
}, },
//添加发票 //添加发票
Reimbursement() {}, Reimbursement() {
this.isgetid = !this.isgetid;
this.$refs.addTO.resetFields();
this.fileList = this.fileList.filter((item) => item.uid !== file.uid);
},
//发票的分页查询 //发票的分页查询
getincomeSelectlist() { getincomeSelectlist() {
queryBypageIncomeAdd(this.invoiceQruey) queryBypageIncomeAdd(this.invoiceQruey)
...@@ -300,6 +464,11 @@ export default { ...@@ -300,6 +464,11 @@ export default {
this.$message.error("查询发票数据失败"); this.$message.error("查询发票数据失败");
}); });
}, },
//换页
handleCurrentChange(val) {
this.invoiceQruey.pageNum = val;
this.getincomeSelectlist();
},
//图片格式 //图片格式
formatProtocolType(row) { formatProtocolType(row) {
//这里判断的是是否有文件 //这里判断的是是否有文件
...@@ -326,9 +495,99 @@ export default { ...@@ -326,9 +495,99 @@ export default {
let date = dt.getDate(); let date = dt.getDate();
return `${year}年${month}月${date}日`; return `${year}年${month}月${date}日`;
}, },
//点击查看发票
handlePreView(row) {
const photopath = process.env.VUE_APP_BASE_API + row.filePath;
console.log(photopath);
window.open(photopath, "_blank");
},
//时间处理 yyyy-MM-dd hh:mm:ss
timestampToTime1() {
var date = this.addTO.time;
var Y = date.getFullYear() + "-";
var M =
(date.getMonth() + 1 < 10
? "0" + (date.getMonth() + 1)
: date.getMonth() + 1) + "-";
var D =
(date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
var h =
(date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + ":";
var m =
(date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) +
":";
var s =
date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
this.addTO.time = Y + M + D + h + m + s;
},
//发票提交页面的提交
getlistForm() {
this.loading = true
if (this.fileTypeJpg == true) {
this.$refs.addTO.validate((valid) => {
if (valid) {
this.addTO.userId = this.$store.getters.urId;
this.addTO.companyId = this.$store.getters.companyId;
insertList(this.addTO)
.then((res) => {
if (res.success) {
//发票记录添加成功
//提交发票文件
this.proutlist.Id = res.data;
this.$refs.upload.submit();
this.$message.success(res.msg);
} else {
this.$message.error(res.msg);
}
})
.catch((e) => {
this.$message.error("发票添加失败,检测是否重复");
});
}
});
} else {
this.$message.warning("没有发票文件，无法提交");
}
},
//数据清除
delectdd() {
this.$refs.addTO.resetFields();
},
//校验发票文件格式
onChange(file) {
const fileNamepdf = file.name;
console.log(file.name);
let fileType = fileNamepdf.substring(fileNamepdf.lastIndexOf("."));
if (fileType == ".pdf" || fileType == ".png" || fileType == ".jpg") {
this.fileTypeJpg = true;
} else {
this.fileTypeJpg = false;
this.$message.warning("发票文件只能是pdf，png，jpg格式文件");
this.$refs.upload.clearFiles();
}
},
//清除发片文件
delfile() {
this.fileTypeJpg = false;
},
//文件上传成功
fileSuccess(res){
this.loading = false
this.isgetid = true;
this.getincomeSelectlist();
}
}, },
}; };
</script> </script>
<style scoped>
<style> .container {
padding: 10px;
}
.QueryInvoice .el-form-item {
margin: 10px 15px;
}
.drawer .foot_yi {
margin: 10px 10px;
text-align: right;
}
</style> </style>
\ No newline at end of file
src/views/pettyMoney/pettyMoneyRecord.vue
View file @ 10da433b
...@@ -185,7 +185,10 @@ export default { ...@@ -185,7 +185,10 @@ export default {
return return
} }
this.dialogVisible = dialogVisible this.dialogVisible = dialogVisible
this.$refs['dialogForm'].resetFields(); this.$$nextTick(()=>{
this.$refs['dialogForm'].resetFields();
})
}, },
getRepayDetailList() { getRepayDetailList() {
const params = { const params = {
......
src/views/reimbursement/reimbursementList.vue
View file @ 10da433b
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
size="mini " size="mini "
style="font-size: 13px" style="font-size: 13px"
slot="reference" slot="reference"
:disabled="submissionFlag" :disabled="isDisabled"
>删除</el-button >删除</el-button
> >
</el-popover> </el-popover>
...@@ -582,8 +582,8 @@ import { ...@@ -582,8 +582,8 @@ import {
export default { export default {
data() { data() {
return { return {
isDisabled: null, //判断是否显示附件的删除按钮 isDisabled: false, //判断是否显示附件的删除按钮
isDisabledDel:false,//判断是否禁用删除发票图片按钮 isDisabledDel: false, //判断是否禁用删除发票图片按钮
//修改发票表格 //修改发票表格
invoicelist: [], invoicelist: [],
invoiceQurey: { invoiceQurey: {
...@@ -734,7 +734,7 @@ export default { ...@@ -734,7 +734,7 @@ export default {
this.getinvoive({ this.getinvoive({
reimbursementId: this.invoiceQurey.reimbursementId, reimbursementId: this.invoiceQurey.reimbursementId,
}); });
this.$refs.form.resetFields() this.$refs.form.resetFields();
this.$message.success(res.msg); this.$message.success(res.msg);
} else { } else {
this.$message.error("发票上传失败！"); this.$message.error("发票上传失败！");
...@@ -777,11 +777,11 @@ export default { ...@@ -777,11 +777,11 @@ export default {
console.log(res); console.log(res);
if (res.success) { if (res.success) {
this.invoicelist = res.data; this.invoicelist = res.data;
console.log(res.data.length) console.log(res.data.length);
if(res.data.length<=1){ if (res.data.length <= 1) {
this.isDisabledDel=true this.isDisabledDel = true;
}else{ } else {
this.isDisabledDel=false this.isDisabledDel = false;
} }
} else { } else {
this.$message.error(res.msg); this.$message.error(res.msg);
...@@ -895,13 +895,13 @@ export default { ...@@ -895,13 +895,13 @@ export default {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}).then(()=>{ }).then(() => {
reimbursementId(data.reimbursementId).then((res) => { reimbursementId(data.reimbursementId).then((res) => {
if (res.success) { if (res.success) {
this.getReimbursement(); this.getReimbursement();
} }
});
}); });
})
}, },
//查看图片的方法 //查看图片的方法
ReviseImage(row) { ReviseImage(row) {
...@@ -993,7 +993,17 @@ export default { ...@@ -993,7 +993,17 @@ export default {
}, },
//删除附件 //删除附件
deleteProject(row) { deleteProject(row) {
this.submissionFlag = true; // this.submissionFlag = true;
if (
row.reimbursementState == 1 ||
row.reimbursementState == 3 ||
row.reimbursementState == 2 ||
row.reimbursementState == 4
) {
this.isDisabled = true;
} else {
this.isDisabled = false;
}
deleteById(row) deleteById(row)
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
......
src/views/staff/addStaff.vue
View file @ 10da433b
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<el-form-item> <el-form-item>
<el-button type="success" icon="el-icon-upload2" @click="update()">提交</el-button> <el-button type="success" icon="el-icon-upload2" @click="update()">提交</el-button>
<el-button type="info" icon="el-icon-refresh-left" @click="reset">重置信息</el-button> <el-button type="info" icon="el-icon-refresh-left" @click="reset">重置信息</el-button>
<el-button type="info" @click="back()">返回</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-col> </el-col>
...@@ -148,6 +149,11 @@ export default { ...@@ -148,6 +149,11 @@ export default {
}) })
}, },
//返回
back() {
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({ path: "/staffList" });
},
} }
}; };
</script> </script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment