meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NVARBARdialog

Browse Source
This commit is contained in:
zhangdingyu
2019-10-10 20:05:03 +08:00
parent 5bb1402474
commit e2ae5962ce
3 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/Inventory/OfflinePartsStorage/index.vue
View File

@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<span>合同：</span>
<el-select v-model="contractValue" placeholder="请选择合同" filterable size="small" style="width: 200px">
<el-select v-model="contractValue" placeholder="请选择合同" filterable clearable size="small" style="width: 200px">
<el-option
v-for="item in contract"
:key="item.value"
@@ -20,20 +20,16 @@
<el-button type="success" size="small" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
</el-card>
<el-card>
<el-table ref="multipleTable" :data="table1" border size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" height="350px" @selection-change="handleSelectionChange">
<el-table ref="multipleTable" :data="table1" border size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
<el-table-column label="名称" width="200px" align="center" show-overflow-tooltip prop="物料名称">
<template slot-scope="scope">
<el-tooltip :content="scope.row.物料名称" effect="dark">
<span>{{ scope.row.物料名称 }}</span>
</el-tooltip>
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="规格型号" min-width="300px" align="center" show-overflow-tooltip>
<el-table-column label="规格型号" width="300px" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<el-tooltip :content="scope.row.物料规格 + ' ' + scope.row.物料型号" effect="dark">
<span>{{ scope.row.物料规格 + ' ' + scope.row.物料型号 }}</span>
</el-tooltip>
{{ scope.row.物料规格 + '&nbsp;' + scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="180" show-overflow-tooltip prop="数量">
@@ -233,7 +229,6 @@ export default {
// 获取人员编号
getpeopleid() {
this.inventoryPeople = Cookie.get('id')
console.log(this.inventoryPeople)
},
// 查询离线合同明细
async searchContractDetail() {
@@ -256,7 +251,6 @@ export default {
this.$set(v, '本次到货数量', v.数量 - v.到货数量)
return v
})
console.log(res.data)
if (res.data.length > 0) {
this.supplierName = res.data[0].供应商名称
this.contractNumber = res.data[0].离线合同编号
@@ -278,7 +272,6 @@ export default {
} else if (!this.locateNumber) {
this.$message.warning('请选择货位或者扫码货位二维码')
} else {
console.log(this.multipleSelection)
const materialGroup = []
const numberGroup = []
const partGroup = []
@@ -293,7 +286,6 @@ export default {
center: 'true',
type: 'warning'
}).then(async() => {
console.log(materialGroup, partGroup, numberGroup, this.locateNumber)
const param = {
url: url,
method: 'post',

4
src/views/Inventory/PurchasePartsStorage/index.vue
View File

@@ -126,11 +126,11 @@
</el-row>
</el-form>
</el-card>
<el-table v-show="true" :data="tableData" border style="width: 100%;margin-top:20px;">
<el-table v-show="false" :data="tableData" border style="width: 100%;margin-top:20px;">
<el-table-column v-for="item of tableHeader" :key="item" :label="item">
<el-table-column label="重量" width="120">
<template slot-scope="scope">
{{ scope.row.address }}
<!--{{ scope.row[${item}重量] }}-->
</template>
</el-table-column>
<el-table-column label="金额" width="120">

54
src/views/layout/components/Navbar.vue
View File

@@ -1,24 +1,37 @@
<template>
<el-menu class="navbar" mode="horizontal" style="background: rgb(87,177,253)!important;">
<hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
<breadcrumb />
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<img :src="require('@/assets/img/user.jpg')" class="user-avatar">
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<router-link class="inlineBlock" to="/">
<el-dropdown-item>
主页
<div>
<el-menu class="navbar" mode="horizontal" style="background: rgb(87,177,253)!important;">
<hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
<breadcrumb />
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<img :src="require('@/assets/img/user.jpg')" class="user-avatar">
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<router-link class="inlineBlock" to="/">
<el-dropdown-item>
主页
</el-dropdown-item>
</router-link>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出</span>
</el-dropdown-item>
</router-link>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-menu>
</el-dropdown-menu>
</el-dropdown>
</el-menu>
<el-dialog :visible.sync="dialogFormVisible" title="打回档案" center width="28%">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="打回原因" prop="reason">
<el-input v-model="form.reason" size="small" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="callOff1('form1')">取消</el-button>
<el-button size="small" type="primary" @click="submit1('form1')">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
@@ -35,6 +48,9 @@ export default {
},
data() {
return {
dialogFormVisible: false,
form: {},
rules: {},
timer: '',
noticeContract: null,
noticeFund: null,