Skip to content

C
confucius
Commit 565b7d97 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 7b482e84
Hide whitespace changes
Inline Side-by-side
Showing with 308 additions and 263 deletions
quasar.conf.js
View file @ 565b7d97
......@@ -49,10 +49,10 @@ module.exports = function (ctx) {
env: ctx.dev ? {
//API: 'http://192.168.1.36:8300/api'
// API: 'https://localhost:5001/api',
API: 'https://localhost:5001/api',
// API: 'http://192.168.20.24:8300/api',
// API: 'http://testeduapi.oytour.com/api',
API: 'http://192.168.20.9:8085/api',
// API: 'http://192.168.20.9:8085/api',
// API: 'http://192.168.20.17:8017/api',
// API: 'http://eduapi.oytour.com/api'
API_ZC:'http://192.168.20.9:8087/api',
......
src/components/course/class-form.vue
View file @ 565b7d97
......@@ -277,8 +277,8 @@
<tbody v-for="(nItem,nIndex) in DefaultPlanTimeList" :key="nIndex+10000">
<tr v-for="(sItem,sIndex) in nItem.TimeList">
<td :rowspan="nItem.TimeList.length" v-if="sIndex==0">
<q-select filled style="width:220px;" stack-label multiple v-model="nItem.DateList" ref="ClassStyle" :options="checkedDays"
label="选择日期" :dense="false" class="col-6" emit-value map-options>
<q-select filled style="width:220px;" stack-label multiple v-model="nItem.DateList" ref="DateList" :options="checkedDays"
:label="objOption.ClassStyle==1?'选择周几':'选择日期'" :dense="false" class="col-6" emit-value map-options clearable>
</q-select>
<a @click="deletePlan(nIndex)" style="color:blue;cursor:pointer;">删除</a>
</td>
......@@ -442,10 +442,7 @@
//选中日期/星期
checkedDays: [],
//默认上课时间数组
DefaultPlanTimeList: [{
DateList: [],
TimeList: [],
}],
DefaultPlanTimeList: [ ],
}
},
created() {
......
src/pages/financial/addFinancialProcess.vue
View file @ 565b7d97
......@@ -244,7 +244,8 @@
</div>
<!-- <input type="button" class="normalBtn" @click="getMember()"
:value="$t('fnc.tjchengyuan')" /> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tjchengyuan')" @click="getMember()" style="marginRight:10px"/>
<q-btn color="primary" size="11px" :label="$t('fnc.tjchengyuan')" @click="getMember()"
style="marginRight:10px" />
<div style="margin: 10px 0;" v-if="showMember.length>1">
<el-radio-group v-model="AuditWay">
<el-radio :label="2">{{$t('fnc.huiquandetail')}}</el-radio>
......@@ -291,14 +292,18 @@
</div>
</div>
<div class="approval_page_layer_bottom">
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="closeLayer" style="marginRight:10px"/>
<q-btn color="primary" size="11px" :label="$t('pub.sureBtn')" @click="addNode" style="marginRight:10px" v-if='addBtn'/>
<q-btn color="primary" size="11px" :label="$t('fnc.xgjiedian')" @click="saveUpdateNode" style="marginRight:10px" v-if='!addBtn'/>
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="closeLayer"
style="marginRight:10px" />
<q-btn color="primary" size="11px" :label="$t('pub.sureBtn')" @click="addNode" style="marginRight:10px"
v-if='addBtn' />
<q-btn color="primary" size="11px" :label="$t('fnc.xgjiedian')" @click="saveUpdateNode"
style="marginRight:10px" v-if='!addBtn' />
</div>
</div>
</div>
<div v-loading="loading">
<q-btn color="primary" size="11px" :label="$t('pub.returnBack')" @click="goUrl('FProcessManagement')" style="marginLeft:10px" class="approval_back_btn"/>
<q-btn color="primary" size="11px" :label="$t('pub.returnBack')" @click="goUrl('FProcessManagement')"
 style="marginLeft:10px" class="approval_back_btn" />
<el-form class="_add_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<div class="approval_page_title">{{$t('fnc.jcxinxi')}}</div>
<el-form-item :label="$t('fnc.lcmingcheng')" prop="Name">
......@@ -349,16 +354,14 @@
<el-form-item v-show="addMsg.IsShow==2" label="可显示部门">
<el-select filterable multiple v-model='addMsg.ShowDepartmentList' class="w200"
style="max-height:100px;overflow:hidden" size="small">
<el-option v-for='item in DepartmentList' :label='item.DeptName' :value='item.DeptId'
:key='item.DeptId'>
<el-option v-for='item in DepartmentList' :label='item.DeptName' :value='item.DeptId' :key='item.DeptId'>
</el-option>
</el-select>
</el-form-item>
<el-form-item v-show="addMsg.IsShow==2" label="可显示人">
<el-select filterable multiple v-model='addMsg.ShowEmployeeList' class="w200"
style="max-height:100px;overflow:hidden" size="small">
<el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id'
:key='item.Id'>
<el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</el-form-item>
......@@ -391,8 +394,8 @@
<div class="approval_person_content">
<span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span>
<span style="float:right">
<el-button @click="Auditshow=true" style="padding:4px" type="primary" icon="el-icon-edit"
circle></el-button>
<el-button @click="Auditshow=true" style="padding:4px" type="primary" icon="el-icon-edit" circle>
</el-button>
</span>
<div class="approval_person_list fl">
<span class="approval_person_list_tit">{{$t('fnc.mrspiren')}}</span>
......@@ -410,7 +413,7 @@
<i class="iconfont icon-jiantouyou"></i>
</div>
<!-- <input type="button" class="hollowFixedBtn" @click="addAppPerson" :value="$t('fnc.tianjia')" /> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tianjia')" @click="addAppPerson"/>
<q-btn color="primary" size="11px" :label="$t('fnc.tianjia')" @click="addAppPerson" />
</div>
</div>
<div class="approval_person_list fl">
......@@ -426,7 +429,7 @@
<i class="iconfont icon-jiantouyou"></i>
</div>
<!-- <input type="button" class="hollowFixedBtn" @click="addAuditUser" :value="$t('fnc.tianjia')" /> -->
<q-btn color="primary" size="11px" :label="$t('fnc.tianjia')" @click="addAuditUser"/>
<q-btn color="primary" size="11px" :label="$t('fnc.tianjia')" @click="addAuditUser" />
</div>
</div>
</div>
......@@ -434,9 +437,9 @@
</el-form>
<div style="margin: 20px 0;">
<!-- <input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn" @click="goUrl('FProcessManagement')" /> -->
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="goUrl('FProcessManagement')" style="margin:10px"/>
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="goUrl('FProcessManagement')" style="margin:10px" />
<!-- <input type="button" :value="$t('pub.saveBtn')" class="normalBtn" @click="saveApproval" /> -->
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="saveApproval"/>
<q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="saveApproval" />
</div>
</div>
<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible" center>
......@@ -446,7 +449,8 @@
</el-input>
</p>
<el-tree class='ApprovalProcessBg' :data="memberList" show-checkbox :filter-node-method="filterNode" ref="tree"
:props="defaultProps" :render-after-expand="false" node-key="Id" :check-on-click-node="true" @check-change="handleNodeChange">
:props="defaultProps" :render-after-expand="false" node-key="Id" :check-on-click-node="true"
@check-change="handleNodeChange">
</el-tree>
</div>
<div class="fl">
......@@ -469,8 +473,8 @@
</el-input>
</p>
<el-tree class='ApprovalProcessBg' :data="roleList" ref="treeRole" show-checkbox
:filter-node-method="filterNode1" :props="defaultProps1" :check-on-click-node="true" :check-strictly="true" @check-change="checkedRole"
:default-checked-keys="defaultCheckedArr" node-key="PostId">
:filter-node-method="filterNode1" :props="defaultProps1" :check-on-click-node="true" :check-strictly="true"
@check-change="checkedRole" :default-checked-keys="defaultCheckedArr" node-key="PostId">
</el-tree>
</div>
<div class="fl">
......@@ -508,9 +512,9 @@
</div>
<div slot="footer" class="dialog-footer">
<!-- <button class="hollowFixedBtn" @click="outerVisible2 = false">{{$t('pub.cancelBtn')}}</button> &nbsp; -->
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="outerVisible2 = false" style="marginRight:10px"/>
<q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="outerVisible2=false" style="marginRight:10px" />
<!-- <button class="normalBtn" type="primary" @click="saveAuditUser">{{$t('pub.sureBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.sureBtn')" @click="saveAuditUser"/>
<q-btn color="primary" size="11px" :label="$t('pub.sureBtn')" @click="saveAuditUser" />
</div>
</el-dialog>
<el-dialog title="修改审批人" :visible.sync="Auditshow" width="400px">
......@@ -612,46 +616,45 @@
CompanyList: [],
CostTypeList: [],
myAuditList: [],
levelList: [
{
level:1,
name:'第1级主管'
levelList: [{
level: 1,
name: '第1级主管'
},
{
level:2,
name:'第2级主管'
level: 2,
name: '第2级主管'
},
{
level:3,
name:'第3级主管'
level: 3,
name: '第3级主管'
},
{
level:4,
name:'第4级主管'
level: 4,
name: '第4级主管'
},
{
level:5,
name:'第5级主管'
level: 5,
name: '第5级主管'
},
{
level:6,
name:'第6级主管'
level: 6,
name: '第6级主管'
},
{
level:7,
name:'第7级主管'
level: 7,
name: '第7级主管'
},
{
level:8,
name:'第8级主管'
level: 8,
name: '第8级主管'
},
{
level:9,
name:'第9级主管'
level: 9,
name: '第9级主管'
},
{
level:10,
name:'第10级主管'
level: 10,
name: '第10级主管'
},
],
showMember: [],
......@@ -736,7 +739,7 @@
lab: this.$t('fnc.zjinchi')
}],
isIndeterminate: true,
schoolMsg:{
schoolMsg: {
pageIndex: 1,
pageSize: 99999,
rowsPerPage: 12,
......@@ -744,7 +747,7 @@
Status: '-1'
},
//岗位msg
jobMsg:{
jobMsg: {
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
......@@ -801,7 +804,7 @@
methods: {
getSchool() {
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList=res.Data.PageData;
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
......@@ -820,7 +823,7 @@
},
//根据多公司获取部门
getDepartment() {
let msg={
let msg = {
pageIndex: 1,
pageSize: 999,
rowsPerPage: 12,
......@@ -832,9 +835,8 @@
ParentId: 0,
}
getDeptPage(msg).then(res => {
this.DepartmentList=res.Data.PageData;
}).catch(() => {
})
this.DepartmentList = res.Data.PageData;
}).catch(() => {})
},
RadioShow(val) {
if (val == 1) {
......@@ -845,8 +847,8 @@
},
getEmployeeList() {
queryEmployee({}).then(res => {
if(res.Code==1){
this.EmployeeList = res.Data;
if (res.Code == 1) {
this.EmployeeList = res.Data;
}
}).catch(() => {
......@@ -1025,7 +1027,7 @@
} else {
this.addMsg.list = this.accListMsg
}
this.addMsg.FinancialInstitutions=[];
this.addMsg.FinancialInstitutions = [];
if (this.BranchIdS.length != 0) { //适用公司
this.BranchIdS.forEach(x => {
if (x == -1) {
......@@ -1045,9 +1047,9 @@
}
FinancialInstitutions.Type = 1;
FinancialInstitutions.SuitableObjectId = x;
this.CompanyList.forEach(y=>{
if(x==y.SId){
FinancialInstitutions.SuitableObjectIdName=y.SName
this.CompanyList.forEach(y => {
if (x == y.SId) {
FinancialInstitutions.SuitableObjectIdName = y.SName
}
})
this.addMsg.FinancialInstitutions.push(FinancialInstitutions)
......@@ -1143,17 +1145,17 @@
}, err => {})
},
deleteUser(index) { // 删除人员
var arr=[];
this.myAuditUserList1.splice(index,1);
this.myAuditUserList1.forEach(x=>{
var arr = [];
this.myAuditUserList1.splice(index, 1);
this.myAuditUserList1.forEach(x => {
arr.push(x.EmployeeId);
})
if(this.$refs.treeUser){
if (this.$refs.treeUser) {
this.$refs.treeUser.setCheckedKeys(arr);
}
},
deleteUser2(index){
this.myAuditUserList.splice(index,1);
deleteUser2(index) {
this.myAuditUserList.splice(index, 1);
},
saveAuditUser() { // 抄送人保存
if (this.myAuditUserList1.length <= 10) {
......@@ -1168,12 +1170,12 @@
handleNodeChange1(data, checked) { //抄送人操作选中
data.IsCheck = checked;
let res = this.$refs.treeUser.getCheckedNodes(true, true);
this.myAuditUserList1=[];
res.forEach((x,index)=>{
var obj={
sort:index+1,
emName:x.EmployeeName,
EmployeeId:x.Id
this.myAuditUserList1 = [];
res.forEach((x, index) => {
var obj = {
sort: index + 1,
emName: x.EmployeeName,
EmployeeId: x.Id
}
this.myAuditUserList1.push(obj)
})
......@@ -1191,18 +1193,18 @@
// }, err => {})
this.dialogTitle = this.$t('fnc.xzrenyuan');
this.outerVisible2 = true;
var arr=[];
if(this.myAuditUserList1.length>0){
this.myAuditUserList1.forEach(x=>{
var arr = [];
if (this.myAuditUserList1.length > 0) {
this.myAuditUserList1.forEach(x => {
arr.push(x.EmployeeId);
})
if(this.$refs.treeUser){
if (this.$refs.treeUser) {
this.$refs.treeUser.setCheckedKeys(arr);
}
}
queryEmployee({}).then(res => {
if(res.Code==1){
this.userList=res.Data;
if (res.Code == 1) {
this.userList = res.Data;
}
}).catch(() => {
......@@ -1210,32 +1212,32 @@
},
checkedRole(data, checked) { // 岗位选择+
if(checked){
this.$refs.treeRole.setCheckedKeys([data.PostId]);
if (checked) {
this.$refs.treeRole.setCheckedKeys([data.PostId]);
}
let res = this.$refs.treeRole.getCheckedNodes(true, true);
this.showRole = [];
res.forEach((x, index) => {
var obj = {
DepartmentName: x.PostName,
Id: x.PostId
}
let res = this.$refs.treeRole.getCheckedNodes(true, true);
this.showRole=[];
res.forEach((x,index)=>{
var obj={
DepartmentName:x.PostName,
Id:x.PostId
}
this.showRole.push(obj)
})
this.showRole.push(obj)
})
},
deleteRole(index) { // 删除已选岗位
this.showRole.splice(index,1);
var arr=[];
this.showRole.forEach(x=>{
this.showRole.splice(index, 1);
var arr = [];
this.showRole.forEach(x => {
arr.push(x.Id);
})
if(this.$refs.treeRole){
if (this.$refs.treeRole) {
this.$refs.treeRole.setCheckedKeys(arr);
}
},
getRole() { // 选择岗位
getPostPage(this.jobMsg).then(res => {
if(res.Code==1){
if (res.Code == 1) {
this.roleList = res.Data.PageData;
}
}).catch(() => {
......@@ -1253,7 +1255,7 @@
AuditList.AuditWay = 1;
AuditList.AuditUserList = [{
EmployeeId: '',
EmployeeIdName:'',
EmployeeIdName: '',
Sort: ''
}];
AuditList.Sort = this.myAuditList.length + 1;
......@@ -1438,14 +1440,14 @@
// this.showMember = [];
this.memberSetCheckedKeys = [];
this.AuditWay = obj.AuditWay;
var arr=[];
var arr = [];
obj.AuditUserList.forEach((item, index) => {
this.showMember.push({
EmployeeName: item.EmName,
Id: item.EmployeeId
})
arr.push(item.EmployeeId);
if(this.$refs.tree){
if (this.$refs.tree) {
this.$refs.tree.setCheckedKeys(arr);
}
})
......@@ -1478,22 +1480,22 @@
handleNodeChange(data, checked) {
data.IsCheck = checked;
let res = this.$refs.tree.getCheckedNodes(true, true);
this.showMember=[];
res.forEach(x=>{
var obj={
EmployeeName:x.EmployeeName,
Id:x.Id
this.showMember = [];
res.forEach(x => {
var obj = {
EmployeeName: x.EmployeeName,
Id: x.Id
}
this.showMember.push(obj)
})
},
mySetCheckedKeys(id,index) {
var arr=[];
this.showMember.splice(index,1);
this.showMember.forEach(x=>{
mySetCheckedKeys(id, index) {
var arr = [];
this.showMember.splice(index, 1);
this.showMember.forEach(x => {
arr.push(x.Id);
})
if(this.$refs.tree){
if (this.$refs.tree) {
this.$refs.tree.setCheckedKeys(arr);
}
},
......@@ -1501,17 +1503,17 @@
this.outerVisible = true;
this.dialogTitle = this.$t('fnc.xzrenyuan');
queryEmployee({}).then(res => {
if(res.Code==1){
if (res.Code == 1) {
this.memberList = res.Data;
}
}).catch(() => {
})
var arr=[];
this.showMember.forEach(x=>{
var arr = [];
this.showMember.forEach(x => {
arr.push(x.Id);
})
if(this.$refs.tree){
if (this.$refs.tree) {
this.$refs.tree.setCheckedKeys(arr);
}
},
......@@ -1703,7 +1705,6 @@
},
getMaxDepartmentTierList() { // 获取直接主管层级
this.apipost('admin_get_GetMaxDepartmentTier', {}, res => {
console.log(res,'数据');
if (res.data.resultCode == 1) {
let data = res.data.data;
let newList = [];
......@@ -1743,7 +1744,7 @@
},
goUrl(path) {
this.$router.push({
path: '/financial/'+path,
path: '/financial/' + path,
query: {
"type": this.addMsg.TemplateType,
'Branch_Id': this.$route.query.Branch_Id
......
src/pages/sale/SuppliesStockOutApplyForMan.vue
View file @ 565b7d97
......@@ -109,27 +109,29 @@
line-height: 25px;
background-color: #004d40;
}
.courseOffer .el-range-editor.el-input__inner {
.courseOffer .el-range-editor.el-input__inner {
background-color: transparent;
}
.courseOffer .el-range-editor .el-range-input {
}
.courseOffer .el-range-editor .el-range-input {
background: transparent;
}
}
</style>
<template>
<div class="page-body courseOffer">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select filled use-input input-debounce="0" option-value="id" @input="resetSearch"
option-label="name" v-model="msg.AuditStatus" :options="AuditStatusOptions" label="审核状态" :dense="false"
emit-value map-options>
<q-select filled use-input input-debounce="0" option-value="id" @input="resetSearch" option-label="name"
v-model="msg.AuditStatus" :options="AuditStatusOptions" label="审核状态" :dense="false" emit-value map-options>
</q-select>
</div>
<div class="col-3">
<q-select filled use-input input-debounce="0" option-value="id" @input="resetSearch"
option-label="name" v-model="msg.StockOutStatus" :options="StockOutStatusOptions" label="出库状态" :dense="false"
emit-value map-options>
<div class="col-3">
<q-select filled use-input input-debounce="0" option-value="id" @input="resetSearch" option-label="name"
v-model="msg.StockOutStatus" :options="StockOutStatusOptions" label="出库状态" :dense="false" emit-value
map-options>
</q-select>
</div>
<div class="col-3">
......@@ -141,9 +143,8 @@
label="耗材名称" @clear="resetSearch" maxlength="20" />
</div>
<div class="col-3">
<q-select filled use-input input-debounce="0" option-value="id" @input="resetSearch"
option-label="name" v-model="msg.Type" :options="TypeOptions" label="类型" :dense="false"
emit-value map-options >
<q-select filled use-input input-debounce="0" option-value="id" @input="resetSearch" option-label="name"
v-model="msg.Type" :options="TypeOptions" label="类型" :dense="false" emit-value map-options>
</q-select>
</div>
<div class="col-3">
......@@ -158,89 +159,91 @@
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class=" sticky-right-column-table sticky-column-table"
:data="data" :columns="columns" row-key="name">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class=" sticky-right-column-table sticky-column-table" :data="data" :columns="columns" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">出库管理</div>
<q-space />
<q-btn color="accent" size="11px" icon="add" @click="showAdd">新增出库单</q-btn>
</template>
<template v-slot:body-cell-StockOutStatus="props">
<template v-slot:body-cell-StockOutStatus="props">
<q-td :props="props">
<div v-if="props.row.StockOutStatus===1">未出库</div>
<div v-if="props.row.StockOutStatus===2">部分出库</div>
<div v-if="props.row.StockOutStatus===3">已出库</div>
<div v-if="props.row.StockOutStatus===1">未出库</div>
<div v-if="props.row.StockOutStatus===2">部分出库</div>
<div v-if="props.row.StockOutStatus===3">已出库</div>
</q-td>
</template>
<template v-slot:body-cell-AuditStatus="props">
<q-td :props="props">
<div v-if="props.row.AuditStatus===1">审核中</div>
<div v-if="props.row.AuditStatus===2">通过</div>
<div v-if="props.row.AuditStatus===3">驳回</div>
<div v-if="props.row.AuditStatus===1">审核中</div>
<div v-if="props.row.AuditStatus===2">通过</div>
<div v-if="props.row.AuditStatus===3">驳回</div>
</q-td>
</template>
<template v-slot:body-cell-ClassName="props">
<q-td :props="props">
<div v-for="item in props.row.DetailList" :key="item.Id" class="td_height">
{{item.ClassName}}
{{item.ClassName}}
</div>
</q-td>
</template>
<template v-slot:body-cell-CourseName="props">
<q-td :props="props">
<div v-for="item in props.row.DetailList" :key="item.Id" class="td_height">
{{item.CourseName}}
{{item.CourseName}}
</div>
</q-td>
</template>
<template v-slot:body-cell-FinanceIdList="props">
<q-td :props="props">
<div v-for="item in props.row.FinanceIdList" :key="item.Id" class="td_height" @click="gocaiwu(item)" style="text-decoration:underline;color:#2961FE;cursor:pointer;">
{{item}}
<div v-for="item in props.row.FinanceIdList" :key="item.Id" class="td_height" @click="gocaiwu(item)"
style="text-decoration:underline;color:#2961FE;cursor:pointer;">
{{item}}
</div>
</q-td>
</template>
<template v-slot:body-cell-SuppliesName="props">
<q-td :props="props">
<div v-for="item in props.row.DetailList" :key="item.Id" class="td_height">
{{item.SuppliesName}}
{{item.SuppliesName}}
</div>
</q-td>
</template>
<template v-slot:body-cell-Type="props">
<template v-slot:body-cell-Type="props">
<q-td :props="props">
<div v-if="props.row.Type===1">班级相关</div>
<div v-if="props.row.Type===1">班级相关</div>
<div v-if="props.row.Type===2">其他业务</div>
</q-td>
</template>
<template v-slot:body-cell-BrandName="props">
<q-td :props="props">
<div v-for="item in props.row.DetailList" :key="item.Id" class="td_height">
{{item.BrandName}}
{{item.BrandName}}
</div>
</q-td>
</template>
<template v-slot:body-cell-CategoryName="props">
<q-td :props="props">
<div v-for="item in props.row.DetailList" :key="item.Id" class="td_height">
{{item.CategoryName}}
{{item.CategoryName}}
</div>
</q-td>
</template>
<template v-slot:body-cell-Number="props">
<q-td :props="props">
<div v-for="item in props.row.DetailList" :key="item.Id" class="td_height">
{{item.Number}}
{{item.Number}}
</div>
</q-td>
</template>
<template v-slot:body-cell-optioned="props">
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" @click="goDetail(props.row)">详情</q-btn>
<q-btn flat size="xs" icon="edit" color="accent" style="color:#f00" @click="quxiao(props.row)" v-if="props.row.CreateBy==loginId&&props.row.AuditStatus!=2">取消</q-btn>
<q-btn flat size="xs" icon="edit" color="accent" @click="goDetail(props.row)">详情</q-btn>
<q-btn flat size="xs" icon="edit" color="accent" style="color:#f00" @click="quxiao(props.row)"
v-if="props.row.CreateBy==loginId&&props.row.AuditStatus!=2">取消</q-btn>
</q-td>
</template>
<template v-slot:bottom>
......@@ -250,13 +253,16 @@
</q-table>
</div>
<q-dialog v-model="showaddStockOut" persistent>
<SuppliesStockOutFrom @success="successSave"/>
<SuppliesStockOutFrom @success="successSave" />
</q-dialog>
</div>
</template>
<script>
import SuppliesStockOutFrom from '../../components/sale/addSuppliesStockOut-from'
import {GetSuppliesStockOutApplyForPageList,SetSuppliesStockOutApplyForState} from '../../api/sale/StockOutApplyFor'
import {
GetSuppliesStockOutApplyForPageList,
SetSuppliesStockOutApplyForState
} from '../../api/sale/StockOutApplyFor'
export default {
meta: {
title: "出库管理"
......@@ -266,44 +272,52 @@
},
data() {
return {
AuditStatusOptions:[
{
id:0,name:"不限"
},
{
id:1,name:"审核中"
},
{
id:2,name:"通过"
},
{
id:3,name:"驳回"
}
AuditStatusOptions: [{
id: 0,
name: "不限"
},
{
id: 1,
name: "审核中"
},
{
id: 2,
name: "通过"
},
{
id: 3,
name: "驳回"
}
],
StockOutStatusOptions:[
{
id:0,name:"不限"
},
{
id:1,name:"未出库"
},
{
id:2,name:"部分出库"
},
{
id:3,name:"已出库"
}
StockOutStatusOptions: [{
id: 0,
name: "不限"
},
{
id: 1,
name: "未出库"
},
{
id: 2,
name: "部分出库"
},
{
id: 3,
name: "已出库"
}
],
TypeOptions:[
{
id:0,name:"不限"
},
{
id:1,name:"主营业务"
},
{
id:2,name:"其他业务"
},
TypeOptions: [{
id: 0,
name: "不限"
},
{
id: 1,
name: "主营业务"
},
{
id: 2,
name: "其他业务"
},
],
dateList: [], //创建时间
data: [],
......@@ -311,24 +325,23 @@
msg: {
pageIndex: 1,
pageSize: 10,
AuditStatus:0,
StockOutStatus:0,
ClassName:"",
SuppliesName:"",
StartTime:"",
EndTime:"",
Type:0
AuditStatus: 0,
StockOutStatus: 0,
ClassName: "",
SuppliesName: "",
StartTime: "",
EndTime: "",
Type: 0
},
pageCount: 0,
offerObj: {}, //报价单信息
columns: [
{
columns: [{
name: "AuditStatus",
label: "审核状态",
field: "AuditStatus",
align: "left"
},
{
{
name: "Id",
label: "编号",
field: "Id",
......@@ -341,24 +354,24 @@
align: "left"
},
{
name: "ClassName",
label: "班级名称",
align: "left",
},
{
{
name: "CourseName",
label: "课程名称",
align: "left",
},
{
{
name: "SuppliesName",
label: "耗材名称",
align: "left",
},
{
{
name: "CategoryName",
label: "分类",
align: "left",
......@@ -373,29 +386,29 @@
label: "数量",
align: "left",
},
{
{
name: "FinanceIdList",
label: "相关单据",
align: "left",
},
{
{
name: "StockOutStatus",
label: "出库状态",
field: "StockOutStatus",
align: "left"
},
{
{
name: "CreateByName",
label: "申请人",
align: "left",
field:"CreateByName"
field: "CreateByName"
},
{
{
name: "CreateDate",
label: "申请时间",
align: "left",
field:"CreateDate"
field: "CreateDate"
},
{
name: 'optioned',
......@@ -403,15 +416,15 @@
align: "left",
}
],
showaddStockOut:false,
loginId:0,
showaddStockOut: false,
loginId: 0,
}
},
mounted() {
this.getSuppliesStockOutApplyForPageList();
this.loginId= JSON.parse(localStorage.getItem('loginUserInfo')).data.Id
this.loginId = JSON.parse(localStorage.getItem('loginUserInfo')).data.Id
},
methods: {
//跳转详情
......@@ -423,14 +436,14 @@
}
});
},
//刷新页面
refreshPage() {
// this.showOrderForm = false;
// this.showEditPrice = false;
this.getSuppliesStockOutApplyForPageList();
},
//重新查询
resetSearch() {
this.msg.pageIndex = 1;
......@@ -454,20 +467,20 @@
this.loading = false;
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}).catch(() => {
this.loading = false;
})
},
// 显示新增出库单
showAdd(){
this.showaddStockOut=true
showAdd() {
this.showaddStockOut = true
},
closePop(){
this.showaddStockOut=false
closePop() {
this.showaddStockOut = false
},
//取消
quxiao(row){
quxiao(row) {
this.$q.dialog({
title: '提示信息',
message: '是否确定取消？',
......@@ -476,45 +489,44 @@
ok: "确定",
cancel: "取消",
}).onOk(() => {
let obj={
ApplyForId:row.Id,
Type:1,
Remark:""
}
SetSuppliesStockOutApplyForState(obj).then(res=>{
if(res.data.resultCode===1){
let obj = {
ApplyForId: row.Id,
Type: 1,
Remark: ""
}
SetSuppliesStockOutApplyForState(obj).then(res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message)
this.getSuppliesStockOutApplyForPageList();
}else{
} else {
this.Error(res.data.message)
}
})
})
}).onCancel(() => {
});
},
gocaiwu(item){
// console.log(item)
let tempStr = '/financial/financalDocument/FinancialDocumentsDetail?id='+item;
this.$router.push({
path: tempStr
});
gocaiwu(item) {
let tempStr = '/financial/financalDocument/FinancialDocumentsDetail?id=' + item;
this.$router.push({
path: tempStr
});
},
successSave(){
successSave() {
this.getSuppliesStockOutApplyForPageList()
this.closePop()
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
@import url('~assets/css/table.sass')
</style>
<style >
.td_height{
height: 40px;
line-height: 40px;
}
<style>
.td_height {
height: 40px;
line-height: 40px;
}
</style>
src/pages/sale/japaneseTrain.vue
View file @ 565b7d97
......@@ -138,21 +138,56 @@
</el-calendar>
</div>
<div style="color:#2D2D2D;font-size: 14px;font-weight: bold;">课程安排</div>
<div
style="width:100%;height: 40px;background: #EEEEEF;font-size: 12px;color: #2D2D2D;font-weight: 600;margin-top: 20px;display: flex;align-items: center">
<div style="width: 50%;padding-left: 20px">
课节
</div>
<div>时间</div>
</div>
<div
<table>
<thead>
<tr
style="width:100%;height: 40px;background: #EEEEEF;font-size: 12px;color: #2D2D2D;font-weight: 600;margin-top: 20px;display: flex;align-items: center">
<th width="40%">
<template v-if="item.ClassStyle==1">
每周
</template>
<template v-if="item.ClassStyle==2">
每月
</template>
<template v-if="item.ClassStyle==3">
固定日期
</template>
</th>
<th width="20%">
课节
</th>
<th width="40%">
时间
</th>
</tr>
</thead>
<tbody v-for="(tItem,tIndex) in item.ClassTimeList" :key="tIndex">
<template v-for="(timeItem,timeIndex) in tItem.TimeList">
<tr>
<td :rowspan=" tItem.TimeList.length" v-if="timeIndex==0">
<template v-for="(sItem,sIndex) in tItem.DateList">
{{sItem}}
</template>
</td>
<td>
第 {{timeIndex+1}} 节
</td>
<td>
{{timeItem.StartTime}}-{{timeItem.timeItem}}
</td>
</tr>
</template>
</tbody>
</table>
<!-- <div
style="font-size: 12px;color: #2D2D2D;font-weight: bold;height: 40px;width: 454px;line-height: 40px;display: flex;border-bottom: 1px solid rgba(138, 138, 138, 0.09);"
v-for="(zx,zi) in item.ClassTimeList" :key="zi">
>
<div style="width: 50%;padding-left: 20px">
第{{zi+1}}节
</div>
<div>{{zx.StartTime}}-{{zx.EndTime}}</div>
</div>
</div> -->
</div>
</div>
</q-banner>
......@@ -588,4 +623,4 @@
background: transparent !important;
}
</style>
\ No newline at end of file
</style>
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