Commit cf6168af by liangjianmin

Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem

parents 4d64c8c5 4cf84174
...@@ -292,7 +292,10 @@ body { ...@@ -292,7 +292,10 @@ body {
.el-table { .el-table {
color: #646B78; color: #646B78;
} }
.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #1969F9;
border-color: #1969F9;
}
.el-table__header { .el-table__header {
th { th {
font-weight: normal; font-weight: normal;
...@@ -352,7 +355,7 @@ body { ...@@ -352,7 +355,7 @@ body {
//弹窗公共样式 //弹窗公共样式
.el-dialog__body { .el-dialog__body {
padding: 0 20px !important; padding:20px !important;
} }
.el-dialog__title { .el-dialog__title {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
}, },
watch: {}, watch: {},
created() { created() {
Message('这是一条消息提示');
}, },
computed: {}, computed: {},
methods: { methods: {
......
...@@ -43,7 +43,9 @@ ...@@ -43,7 +43,9 @@
<div class="fl dcg heti xjk" @click="handleClose">下架</div> <div class="fl dcg heti xjk" @click="handleClose">下架</div>
</div> </div>
<div class="data-box"> <div class="data-box">
<el-table :data="tableData" border style="width: 100%"> <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="37">
</el-table-column>
<el-table-column fixed prop="inquiry_sn" label="供应商内部型号编码" width="200"> <el-table-column fixed prop="inquiry_sn" label="供应商内部型号编码" width="200">
</el-table-column> </el-table-column>
<el-table-column fixed prop="goods_name" label="型号" width="200"> <el-table-column fixed prop="goods_name" label="型号" width="200">
...@@ -70,9 +72,26 @@ ...@@ -70,9 +72,26 @@
</el-table> </el-table>
</div> </div>
<!--修改库存弹窗--> <!--修改库存弹窗-->
<el-dialog title="修改库存" :visible.sync="dialogVisible" width="30%" > <el-dialog title="修改库存" :visible.sync="dialogVisible" width="30%">
<div class="kc-mask"> <div class="kc-mask">
修改库存 <el-table :data="kucundata" border style="width: 100%">
<el-table-column prop="goods_name" label="型号" min-width="25%">
</el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="25%">
</el-table-column>
<el-table-column prop="inquiry_number" label="库存数量" min-width="25%">
</el-table-column>
<el-table-column label="修改库存" min-width="25%">
<template slot-scope="scope">
<el-input v-model="updateKc" placeholder="点击修改"
onkeyup="if(event.keyCode !=37 &amp;&amp; event.keyCode != 39){if (!/^[\d]+$/ig.test(this.value)){this.value='';}}">
</el-input>
</template>
</el-table-column>
</el-table>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
...@@ -80,9 +99,25 @@ ...@@ -80,9 +99,25 @@
</span> </span>
</el-dialog> </el-dialog>
<!--修改库存弹窗--> <!--修改库存弹窗-->
<el-dialog title="修改交期" :visible.sync="dialogVisible2" width="30%" > <el-dialog title="修改交期" :visible.sync="dialogVisible2" width="30%">
<div class="kc-mask"> <div class="kc-mask">
修改货期 <el-table :data="huoqidata" border style="width: 100%">
<el-table-column prop="goods_name" label="型号" min-width="25%">
</el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="25%">
</el-table-column>
<el-table-column prop="inquiry_number" label="库存数量" min-width="25%">
</el-table-column>
<el-table-column label="修改库存" min-width="25%">
<template slot-scope="scope">
<el-input v-model="updateHq" placeholder="点击修改"
onkeyup="if(event.keyCode !=37 &amp;&amp; event.keyCode != 39){if (!/^[\d]+$/ig.test(this.value)){this.value='';}}">
</el-input>
</template>
</el-table-column>
</el-table>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible2 = false">取 消</el-button> <el-button @click="dialogVisible2 = false">取 消</el-button>
...@@ -123,14 +158,50 @@ ...@@ -123,14 +158,50 @@
data() { data() {
return { return {
dialogVisible:false, dialogVisible: false,
dialogVisible2:false, dialogVisible2: false,
formInline: { formInline: {
goods_name: '', goods_name: '',
status: '', status: '',
brand: '', brand: '',
date: '' date: ''
}, },
multipleSelection: [],
updateKc: "",
updateHq: "",
huoqidata: [{
"id": 318,
"inquiry_sn": "X2021050609556",
"goods_name": "M4",
"brand_name": "TR FASTENINGS",
"inquiry_number": 1,
"batch": "1",
"delivery_time": "1天",
"status_val": "已报价(1)",
"quote_count": 1,
"currency": 1,
"status_a": 1,
"user_name": "admin",
"create_name": "admin@ichunt.com",
"create_time": "2021-05-08 09:41:42"
}, ],
kucundata: [{
"id": 318,
"inquiry_sn": "X2021050609556",
"goods_name": "M4",
"brand_name": "TR FASTENINGS",
"inquiry_number": 1,
"batch": "1",
"delivery_time": "1天",
"status_val": "已报价(1)",
"quote_count": 1,
"currency": 1,
"status_a": 1,
"user_name": "admin",
"create_name": "admin@ichunt.com",
"create_time": "2021-05-08 09:41:42"
}, ],
tableData: [{ tableData: [{
"id": 318, "id": 318,
"inquiry_sn": "X2021050609556", "inquiry_sn": "X2021050609556",
...@@ -188,14 +259,19 @@ ...@@ -188,14 +259,19 @@
}) })
}, },
handleSelectionChange(val) {
this.multipleSelection = val;
console.log(this.multipleSelection)
},
handleCommand(command) { handleCommand(command) {
console.log(command) console.log(command)
if (command == 1) { if (command == 1) {
//修改库存弹窗 //修改库存弹窗
this.dialogVisible=true this.dialogVisible = true
} else { } else {
//修改货期弹窗 //修改货期弹窗
this.dialogVisible2=true this.dialogVisible2 = true
} }
}, },
handleClose(done) { handleClose(done) {
......
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