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

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

Browse Source
This commit is contained in:
liulujia
2020-04-29 08:55:46 +08:00
parent c8ad9ec99d 8edf3ea21f
commit 11959d8ab9
22 changed files with 136 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js
View File

@@ -42,7 +42,7 @@ export function searchtable(check1, value1, check3, value3, check5, value5, valu
}
})
}
export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people) {
export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people, operaPeople, procedureGroup) {
return request({
url: '',
method: 'post',
@@ -51,7 +51,7 @@ export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people)
ModularID: router.currentRoute.path,
type: '2',
name: '报废补投_提交报废_循环执行',
param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + '&不合格原因组=' + Unqualified + '&备注组=' + remarkGroup + '&质检人组=' + people
param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + '&不合格原因组=' + Unqualified + '&备注组=' + remarkGroup + '&质检人组=' + people + '&操作人员组=' + operaPeople + '&工序组=' + procedureGroup
}
})
}

14
src/components/AmountInputBox/AmountInputBox.js
View File

@@ -39,7 +39,12 @@ const checkFloat = (e, reg, charcode, el) => {
}
}
}
const loading = (e, el, bind) => {
el.disabled = true
setTimeout(function() {
el.disabled = false
}, 3000)
}
/**
* @author LeeYunxiang
* @description 限制数字输入格式 int => 正整数 , num => 自然数(正整数包括0) , float => 正数包括小数(建议用text类型的input表单)
@@ -75,6 +80,13 @@ export default {
break
}
})
el.addEventListener('click', e => {
switch (bind.value) {
case 'loading':
loading(e, el, bind)
break
}
})
}
}
}

2
src/utils/request.js
View File

@@ -2,7 +2,7 @@ import axios from 'axios'
// import Cookies from 'js-cookie'
// import store from '@/store'
export const wsuri = `ws://123.56.95.229:61101//WebMoudule//websocket`
export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
export const name = `OP8888`
export const name1 = `OP1000`
export const name3 = `OP2000`

56
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -33,7 +33,7 @@
</div>
<el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 1117px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120" show-overflow-tooltip>
<template slot-scope="scope">
@@ -70,6 +70,21 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="已领数" width="70px">
<template slot-scope="scope">
{{ scope.row.已领数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="领用数" width="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -89,7 +104,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 1117px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -126,6 +141,21 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="已领数" width="70px">
<template slot-scope="scope">
{{ scope.row.已领数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="领用数" width="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -145,7 +175,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 976px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 1226px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="42"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -187,6 +217,21 @@
{{ scope.row.备件总数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="已领数" width="70px">
<template slot-scope="scope">
{{ scope.row.已领数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="领用数" width="120px">
<template slot-scope="scope">
<el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.已领数量) || scope.row.货位存量1 === 0" :max="scope.row.货位存量1" v-model="scope.row.领用数量" size="mini" style="width: 100%"/>
</template>
</el-table-column>
<el-table-column align="center" label="库存数" width="70px">
<template slot-scope="scope">
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column align="center" label="领料单编号" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.领料单编号 }}
@@ -287,7 +332,7 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="备注" prop="备注" align="center" min-width="130px">
<el-table-column label="机床" prop="备注" align="center" min-width="130px">
<template slot-scope="scope">
{{ scope.row.领料单备注 }}
</template>
@@ -378,7 +423,7 @@
</el-table-column>
<el-table-column min-width="150" align="center" label="领料时间">
<template slot-scope="scope">
{{ scope.row.操作日期 }}
{{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="数量" prop="出库数量">
@@ -700,6 +745,7 @@ export default {
if (this.PickingValue === false) {
this.loading0 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent0, this.pageSize0, 1).then(response => {
console.log(response.data.rows, 1111)
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.loading0 = false

2
src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
View File

@@ -9,7 +9,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 0">审核时间:</span>
<span style="margin-left: 0">提交时间:</span>
<el-date-picker
v-model="dateRange"
size="small"

15
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -84,11 +84,26 @@
{{ scope.row.报废时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废人" width="85px">
<template slot-scope="scope">
{{ scope.row.报废人 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废工序" width="85px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.报废原因 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工人" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}

2
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
View File

@@ -16,7 +16,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 0">审核时间:</span>
<span style="margin-left: 0">提交时间:</span>
<el-date-picker
v-model="dateRange"
size="small"

23
src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
View File

@@ -46,6 +46,7 @@
style="width: 1390px; margin: 3px 0"
size="mini"
border
stripe
highlight-current-row
element-loading-text="拼命加载中"
@selection-change="handleSelectionChange">
@@ -106,16 +107,16 @@
{{ scope.row.不合格原因文本 }}
</template>
</el-table-column>
<el-table-column label="处理结果" align="center">
<el-table-column label="处理结果" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.不合格处理文本 }}
</template>
</el-table-column>
<!--<el-table-column label="责任人" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.不合格处理文本 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="操作人员" align="center">
<template slot-scope="scope">
{{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
</template>
</el-table-column>
<el-table-column label="报废工时(分)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.报废工时 }}
@@ -203,7 +204,9 @@ export default {
pageSize: 30, // 每页显示条数
pageCurrent: 1, // 后台获取页
outTime: '',
order: ''
order: '',
operaPeople: [],
procedureGroup1: []
}
},
computed: {
@@ -293,15 +296,19 @@ export default {
this.Unqualified = []
this.remarkGroup = []
this.people = []
this.operaPeople = []
this.procedureGroup1 = []
for (let i = 0; i < this.procedureGroup.length; i++) {
this.ScrapQuantity.push(this.procedureGroup[i].不合格数量)
this.ProcessPlanNumber.push(this.procedureGroup[i].工艺计划流水号)
this.Unqualified.push(this.procedureGroup[i].不合格原因文本)
this.remarkGroup.push(this.procedureGroup[i].备注)
this.people.push(this.procedureGroup[i].人员编号)
this.operaPeople.push(this.procedureGroup[i].操作人员编号)
this.procedureGroup1.push(this.procedureGroup[i].工序流水号)
}
this.handleEdit_disable = true
editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id, this.Unqualified, this.remarkGroup, this.people).then(response => {
editSpare(this.ProcessPlanNumber, this.ScrapQuantity, this.id, this.Unqualified, this.remarkGroup, this.people, this.operaPeople, this.procedureGroup1).then(response => {
if (response.data[0].result === '1') {
this.$message.success('报废成功')
this.searchTable()

12
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -42,7 +42,7 @@
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">保证金</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="导出" style="margin: 10px 0 0 590px;width: 50px" placement="top">
<div style="display: inline-block">
<el-button type="primary" plain class="el-icon-download" size="small" style="" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="" @click="exportExcel">导出</el-button>
</div>
</el-tooltip>
</el-card>
@@ -260,7 +260,7 @@
</el-table>
</div>
<el-button size="small" style="margin-left: 90px" icon="el-icon-circle-close" @click="offName">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getName">确认</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="getName">确认</el-button>
<!--<el-button style="margin-left: 260px" @click="offName">取消</el-button>-->
<!--<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>-->
</el-dialog>
@@ -289,7 +289,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form1')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form1')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form1')">确 定</el-button>
<!--<el-button @click="callOff('form1')">取消</el-button>-->
<!--<el-button type="primary" @click="submit('form1')">确 定</el-button>-->
</div>
@@ -377,7 +377,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form2')">取消</el-button>
<el-button :disabled="submitDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form2')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form2')">确 定</el-button>
</div>
</el-dialog>
@@ -400,7 +400,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOffTime('Timeform')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('Timeform')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('Timeform')">确 定</el-button>
</div>
</el-dialog>
@@ -454,7 +454,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondform('PerformanceBondform')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
</div>
</el-dialog>
</div>

2
src/views/MarketingCenter/CRM/index.vue
View File

@@ -341,7 +341,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff2('form')">取消</el-button>
<el-button :disabled="addCustomerDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit2('form2')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit2('form2')">确 定</el-button>
<!--<el-button @click="callOff2()">取消</el-button>-->
<!--<el-button type="primary" @click="submit2('form2')">确 定</el-button>-->
</div>

2
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -24,7 +24,7 @@
end-placeholder="结束日期"/>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出合同执行情况" placement="top">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 300px" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 300px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row>
</el-card>

12
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -1,13 +1,6 @@
<template>
<div class="app-container">
<el-card>
<!--<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px 10px;width: 180px " size="small" clearable>-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="customerName" clearable size="small" style="width:220px;" placeholder="客户名称/项目名称/合同编号"/>
<el-select v-show="false" v-model="customerName" filterable placeholder="请输入客户名称" style="margin: 3px;width: 220px " size="small" clearable>
<el-option
@@ -32,12 +25,9 @@
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
<div style="display: inline-block">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 250px" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 250px" @click="exportExcel">导出</el-button>
</div>
</el-tooltip>
<!--<el-badge :value="value" :max="99" class="item">-->
<!--<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>-->
<!--</el-badge>-->
</el-card>
<el-card>
<el-col :span="17">

2
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -26,7 +26,7 @@
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()" >查询</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >合同</el-button>
<el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出营销合同" placement="top">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 410px" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 410px" @click="exportExcel">导出</el-button>
</el-tooltip>
</div>
</el-card>

8
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -63,7 +63,7 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="120px">
<el-table-column align="center" label="项目创建日期" prop="合同签订日期" width="120px">
<template slot-scope="scope">
{{ scope.row.合同签订日期.substring(0,10) }}
</template>
@@ -128,8 +128,8 @@
</el-col>
</el-row>
<!--新增合同信息对话框-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="450px">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="140px" class="demo-ruleForm">
<el-row>
<el-col :span="24">
<el-form-item label="项目名称" prop="EntryName">
@@ -137,7 +137,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="项目下达日期" prop="contractSigningDate">
<el-form-item label="项目创建日期" prop="contractSigningDate">
<el-date-picker
v-model="form.contractSigningDate"
style="width: 200px"

2
src/views/MarketingCenter/InvoiceRecord/index.vue
View File

@@ -32,7 +32,7 @@
@click.stop="openAddInvoiceRecordingDialog(); flag = 1">开票</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
<div style="display: inline-block">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 70px" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 70px" @click="exportExcel">导出</el-button>
</div>
</el-tooltip>
</el-row>

6
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -41,7 +41,7 @@
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top" style="margin: 10px 0 0 630px">
<div style="display: inline-block">
<el-button type="primary" plain class="el-icon-download" size="small" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" @click="exportExcel">导出</el-button>
</div>
</el-tooltip>
</el-card>
@@ -297,7 +297,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOffTime('form')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('form')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('form')">确 定</el-button>
<!--<el-button @click="callOffTime('form')">取消</el-button>-->
<!--<el-button type="primary" @click="submitTime('form')">确 定</el-button>-->
</div>
@@ -370,7 +370,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondDialog('form2')">取消</el-button>
<el-button :disabled="submitPerformanceBondDisabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
</div>
</el-dialog>
</div>

10
src/views/MarketingCenter/SafetyMargin/index.vue
View File

@@ -42,7 +42,7 @@
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top" style="margin: 10px 0 0 645px">
<div style="display: inline-block">
<el-button type="primary" plain class="el-icon-download" size="small" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" @click="exportExcel">导出</el-button>
</div>
</el-tooltip>
</el-card>
@@ -435,7 +435,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form')">取消</el-button>
<el-button :disabled="submit1Disabled" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form')">确 定</el-button>
<!--<el-button @click="callOff('form')">取消</el-button>-->
<!--<el-button type="primary" @click="submit1('form')">确 定</el-button>-->
</div>
@@ -490,7 +490,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form2')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form2')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form2')">确 定</el-button>
</div>
</el-dialog>
@@ -538,7 +538,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form3')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form3')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form3')">确 定</el-button>
<!--<el-button @click="callOff('form3')">取消</el-button>-->
<!--<el-button type="primary" @click="submit1('form3')">确 定</el-button>-->
</div>
@@ -569,7 +569,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form4')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form4')">确 定</el-button>
<el-button v-positive="'loading'" :disabled="false" type="distribution" size="small" icon="el-icon-circle-check" @click="submit1('form4')">确 定</el-button>
<!--<el-button @click="callOff('form4')">取消</el-button>-->
<!--<el-button type="primary" @click="submit1('form4')">确 定</el-button>-->
</div>

2
src/views/MarketingCenter/ShippingInquiries/index.vue
View File

@@ -19,7 +19,7 @@
<el-button type="primary" icon="el-icon-search" size="mini" style="margin-left: 10px" plain @click="openSearch">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
<div style="display: inline-block">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
</div>
</el-tooltip>
</el-card>

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

@@ -38,7 +38,7 @@
<!-- </el-card>-->
<el-card>
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 60%;" height="210px" highlight-current-row @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 70%;" height="210px" highlight-current-row @row-click="searchTable2">
<!-- <el-table-column type="expand" label="详情">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form id="table" label-position="left" inline class="demo-table-expand">-->
@@ -100,7 +100,7 @@
{{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="100" fixed="right">
<el-table-column label="操作" align="center" min-width="80" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
<el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>

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

@@ -98,7 +98,7 @@
</el-table-column>
<el-table-column align="center" label="利用库存数" width="100px">
<template slot-scope="scope">
{{ scope.row.使用库存数 || '—' }}
{{ scope.row.使用库存数 ? scope.row.使用库存数 : '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="采购数量" width="100px">
@@ -695,6 +695,7 @@ export default {
零件数量: response.data.result[i].零件数量,
数量: response.data.result[i].数量,
离线采购数量: response.data.result[i].离线采购数量,
使用库存数: response.data.result[i].使用库存数,
已到货数量: response.data.result[i].已到货数量,
离线到货数量: response.data.result[i].离线到货数量,
供应商名称: response.data.result[i].供应商名称,

18
src/views/TechnologyCenter/CreatePackingList/index.vue
View File

@@ -13,7 +13,7 @@
<el-button type="distribution" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="打印装箱单" placement="top">
<el-button type="primary" size="small" style="margin-left: 10px" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
<el-button v-positive="'loading'" :disabled="false" type="primary" size="small" style="margin-left: 10px" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
</el-tooltip>
<el-table
v-loading="loading"
@@ -364,8 +364,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取消</el-button>
<el-button v-if="receiptTitle === '新增总装箱单'" type="primary" @click="submitAddReceipt">确定</el-button>
<el-button v-else-if="receiptTitle === '编辑总装箱单'" type="primary" @click="submitEditReceipt">确定</el-button>
<el-button v-positive="'loading'" v-if="receiptTitle === '新增总装箱单'" :disabled="false" type="primary" @click="submitAddReceipt">确定</el-button>
<el-button v-positive="'loading'" v-else-if="receiptTitle === '编辑总装箱单'" :disabled="false" type="primary" @click="submitEditReceipt">确定</el-button>
</div>
</el-dialog>
@@ -397,8 +397,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取消</el-button>
<el-button v-if="machineTitle==='添加主机'" type="primary" @click="submitAddMachine">确定</el-button>
<el-button v-else-if="machineTitle==='编辑主机'" type="primary" @click="submitEditMachine">确定</el-button>
<el-button v-positive="'loading'" v-if="machineTitle==='添加主机'" :disabled="false" type="primary" @click="submitAddMachine">确定</el-button>
<el-button v-positive="'loading'" v-else-if="machineTitle==='编辑主机'" :disabled="false" type="primary" @click="submitEditMachine">确定</el-button>
</div>
</el-dialog>
@@ -424,8 +424,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取消</el-button>
<el-button v-if="fileTitle==='添加文件'" type="primary" @click="submitAddFile">确定</el-button>
<el-button v-else-if="fileTitle==='编辑文件'" type="primary" @click="submitEditFile">确定</el-button>
<el-button v-positive="'loading'" v-if="fileTitle==='添加文件'" :disabled="false" type="primary" @click="submitAddFile">确定</el-button>
<el-button v-positive="'loading'" v-else-if="fileTitle==='编辑文件'" :disabled="false" type="primary" @click="submitEditFile">确定</el-button>
</div>
</el-dialog>
@@ -466,8 +466,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取消</el-button>
<el-button v-if="spareTitle==='添加备件'" type="primary" @click="submitAddSpare">确定</el-button>
<el-button v-else-if="spareTitle==='编辑备件'" type="primary" @click="submitEditSpare">确定</el-button>
<el-button v-positive="'loading'" v-if="spareTitle==='添加备件'" :disabled="false" type="primary" @click="submitAddSpare">确定</el-button>
<el-button v-positive="'loading'" v-else-if="spareTitle==='编辑备件'" :disabled="false" type="primary" @click="submitEditSpare">确定</el-button>
</div>
</el-dialog>
<div v-show="true" id="cjn">

9
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -1,15 +1,6 @@
<template>
<div class="app-container">
<el-card v-loading="loading">
<!-- <el-col :span="6">-->
<!-- <el-steps :active="5" direction="vertical" style="height: 260px;margin-left: 50px">-->
<!-- <el-step title="选择项目"/>-->
<!-- <el-step title="选择类型"/>-->
<!-- <el-step title="浏览"/>-->
<!-- <el-step title="导入到数据库"/>-->
<!-- <el-step title="传递"/>-->
<!-- </el-steps>-->
<!-- </el-col>-->
<el-col :span="6">
<div style="width: 650px;margin: 0px 380px ">
<div style="overflow: hidden">