Skip to content

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

页面修改

parent 7b482e84
Expand all Show 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
This diff is collapsed.
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>
<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,8 +159,8 @@
</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 />
......@@ -195,7 +196,8 @@
</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;">
<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>
......@@ -240,7 +242,8 @@
<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" 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,43 +272,51 @@
},
data() {
return {
AuditStatusOptions:[
{
id:0,name:"不限"
AuditStatusOptions: [{
id: 0,
name: "不限"
},
{
id:1,name:"审核中"
id: 1,
name: "审核中"
},
{
id:2,name:"通过"
id: 2,
name: "通过"
},
{
id:3,name:"驳回"
id: 3,
name: "驳回"
}
],
StockOutStatusOptions:[
{
id:0,name:"不限"
StockOutStatusOptions: [{
id: 0,
name: "不限"
},
{
id:1,name:"未出库"
id: 1,
name: "未出库"
},
{
id:2,name:"部分出库"
id: 2,
name: "部分出库"
},
{
id:3,name:"已出库"
id: 3,
name: "已出库"
}
],
TypeOptions:[
{
id:0,name:"不限"
TypeOptions: [{
id: 0,
name: "不限"
},
{
id:1,name:"主营业务"
id: 1,
name: "主营业务"
},
{
id:2,name:"其他业务"
id: 2,
name: "其他业务"
},
],
dateList: [], //创建时间
......@@ -311,18 +325,17 @@
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",
......@@ -389,13 +402,13 @@
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: {
//跳转详情
......@@ -460,14 +473,14 @@
})
},
// 显示新增出库单
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:""
let obj = {
ApplyForId: row.Id,
Type: 1,
Remark: ""
}
SetSuppliesStockOutApplyForState(obj).then(res=>{
if(res.data.resultCode===1){
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;
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{
<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
<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">
<div style="width: 50%;padding-left: 20px">
<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%">
课节
</div>
<div>时间</div>
</div>
<div
</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>
......
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