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

我去

Browse Source
This commit is contained in:
caoxinyu
2019-09-24 08:22:02 +08:00
parent 0758701e5e
commit ac47b69ea3
24 changed files with 241 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.1.231:8005/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})

2
src/views/Assembly/SparePartsOutStockRecord/index.vue
View File

@@ -39,7 +39,9 @@
style="width: 130px"
type="date"
placeholder="选择日期"/>
<el-tooltip effect="dark" content="查询备料出库记录" placement="top" open-delay="1200">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=20; pageCurrent=1;selecttable()">查询</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>

6
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -5,8 +5,12 @@
<span style="margin-left: 10px">零件图号</span>
<el-input v-model="Partpaint" clearable size="small" style="width:200px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
<el-tooltip effect="dark" content="清除所有机床零件信息" placement="top" open-delay="1200">
<el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将所有机床零件入库" placement="top" open-delay="1200">
<el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -79,6 +83,7 @@
</el-table-column>
<el-table-column label="操作" min-width="100" align="center">
<template slot-scope="scope">
<el-tooltip effect="dark" content="清除该条零件信息" placement="top" open-delay="1200">
<el-button
:disabled="scope.row.是否禁用"
size="mini"
@@ -86,6 +91,7 @@
plain
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">移除</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>

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

@@ -43,7 +43,9 @@
<span>工艺名称:</span>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:200px"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
<el-tooltip effect="dark" content="新增补录工时" placement="top" open-delay="1200">
<el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
</el-tooltip>
</el-row>
</el-card>

8
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -5,10 +5,18 @@
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-tooltip effect="dark" content="已导出和未导出备料单" placement="top" open-delay="1200">
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip>
<el-tooltip effect="dark" content="打印备料单" placement="top" open-delay="1200">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将选中零件分配为自家备料" placement="top" open-delay="1200">
<el-button type="info" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将选中零件分配为外购备料" placement="top" open-delay="1200">
<el-button type="warning" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
</el-tooltip>
</el-row>
</el-card>

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

@@ -192,9 +192,15 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
<el-tooltip effect="dark" content="打回到零件分配" placement="top" open-delay="1200">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="选中零件进行投产" placement="top" open-delay="1200">
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将不同组号中相同图号的零件合并" placement="top" open-delay="1200">
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
</el-tooltip>
</div>
</div>
</el-card>

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

