Skip to content

S
shop-new
提交 30df3295 authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

滚动样式修改

上级 7e437e55
隐藏空白字符变更
内嵌 并排
正在显示 包含 268 行增加 和 336 行删除
.env.development
浏览文件 @ 30df3295
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
ENV = 'development' ENV = 'development'
# 正式环境 # 正式环境
#VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1' VUE_APP_BASE_API = 'http://pop.jxhh.com/api/v1'
# 测试环境 # 测试环境
VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1' #VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
#VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1' #VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
# 文档模块 直接调用 sys开放接口 # 文档模块 直接调用 sys开放接口
......
src/App.vue
浏览文件 @ 30df3295
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
</template> </template>
<script> <script>
export default { export default {
name: 'App' name: 'App'
} }
</script> </script>
<style lang="scss" type="text/stylus"> <style lang="scss" type="text/stylus">
...@@ -30,10 +30,10 @@ export default { ...@@ -30,10 +30,10 @@ export default {
/* --------- 自定义class全局统一样式 ---------- */ /* --------- 自定义class全局统一样式 ---------- */
.app-container { .app-container {
height: 100%; height: 100%;
overflow: auto;
.box-card { .box-card {
height: 100%; /* height: 100%; */
overflow: hidden; /* overflow: hidden; */
} }
} }
...@@ -54,4 +54,4 @@ export default { ...@@ -54,4 +54,4 @@ export default {
} }
} }
/* --- end --- element组件样式重置 -- end ----- */ /* --- end --- element组件样式重置 -- end ----- */
</style> </style>
\ No newline at end of file
src/views/system/asset/settlementbill/index.vue
浏览文件 @ 30df3295
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</el-form> </el-form>
</div> </div>
<el-table :data="withdrawlogList" :height="tableHeight"> <el-table :data="withdrawlogList">
<el-table-column label="序号" align="center" width="55"> <el-table-column label="序号" align="center" width="55">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
......
src/views/system/freight/freight_list/index.vue
浏览文件 @ 30df3295
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</el-form> </el-form>
</div> </div>
<el-table :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange"> <el-table :data="freightList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="ID" align="center" prop="id"/> <el-table-column label="ID" align="center" prop="id"/>
<el-table-column label="模板名称" align="center" prop="name"/> <el-table-column label="模板名称" align="center" prop="name"/>
......
src/views/system/messageCenter/msgtemplate.vue
浏览文件 @ 30df3295
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
<el-table <el-table
ref="msgTableCon" ref="msgTableCon"
:data="msgTableList" :data="msgTableList"
:height="msgConHeight"
style="width: 100%" style="width: 100%"
:header-cell-style="{ :header-cell-style="{
background: '#F9F9FA', background: '#F9F9FA',
...@@ -349,13 +348,13 @@ export default { ...@@ -349,13 +348,13 @@ export default {
<style scoped> <style scoped>
.app-container >>> .el-card { .app-container >>> .el-card {
height: 100%; /* height: 100%; */
overflow: hidden; /* overflow: hidden; */
} }
.app-container >>> .el-card .el-card__body { .app-container >>> .el-card .el-card__body {
height: 100%; /* height: 100%; */
overflow: hidden; /* overflow: hidden; */
} }
.msg-table-con { .msg-table-con {
......
src/views/system/order/index.vue
浏览文件 @ 30df3295
...@@ -1153,20 +1153,20 @@ ...@@ -1153,20 +1153,20 @@
<style scoped> <style scoped>
.box-cardone{ .box-cardone{
height: 100%; /* height: 100%; */
} }
::v-deep .el-range-editor.el-input__inner { ::v-deep .el-range-editor.el-input__inner {
width: 100%; width: 100%;
} }
::v-deep .el-card__body { ::v-deep .el-card__body {
height: calc(100% - 50px); /* height: calc(100% - 50px); */
/* overflow: auto; */ /* overflow: auto; */
} }
.overMain { .overMain {
height: 729px; /* height: 729px; */
overflow: auto; /* overflow: auto; */
padding-top: 15px; padding-top: 15px;
} }
......
src/views/system/retreat/address.vue
浏览文件 @ 30df3295
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</el-form> </el-form>
</div> </div>
<el-table v-loading="loading" :data="addressList" :height="tableHeight"> <el-table v-loading="loading" :data="addressList">
<el-table-column label="序号" prop="id" align="center"></el-table-column> <el-table-column label="序号" prop="id" align="center"></el-table-column>
<el-table-column label="售后地址" prop="address" align="center"> <el-table-column label="售后地址" prop="address" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/system/retreat/retreat/index.vue
浏览文件 @ 30df3295
...@@ -503,12 +503,12 @@ ...@@ -503,12 +503,12 @@
<style scoped> <style scoped>
.card-spe-con { .card-spe-con {
height: 100%; /* height: 100%; */
/*overflow: auto;*/ /*overflow: auto;*/
} }
.card-spe-con ::v-deep .el-card__body { .card-spe-con ::v-deep .el-card__body {
height: calc(100% - 40px); /* height: calc(100% - 40px); */
overflow: hidden; /* overflow: hidden; */
} }
/*::v-deep .el-dialog__body {*/ /*::v-deep .el-dialog__body {*/
/* height: 100%;*/ /* height: 100%;*/
......
src/views/system/settings/commodityExpress.vue
浏览文件 @ 30df3295
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
> >
</div> </div>
<el-table :data="tableData" :height="tableHeight" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column <el-table-column
prop="logistics_company_name" prop="logistics_company_name"
label="快递公司" label="快递公司"
......
src/views/system/settings/commodityGroup.vue
浏览文件 @ 30df3295
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
> >
</div> </div>
<!-- 分组表格 --> <!-- 分组表格 -->
<el-table :data="tableData" :height="tableHeight" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column prop="id" label="分组ID" width="180"> <el-table-column prop="id" label="分组ID" width="180">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="分组名称" width="180"> <el-table-column prop="name" label="分组名称" width="180">
......
src/views/system/shop/brand.vue
浏览文件 @ 30df3295
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-table :data="brandList" :height="tableHeight"> <el-table :data="brandList" >
<el-table-column label="品牌名称" prop="brand_cn" align="center"></el-table-column> <el-table-column label="品牌名称" prop="brand_cn" align="center"></el-table-column>
<el-table-column label="品牌经营类型" prop="brand_type" align="center"> <el-table-column label="品牌经营类型" prop="brand_type" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
src/views/system/shop/index.vue
浏览文件 @ 30df3295
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
<div style="display: flex;flex-direction: row;justify-content: space-between;padding: 0 20px;"> <div style="display: flex;flex-direction: row;justify-content: space-between;padding: 0 20px;">
<p class="text-v-c"> <p class="text-v-c">
当前审核状态：<span class="speDom">{{ reviewResult }}</span><span 当前审核状态：<span class="speDom">{{ reviewResult }}</span><span
style="display: block;width:20px;height:100%"></span> style="display: block;width:20px;height:100%"></span>
<span class="speTip">仅可修改店铺相关信息，企业主体信息不允许修改！</span></p> <span class="speTip">仅可修改店铺相关信息，企业主体信息不允许修改！</span>
</p>
<p> <p>
<el-button size="small" icon="el-icon-edit" type="primary" @click="handleEdit">编辑信息</el-button> <el-button size="small" icon="el-icon-edit" type="primary" @click="handleEdit">编辑信息</el-button>
</p> </p>
...@@ -17,139 +18,107 @@ ...@@ -17,139 +18,107 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<p>企业认证信息</p> <p>企业认证信息</p>
</div> </div>
<el-form ref="mainForm" :model="mainForm" label-width="180px" class="main-form-con" <el-form ref="mainForm" :model="mainForm" label-width="180px" class="main-form-con" size="small">
size="small"> <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
<el-form-item label="企业类型：" prop="organization_type" inline-message="true"> <span v-if="mainForm.organization_type==2">小规模</span>
<span v-if="mainForm.organization_type==2">小规模</span> <span v-if="mainForm.organization_type==1">一般纳税人</span>
<span v-if="mainForm.organization_type==1">一般纳税人</span> </el-form-item>
</el-form-item> <el-form-item label="营业执照：" prop="license">
<el-form-item label="营业执照：" prop="license"> <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
<div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;"> <div style="padding-right:6px;">
<div style="padding-right:6px;"> <el-upload :disabled="true" :class="['uploadData',{ 'hiden-dom': licenseImgFileList.length >= 1 }]"
<el-upload action="#" list-type="picture-card" :on-preview="handleLicenseImgview"
:disabled="true" :file-list='licenseImgFileList'>
:class="['uploadData',{ 'hiden-dom': licenseImgFileList.length >= 1 }]" <i class="el-icon-plus"></i>
action="#" </el-upload>
list-type="picture-card" <el-dialog :visible.sync="isLicenseVisible">
:on-preview="handleLicenseImgview" <img width="100%" :src="licenseImgUrl" alt="">
:file-list='licenseImgFileList' </el-dialog>
> </div>
<i class="el-icon-plus"></i> <div>
</el-upload> <span class="tips-text">
<el-dialog :visible.sync="isLicenseVisible"> <i class="el-icon-warning h-warning"></i>
<img width="100%" :src="licenseImgUrl" alt=""> </span>
</el-dialog>
</div>
<div>
<span class="tips-text">
<i class="el-icon-warning h-warning"></i>
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">点击可查看大图</span>
</div>
</div> </div>
</el-form-item> <div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">点击可查看大图</span>
</div>
</div>
</el-form-item>
<el-form-item label="企业名称：" prop="organization_name" inline-message="true"> <el-form-item label="企业名称：" prop="organization_name" inline-message="true">
<el-input v-model="mainForm.organization_name" :disabled="isMainItem" style="width: 400px;"></el-input> <el-input v-model="mainForm.organization_name" :disabled="isMainItem" style="width: 400px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="企业地址：" prop="organization_address" inline-message="true"> <el-form-item label="企业地址：" prop="organization_address" inline-message="true">
<el-input v-model="mainForm.organization_address" :disabled="isMainItem" style="width: 400px;"></el-input> <el-input v-model="mainForm.organization_address" :disabled="isMainItem" style="width: 400px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统一社会代码：" prop="license_number" inline-message="true"> <el-form-item label="统一社会代码：" prop="license_number" inline-message="true">
<el-input v-model="mainForm.license_number" :disabled="isMainItem" style="width: 400px;"></el-input> <el-input v-model="mainForm.license_number" :disabled="isMainItem" style="width: 400px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="营业期限：" prop="license_expires_time"> <el-form-item label="营业期限：" prop="license_expires_time">
<el-date-picker <el-date-picker style="width:400px;" v-model="periodConcreteTime" type="daterange" range-separator="至"
style="width:400px;" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" :disabled="isMainItem" />
v-model="periodConcreteTime" <el-checkbox v-model="periodLongTermVal" :disabled="isMainItem" style="padding-left:15px;">长期
type="daterange" </el-checkbox>
range-separator="至" </el-form-item>
start-placeholder="开始日期"
end-placeholder="结束日期" <el-form-item label="法人身份证：">
value-format="yyyy-MM-dd" <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
:disabled="isMainItem" <!-- 身份证正面 -->
/> <div style="padding: 0 20px;">
<el-checkbox v-model="periodLongTermVal" :disabled="isMainItem" style="padding-left:15px;">长期</el-checkbox> <el-upload :disabled="true" :class="['uploadData',{ 'hiden-dom': idcardImgFileList.length >= 1 }]"
</el-form-item> list-type="picture-card" action="#" :on-preview="handleIdcardPositiveImgview"
:file-list='idcardImgFileList'>
<el-form-item label="法人身份证："> <i class="el-icon-plus"></i>
<div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;"> </el-upload>
<!-- 身份证正面 --> <el-dialog :visible.sync="idcardPositiveVisible">
<div style="padding: 0 20px;"> <img width="100%" :src="idcardPositiveImgUrl" alt="">
<el-upload </el-dialog>
:disabled="true" </div>
:class="['uploadData',{ 'hiden-dom': idcardImgFileList.length >= 1 }]" <!-- 身份证反面 -->
list-type="picture-card" <div style="padding: 0 20px;">
action="#" <el-upload :disabled="true" :class="['uploadData',{ 'hiden-dom': idcardBackImgFileList.length >= 1 }]"
:on-preview="handleIdcardPositiveImgview" list-type="picture-card" action="#" :on-preview="handleIdcardBackImgview"
:file-list='idcardImgFileList' :file-list='idcardBackImgFileList'>
> <i class="el-icon-plus"></i>
<i class="el-icon-plus"></i> </el-upload>
</el-upload> <el-dialog :visible.sync="idcardBackVisible">
<el-dialog :visible.sync="idcardPositiveVisible"> <img width="100%" :src="idcardBackImgUrl" alt="">
<img width="100%" :src="idcardPositiveImgUrl" alt=""> </el-dialog>
</el-dialog> </div>
</div> <div>
<!-- 身份证反面 --> <span class="tips-text">
<div style="padding: 0 20px;"> <i class="el-icon-warning h-warning"></i>
<el-upload </span>
:disabled="true"
:class="['uploadData',{ 'hiden-dom': idcardBackImgFileList.length >= 1 }]"
list-type="picture-card"
action="#"
:on-preview="handleIdcardBackImgview"
:file-list='idcardBackImgFileList'
>
<i class="el-icon-plus"></i>
</el-upload>
<el-dialog :visible.sync="idcardBackVisible">
<img width="100%" :src="idcardBackImgUrl" alt="">
</el-dialog>
</div>
<div>
<span class="tips-text">
<i class="el-icon-warning h-warning"></i>
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">点击可查看大图</span>
</div>
</div> </div>
<div class="idcard-tips-con"> <div style="width:380px;line-height: 24px;padding-top: 6px;">
<p>请上传身份证正面</p> <span class="tips-text">点击可查看大图</span>
<p>请上传身份证国徽面</p>
</div> </div>
</el-form-item> </div>
<div class="idcard-tips-con">
<el-form-item label="法定姓名：" prop="real_name"> <p>请上传身份证正面</p>
<el-input v-model="mainForm.real_name" :disabled="isMainItem" style="width: 400px;"></el-input> <p>请上传身份证国徽面</p>
</el-form-item> </div>
</el-form-item>
<el-form-item label="法定代表人证件号：" prop="idcard_number">
<el-input v-model="mainForm.idcard_number" :disabled="isMainItem" style="width: 400px;"></el-input> <el-form-item label="法定姓名：" prop="real_name">
</el-form-item> <el-input v-model="mainForm.real_name" :disabled="isMainItem" style="width: 400px;"></el-input>
</el-form-item>
<el-form-item label="有效期至：" prop="idcard_expires_time">
<el-date-picker <el-form-item label="法定代表人证件号：" prop="idcard_number">
style="width:400px;" <el-input v-model="mainForm.idcard_number" :disabled="isMainItem" style="width: 400px;"></el-input>
v-model="validityConcreteTime" </el-form-item>
type="daterange"
range-separator="至" <el-form-item label="有效期至：" prop="idcard_expires_time">
value-format="yyyy-MM-dd" <el-date-picker style="width:400px;" v-model="validityConcreteTime" type="daterange" range-separator="至"
start-placeholder="开始日期" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期" :disabled="isMainItem" />
end-placeholder="结束日期" <el-checkbox v-model="validityLongTermVal" style="padding-left:15px;" :disabled="isMainItem">长期
:disabled="isMainItem" </el-checkbox>
/> </el-form-item>
<el-checkbox v-model="validityLongTermVal" style="padding-left:15px;" </el-form>
:disabled="isMainItem">长期
</el-checkbox>
</el-form-item>
</el-form>
</el-card> </el-card>
</div> </div>
<!-- 店铺信息 --> <!-- 店铺信息 -->
...@@ -160,101 +129,92 @@ ...@@ -160,101 +129,92 @@
</div> </div>
<el-form ref="storeForm" :model="storeForm" label-width="180px"> <el-form ref="storeForm" :model="storeForm" label-width="180px">
<el-form-item label="电商平台经验：" prop="is_business_experience"> <el-form-item label="电商平台经验：" prop="is_business_experience">
<el-radio-group v-model="storeForm.is_business_experience" :disabled="isMainItem"> <el-radio-group v-model="storeForm.is_business_experience" :disabled="isMainItem">
<el-radio :label="1">有</el-radio> <el-radio :label="1">有</el-radio>
<el-radio :label="0">无</el-radio> <el-radio :label="0">无</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="店铺名称：" prop="store_name" inline-message="true"> <el-form-item label="店铺名称：" prop="store_name" inline-message="true">
<el-input v-model="storeForm.store_name" :disabled="isMainItem" style="width: 400px;" <el-input v-model="storeForm.store_name" :disabled="isMainItem" style="width: 400px;"
placeholder="请输入店铺名称"></el-input> placeholder="请输入店铺名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="经营类目：" prop="scope"> <el-form-item label="经营类目：" prop="scope">
<el-select v-model="storeForm.scope" multiple :disabled="isMainItem" placeholder="请选择..." <el-select v-model="storeForm.scope" multiple :disabled="isMainItem" placeholder="请选择..."
style="width: 400px;"> style="width: 400px;">
<el-option <el-option v-for="item in scopeOptions" :key="item.id" :label="item.title" :value="item.id"></el-option>
v-for="item in scopeOptions" </el-select>
:key="item.id" </el-form-item>
:label="item.title"
:value="item.id" <el-form-item label="店铺LOGO：" prop="shop_logo">
></el-option> <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
</el-select> <div style="padding-right:6px;">
</el-form-item> <el-upload :disabled="true" :class="['uploadData',{ 'hiden-dom': logoImgFileList.length >= 1 }]"
action="#" list-type="picture-card" :on-preview="handleShopLogoPreview"
<el-form-item label="店铺LOGO：" prop="shop_logo"> :file-list='logoImgFileList'>
<div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;"> <i class="el-icon-plus"></i>
<div style="padding-right:6px;"> </el-upload>
<el-upload <el-dialog :visible.sync="shopLogoVisible">
:disabled="true" <img width="100%" :src="shopLogoImgUrl" alt="">
:class="['uploadData',{ 'hiden-dom': logoImgFileList.length >= 1 }]" </el-dialog>
action="#"
list-type="picture-card"
:on-preview="handleShopLogoPreview"
:file-list='logoImgFileList'
>
<i class="el-icon-plus"></i>
</el-upload>
<el-dialog :visible.sync="shopLogoVisible">
<img width="100%" :src="shopLogoImgUrl" alt="">
</el-dialog>
</div>
<div>
<span class="tips-text">
<i class="el-icon-warning h-warning"></i>
</span>
</div>
<div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">点击可查看大图</span>
</div>
</div> </div>
</el-form-item> <div>
<span class="tips-text">
<el-form-item label="运营负责人：" prop="emergency_name" inline-message="true"> <i class="el-icon-warning h-warning"></i>
<el-input v-model="storeForm.emergency_name" :disabled="isMainItem" style="width: 400px;"
placeholder="请输入运营负责人姓名"></el-input>
</el-form-item>
<el-form-item label="联系电话：" prop="emergency_tel">
<el-input v-model="storeForm.emergency_tel" :disabled="isMainItem" style="width: 400px;"
placeholder="请输入联系电话"></el-input>
</el-form-item>
<el-form-item>
<p style="width:580px;line-height:24px;font-size:14px;margin: 0;color: #333;">
需要提交特殊产品资质的类目请将资质上传在此处，包括全国工业生产许可证、3C、医疗品械
生产许可证、化妆品生产企业许可证等，根据具体类目资质要求提交</p>
</el-form-item>
<el-form-item label="其他资质：">
<div class="auth-con">
<div v-for="(item,index) in qualificationList" :key="item.id" class="single-upload-con">
<div v-show="!item.url" class="single-auth-img"></div>
<div v-show="item.url" class="single-auth-img-con">
<img class="auth-spec-img" :src="item.url" alt=""/>
<span class="span-img-del-loading">
<span class="span-img-del el-icon-zoom-in zoom-span-block"
@click="viewSingleSpecImg(index,item)"></span>
</span> </span>
</div> </div>
<div class="single-title">{{ authTitleFormatter(item.content) }}</div> <div style="width:380px;line-height: 24px;padding-top: 6px;">
<span class="tips-text">点击可查看大图</span>
</div>
</div>
</el-form-item>
<el-form-item label="运营负责人：" prop="emergency_name" inline-message="true">
<el-input v-model="storeForm.emergency_name" :disabled="isMainItem" style="width: 400px;"
placeholder="请输入运营负责人姓名"></el-input>
</el-form-item>
<el-form-item label="联系电话：" prop="emergency_tel">
<el-input v-model="storeForm.emergency_tel" :disabled="isMainItem" style="width: 400px;"
placeholder="请输入联系电话"></el-input>
</el-form-item>
<el-form-item>
<p style="width:580px;line-height:24px;font-size:14px;margin: 0;color: #333;">
需要提交特殊产品资质的类目请将资质上传在此处，包括全国工业生产许可证、3C、医疗品械
生产许可证、化妆品生产企业许可证等，根据具体类目资质要求提交</p>
</el-form-item>
<el-form-item label="其他资质：">
<div class="auth-con">
<div v-for="(item,index) in qualificationList" :key="item.id" class="single-upload-con">
<div v-show="!item.url" class="single-auth-img"></div>
<div v-show="item.url" class="single-auth-img-con">
<img class="auth-spec-img" :src="item.url" alt="" />
<span class="span-img-del-loading">
<span class="span-img-del el-icon-zoom-in zoom-span-block"
@click="viewSingleSpecImg(index,item)"></span>
</span>
</div> </div>
<div class="single-title">{{ authTitleFormatter(item.content) }}</div>
</div> </div>
</div>
</el-form-item>
</el-form-item>
</el-form> </el-form>
</el-card> </el-card>
</div> </div>
</el-card> </el-card>
<!--编辑--> <!--编辑-->
<el-dialog title="编辑店铺信息" :visible.sync="isOpen" width="65%" class="shopinf-edit" <el-dialog title="编辑店铺信息" :visible.sync="isOpen" width="65%" class="shopinf-edit" center :destroy-on-close="true"
center :destroy-on-close="true" :close-on-click-modal="false" :before-close="handleCancel"> :close-on-click-modal="false" :before-close="handleCancel">
<el-form v-if="isOpen" ref="editForm" class="editForm" :model="editForm" :rules="editRules" label-width="180px" size="small"> <el-form v-if="isOpen" ref="editForm" class="editForm" :model="editForm" :rules="editRules" label-width="180px"
size="small">
<!-- <el-form-item label="企业类型：" prop="organization_type" inline-message="true"> <!-- <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
<el-radio-group v-model="editForm.organization_type" size="mini"> <el-radio-group v-model="editForm.organization_type" size="mini">
<el-radio :label="2">小规模</el-radio> <el-radio :label="2">小规模</el-radio>
...@@ -274,31 +234,19 @@ ...@@ -274,31 +234,19 @@
</el-form-item> </el-form-item>
<el-form-item label="经营类目：" prop="scope"> <el-form-item label="经营类目：" prop="scope">
<el-select v-model="editForm.scope" @remove-tag="removeEditTag" @visible-change="editScopeVisibleChange($event)" multiple placeholder="请选择..." style="width: 400px;"> <el-select v-model="editForm.scope" @remove-tag="removeEditTag"
<el-option @visible-change="editScopeVisibleChange($event)" multiple placeholder="请选择..." style="width: 400px;">
v-for="item in scopeOptions" <el-option v-for="item in scopeOptions" :key="item.id" :label="item.title" :value="item.id"></el-option>
:key="item.id"
:label="item.title"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="店铺LOGO：" prop="shop_logo"> <el-form-item label="店铺LOGO：" prop="shop_logo">
<div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;"> <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
<div style="padding-right:6px;"> <div style="padding-right:6px;">
<el-upload <el-upload :class="['uploadData',{ 'hiden-dom': editLogoImgFileList.length >= 1 }]" action="#"
:class="['uploadData',{ 'hiden-dom': editLogoImgFileList.length >= 1 }]" list-type="picture-card" :limit="1" :on-exceed="showTip1" :before-upload="beforeUploadLogoImg"
action="#" :http-request="uploadShopLogoImg" :on-preview="handleEditShopLogoView"
list-type="picture-card" :on-remove="removeEditShopLogoImg" :file-list='editLogoImgFileList'>
:limit="1"
:on-exceed="showTip1"
:before-upload = "beforeUploadLogoImg"
:http-request="uploadShopLogoImg"
:on-preview="handleEditShopLogoView"
:on-remove="removeEditShopLogoImg"
:file-list = 'editLogoImgFileList'
>
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
<el-dialog :visible.sync="isEditShopLogoVisible" append-to-body> <el-dialog :visible.sync="isEditShopLogoVisible" append-to-body>
...@@ -337,16 +285,17 @@ ...@@ -337,16 +285,17 @@
<div v-show="item.url" class="single-auth-img-con"> <div v-show="item.url" class="single-auth-img-con">
<img class="auth-spec-img" :src="item.url" alt="" /> <img class="auth-spec-img" :src="item.url" alt="" />
<span class="span-img-del-loading"> <span class="span-img-del-loading">
<span class="span-img-del el-icon-zoom-in zoom-span-block" @click="viewSingleAuthImg(index,item)"></span> <span class="span-img-del el-icon-zoom-in zoom-span-block"
<span class="span-img-del el-icon-delete del-span-block" @click="delSingleAuthImg(index,item)"></span> @click="viewSingleAuthImg(index,item)"></span>
</span> <span class="span-img-del el-icon-delete del-span-block" @click="delSingleAuthImg(index,item)"></span>
</span>
</div> </div>
<div class="single-title">{{ authTitleFormatter(item.content) }}</div> <div class="single-title">{{ authTitleFormatter(item.content) }}</div>
<!-- 真正上传 dom 原生 input --> <!-- 真正上传 dom 原生 input -->
<input type="file" style="display: none;" :ref=" 'hxz' + index " accept="image/*" <input type="file" style="display: none;" :ref=" 'hxz' + index " accept="image/*"
@change="changeIMG(index,item)"> @change="changeIMG(index,item)">
</div> </div>
</div> </div>
<div style="width:680px;line-height: 24px;padding-top: 6px;"> <div style="width:680px;line-height: 24px;padding-top: 6px;">
<span class="tips-text"> <span class="tips-text">
...@@ -365,21 +314,15 @@ ...@@ -365,21 +314,15 @@
</el-dialog> </el-dialog>
<!-- 资质图片预览 --> <!-- 资质图片预览 -->
<el-dialog <el-dialog :visible.sync="imgDialog" :destroy-on-close="true" width="60%" center :close-on-click-modal="false"
:visible.sync="imgDialog" class="img-dialog-con">
:destroy-on-close="true"
width="60%"
center
:close-on-click-modal="false"
class="img-dialog-con"
>
<img class="img-spe" :src="qualificationUrl" alt=""> <img class="img-spe" :src="qualificationUrl" alt="">
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {getGoodsType, getMainInf, getShopInf, upLoadImg, addShopInf, getUploadQualificationListData} from '@/api/module/entry'; import { getGoodsType, getMainInf, getShopInf, upLoadImg, addShopInf, getUploadQualificationListData } from '@/api/module/entry';
import { dateFormat } from '@/utils' import { dateFormat } from '@/utils'
export default { export default {
name: "Shop", name: "Shop",
...@@ -411,7 +354,7 @@ ...@@ -411,7 +354,7 @@
reviewResult: '加载中。。', reviewResult: '加载中。。',
isMainItem: true,// 主体/企业信息 是否可以修改，目前暂时不能 isMainItem: true,// 主体/企业信息 是否可以修改，目前暂时不能
mainForm: { mainForm: {
organization_type:1, organization_type: 1,
license: '', license: '',
organization_name: '', organization_name: '',
license_number: '', license_number: '',
...@@ -474,15 +417,15 @@ ...@@ -474,15 +417,15 @@
business_auth: '', business_auth: '',
}, },
editRules: { editRules: {
store_name: [{required: true, message: '店铺名称不能为空', trigger: 'blur'}], store_name: [{ required: true, message: '店铺名称不能为空', trigger: 'blur' }],
scope: [{required: true, message: '经营类目至少选择一种', trigger: 'change'}], scope: [{ required: true, message: '经营类目至少选择一种', trigger: 'change' }],
shop_logo: [{required: true, message: '店铺Logo至少上传一张图片', validator: logoValidator}],// shop_logo: [{ required: true, message: '店铺Logo至少上传一张图片', validator: logoValidator }],//
emergency_name: [{required: true, message: '运营负责人不能为空', trigger: 'blur'}],// emergency_name: [{ required: true, message: '运营负责人不能为空', trigger: 'blur' }],//
emergency_tel: [ emergency_tel: [
{required: true, message: '联系人手机号码不能为空', trigger: 'blur'}, { required: true, message: '联系人手机号码不能为空', trigger: 'blur' },
{required: true, validator: checkTel, trigger: 'blur'} { required: true, validator: checkTel, trigger: 'blur' }
], ],
business_auth: [{required: true, message: '店铺Logo至少上传一张图片', validator: busAuthValidator}],// business_auth: [{ required: true, message: '店铺Logo至少上传一张图片', validator: busAuthValidator }],//
}, },
// 编辑 店铺logo // 编辑 店铺logo
editLogoImgFileList: [], editLogoImgFileList: [],
...@@ -639,13 +582,13 @@ ...@@ -639,13 +582,13 @@
this.qualificationList = this.storeForm.qualification ? this.storeForm.qualification : []; this.qualificationList = this.storeForm.qualification ? this.storeForm.qualification : [];
} else if (res.code) { } else if (res.code) {
this.$message({message: res.msg, type: 'error'}); this.$message({ message: res.msg, type: 'error' });
} }
}); });
}, },
/** 编辑 */ /** 编辑 */
handleEdit() { handleEdit() {
getShopInf().then(res=> { getShopInf().then(res => {
if (res.code == 1) { if (res.code == 1) {
this.isOpen = true; this.isOpen = true;
this.editForm = res.data this.editForm = res.data
...@@ -668,21 +611,21 @@ ...@@ -668,21 +611,21 @@
this.editLogoImgFileList = [] this.editLogoImgFileList = []
logoImgArr = this.editForm.shop_logo.split(","); logoImgArr = this.editForm.shop_logo.split(",");
if (logoImgArr.length > 0) { if (logoImgArr.length > 0) {
logoImgArr.forEach(item=> { logoImgArr.forEach(item => {
logoImgUrl = {}; logoImgUrl = {};
if (item) { if (item) {
logoImgUrl.url = item logoImgUrl.url = item
this.editLogoImgFileList.push(logoImgUrl) this.editLogoImgFileList.push(logoImgUrl)
} }
}); });
}else { } else {
this.editLogoImgFileList = []; this.editLogoImgFileList = [];
} }
// 资质图片回显处理 // 资质图片回显处理
this.editQualificationList = this.editForm.qualification ? this.editForm.qualification : []; this.editQualificationList = this.editForm.qualification ? this.editForm.qualification : [];
} else { } else {
this.$message({type: 'error', message: res.msg ? res.msg : '获取店铺信息失败' }); this.$message({ type: 'error', message: res.msg ? res.msg : '获取店铺信息失败' });
} }
}); });
}, },
...@@ -704,7 +647,7 @@ ...@@ -704,7 +647,7 @@
} }
if (isComplete) { if (isComplete) {
this.$message({type:'warning',message: '请上传对应资质所需的图片'}); this.$message({ type: 'warning', message: '请上传对应资质所需的图片' });
return; return;
} }
} }
...@@ -721,11 +664,11 @@ ...@@ -721,11 +664,11 @@
data['scope'] = this.editForm.scope.join(','); data['scope'] = this.editForm.scope.join(',');
// 编辑 的店铺logolist // 编辑 的店铺logolist
debugger debugger
if(this.editLogoImgFileList.length > 0) { if (this.editLogoImgFileList.length > 0) {
for(let i = 0; i < this.editLogoImgFileList.length; i++) { for (let i = 0; i < this.editLogoImgFileList.length; i++) {
if(i === 0) { if (i === 0) {
data['shop_logo'] = this.editLogoImgFileList[i].url; data['shop_logo'] = this.editLogoImgFileList[i].url;
}else { } else {
data['shop_logo'] += ',' + this.editLogoImgFileList[i].url; data['shop_logo'] += ',' + this.editLogoImgFileList[i].url;
} }
} }
...@@ -737,16 +680,16 @@ ...@@ -737,16 +680,16 @@
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消' cancelButtonText: '取消'
}).then(() => { }).then(() => {
addShopInf(data).then(res=> { addShopInf(data).then(res => {
if (res.code == 1) { if (res.code == 1) {
this.$message({type: 'success',message: '编辑成功'}); this.$message({ type: 'success', message: '编辑成功' });
this.isOpen = false; this.isOpen = false;
this.getShop(); this.getShop();
}else { } else {
this.$message({type: 'error',message: res.message || res.msg ? res.message || res.msg : '操作失败'}); this.$message({ type: 'error', message: res.message || res.msg ? res.message || res.msg : '操作失败' });
} }
}); });
}).catch(() => {}); }).catch(() => { });
} // valid true 通过 end } // valid true 通过 end
}) })
...@@ -772,7 +715,7 @@ ...@@ -772,7 +715,7 @@
this.shopLogoVisible = true; this.shopLogoVisible = true;
}, },
/** 预览 当前资质对应图片 */ /** 预览 当前资质对应图片 */
viewSingleSpecImg(index,item) { viewSingleSpecImg(index, item) {
this.imgDialog = false; this.imgDialog = false;
if (!item.url) return; if (!item.url) return;
this.imgDialog = true; this.imgDialog = true;
...@@ -801,13 +744,13 @@ ...@@ -801,13 +744,13 @@
this.getBase64(param.file).then((res) => { this.getBase64(param.file).then((res) => {
let result = res.split(","); let result = res.split(",");
this.Base64img = result[1]; this.Base64img = result[1];
let data = {"img_data": this.Base64img,"type":2}; let data = { "img_data": this.Base64img, "type": 2 };
this.editLogoImgFileList = [] this.editLogoImgFileList = []
upLoadImg(data).then((res) => { upLoadImg(data).then((res) => {
if (res && res.code == 1) { if (res && res.code == 1) {
this.editLogoImgFileList.push({'url': res.data.image_url}); this.editLogoImgFileList.push({ 'url': res.data.image_url });
debugger debugger
this.$message({message: '上传成功', type: 'success'}); this.$message({ message: '上传成功', type: 'success' });
this.$refs.storeForm.clearValidate('shop_logo'); this.$refs.storeForm.clearValidate('shop_logo');
} }
}); });
...@@ -838,28 +781,28 @@ ...@@ -838,28 +781,28 @@
let inputDom = "hxz" + index; let inputDom = "hxz" + index;
let file = this.$refs[inputDom][0].files[0]; let file = this.$refs[inputDom][0].files[0];
if( file.size > 1024 * 500 ) { if (file.size > 1024 * 500) {
this.$message({ type: 'error',message: '规格图片不能大于 500k'}); this.$message({ type: 'error', message: '规格图片不能大于 500k' });
return; return;
} }
this.getBase64(file).then((res) => { this.getBase64(file).then((res) => {
let result = res.split(","); let result = res.split(",");
this.Base64img = result[1]; this.Base64img = result[1];
let data = {"img_data": this.Base64img,"type":2} let data = { "img_data": this.Base64img, "type": 2 }
upLoadImg(data).then(res => { upLoadImg(data).then(res => {
if (res && res.code == 1) { if (res && res.code == 1) {
curItem.url = res.data.image_url; curItem.url = res.data.image_url;
// this.singleSpecImgList.push({'url': res.data.image_url}) // this.singleSpecImgList.push({'url': res.data.image_url})
this.$message({ message:'上传成功',type:'success'}); this.$message({ message: '上传成功', type: 'success' });
}else { } else {
this.$message({ message:'上传失败，请重新上传',type:'error'}); this.$message({ message: '上传失败，请重新上传', type: 'error' });
} }
}) })
}); });
}, },
/** 查看 当前资质图片 */ /** 查看 当前资质图片 */
viewSingleAuthImg(index,item) { viewSingleAuthImg(index, item) {
this.imgDialog = false; this.imgDialog = false;
// this.qualificationUrl = ""; // this.qualificationUrl = "";
if (!item.url) return; if (!item.url) return;
...@@ -867,10 +810,10 @@ ...@@ -867,10 +810,10 @@
this.qualificationUrl = item.url this.qualificationUrl = item.url
}, },
/** 删除 当前图片 */ /** 删除 当前图片 */
delSingleAuthImg(index,item) { delSingleAuthImg(index, item) {
if( item.url ) { if (item.url) {
item.url = ''; item.url = '';
this.$message({type: 'success',message: '删除成功'}); this.$message({ type: 'success', message: '删除成功' });
} }
}, },
...@@ -882,7 +825,7 @@ ...@@ -882,7 +825,7 @@
} }
if (this.editForm.scope.length > 0) { if (this.editForm.scope.length > 0) {
let data = { cate_ids: this.editForm.scope } let data = { cate_ids: this.editForm.scope }
getUploadQualificationListData(data).then(res=> { getUploadQualificationListData(data).then(res => {
if (res.code == 1) { if (res.code == 1) {
this.editQualificationList = res.data ? res.data : []; this.editQualificationList = res.data ? res.data : [];
} }
...@@ -894,7 +837,7 @@ ...@@ -894,7 +837,7 @@
if (!handleType) { if (!handleType) {
if (Array.isArray(this.editForm.scope) && this.editForm.scope.length > 0) { if (Array.isArray(this.editForm.scope) && this.editForm.scope.length > 0) {
let data = { cate_ids: this.editForm.scope } let data = { cate_ids: this.editForm.scope }
getUploadQualificationListData(data).then(res=> { getUploadQualificationListData(data).then(res => {
if (res.code == 1) { if (res.code == 1) {
this.editQualificationList = res.data ? res.data : []; this.editQualificationList = res.data ? res.data : [];
} }
...@@ -929,11 +872,11 @@ ...@@ -929,11 +872,11 @@
}, },
/** 时间戳转换为 标准时间格式 */ /** 时间戳转换为 标准时间格式 */
formatterTime(time) { formatterTime(time) {
return dateFormat(time *1000, 'Y-m-d') return dateFormat(time * 1000, 'Y-m-d')
}, },
/** 上传图片限制 1张 */ /** 上传图片限制 1张 */
showTip1() { showTip1() {
this.$message({message: '最多上传1张图片', type: 'warning'}); this.$message({ message: '最多上传1张图片', type: 'warning' });
}, },
/** 资质类目 title格式化 */ /** 资质类目 title格式化 */
authTitleFormatter(textVal) { authTitleFormatter(textVal) {
...@@ -954,26 +897,18 @@ ...@@ -954,26 +897,18 @@
} }
</script> </script>
<style scoped> <style scoped>
.box-card /deep/ .uploadData .el-upload-list--picture-card .el-upload-list__item{ .box-card /deep/ .uploadData .el-upload-list--picture-card .el-upload-list__item {
line-height: 20px !important; line-height: 20px !important;
} }
.editForm /deep/ .uploadData .el-upload-list--picture-card .el-upload-list__item{
line-height: 20px !important;
}
</style>
<style lang="scss" type="text/stylus" scoped>
.shopinf-edit {
//::v-deep .el-dialog {
// height: 80%;
// overflow : hidden;
//}
//::v-deep .el-dialog__body{
// height: calc(100% - 60px);
// overflow-x: hidden;
// overflow-y: scroll;
//}
.editForm /deep/ .uploadData .el-upload-list--picture-card .el-upload-list__item {
line-height: 20px !important;
}
</style>
<style lang="scss" type="text/stylus" scoped>
.app-container{
height:100%;
overflow: auto;
} }
/* 弹窗 样式 重置 */ /* 弹窗 样式 重置 */
...@@ -997,10 +932,9 @@ ...@@ -997,10 +932,9 @@
::v-deep .el-card__body { ::v-deep .el-card__body {
height: calc(100% - 80px);
margin: 10px 0; margin: 10px 0;
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; /* overflow-y: scroll; */
} }
::v-deep .speDom { ::v-deep .speDom {
...@@ -1200,4 +1134,4 @@ ...@@ -1200,4 +1134,4 @@
//width: 80%; //width: 80%;
margin: 0 auto; margin: 0 auto;
} }
</style> </style>
\ No newline at end of file
src/views/system/supplier/suppliers.vue
浏览文件 @ 30df3295
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<!-- 分组表格 --> <!-- 分组表格 -->
<el-table <el-table
:data="tableData" :data="tableData"
:height="tableHeight"
stripe stripe
style="width: 100%" style="width: 100%"
> >
...@@ -502,6 +501,7 @@ export default { ...@@ -502,6 +501,7 @@ export default {
if (res.code == 1) { if (res.code == 1) {
this.total = res.data.count; this.total = res.data.count;
this.tableData = res.data.list; this.tableData = res.data.list;
} }
}); });
}, },
......
src/views/system/warehouse/index.vue
浏览文件 @ 30df3295
...@@ -68,7 +68,6 @@ ...@@ -68,7 +68,6 @@
<!-- 表格 --> <!-- 表格 -->
<el-table <el-table
:data="tableData" :data="tableData"
:height="tableHeight"
stripe stripe
style="width: 100%" style="width: 100%"
> >
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论