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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-06-27 15:29:16 +08:00
parent a7465440f2 1bb5db9ab6
commit 1a65d2ce90
7 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -16,7 +16,7 @@
"@xkeshi/vue-barcode": "^1.0.0",
"axios": "0.18.0",
"echarts": "^4.2.0-rc.2",
"element-ui": "2.8.2",
"element-ui": "2.10.0",
"file-saver": "^1.3.8",
"html2canvas": "^1.0.0-alpha.12",
"jquery": "^3.3.1",

4
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -32,7 +32,7 @@
</el-row>
<el-row style="margin-bottom: 5px">
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<span>物料名称:</span>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
</el-row>
@@ -215,7 +215,7 @@
</el-row>
<el-row style="margin-bottom: 5px">
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<span>零件图号:</span>
<el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
</el-row>

2
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -12,7 +12,7 @@
</el-row>
<el-row style="">
<span>物料状态:</span>
<el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select style="margin: 0"/>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
<el-button
type="success"
size="small"

14
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -315,7 +315,7 @@ export default {
name: '', // 采购件采购查询
data() {
return {
name: '',
Name: '',
spec: '',
model: '',
machineNumberValue: '',
@@ -502,10 +502,10 @@ export default {
let check1, check2, check3, check4, check5
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.name ? check3 = 1 : check3 = 0
this.Name ? check3 = 1 : check3 = 0
this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.name, check4, this.spec, check5, this.model).then(response => {
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
})
@@ -514,10 +514,10 @@ export default {
let check1, check2, check3, check4, check5
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.name ? check3 = 1 : check3 = 0
this.Name ? check3 = 1 : check3 = 0
this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.name, check4, this.spec, check5, this.model).then(response => {
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
@@ -526,10 +526,10 @@ export default {
let check1, check2, check3, check4, check5
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.name ? check3 = 1 : check3 = 0
this.Name ? check3 = 1 : check3 = 0
this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0
searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.name, check4, this.spec, check5, this.model).then(response => {
searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
})

12
src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
View File

@@ -26,7 +26,7 @@
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
style="margin-left: 10px;margin-bottom:10px"
@click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
<div style="float:right;">
<span style="margin-left: 0">采购员:</span>
@@ -49,7 +49,7 @@
:value="item.value"/>
</el-select>
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<div style="float:right;padding-top:10px;">
<el-button
type="primary"
@@ -240,7 +240,7 @@
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
style="margin-left: 10px;margin-bottom:10px"
@click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
<div style="float:right;">
<span style="margin-left: 0">采购员:</span>
@@ -263,7 +263,7 @@
:value="item.value"/>
</el-select>
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<div style="float:right;padding-top:10px;">
<el-button
type="primary"
@@ -454,7 +454,7 @@
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
style="margin-left: 10px;margin-bottom:10px"
@click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
<div style="float:right">
<span style="margin-left: 0">采购员:</span>
@@ -477,7 +477,7 @@
:value="item.value"/>
</el-select>
<span style="margin-right: -10px">物料状态:</span>
<el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
<div style="float:right;padding-top: 10px">
<el-button
type="primary"

1
src/views/dashboard/index.vue
View File

@@ -41,7 +41,6 @@ export default {
mounted() {
this.getFileList()
this.timer = setInterval(this.getFileList, 60 * 60 * 1000) // 60 分钟一刷新
this.drawLine()
},
beforeDestroy() {
clearInterval(this.timer)

12
src/views/layout/components/TagsView.vue
View File

@@ -6,7 +6,7 @@
<span class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
</router-link>
</scroll-pane>
<ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
<ul v-show="visible" :style="{left:tagLeft+'px',top:tagTop+'px','z-index': 99}" class="contextmenu">
<li @click="refreshSelectedTag(selectedTag)">重新加载</li>
<li @click="closeSelectedTag(selectedTag)">关闭当前</li>
<li @click="closeOthersTags">关闭其他</li>
@@ -25,8 +25,8 @@ export default {
data() {
return {
visible: false,
top: 0,
left: 0,
tagTop: 0,
tagLeft: 0,
selectedTag: {}
}
},
@@ -111,9 +111,9 @@ export default {
const status = Cookies.get('sidebarStatus')
this.visible = true
this.selectedTag = tag
this.left = e.clientX
if (status === '0') this.left = parseInt(e.clientX) - 200
this.top = e.clientY
this.tagLeft = e.clientX
if (status === '0') this.tagLeft = parseInt(e.clientX) - 200
this.tagTop = e.clientY
},
closeMenu() {
this.visible = false