@@ -271,11 +271,21 @@
<el-table-column label="操作" width="490px" align="center">
<template slot-scope="scope">
<div>
<el-tooltip effect="dark" content="上移" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-arrow-up" type="primary" plain @click="upOne(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="下移" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-arrow-down" type="primary" plain @click="downOne(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="置顶" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-upload2" type="primary" plain @click="TOP(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="置底" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-download" type="primary" plain @click="Down(scope.row)"/>
</el-tooltip>
<el-tooltip effect="dark" content="删除" placement="top" open-delay="1200">
<el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
</el-tooltip>
</div>
</template>
</el-table-column>

10
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -22,9 +22,15 @@
</el-select>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-tooltip effect="dark" content="自家备料查询" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="自家备料完成" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-success" type="info" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将备料件打回重新分配" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
@@ -62,8 +68,12 @@
<el-card>
<span>零件图号:</span>
<el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-tooltip effect="dark" content="外购备料确认" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="外购备料完成" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">

14
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -190,9 +190,15 @@
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip effect="dark" content="将零件选择到采购单" placement="top" open-delay="1200">
<el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="所选零件分配到采购部" placement="top" open-delay="1200">
<el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="所选零件分配为自家生产" placement="top" open-delay="1200">
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-row>
@@ -286,12 +292,12 @@
</el-table-column>
<el-table-column label="操作" align="center" width="150px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
<el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
<div style="display: inline-block;margin-right: 10px">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="移出" placement="top">
<el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>
@@ -359,12 +365,12 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
<el-tooltip effect="dark" content="编辑" placement="top" open-delay="1200">
<div style="display: inline-block;margin-right: 10px">
<el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit1(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="移出" placement="top">
<el-tooltip effect="dark" content="移出" placement="top" open-delay="1200">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="MoveOut(scope.row)"/>
</div>

12
src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
View File

@@ -82,37 +82,47 @@
<el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][0]" @click="handleChange1(scope.$index, scope.row, 'form', 0)">
<h4>{{ process[scope.$index][0] }}</h4><h4>{{ planDate[scope.$index][0] }} </h4><h4> {{ realDate[scope.$index][0] }}</h4><h4> {{ worker[scope.$index][0] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[2]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][1]" @click="handleChange1(scope.$index, scope.row, 'form', 1)">
<h4>{{ process[scope.$index][1] }}</h4><h4>{{ planDate[scope.$index][1] }} </h4><h4> {{ realDate[scope.$index][1] }}</h4><h4> {{ worker[scope.$index][1] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[3]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][2]" @click="handleChange1(scope.$index, scope.row, 'form', 2)">
<h4>{{ process[scope.$index][2] }}</h4><h4>{{ planDate[scope.$index][2] }} </h4><h4> {{ realDate[scope.$index][2] }}</h4><h4> {{ worker[scope.$index][2] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[4]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][3]" @click="handleChange1(scope.$index, scope.row, 'form', 3)">
<h4>{{ process[scope.$index][3] }}</h4><h4>{{ planDate[scope.$index][3] }} </h4><h4> {{ realDate[scope.$index][3] }}</h4><h4> {{ worker[scope.$index][3] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[5]" align="center" width="120px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="单击工序修改进度" placement="top" open-delay="1200">
<div :class="colorCode[scope.$index][4]" @click="handleChange1(scope.$index, scope.row, 'form', 4)">
<h4>{{ process[scope.$index][4] }}</h4><h4>{{ planDate[scope.$index][4] }} </h4><h4> {{ realDate[scope.$index][4] }}</h4><h4> {{ worker[scope.$index][4] }}</h4>
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column label="[6]" align="center" width="120px">
@@ -340,6 +350,8 @@
style="width: 150px;float: left"
height="400"
accordion
default-expand-all="true"
highlight-current="true"
@node-click="handleNodeClick"/>
</div>
<el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">

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

@@ -25,15 +25,12 @@
</el-select>
<span>零件图号:</span>
<el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 200px;"/>
<el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
<el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
<el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
</el-row>
</div>
</el-card>
<el-card>
<span class="demonstration">开始日期: </span>
<el-date-picker
@@ -51,7 +48,9 @@
value-format="yyyy-MM-dd"
style="top: 1px;"
placeholder="选择开始日期"/>
<el-tooltip effect="dark" content="变更零件加工开始和结束时间" placement="top" open-delay="1200">
<el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
</el-tooltip>
<el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
<el-table
v-loading="listLoading"
@@ -144,7 +143,9 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
<el-tooltip effect="dark" content="将选中零件自动排出加工工序" placement="top" open-delay="1200">
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
</el-tooltip>
<el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 20px 10px 10px" @click="SelectionAll">全部选入</el-button>
</div>
<div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
@@ -431,9 +432,13 @@
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
<div style="float:right">
<el-tooltip effect="dark" content="自动计算工序加工时间" placement="top" open-delay="1200">
<el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
</el-tooltip>
<el-button v-if="可以确定零件计划" type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Plan" >确定零件计划</el-button>
<el-tooltip effect="dark" content="选出重新设置零件的加工时间" placement="top" open-delay="1200">
<el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
</el-tooltip>
</div>
</div>
</div>
@@ -1606,7 +1611,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin: 0px;
}
.el-date-editor{
width: 200px;
@@ -1647,7 +1652,4 @@ export default {
background-color: lightgreen!important;
border: 1px solid #1f2d3d;
}
.el-card{
margin: 0px;
}
</style>

8
src/views/ManufacturingCenter/RepairTimeEntry/index.vue
View File

@@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-card>
<span>人员名称:</span>
<el-input v-model="personnelNumber" placeholder="请双击选择人员名称" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
<span>人员姓名:</span>
<el-input v-model="personnelNumber" placeholder="请双击选择人员姓名" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
<el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增</el-button>
</el-card>
@@ -454,7 +454,7 @@ export default {
// 增加打开
editType1(formName) {
if (this.personnelNumber === '' || this.personnelNumber === null) {
this.$message.error('请输入人员编号')
this.$message.error('请选择人员名称')
} else {
this.form.TechnologyValue = ''
this.form.timeNumber = ''
@@ -464,7 +464,7 @@ export default {
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.title1 = '新增修补工时'
this.title1 = '新增'+this.personnelNumber+'修补工时'
this.dialogFormVisible = true
}
},

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

@@ -4,7 +4,9 @@
<span>设备名称:</span>
<el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px" @click="pageCurrent = 1;fetchData()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">增加</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
</el-tooltip>
</el-card>
<el-card>

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

@@ -31,7 +31,9 @@
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-tooltip effect="dark" content="新增项目" placement="top" open-delay="1200">
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
</el-tooltip>
</div>
</el-card>
<el-card>
@@ -105,12 +107,14 @@
</el-table-column>
<el-table-column label="操作" align="center" width="350">
<template slot-scope="scope">
<el-tooltip effect="dark" content="增加机床" placement="top" open-delay="1200">
<el-button
size="mini"
type="warning"
plain
icon="el-icon-plus"
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
</el-tooltip>
<el-button
size="mini"
plain

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

@@ -43,8 +43,9 @@
</el-select>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
<el-tooltip effect="dark" content="查询序间外协计划" placement="top" open-delay="1200">
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize2=10; pageCurrent2=1;searchPartNum()">查询</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>
@@ -150,7 +151,9 @@
</template>
</el-table-column>
</el-table>
<el-tooltip effect="dark" content="保存" placement="top" open-delay="1200">
<el-button size="small" type="primary" style="float:right;margin: 10px" @click="saveRowPrice">保存</el-button>
</el-tooltip>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="编辑" center style="min-height: 300px" width="800px">

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

@@ -7,7 +7,9 @@
<span>电话:</span>
<el-input v-model="phNumber" size="small" clearable style="width:200px"/>
<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
<el-tooltip effect="dark" content="新增外协厂家" placement="top" open-delay="1200">
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-table v-loading="loading0" :data="tableData" height="550" style="width: 100%;" border>

13
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -60,20 +60,21 @@
label="序号"
type="index"
align="center"
fixed="left"
width="50"/>
<el-table-column label="付款状态" width="70" align="center">
<el-table-column label="付款状态" width="70" align="center" fixed="left">
<template slot-scope="scope">
<el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
<el-tag v-else type="info" size="small">未付</el-tag>
</template>
</el-table-column>
<el-table-column label="到货状态" width="70" align="center">
<el-table-column label="到货状态" width="70" align="center" fixed="left">
<template slot-scope="scope">
<el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
<el-tag v-else type="info" size="small">未到</el-tag>
</template>
</el-table-column>
<el-table-column label="表单号" align="center" min-width="200px">
<el-table-column label="表单号" align="center" min-width="200px" fixed="left">
<template slot-scope="scope">
{{ scope.row.表单号 }}
</template>
@@ -171,6 +172,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="280px" fixed="right">
<template slot-scope="scope">
<el-tooltip effect="dark" content="记录外协付款到票信息" placement="top" open-delay="1200">
<el-button
:disabled="scope.row.实际付款时间!==''"
size="mini"
@@ -178,6 +180,8 @@
plain
class="el-icon-check"
@click="editType1(scope.row, 'form');param = 0">到票</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="记录外协扣款信息" placement="top" open-delay="1200">
<el-button
:disabled="scope.row.实际付款时间!==''"
size="mini"
@@ -185,12 +189,15 @@
plain
class="el-icon-edit"
@click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="付款信息" placement="top" open-delay="1200">
<el-button
:disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'"
size="mini"
type="success"
class="el-icon-check"
@click="payment(scope.$index, scope.row)">付款</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>

9
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -337,9 +337,15 @@
<div>
<span>下调金额:（百分比）</span>
<el-input v-model="money" size="small" clearable style="width:200px"/>
<el-tooltip effect="dark" content="计算选入零件的价格" placement="top" open-delay="1200">
<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="核对价格信息后确定" placement="top" open-delay="1200">
<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="confirmPrice">确定价格</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="成交" placement="top" open-delay="1200">
<el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 15px" @click="Deal">成交</el-button>
</el-tooltip>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 15px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
</div>
</el-card>
@@ -1615,9 +1621,6 @@ export default {
.el-card{
margin: 0px;
}
span{
margin: 10px 0 10px 10px;
}
td{
width: 100px;
height: 30px;

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

@@ -13,7 +13,9 @@
size="small"
placeholder="选择日期"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="打印外协采购单" placement="top" open-delay="1200">
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
</el-tooltip>
</el-card>
<el-card>

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

@@ -108,7 +108,7 @@
style="margin-left: 10px"
@click="pageCurrent=1;searchMaterial()">查询
</el-button>
<el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
<el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
<el-button
:disabled="token !== 11 && token !== 36"
type="warning"

12
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -28,9 +28,15 @@
<el-col style="margin-left: 0px">
<span>零件图号:</span>
<el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0"/>
<el-tooltip effect="dark" content="查询备料零件" placement="top" open-delay="1200">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="向选择的采购单里添加采购零件" placement="top" open-delay="1200">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="将零件打回重新分配备料计划" placement="top" open-delay="1200">
<el-button type="danger" size="small" icon="el-icon-download" style="margin-left: 10px" @click="back">打回</el-button>
</el-tooltip>
<el-table v-loading="loading1" :data="tableData1" border stripe highlight-current-row style="width: 100%;margin-top:3px;" height="330" size="mini" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
<el-table-column label="零件图号" min-width="100" align="center">
@@ -73,9 +79,13 @@
<el-input v-model="purchasingOrder" placeholder="采购单号" size="small" style="margin: 3px 0" clearable/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-tooltip effect="dark" content="查询采购单" placement="top" open-delay="1200">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
</el-tooltip>
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购单</el-button>
<el-tooltip effect="dark" content="保存选中的采购单" placement="top" open-delay="1200">
<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button>
</el-tooltip>
</div>
<el-table v-loading="" :data="tableData2" border stripe h style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
<el-table-column label="单号状态" align="center" width="100" fixed="left">
@@ -127,7 +137,7 @@
<el-button :disabled="parseInt(scope.row.采购计划状态)===2" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="导出" placement="top">
<el-tooltip effect="dark" content="导出打印采购计划" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-download" style="margin-left: 20px" @click="exportExcel(scope.row)"/>
</div>

2
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -21,12 +21,14 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-tooltip effect="dark" content="查询外购备料发货信息" placement="top" open-delay="1200">
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-tooltip>
<el-button
type="primary"
size="small"

6
src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
View File

@@ -12,12 +12,14 @@
</el-select>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" style="width: 200px" size="small" clearable/>
<el-tooltip effect="dark" content="查询外购件到货信息" placement="top" open-delay="1200">
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent=1;pageSize=10;total=0;searchTable()">查询</el-button>
</el-tooltip>
</div>
<el-table
v-loading="loading"
@@ -137,9 +139,9 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="70">
<template slot-scope="scope">
<el-tooltip effect="dark" content="到货" placement="top">
<el-tooltip effect="dark" content="输入到货信息" placement="top" open-delay="1200">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-goods" @click="OpenArrival(scope.row)"/>
<el-button el-button type="success" size="mini" icon="el-icon-goods" plain @click="OpenArrival(scope.row)">到货</el-button>
</div>
</el-tooltip>
</template>

4
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -16,13 +16,17 @@
end-placeholder="结束日期"/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-tooltip effect="dark" content="查询外购备料清款信息" placement="top" open-delay="1200">
<el-button
type="success"
size="small"
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="对选择的请款任务创建请款申请" placement="top" open-delay="1200">
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</el-tooltip>
</el-card>
<el-card>