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.112:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-01-26 16:22:48 +08:00
parent 266ce2f3b3 3bd41eb18d
commit a8539999aa
8 changed files with 269 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/ManufacturingCenter/MaterialArrivalManagement.js
View File

@@ -25,18 +25,6 @@ export function searchtable2(num1) {
}
})
}
// 更改打印状态
export function edit(num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_备料到货_状态更改',
param: '工艺计划流水号=' + num1
}
})
}
export function handlechange(Number, code) {
return request({

18
src/utils/request.js
View File

@@ -3,24 +3,24 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket`
export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
export const readFile = `192.168.1.212:8411/webpage/file/` // invoice
export const readImg = `192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `192.168.1.212:8411/submit/upload2.ashx` // delivery
export const upload3 = `192.168.1.212:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const readFile = `192.168.1.231:8411/webpage/file/` // invoice
export const readImg = `192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `192.168.1.231:8411/submit/upload2.ashx` // delivery
export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间

104
src/views/BasicData/PersonnelManagement/index.vue
View File

@@ -17,36 +17,36 @@
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button>
<el-button type="danger" icon="el-icon-circle-close-outline" size="small" @click="Quit()">离职</el-button>
<el-button type="text" size="small" style="float: right" @click="searchLeavingList">离职名单</el-button>
<!--<el-button v-popover:popover4 type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动-->
<!--</el-button>-->
<el-button v-popover:popover4 :disabled="disabledMove" type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动
</el-button>
<!--<el-button size="small" @click="postMaintain()">岗位维护</el-button>-->
<!--<el-popover-->
<!--ref="popover4"-->
<!--width="178"-->
<!--placement="right"-->
<!--trigger="click"-->
<!--@hide="hide()">-->
<!--<el-dropdown size="small" placement="bottom-start" style="margin-right: 0">-->
<!--<el-input-->
<!--v-model="nodeName1"-->
<!--:disabled="true"-->
<!--size="small"-->
<!--placeholder="请选择部门"/>-->
<!--<el-button type="text" size="small" style="margin-left: 60px; margin-top: 15px" @click="moveGroupConfim">-->
<!--确认-->
<!--</el-button>-->
<!--<el-dropdown-menu slot="dropdown">-->
<!--<el-tree-->
<!--ref="treeForm"-->
<!--:data="departmentData"-->
<!--:props="defaultProps"-->
<!--style="width: 150px"-->
<!--node-key="id"-->
<!--accordion-->
<!--@node-click="NodeClick"/>-->
<!--</el-dropdown-menu>-->
<!--</el-dropdown>-->
<!--</el-popover>-->
<el-popover
ref="popover4"
width="178"
placement="right"
trigger="click"
@hide="hide()">
<el-dropdown size="small" placement="bottom-start" style="margin-right: 0">
<el-input
v-model="nodeName1"
:disabled="true"
size="small"
placeholder="请选择部门"/>
<el-button type="text" size="small" style="margin-left: 60px; margin-top: 15px" @click="moveGroupConfim">
确认
</el-button>
<el-dropdown-menu slot="dropdown">
<el-tree
ref="treeForm"
:data="departmentData"
:props="defaultProps"
style="width: 150px"
node-key="id"
accordion
@node-click="NodeClick"/>
</el-dropdown-menu>
</el-dropdown>
</el-popover>
</el-card>
</el-col>
</el-row>
@@ -124,12 +124,12 @@
</el-table-column>
<el-table-column align="center" label="入职时间" width="100">
<template slot-scope="scope">
{{ scope.row.入公司时间 }}
{{ scope.row.入公司时间 !== '' && scope.row.入公司时间 !== null ? scope.row.入公司时间 = scope.row.入公司时间.split(' ')[0]: scope.row.入公司时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="出生日期" width="100">
<template slot-scope="scope">
{{ scope.row.出生日期 }}
{{ scope.row.出生日期 !== '' && scope.row.出生日期 !== null ? scope.row.出生日期 = scope.row.出生日期.split(' ')[0]: scope.row.出生日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系方式" width="110">
@@ -170,7 +170,7 @@
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="PageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@@ -345,12 +345,12 @@
</el-table-column>
<el-table-column align="center" label="入职时间" width="100">
<template slot-scope="scope">
{{ scope.row.入公司时间 }}
{{ scope.row.入公司时间 !== '' && scope.row.入公司时间 !== null ? scope.row.入公司时间 = scope.row.入公司时间.split(' ')[0]: scope.row.入公司时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="出生日期" width="100">
<template slot-scope="scope">
{{ scope.row.出生日期 }}
{{ scope.row.出生日期 !== '' && scope.row.出生日期 !== null ? scope.row.出生日期 = scope.row.出生日期.split(' ')[0]: scope.row.出生日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系方式" width="110">
@@ -368,7 +368,7 @@
{{ scope.row.民族 }}
</template>
</el-table-column>
<el-table-column align="center" label="家庭住址" width="200">
<el-table-column align="center" label="家庭住址">
<template slot-scope="scope">
{{ scope.row.家庭住址 }}
</template>
@@ -389,10 +389,11 @@
</template>
<script>
import { getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
import { moveGroups, getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
export default {
data() {
return {
disabledMove: true,
PageCurrentN: 1,
PageSizeN: 10,
totalN: null,
@@ -403,7 +404,7 @@ export default {
i: 1,
id: '',
PageCurrent: 1,
PageSize: 10,
PageSize: 50,
List: [],
total: null,
nodeName: '',
@@ -729,6 +730,7 @@ export default {
},
handleSelectionChange(val) {
this.multipleSelection = val
this.multipleSelection.length === 0 ? this.disabledMove = true : this.disabledMove = false
},
Quit() {
if (this.multipleSelection.length === 0) {
@@ -761,6 +763,34 @@ export default {
searchLeavingList() {
this.LeavingListVisiable = true
this.getTable(searchLeavingList, [this.PageCurrentN, this.PageSizeN], ['LeavingList', 'totalN'])
},
moveGroupConfim() {
this.id = this.node
for (let i = 0; i < this.multipleSelection.length; i++) {
moveGroups(this.multipleSelection[i].人员编号, this.node).then(response => {
if (response.data[0].result === '1') {
this.handleNodeClick()
if (i === this.multipleSelection.length - 1) {
this.$message.success('移组成功')
}
} else {
this.$message.error('更新失败')
}
})
}
},
hide() {
this.nodeName1 = ''
this.node = ''
},
moveGroup() {
if (this.multipleSelection.length === 0) {
this.$message.warning('请至少选择一个人员')
}
},
NodeClick(data) {
this.node = data.id
this.nodeName1 = data.label
}
}
}

6
src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
View File

@@ -94,12 +94,12 @@
<el-table-column property="date" label="操作" align="center">
<template slot-scope="scope">
<el-button
v-if="scope.row.调序权限===0"
v-if="scope.row.调序权限==='0'"
size="mini"
type="success"
@click="JurisdictionControl1(scope.row)">开启</el-button>
<el-button
v-if="scope.row.调序权限===1"
v-if="scope.row.调序权限==='1'"
size="mini"
type="danger"
@click="JurisdictionControl2(scope.row)">关闭</el-button>
@@ -165,7 +165,7 @@ export default {
getMachine().then(response => {
this.gridData = response.data
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].调序权限 === 1) { this.count = this.count + 1 }
if (response.data[i].调序权限 === '1') { this.count = this.count + 1 }
}
this.num = this.count
})

203
src/views/ManufacturingCenter/ProcessPlanning/index.vue
View File

@@ -67,7 +67,7 @@
<el-row>
<el-col :span="4">
<span>物料类型:</span>
<el-select v-model="materielValue" size="small" style="margin-top: 20px;width:100px" placeholder="物料类型" @change="clear()">
<el-select v-model="materielValue" size="small" style="margin-top: 20px;width:120px" placeholder="物料类型" @change="clear()">
<el-option
v-for="item in materiel"
:key="item.value"
@@ -75,22 +75,54 @@
:value="item.value"/>
</el-select>
</el-col>
<el-col v-show="materielValue==='1'" :span="20">
<el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="20">
<span>直径:</span>
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>长度:</span>
<el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ ()
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>
</el-col>
<el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
<span>长:</span>
<el-input-number v-model="Length" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>宽:</span>
<el-input-number v-model="Width" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>高:</span>
<span>厚:</span>
<el-input-number v-model="height1" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
</el-col>
<el-col v-show="materielValue==='2'" :span="20">
<span>直径:</span>
<el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>高:</span>
<el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation2()">计算重量</el-button>
</el-col>
<el-col v-show="materielValue==='3'" :span="20">
<span>对边宽:</span>
<el-input-number v-model="OppositeSideWidth" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>长度:</span>
<el-input-number v-model="length2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation3()">计算重量</el-button>
</el-col>
<el-col v-show="materielValue==='4'" :span="20">
<span>边宽:</span>
<el-input-number v-model="biankuan" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>边厚:</span>
<el-input-number v-model="bianhou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>长度:</span>
<el-input-number v-model="changdu" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation4()">计算重量</el-button>
</el-col>
<el-col v-show="materielValue==='5'" :span="20">
<span>壁厚:</span>
<el-input-number v-model="bihou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>外径:</span>
<el-input-number v-model="waijing" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<span>长度:</span>
<el-input-number v-model="changdu2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation5()">计算重量</el-button>
</el-col>
</el-row>
</div>
</el-card>
@@ -112,7 +144,7 @@
<el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
<el-button-group v-if="isShow1" style="margin: 10px">
<el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
<el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
<el-button v-if="false" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
</el-button>
<el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺
</el-button>
@@ -563,22 +595,60 @@ export default {
},
data() {
return {
lastFocusText: '',
Result1: '',
Result2: '',
Result3: '',
Result4: '',
Result5: '',
Length: '',
Width: '',
height1: '',
diameter: '',
height2: '',
OppositeSideWidth: '',
length2: '',
biankuan: '',
bianhou: '',
changdu: '',
bihou: '',
waijing: '',
changdu2: '',
materielValue: '1',
materiel: [{
value: '1',
label: '方'
label: '园钢'
}, {
value: '2',
label: '柱'
label: '钢板'
}, {
value: '3',
label: '六角钢'
}, {
value: '4',
label: '角钢'
}, {
value: '5',
label: '钢管'
}, {
value: '6',
label: '园紫铜棒'
}, {
value: '7',
label: '园黄铜棒'
}, {
value: '8',
label: '园铝棒'
}, {
value: '9',
label: '紫铜板'
}, {
value: '10',
label: '黄铜板'
}, {
value: '11',
label: '6061铝板'
}],
materielValue: '1',
total: 0,
pageCurrent: 1,
pageSize: 10,
@@ -688,30 +758,121 @@ export default {
this.height1 = ''
this.diameter = ''
this.height2 = ''
this.OppositeSideWidth = ''
this.biankuan = ''
this.bianhou = ''
this.changdu = ''
this.bihou = ''
this.waijing = ''
this.changdu2 = ''
},
// 长宽高计算
// 直径高计算
Calculation1() {
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请先选择一个零件')
} else {
this.Result1 = '长:' + this.Length + ' 宽:' + this.Width + ' 高:' + this.height1 + ' 重量:' + parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1)
WeightCopy(this.partNumValue, this.Result1).then(response => {
if (this.materielValue === '1') {
this.Result2 = '物料:' + this.materiel[1].label + ' 直径:' + this.diameter + 'mm 长度:' + this.height2 + 'mm 重量:' + 0.00617 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2) + 'kg'
WeightCopy(this.partNumValue, this.Result2).then(response => {
this.searchDetail()
})
}
if (this.materielValue === '6') {
this.Result2 = '物料:' + this.materiel[6].label + ' 直径:' + this.diameter + 'mm 长度:' + this.height2 + 'mm 重量:' + 0.00698 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2) + 'kg'
WeightCopy(this.partNumValue, this.Result2).then(response => {
this.searchDetail()
})
}
if (this.materielValue === '7') {
this.Result2 = '物料:' + this.materiel[7].label + ' 直径:' + this.diameter + 'mm 长度:' + this.height2 + 'mm 重量:' + 0.00668 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2) + 'kg'
WeightCopy(this.partNumValue, this.Result2).then(response => {
this.searchDetail()
})
}
if (this.materielValue === '8') {
this.Result2 = '物料:' + this.materiel[8].label + ' 直径:' + this.diameter + 'mm 长度:' + this.height2 + 'mm 重量:' + 0.0022 * 0.001 * parseInt(this.diameter) * parseInt(this.diameter) * parseFloat(this.height2) + 'kg'
WeightCopy(this.partNumValue, this.Result2).then(response => {
this.searchDetail()
})
}
}
},
// 直径高计算
// 长宽高计算
Calculation2() {
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请先选择一个零件')
} else {
this.Result2 = Math.pow(parseInt(this.diameter) / 2, 2) * parseFloat(this.height2) * Math.PI
this.Result2 = this.Result2.toFixed(2)
this.Result3 = '直径:' + this.diameter + ' 高:' + this.height2 + ' 重量:' + this.Result2
if (this.materielValue === '2') {
this.Result1 = '物料:' + this.materiel[2].label + ' 长:' + this.Length + 'mm 宽:' + this.Width + 'mm 厚:' + this.height1 + 'mm 重量:' + 0.001 * 0.00785 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1) + 'kg'
WeightCopy(this.partNumValue, this.Result1).then(response => {
this.searchDetail()
})
}
if (this.materielValue === '9') {
this.Result1 = '物料:' + this.materiel[9].label + ' 长:' + this.Length + 'mm 宽:' + this.Width + 'mm 厚:' + this.height1 + 'mm 重量:' + 0.001 * 0.0089 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1) + 'kg'
WeightCopy(this.partNumValue, this.Result1).then(response => {
this.searchDetail()
})
}
if (this.materielValue === '10') {
this.Result1 = '物料:' + this.materiel[10].label + ' 长:' + this.Length + 'mm 宽:' + this.Width + 'mm 厚:' + this.height1 + 'mm 重量:' + 0.001 * 0.0085 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1) + 'kg'
WeightCopy(this.partNumValue, this.Result1).then(response => {
this.searchDetail()
})
}
if (this.materielValue === '11') {
this.Result1 = '物料:' + this.materiel[11].label + ' 长:' + this.Length + 'mm 宽:' + this.Width + 'mm 厚:' + this.height1 + 'mm 重量:' + 0.001 * 0.0028 * parseInt(this.Length) * parseInt(this.Width) * parseFloat(this.height1) + 'kg'
WeightCopy(this.partNumValue, this.Result1).then(response => {
this.searchDetail()
})
}
}
},
// 对边宽*对边宽*长度
Calculation3() {
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请先选择一个零件')
} else {
if (this.materielValue === '3') {
this.Result3 = '物料:' + this.materiel[3].label + ' 对边宽:' + this.OppositeSideWidth + 'mm 长度:' + this.length2 + 'mm 重量:' + 0.001 * 0.0068 * parseInt(this.OppositeSideWidth) * parseInt(this.OppositeSideWidth) * parseInt(this.length2) + 'kg'
WeightCopy(this.partNumValue, this.Result3).then(response => {
this.searchDetail()
})
}
}
},
// （边宽+边宽-边厚）×边厚×长度÷1000
Calculation4() {
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请先选择一个零件')
} else {
if (this.materielValue === '4') {
this.Result4 = '物料:' + this.materiel[4].label + ' 边宽:' + this.biankuan + 'mm 边厚:' + this.bianhou + 'mm 长度:' + this.changdu + 'mm 重量:' + 0.001 * 0.00785 * (parseInt(this.biankuan) + parseInt(this.biankuan) - parseInt(this.bianhou)) * parseInt(this.bianhou) * parseInt(this.changdu) + 'kg'
WeightCopy(this.partNumValue, this.Result4).then(response => {
this.searchDetail()
})
}
}
},
Calculation5() {
if (this.partNumValue === '' || this.partNumValue === null) {
this.$message.error('请先选择一个零件')
} else {
if (this.materielValue === '5') {
this.Result5 = '物料:' + this.materiel[5].label + ' 壁厚:' + this.bihou + 'mm 外径:' + this.waijing + 'mm 长度:' + this.changdu2 + 'mm 重量:' + 0.001 * 0.02466 * parseInt(this.bihou) * (parseInt(this.waijing) - parseInt(this.bihou)) * parseInt(this.changdu2) + 'kg'
WeightCopy(this.partNumValue, this.Result5).then(response => {
this.searchDetail()
})
}
}
},
insertThestring(NewCode) {
this.lastFocusText = event.srcElement
this.lastFocusText.focus()
console.log(this.lastFocusText)
var sel = document.selection.createRange()
sel.text = NewCode
return
},
clearDetail() {
this.checked = false

4
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -52,7 +52,7 @@
value-format="yyyy-MM-dd"
style="top: 1px;"
placeholder="选择开始日期"/>
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">制定零件计划</el-button>
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
<el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
<el-table
v-loading="listLoading"
@@ -1489,7 +1489,7 @@ export default {
}
}
},
// 制定零件计划2.1
// 零件计划变更2.1
PartPlan() {
if (this.startTime !== '' && this.startTime !== null) {
if (this.endTime !== '' && this.endTime !== null) {

1
src/views/ManufacturingCenter/QuotaFormulation/index.vue
View File

@@ -273,7 +273,6 @@ export default {
}
}).then(() => {
mainTable(this.num0).then(response => {
console.log(response.data)
if (response.data.length === 0) {
this.listLoading = false
} else {

2
src/views/Outsourcing/InterBudgetaryBudgets/index.vue
View File

@@ -40,7 +40,7 @@
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="370" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
<el-table v-loading="loading2" :data="tableData2" highlight-current-row height="370" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
<el-table-column
label=" "
type="index"