Skip to content

肖康 / cloudSystem

Go to a project
Commit d3c05351 by LJM
Options

Merge branch 'ljm_2022-10-25' into dev/ver/2.0.0

parents 18129972 ee52af11
Inline Side-by-side
Showing with 129 additions and 32 deletions
src/assets/css/goods/brand.min.css.map
{"version":3,"sources":["brand.less"],"names":[],"mappings":"AAAA,QACI;EACI,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AALR,QAOI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AACA,QAVJ,YAUK;EACG,mBAAA;;AAlBZ,QAqBI;EACI,gBAAA;EACA,mBAAA;;AAvBR,QAqBI,SAII;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,kBAAA;EACA,eAAA;EACA,oBAAA;;AACA,QAhBR,SAII,KAYK;EACG,mBAAA;EACA,eAAA;EACA,WAAA;;AAEJ,QArBR,SAII,KAiBK;EACG,yBAAA;EACA,mBAAA;EACA,cAAA;;AACA,QAzBZ,SAII,KAiBK,OAII;EACG,mBAAA;EACA,WAAA;;AAhDpB,QAqBI,SAkCI;EAEI,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AACA,QA9CR,SAkCI,SAYK;EAEG,mBAAA;EACA,WAAA;;AAtEhB,QA2EI;EACI,UAAA;EACA,YAAA","file":"brand.min.css"}
\ No newline at end of file
{"version":3,"sources":["brand.less"],"names":[],"mappings":"AAAA,QACI;EACI,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AALR,QAQI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,QAXJ,YAWK;EACG,mBAAA;;AApBZ,QAwBI;EACI,gBAAA;EACA,mBAAA;;AA1BR,QAwBI,SAII;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,kBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,QAjBR,SAII,KAaK;EACG,mBAAA;EACA,eAAA;EACA,WAAA;;AAGJ,QAvBR,SAII,KAmBK;EACG,yBAAA;EACA,mBAAA;EACA,cAAA;;AAEA,QA5BZ,SAII,KAmBK,OAKI;EACG,mBAAA;EACA,WAAA;;AAtDpB,QAwBI,SAuCI;EAEI,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AAEA,QApDR,SAuCI,SAaK;EAEG,mBAAA;EACA,WAAA;;AA/EhB,QAqFI;EACI,UAAA;EACA,YAAA","file":"brand.min.css"}
\ No newline at end of file
src/assets/css/goods/goods.min.css
.goods .pdf{color:#666}.goods .pdf span{font-size:20px}.goods .pdf:hover{color:#1969F9;cursor:pointer}.goods .goods-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.goods .search-btn{cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.goods .search-btn:hover{background:#0050E0}.goods .btn-nav{margin-top:11px;margin-bottom:22px}.goods .btn-nav .dcg{width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;background:#E5EEFF;color:#1969F9;margin-right:10px;font-size:14px;transition:all .5s}.goods .btn-nav .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.goods .btn-nav .dcg.delbtn{border:1px solid #FC1F00;background:#FFE7E3;color:#FC1F00}.goods .btn-nav .dcg.delbtn:hover{background:#FF715D;color:#fff}.goods .btn-nav .updatex{height:26px;line-height:26px;text-align:center;background:#FFEEDD;border:1px solid #FF870D;border-radius:2px;color:#FF870D;font-size:14px;cursor:pointer;width:66px}.goods .btn-nav .updatex:hover{background:#FCA955;color:#fff}.goods .brand-img{width:80%;height:80}.goods .xktitle{border-left:5px solid #1969F9;height:38px;line-height:38px;background:#f3f3f3;padding-left:20px;font-weight:bold;color:#333}.goods .infoboxpx{padding:15px;padding-bottom:30px}.goods .infoboxpx .el-col{margin-top:15px}
\ No newline at end of file
.goods .pdf {
color: #666;
}
.goods .pdf span {
font-size: 20px;
}
.goods .pdf:hover {
color: #1969F9;
cursor: pointer;
}
.goods .goods-con {
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #E5EBF6;
padding: 20px;
}
.goods .search-btn {
cursor: pointer;
width: 76px;
height: 37px;
line-height: 37px;
background: #1969F9;
border-radius: 2px;
font-size: 14px;
color: #fff;
text-align: center;
}
.goods .search-btn:hover {
background: #0050E0;
}
.goods .btn-nav {
margin-top: 11px;
margin-bottom: 22px;
}
.goods .btn-nav .dcg {
width: 66px;
height: 26px;
border-radius: 2px;
text-align: center;
line-height: 26px;
border: 1px solid #1969F9;
background: #E5EEFF;
color: #1969F9;
margin-right: 10px;
font-size: 14px;
transition: all 0.5s;
}
.goods .btn-nav .dcg:hover {
background: #1969F9;
cursor: pointer;
color: #fff;
}
.goods .btn-nav .dcg.delbtn {
border: 1px solid #FC1F00;
background: #FFE7E3;
color: #FC1F00;
}
.goods .btn-nav .dcg.delbtn:hover {
background: #FF715D;
color: #fff;
}
.goods .btn-nav .updatex {
height: 26px;
line-height: 26px;
text-align: center;
background: #FFEEDD;
border: 1px solid #FF870D;
border-radius: 2px;
color: #FF870D;
font-size: 14px;
cursor: pointer;
width: 66px;
}
.goods .btn-nav .updatex:hover {
background: #FCA955;
color: #fff;
}
.goods .brand-img {
width: 80%;
height: 80;
}
.goods .xktitle {
border-left: 5px solid #1969F9;
height: 38px;
line-height: 38px;
background: #f3f3f3;
padding-left: 20px;
font-weight: bold;
color: #333;
}
.goods .infoboxpx {
padding: 15px;
padding-bottom: 30px;
}
.goods .infoboxpx .el-col {
margin-top: 15px;
}
/*# sourceMappingURL=goods.min.css.map */
\ No newline at end of file
src/assets/css/goods/goods.min.css.map
{"version":3,"sources":["goods.less"],"names":[],"mappings":"AAAA,MACI;EAKI,WAAA;;AANR,MACI,KACI;EACI,eAAA;;AAKJ,MAPJ,KAOK;EACG,cAAA;EACA,eAAA;;AAVZ,MAcI;EACI,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAlBR,MAqBI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,MAXJ,YAWK;EACG,mBAAA;;AAjCZ,MAqCI;EACI,gBAAA;EACA,mBAAA;;AAvCR,MAqCI,SAII;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EAEA,cAAA;EACA,kBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,MAlBR,SAII,KAcK;EACG,mBAAA;EACA,eAAA;EACA,WAAA;;AAGJ,MAxBR,SAII,KAoBK;EACG,yBAAA;EACA,mBAAA;EACA,cAAA;;AAEA,MA7BZ,SAII,KAoBK,OAKI;EACG,mBAAA;EACA,WAAA;;AApEpB,MAqCI,SAsCI;EAEI,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AAEA,MAnDR,SAsCI,SAaK;EAEG,mBAAA;EACA,WAAA;;AA3FhB,MAiGI;EACI,UAAA;EACA,UAAA","file":"goods.min.css"}
\ No newline at end of file
{"version":3,"sources":["goods.less"],"names":[],"mappings":"AAAA,MACI;EAKI,WAAA;;AANR,MACI,KACI;EACI,eAAA;;AAKJ,MAPJ,KAOK;EACG,cAAA;EACA,eAAA;;AAVZ,MAcI;EACI,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAlBR,MAqBI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAEA,MAXJ,YAWK;EACG,mBAAA;;AAjCZ,MAqCI;EACI,gBAAA;EACA,mBAAA;;AAvCR,MAqCI,SAII;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,kBAAA;EACA,eAAA;EACA,oBAAA;;AAEA,MAjBR,SAII,KAaK;EACG,mBAAA;EACA,eAAA;EACA,WAAA;;AAGJ,MAvBR,SAII,KAmBK;EACG,yBAAA;EACA,mBAAA;EACA,cAAA;;AAEA,MA5BZ,SAII,KAmBK,OAKI;EACG,mBAAA;EACA,WAAA;;AAnEpB,MAqCI,SAqCI;EAEI,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AAEA,MAlDR,SAqCI,SAaK;EAEG,mBAAA;EACA,WAAA;;AA1FhB,MAgGI;EACI,UAAA;EACA,UAAA;;AAlGR,MAsGI;EACI,8BAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,iBAAA;EACA,WAAA;;AA7GR,MAgHI;EACI,aAAA;EACA,oBAAA;;AAlHR,MAgHI,WAII;EACI,gBAAA","file":"goods.min.css"}
\ No newline at end of file
src/views/Goods/goods.vue
......@@ -23,23 +23,23 @@
<div class="data-box th-all" v-if="tableData">
<el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="40"></el-table-column>
<el-table-column prop="spu_name" label="型号" min-width="15%"></el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="15%"></el-table-column>
<el-table-column prop="encap" label="封装" min-width="15%">
<el-table-column prop="spu_name" label="型号" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="brand_name" label="品牌" width="200" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="encap" label="封装" width="100" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="pdf" label="规格书" min-width="15%">
<el-table-column prop="pdf" label="规格书" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope" v-if="scope.row.pdf">
<a :href="scope.row.pdf" target="_blank" class="pdf"><span class="icon iconfont"></span></a>
</template>
</el-table-column>
<el-table-column prop="images_l" label="图片" min-width="15%">
<el-table-column prop="images_l" label="图片" width="130" align="center">
<template slot-scope="scope" v-if="scope.row.images_l">
<img :src="scope.row.images_l" class="brand-img" alt="">
<el-image style="width: 100px; height: 23px" :src="scope.row.images_l" fit="cover" :preview-src-list="[scope.row.images_l]"></el-image>
</template>
</el-table-column>
<el-table-column prop="remark" label="商品备注" min-width="15%"></el-table-column>
<el-table-column prop="create_time" label="创建时间" min-width="15%"></el-table-column>
<el-table-column prop="update_time" label="更新时间" min-width="15%"></el-table-column>
<el-table-column prop="remark" label="商品备注" min-width="50" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="create_time" label="创建时间" width="140"></el-table-column>
<el-table-column prop="update_time" label="更新时间" width="140"></el-table-column>
</el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div>
......@@ -83,11 +83,11 @@
<script>
import Vue from 'vue';
import Menu from "@/components/menu.vue";
import {Autocomplete, Button, Cascader, Dialog, Form, FormItem, Input, Message, Option, Pagination, Select, Table, TableColumn} from 'element-ui'
import {Autocomplete, Button, Cascader, Dialog, Form, FormItem, Image, Input, Message, Option, Pagination, Select, Table, TableColumn} from 'element-ui'
Vue.prototype.$message = Message
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination)
Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete)
Vue.use(TableColumn).use(Table).use(Cascader).use(Autocomplete).use(Image)
export default {
name: "brand",
data() {
......@@ -99,7 +99,7 @@ export default {
page: 1,
downHref: "",
formParam: {
goods_name: '',
goods_name: 'ISL29035IROZ-T7',
brand_name: '',
keyword: '',
class_id2: '',
......@@ -213,14 +213,14 @@ export default {
updateBrand() {
if (this.multipleSelection.length > 1) {
this.$message({
message:'只能选择一条数据',
message: '只能选择一条数据',
type: 'warning'
});
return false;
}
if (this.multipleSelection.length == 0) {
this.$message({
message:'请至少选择一条数据',
message: '请至少选择一条数据',
type: 'warning'
});
return false;
......
src/views/OrderTrack/goods.vue
......@@ -55,7 +55,7 @@
<div class="data-box th-all" v-if="tableData">
<el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="40"></el-table-column>
<el-table-column label="订货公司" min-width="150">
<el-table-column label="订货公司" min-width="160" :show-overflow-tooltip="true">
<template slot-scope="scope">
<a :href="'/#/orderTrackGoodsDetail?purchase_id='+scope.row.purchase_id" class="f-blue">{{ scope.row.company_name }}</a>
</template>
......@@ -71,7 +71,7 @@
</template>
</el-table-column>
<el-table-column prop="pay_name" label="对方付款方式" min-width="100"></el-table-column>
<el-table-column prop="pay_status_val" label="收款状态" min-width="80">
<el-table-column prop="pay_status_val" label="收款状态" min-width="85">
<template slot-scope="scope">
<el-tag type="primary" v-if="scope.row.pay_status_val == '待付款'" disable-transitions>{{ scope.row.pay_status_val }}</el-tag>
<el-tag type="warning" v-if="scope.row.pay_status_val == '部分付款'" disable-transitions>{{ scope.row.pay_status_val }}</el-tag>
......@@ -125,7 +125,7 @@ export default {
limit: 10,
page: 1,
dialogVisible: false,
logs:[],
logs: [],
formInline: {
goods_name: '',
brand_name: '',
......
src/views/OrderTrack/invoice.vue
......@@ -30,12 +30,12 @@
<div class="data-box th-all" v-if="tableData">
<el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="40"></el-table-column>
<el-table-column prop="stock_in_sn" label="发货单号" width="160"></el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="150"></el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="150"></el-table-column>
<el-table-column prop="out_qty" label="发货数量" min-width="80"></el-table-column>
<el-table-column prop="in_qty" label="到货数量" min-width="80"></el-table-column>
<el-table-column prop="status_val" label="状态" min-width="60">
<el-table-column prop="stock_in_sn" label="发货单号" width="160" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="150" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="out_qty" label="发货数量" min-width="80" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="in_qty" label="到货数量" min-width="80" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="status_val" label="状态" min-width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.status == 2 " disable-transitions>{{ scope.row.status_val }}</el-tag>
<el-tag type="primary" v-else-if="scope.row.status == 1 " disable-transitions>{{ scope.row.status_val }}</el-tag>
......
src/views/Store/enter.vue
......@@ -34,7 +34,7 @@
<a :href="'/#/listDetail?sn='+scope.row.up_sn+'&id='+scope.row.id" class="f-blue">{{ scope.row.up_sn }}</a>
</template>
</el-table-column>
<el-table-column prop="file_name" label="文件名字" min-width="20%">
<el-table-column prop="file_name" label="文件名字" min-width="20%" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="status" label="状态" min-width="20%">
<template slot-scope="scope">
......
src/views/Store/list.vue
......@@ -213,8 +213,8 @@ export default {
status: this.formParam.status,
brand_id: this.formParam.brand_id,
brand_name: this.formParam.brand_name,
action_time: this.formParam.date[0],
end_time: this.formParam.date[1]
action_time: this.formParam.date ? this.formParam.date[0] : '',
end_time: this.formParam.date ? this.formParam.date[1] : ''
}).then(res => {
if (res.code === 0) {
this.tableData = res.data.list || [];
......
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 sign in to comment