Commit ddaa03e8 authored by zhengke's avatar zhengke

修改

parent ebdbef9d
...@@ -12,7 +12,7 @@ export default { ...@@ -12,7 +12,7 @@ export default {
<style> <style>
@import url('~assets/css/font.css'); @import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_fnioszx4oyw.css'); @import url('//at.alicdn.com/t/font_2077629_8yyepcm7s1.css');
html, html,
body, body,
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
:http-request="UploadAttachment" :multiple="uploadMultple"> :http-request="UploadAttachment" :multiple="uploadMultple">
<q-btn color="accent" size="sm" icon="add" label="上传供应商合同" /> <q-btn color="accent" size="sm" icon="add" label="上传供应商合同" />
</el-upload> </el-upload>
<a v-if="objOption.SupplierContract" style="margin-left:10px;color:#2961FE;text-decoration:none;" :href="objOption.SupplierContract">查看合同</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -51,6 +52,10 @@ ...@@ -51,6 +52,10 @@
saveObj: { saveObj: {
type: Object, type: Object,
default: null default: null
},
Type:{
type: Number,
default: null
} }
}, },
data() { data() {
...@@ -100,7 +105,7 @@ ...@@ -100,7 +105,7 @@
}) })
} else { } else {
this.objOption.Id = 0; this.objOption.Id = 0;
this.objOption.Type = 1; this.objOption.Type = this.Type;
this.objOption.Name = ''; this.objOption.Name = '';
this.objOption.SupplierId = 0; this.objOption.SupplierId = 0;
this.objOption.SupplierContract = ''; this.objOption.SupplierContract = '';
......
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
<q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Name" label="项目名称" <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Name" label="项目名称"
@clear="resetSearch" maxlength="20" /> @clear="resetSearch" maxlength="20" />
</div> </div>
<div class="col-3">
<q-select class="q-pb-lg q-pr-lg" filled stack-label
option-value="Id" option-label="Name" v-model="msg.SaleState" ref="SaleState" :options="saleDownList"
label="销售状态" :dense="false" emit-value map-options>
</q-select>
</div>
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
...@@ -18,6 +24,16 @@ ...@@ -18,6 +24,16 @@
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增留学" @click="EditStudy(null)" /> <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增留学" @click="EditStudy(null)" />
</div> </div>
</template> </template>
<template v-slot:body-cell-SupplierName="props">
<q-td>
<div>{{props.row.SupplierName}}</div>
<div>
<a :href="props.row.SupplierContract" style="color:#2961FE;text-decoration:none;" v-if="props.row.SupplierContract">
查看合同
</a>
</div>
</q-td>
</template>
<template v-slot:body-cell-PreferentialList="props"> <template v-slot:body-cell-PreferentialList="props">
<q-td :props="props" style="padding-right:0px"> <q-td :props="props" style="padding-right:0px">
<div v-for="x in props.value"> <div v-for="x in props.value">
...@@ -84,6 +100,8 @@ ...@@ -84,6 +100,8 @@
@click="EditStudy(props.row)" /> @click="EditStudy(props.row)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
@click="EditStudyPrice(props.row)" /> @click="EditStudyPrice(props.row)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="申请审核"
@click="applyApply(props.row)" />
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
...@@ -91,7 +109,7 @@ ...@@ -91,7 +109,7 @@
:input="true" @input="changePage" /> :input="true" @input="changePage" />
</template> </template>
</q-table> </q-table>
<studyAbroad-form v-if="isShowStudy" :save-obj="studyObj" @close="closeStudyForm" @success="refreshPage"> <studyAbroad-form v-if="isShowStudy" :save-obj="studyObj" :Type="1" @close="closeStudyForm" @success="refreshPage">
</studyAbroad-form> </studyAbroad-form>
<studyAbroadprice-form v-if="isShowStudyPrice" :save-obj="studyObj" @close="closeStudyForm" <studyAbroadprice-form v-if="isShowStudyPrice" :save-obj="studyObj" @close="closeStudyForm"
@success="refreshPage"> @success="refreshPage">
...@@ -124,6 +142,7 @@ ...@@ -124,6 +142,7 @@
rowsPerPage: 10, rowsPerPage: 10,
Name: "", Name: "",
IsQPrice: 1, IsQPrice: 1,
SaleState:0 //销售状态
}, },
dataList: [], dataList: [],
loading: true, loading: true,
...@@ -145,7 +164,6 @@ ...@@ -145,7 +164,6 @@
// field: 'SupplierContract', // field: 'SupplierContract',
// align: 'left' // align: 'left'
// }, // },
{ {
name: 'SuggestPrice', name: 'SuggestPrice',
label: '建议卖价', label: '建议卖价',
...@@ -203,6 +221,17 @@ ...@@ -203,6 +221,17 @@
isShowStudy: false, //是否显示留学弹窗 isShowStudy: false, //是否显示留学弹窗
studyObj: {}, //留学对象 studyObj: {}, //留学对象
isShowStudyPrice: false, //是否显示价格设置 isShowStudyPrice: false, //是否显示价格设置
saleDownList:[{
Id:0,
Name:'不限'
},{
Id:1,
Name:'销售中'
},{
Id:2,
Name:'已下架'
}], //销售状态下拉
} }
}, },
mounted() { mounted() {
...@@ -257,6 +286,10 @@ ...@@ -257,6 +286,10 @@
EditStudyPrice(obj) { EditStudyPrice(obj) {
this.studyObj = obj; this.studyObj = obj;
this.isShowStudyPrice = true; this.isShowStudyPrice = true;
},
//申请审核
applyApply(obj){
} }
} }
} }
......
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