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:
liushuai
2020-02-12 16:46:13 +08:00
parent dd28e09a2d 1db4944493
commit 82dba033a1
247 changed files with 4818 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@
type="datetime"
placeholder="结束日期"/>
<el-button type="primary" plain icon="el-icon-search" size="mini" style="margin-left: 74px" @click="search">查询</el-button>
<el-button class="button111" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
<el-button type="distribution" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
</el-row>
</div>
<el-divider/>

19
src/views/Assembly/MakeAssemblyPlan/index.vue
View File

@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>
@@ -288,21 +288,4 @@ export default {
<style scoped>
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>

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

@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>

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

@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
<el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
</el-row>
</el-card>

22
src/views/BasicData/MenuManagement/index.vue
View File

@@ -3,7 +3,7 @@
<el-row>
<el-col :span="7">
<el-card style="margin-bottom: 20px">
<el-button size="small" class="button111" @click="addFisrtLevel">创建一级菜单</el-button>
<el-button size="small" type="distribution" @click="addFisrtLevel">创建一级菜单</el-button>
</el-card>
<el-card>
<div slot="header">
@@ -83,7 +83,7 @@
</el-col>
<el-col :span="7">
<el-card style="margin-bottom: 20px">
<el-button size="small" class="button111" @click="addSecondLevel">创建二级菜单</el-button>
<el-button size="small" type="distribution" @click="addSecondLevel">创建二级菜单</el-button>
</el-card>
<el-card>
<div slot="header">
@@ -394,20 +394,4 @@ export default {
padding-right: 8px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -3,7 +3,7 @@
<el-row>
<el-col :span="6">
<el-card>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd('department_Form')">新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd('department_Form')">新增</el-button>
<el-button type="warning" icon="el-icon-edit" size="small" plain @click="handleEdit()">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="small" plain @click="deleteTable()">删除</el-button>
</el-card>
@@ -14,7 +14,7 @@
<el-input v-model="Name" placeholder="请输入人员名称" class="input-with-select" size="small" style="width: 200px; margin-right: 15px" clearable>
<el-button slot="append" icon="el-icon-search" @click="fetchPeopleForName"/>
</el-input>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button>
<el-button type="danger" icon="el-icon-circle-close-outline" size="small" plain @click="Quit()">离职</el-button>
<el-button type="text" size="small" style="float: right" plain @click="searchLeavingList">离职名单</el-button>
<el-button v-popover:popover4 :disabled="disabledMove" type="success" icon="el-icon-sort" size="small" plain @click="moveGroup">移动
@@ -912,20 +912,4 @@ export default {
<style scoped>
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

20
src/views/BasicData/ShiftManagement/index.vue
View File

@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchTable()">查询</el-button>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="addShifttable()">新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="addShifttable()">新增</el-button>
<el-button type="warning" icon="el-icon-circle-plus-outline" plain size="small" @click="ShiftType()">班次类型工作时间</el-button>
</el-card>
@@ -475,20 +475,4 @@ export default {
margin: 0px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

20
src/views/BasicData/SystemRrolemaintenance/index.vue
View File

@@ -4,7 +4,7 @@
<!-- <span>角色功能:</span>-->
<el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchData()">查询</el-button>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
</el-card>
<el-card style="margin-top: 0px">
<el-table
@@ -216,20 +216,4 @@ export default {
margin: 0px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

20
src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
View File

@@ -14,7 +14,7 @@
:value="item.value"/>
</el-select>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchData">查询</el-button>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="handelAdd">增加</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="handelAdd">增加</el-button>
</el-card>
<el-card>
@@ -403,20 +403,4 @@ export default {
margin: 0px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

20
src/views/BasicData/WorkshopProcessMaintenance/index.vue
View File

@@ -7,7 +7,7 @@
<span>工艺分类：</span>
</el-row>
<el-row>
<el-button class="button111" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
<el-button type="distribution" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
<el-button size="small" style="margin-left: 10px" type="warning" icon="el-icon-edit-outline" plain @click="editProcessClassification()">编辑</el-button>
<el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" plain @click="delProcessClassification()">删除</el-button>
</el-row>
@@ -611,20 +611,4 @@ export default {
}
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -264,7 +264,7 @@
end-placeholder="结束日期"/>
<el-input v-model="pickingListPeople" clearable size="small" placeholder="制单人" style="width:120px;margin-left: 10px" />
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
<el-button size="small" class="button111" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
<el-button size="small" type="distribution" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="为所选领料单增加物料明细" placement="top">
<el-button size="small" type="success" plain icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
</el-tooltip>

20
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -21,7 +21,7 @@
:value="item.value"/>
</el-select>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
<el-button class="button111" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
<el-button type="distribution" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
</el-row>
</div>
<el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 850px" size="mini">
@@ -384,20 +384,4 @@ export default {
width:165px
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

22
src/views/Inventory/InventoryManagement/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<div slot="header" class="clearfix">
<el-button size="small" class="button111" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
<el-button size="small" type="distribution" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
</div>
<el-table :data="tableData" border stripe highlight-current-row size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
<el-table-column label="仓库编号" align="center" width="90" show-overflow-tooltip>
@@ -49,7 +49,7 @@
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" class="button111" icon="el-icon-circle-plus-outline" plain style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
<el-button size="mini" type="distribution" icon="el-icon-circle-plus-outline" plain style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
</template>
</el-table-column>
</el-table>
@@ -605,20 +605,4 @@ export default {
margin: 10px 0 10px 10px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

21
src/views/Inventory/MaterialOut/index.vue
View File

@@ -5,8 +5,7 @@
<span style="margin: 5px">领料单编号:</span>
<el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
<!-- <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>-->
<el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" class="button111" @click="inputPassword()">领料确认</el-button>
<el-button :disabled="审批未通过===true" size="small" style="float: right; margin-right: 30px" type="distribution" @click="inputPassword()">领料确认</el-button>
</div>
</el-card>
<div style="width: 27%;float: left;margin-right: 16px">
@@ -680,20 +679,4 @@ export default {
background: #E9F0F9 !important;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -68,7 +68,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button class="button111" style="margin-left: 5px" size="small" @click="submitInStorage">确认入库</el-button>
<el-button type="distribution" style="margin-left: 5px" size="small" @click="submitInStorage">确认入库</el-button>
</el-card>
</div>
</template>
@@ -351,20 +351,4 @@ export default {
<style scoped>
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -72,7 +72,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button class="button111" style="margin: 10px" size="small" @click="submitInStorage">确认入库</el-button>
<el-button type="distribution" style="margin: 10px" size="small" @click="submitInStorage">确认入库</el-button>
</el-card>
</div>
</template>
@@ -475,20 +475,4 @@ export default {
margin-bottom: 5px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -16,7 +16,7 @@
<el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
<el-button type="distribution" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
@@ -327,21 +327,4 @@ export default {
<style scoped>
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -6,7 +6,7 @@
<!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
<el-tooltip effect="dark" content="添加新设备" placement="top">
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
<!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
</el-tooltip>
<span style="margin-left: 40px">有效时间：</span>
@@ -435,20 +435,4 @@ export default {
/* color: #ff9759;*/
/*}*/
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -62,7 +62,7 @@
<el-table-column align="center" label="操作" width="160">
<template slot="header" slot-scope="scope">
<!--<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd1('form1')">新增</el-button>-->
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
</template>
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit1(scope.row)">确定</el-button>
@@ -107,7 +107,7 @@
<el-table-column align="center" label="操作" width="160">
<template slot="header" slot-scope="scope">
<!--<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd2('form2')">新增</el-button>-->
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
</template>
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit2(scope.row)">确定</el-button>
@@ -747,7 +747,7 @@ export default {
</script>
<style lang="scss">
.button111{
.NewlyAdded{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;

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

@@ -26,7 +26,7 @@
<!-- type="date"-->
<!-- 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-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
<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-card>
<!--投标保证金表格-->
@@ -782,20 +782,4 @@ export default {
<style scoped>
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -24,7 +24,7 @@
<el-button type="primary" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" plain @click="selectCustomerOfName">查询</el-button>
</el-card>
<el-card>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
<el-button class="button222" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
<!--<el-table-column label="责权省份" align="center" min-width="80">-->
@@ -673,7 +673,7 @@ export default {
}
</style>
<style lang="scss">
.button111
.NewlyAdded
{
background:rgb(253,246,236);
border-color: #ff9759;

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

@@ -1,7 +1,6 @@
<template>
<div class="app-container">
<el-card>
<!-- style="background: rgb(233,240,250)"-->
<div>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 3px 10px;">
<el-option
@@ -10,25 +9,9 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!-- <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>-->
<el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
<!-- <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>-->
<!-- <el-date-picker-->
<!-- v-model="startTime"-->
<!-- style="width: 150px;"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- placeholder="请选择开始日期"/>-->
<!-- <el-date-picker-->
<!-- v-model="endTime"-->
<!-- style="width: 150px;margin-bottom: 3px;"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- 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-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
</div>
</el-card>
<el-card>
@@ -45,15 +28,15 @@
size="mini"
@row-click="fetchExecutionProgressdata"
@expand-change="selectMachine">
<el-table-column type="expand" label="详情">
<el-table-column type="expand" label="详情" width="60">
<template slot-scope="scope">
<el-table :data="tableData2" class="subTableHeader" size="mini" border stripe style="width: 482px; text-align: center">
<el-table-column label="设备型号" align="center" width="140">
<template slot-scope="scope">
<el-table :data="tableData2" class="subTableHeader" size="mini" border style="width: 482px; text-align: center">
<el-table-column label="机床名称" align="center" width="140">
<template slot-scope="机床图号">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="设备名称" align="center" width="160" show-overflow-tooltip>
<el-table-column label="机床名称" align="center" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
@@ -92,22 +75,6 @@
<el-table-column align="center" label="合同编号" prop="合同编号" width="130">
<template slot-scope="scope">
{{ scope.row.合同编号 }}
<!-- <template>-->
<!-- <el-popover-->
<!-- placement="right"-->
<!-- width="200"-->
<!-- trigger="hover">-->
<!-- <div v-show="!scope.row.招标企业" style="text-align: center">-->
<!-- <h4 style="margin: 5px 0">未缴纳投标保证金</h4>-->
<!-- </div>-->
<!-- <div v-show="scope.row.招标企业">-->
<!-- <h4>招标企业： {{ scope.row.招标企业 }}</h4>-->
<!-- <h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>-->
<!-- <h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>-->
<!-- </div>-->
<!-- <el-tag slot="reference" size="mini">{{ scope.row.合同编号 }}</el-tag>-->
<!-- </el-popover>-->
<!-- </template>-->
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="190" show-overflow-tooltip>
@@ -140,48 +107,23 @@
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="会签节点" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="预验收节点" width="110">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="发货节点" width="85">
<template slot-scope="scope">
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="安装调试节点" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.联系人 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.电话 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="合同备注" width="120">
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="300">
<el-table-column label="操作" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-circle-plus-outline"
@click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
@@ -189,7 +131,7 @@
type="text"
icon="el-icon-edit-outline"
style="margin-left: 20px"
@click.stop="handleEdit(scope.row)">修改</el-button>
@click.stop="handleEdit(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
@@ -199,7 +141,7 @@
type="text"
icon="el-icon-delete"
style="margin-left: 20px"
@click.stop="handleDelete(scope.row)">删除</el-button>
@click.stop="handleDelete(scope.row)"/>
</div>
</el-tooltip>
</template>
@@ -217,34 +159,6 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<!-- <el-card v-show="ExecutionProgressShow">-->
<!-- <div>-->
<!-- <h4 style="display: inline-block;margin: 3px;">项目进度</h4>-->
<!-- <div style="display: inline-block; float:right">-->
<!-- <span>已完成进度：</span>-->
<!-- <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">-->
<!-- <el-option-->
<!-- v-for="item in executionProgress"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- :disabled ="item.disabled"/>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">-->
<!-- <el-step :description="time1" title="签订合同" icon="el-icon-edit-outline"/>-->
<!-- <el-step :description="time2" title="图纸会签" icon="el-icon-picture-outline"/>-->
<!-- <el-step :description="time3" title="加工制造" icon="el-icon-setting"/>-->
<!-- <el-step :description="time4" title="预备验收" icon="el-icon-view"/>-->
<!-- <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>-->
<!-- <el-step :description="time6" title="安装调试" icon="el-icon-time"/>-->
<!-- <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>-->
<!-- <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>-->
<!-- </el-steps>-->
<!-- </div>-->
<!-- </el-card>-->
<el-card v-show="uploader" style="min-height: 145px;">
<h4 style="margin: 3px;">纪要文件</h4>
<div style="float: left;">
@@ -416,17 +330,6 @@
<!--营销经理选择-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<!-- <span>姓名：</span>-->
<!-- <el-input v-model="name" clearable size="small" style="width: 200px"/>-->
<!-- <el-button size="small" type="success" style="margin-left: 10px" icon="el-icon-search" @click="searchName">查询</el-button>-->
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
<!--v-for="item in Province"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px;">
<el-table :data="tableData4" border style="width: 200px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
<el-table-column label="部门" align="center" >
@@ -441,11 +344,6 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<!-- <el-table-column label="性别" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.性别 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<div slot="footer" class="dialog-footer">
@@ -522,36 +420,12 @@
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 350px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
<!-- <el-table-column label="省份" align="center" width="80">-->
<!-- <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" width="80">-->
<!-- <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>
<!-- <el-pagination-->
<!-- :current-page="PageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="PageSize1"-->
<!-- :total="total1"-->
<!-- style="margin-top: 10px"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<div slot="footer" class="dialog-footer">
<el-button @click="offCustomerChange">取消</el-button>
<el-button type="primary" @click="getCustomerCode">确 定</el-button>
@@ -1377,34 +1251,5 @@ a{
}
</style>
<style lang="scss">
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -42,7 +42,7 @@
<!--<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
<!--<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>-->
</el-tooltip>
<el-button type="success" plain size="small" @click="exportExcel()">导出</el-button>
@@ -496,7 +496,7 @@ export default {
/*}*/
</style>
<style lang="scss">
.button111{
.NewlyAdded{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;

20
src/views/MarketingCenter/DeliveryApplication/index.vue
View File

@@ -3,7 +3,7 @@
<el-card class="box-card">
<div>
<el-row>
<el-button :disabled="disabledAdd" class="button111" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">新增</el-button>
<el-button :disabled="disabledAdd" type="distribution" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">新增</el-button>
<el-button :disabled="disabledEdit" type="warning" icon="el-icon-edit" size="mini" plain @click="function_InvoiceEdit">编辑</el-button>
<el-button :disabled="disabledSave" type="success" icon="el-icon-upload" size="mini" plain @click="function_InvoiceSave">保存</el-button>
<el-button :disabled="disabledExamine" type="success" icon="el-icon-lock" size="mini" plain @click="function_InvoiceExamine">核准</el-button>
@@ -1221,20 +1221,4 @@ export default {
clear: both
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -11,26 +11,10 @@
:value="item.value"/>
</el-select>
<el-input v-model="customerName" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请输入客户名称" @dblclick.native="openName" @clear="clearPeople()"/>
<!-- <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>-->
<!-- <el-date-picker-->
<!-- v-model="startTime"-->
<!-- style="margin-right: 5px;width: 150px;"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- placeholder="请选择开始日期"/>-->
<!-- <el-date-picker-->
<!-- v-model="endTime"-->
<!-- style="width: 150px;"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- 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-button
class="button111"
type="distribution"
size="small"
type="primary"
icon="el-icon-circle-plus-outline"
@click.stop="openAddInvoiceRecordingDialog(); flag = 1">新增记录</el-button>
</el-row>
@@ -80,11 +64,6 @@
<span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已支付).toFixed(2) }} </span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="税率" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
@@ -122,95 +101,6 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<!--开票记录-->
<!-- <el-card>-->
<!-- <el-table-->
<!-- v-loading="listLoading2"-->
<!-- :data="tableData2"-->
<!-- :summary-method="getSummaries"-->
<!-- show-summary-->
<!-- style="width: 40%;margin-top: 3px"-->
<!-- height="300"-->
<!-- highlight-current-row-->
<!-- border-->
<!-- stripe-->
<!-- size="mini">-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- label="序号"-->
<!-- type="index"-->
<!-- width="50"/>-->
<!-- <el-table-column align="center" label="发票抬头" width="200" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.客户名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="纳税人识别号" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.税号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="开票电话" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.传真 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="开票地址" width="200">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.地址 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="开户行" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.开户行 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="银行账号" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.银行账号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="开票金额（含税）" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- {{ Number(scope.row.开票金额).toFixed(2) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="开票时间" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.开票时间 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="备注">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.备注 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" width="130">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">-->
<!-- <div style="display: inline-block">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit-outline"-->
<!-- @click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2"/>-->
<!-- </div>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
<!-- <div style="display: inline-block">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- style="margin-left: 20px"-->
<!-- icon="el-icon-delete"-->
<!-- @click.stop="delInvoiceRecordingDialog(scope.row)"/>-->
<!-- </div>-->
<!-- </el-tooltip>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-card>-->
<!-- 开票详情-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleRecord" title="开票详情" center width="800px">
<el-table
@@ -234,31 +124,6 @@
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="纳税人识别号" width="180">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.税号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="开票电话" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.传真 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="开票地址" width="200">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.地址 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="开户行" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.开户行 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="银行账号" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.银行账号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="开票金额（含税）" width="120">
<template slot-scope="scope">
{{ Number(scope.row.开票金额).toFixed(2) }}
@@ -304,14 +169,6 @@
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" type="success" style="margin-left: 10px;" icon="el-icon-search" @click="searchName">查询</el-button>
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
<!--v-for="item in Province"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 5px">
<el-table :data="dataPeople" border size="mini" stripe style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
<el-table-column label="销售经理" align="center" >
@@ -340,36 +197,6 @@
<el-input v-model="form.客户名称" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="发票抬头" prop="发票抬头">-->
<!-- <el-input v-model="form.发票抬头" clearable size="small" style="width:200px" disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="税号" prop="税号">-->
<!-- <el-input v-model="form.税号" clearable size="small" style="width:200px" disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="开票电话" prop="开票电话">-->
<!-- <el-input v-model="form.开票电话" clearable size="small" style="width:200px" disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="开票地址" prop="开票地址">-->
<!-- <el-input v-model="form.开票地址" clearable size="small" style="width:200px" disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="开户行" prop="开户行">-->
<!-- <el-input v-model="form.开户行" clearable size="small" style="width:200px" disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="银行账号" prop="银行账号">-->
<!-- <el-input v-model="form.银行账号" clearable size="small" style="width:200px" disabled/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="开票金额" prop="开票金额">
<el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px"/>
@@ -822,20 +649,4 @@ export default {
/* }*/
/*}*/
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -8,7 +8,7 @@
<!--<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=50;searchTable()">查询</el-button>-->
<el-tooltip :open-delay="1200" effect="dark" content="新增外协厂家" placement="top">
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
</el-tooltip>
</el-card>
<el-card>
@@ -419,20 +419,4 @@ export default {
margin: 0px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<el-col :span="8">
<el-col style="width: auto">
<el-row>
<span>外协厂家:</span>
<el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
@@ -13,24 +13,24 @@
{{ scope.row.外协厂家名称 }}
</template>
</el-table-column>
<el-table-column label="外协金额(元)" prop="总价" align="center" width="200px">
<el-table-column label="外协金额(元)" prop="总价" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.总价 }}
</template>
</el-table-column>
<el-table-column label="到票金额(元)" align="center" width="130px" prop="开票金额">
<el-table-column label="到票金额(元)" align="center" width="110px" prop="开票金额">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column label="付款金额(元)" align="center">
<el-table-column label="付款金额(元)" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.备注 }}
{{ scope.row.付款金额 }}
</template>
</el-table-column>
<el-table-column label="未付金额(元)" align="center">
<el-table-column label="未付金额(元)" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.备注 }}
{{ scope.row.应付金额 }}
</template>
</el-table-column>
</el-table>
@@ -46,27 +46,33 @@
@current-change="handleCurrentChange"/>
</div>
</el-col>
<el-col :span="8">
<el-col style="width: auto">
<el-row>
<span style="margin-top: 10px">开票明细:</span>
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1()">新增</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1('form1')">新增</el-button>
</el-row>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
<el-table-column label="发票号" prop="外协厂家名称" align="center" width="230px">
<el-table-column label="发票号" prop="发票号" align="center" width="180px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="开票金额" prop="总价" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.总价 }}
</template>
</el-table-column>
<el-table-column label="开票时间" align="center" width="130px" prop="开票金额">
<el-table-column label="开票金额(元)" prop="开票金额" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column label="开票日期" align="center" width="100px" prop="开票日期">
<template slot-scope="scope">
{{ scope.row.开票时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="200px">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="ChangeOpen1(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete1(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@@ -80,20 +86,26 @@
@current-change="handleCurrentChange2"/>
</div>
</el-col>
<el-col :span="8">
<el-col style="width: auto">
<el-row>
<span style="margin-top: 10px">付款明细:</span>
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd2()">新增</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd2('form2')">新增</el-button>
</el-row>
<el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
<el-table-column label="付款金额" prop="外协厂家名称" align="center" width="230px">
<el-table-column label="付款金额(元)" prop="付款金额" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
{{ scope.row.付款金额 }}
</template>
</el-table-column>
<el-table-column label="付款时间" prop="总价" align="center" width="200px">
<el-table-column label="付款日期" prop="总价" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.总价 }}
{{ scope.row.付款日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="200px">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="ChangeOpen2(scope.row)">编辑</el-button>
<el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete2(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -111,15 +123,15 @@
</el-col>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="新增发票" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" :title="title1" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row>
<el-form-item label="发票号" prop="发票号" >
<el-input v-model="form1.发票号" placeholder="发票号" style="width:200px" clearable size="small"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="开票金额" prop="开票金额">
<el-form-item label="开票金额(元)" prop="开票金额">
<el-input v-model="form1.开票金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
</el-form-item>
</el-row>
@@ -142,16 +154,44 @@
<el-button type="primary" @click="submit1('form1')" >确定</el-button>
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" :title="title2" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row>
<el-form-item label="付款金额(元)" prop="付款金额">
<el-input v-model="form2.付款金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="付款时间" prop="付款时间">
<el-date-picker
v-model="form2.付款时间"
style="width:200px"
size="small"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
clearable
placeholder="付款时间"/>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form2')">取消</el-button>
<el-button type="primary" @click="submit2('form2')" >确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { searchtable, getInvoice, getPayment, AddType1, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
import { searchtable, getInvoice, getPayment, AddType1, AddType2, handleChange1, handleChange2, handleDelete1, handleDelete2 } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
export default {
data() {
return {
ManufacturerName: '', // 外协厂家
外协厂家流水号: '',
外协厂家流水号_Select: '',
loading: false,
tableData: [], // 表格数据
total: null, // 总条数
@@ -167,13 +207,30 @@ export default {
total3: null, // 总条数
pageSize3: 50, // 每页显示条数
pageCurrent3: 1, // 后台获取页
id_edit1: '',
param1: 0,
title1: '',
dialogFormVisible1: false,
form1: {
发票号: '',
开票时间: '',
开票金额: ''
},
rules: {}
id_edit2: '',
param2: 0,
title2: '',
dialogFormVisible2: false,
form2: {
付款金额: '',
付款时间: ''
},
rules: {
发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
开票时间: [{ required: true, message: '请选择开票时间', trigger: 'change' }],
开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
付款时间: [{ required: true, message: '请选择开票时间', trigger: 'change' }],
付款金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }]
}
}
},
created() {
@@ -182,13 +239,13 @@ export default {
methods: {
// 获取表格1数据
getParts() {
this.外协厂家流水号 = ''
this.loading = true
this.tableData = []
var check
var check2 = 0
this.ManufacturerName ? check = 1 : check = 0
searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent, this.pageSize).then(response => {
console.log(response.data)
this.loading = false
if (response.data.rows.length !== 0) {
this.tableData = response.data.rows
@@ -198,20 +255,19 @@ export default {
},
rowClick(row) {
this.外协厂家流水号 = row.外协厂家流水号
this.外协厂家流水号_Select = row.外协厂家流水号
this.loading2 = true
this.tableData2 = []
this.loading3 = true
this.tableData3 = []
getInvoice(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 2)
this.loading2 = false
if (response.data.rows.length !== 0) {
this.tableData2 = response.data.rows
this.total2 = response.data.total
}
})
getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 3)
getPayment(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
this.loading3 = false
if (response.data.rows.length !== 0) {
this.tableData3 = response.data.rows
@@ -220,11 +276,10 @@ export default {
})
},
// 发票
getInvoice(row) {
getInvoice() {
this.loading2 = true
this.tableData2 = []
getInvoice(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 2)
getInvoice(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => {
this.loading2 = false
if (response.data.rows.length !== 0) {
this.tableData2 = response.data.rows
@@ -233,11 +288,10 @@ export default {
})
},
// 付款
getPayment(row) {
getPayment() {
this.loading3 = true
this.tableData3 = []
getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
console.log(response.data, 3)
getPayment(this.外协厂家流水号_Select, this.pageCurrent2, this.pageSize2).then(response => {
this.loading3 = false
if (response.data.rows.length !== 0) {
this.tableData3 = response.data.rows
@@ -247,22 +301,29 @@ export default {
},
// 点击增加
handleAdd1(formName) {
this.form1.发票号 = ''
this.form1.开票时间 = ''
this.form1.开票金额 = ''
this.form1.外协厂家 = ''
this.dialogFormVisible1 = true
if (this.$refs[formName] !== undefined) {
this.$refs[formName].resetFields()
}
if (this.外协厂家流水号) {
this.param1 = 1
this.title1 = '新增发票'
this.form1.发票号 = ''
this.form1.开票时间 = ''
this.form1.开票金额 = ''
this.form1.外协厂家 = ''
this.dialogFormVisible1 = true
} else {
this.$message.error('请先选择外协厂家')
}
},
// 增加确定
AddType1() {
AddType1(this.外协厂家流水号, this.form.发票号, this.form.开票时间, this.form.开票金额, this.form.外协厂家).then(response => {
AddType1(this.外协厂家流水号, this.form1.发票号, this.form1.开票时间, this.form1.开票金额).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息增加成功',
type: 'success'
})
this.$message.success('信息增加成功')
this.getParts()
this.getInvoice()
this.getPayment()
} else {
this.$message.error('信息增加失败')
}
@@ -270,27 +331,26 @@ export default {
this.dialogFormVisible1 = false
},
// 编辑打开
handleChange1(index, row, formName) {
this.form1.外协厂家 = row.外协厂家流水号
ChangeOpen1(row, formName) {
if (this.$refs[formName] !== undefined) {
this.$refs[formName].resetFields()
}
this.id_edit1 = row.id
this.param1 = 0
this.title1 = '编辑发票'
this.form1.发票号 = row.发票号
this.form1.开户行 = row.开户行
this.form1.开票时间 = row.开票时间
this.form1.开票金额 = row.开票金额
this.form1.接收人 = row.接收人
this.form1.接收时间 = row.接收时间
this.form1.备注 = row.备注
this.dialogFormVisible1 = true
},
// 编辑确定
handleChange() {
handlechange(this.CoManufacturerFlowNumber1, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
handleChange1() {
handleChange1(this.id_edit1, this.form1.发票号, this.form1.开票时间, this.form1.开票金额).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息修改成功',
type: 'success'
})
this.$message.success('信息修改成功')
this.getParts()
this.getInvoice()
this.getPayment()
} else {
this.$message.error('信息修改失败')
}
@@ -298,13 +358,13 @@ export default {
this.dialogFormVisible1 = false
},
// 提交添加或者修改
submit(formName) {
submit1(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.param === 0) {
this.editType()
if (this.param1 === 0) {
this.handleChange1()
} else {
this.handleChange()
this.AddType1()
}
} else {
return false
@@ -312,28 +372,121 @@ export default {
})
},
// 重置表单
callOff(formName) {
callOff1(formName) {
this.dialogFormVisible1 = false
this.$refs[formName].resetFields()
},
// 删除
handleDelete(index, row) {
handleDelete1(row) {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handledelete(row.id).then(response => {
if (this.tableData && this.tableData.length === 1 && this.pageCurrent > 1) {
this.pageCurrent--
handleDelete1(row.id).then(response => {
if (this.tableData2 && this.tableData2.length === 1 && this.pageCurrent2 > 1) {
this.pageCurrent2--
}
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
message: '信息删除成功',
type: 'success'
})
this.$message.success('信息删除成功')
this.getParts()
this.getInvoice()
this.getPayment()
} else {
this.$message.error('信息删除失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
handleAdd2(formName) {
if (this.外协厂家流水号) {
if (this.$refs[formName] !== undefined) {
this.$refs[formName].resetFields()
}
this.param2 = 1
this.title2 = '新增付款'
this.form2.付款时间 = ''
this.form2.付款金额 = ''
this.dialogFormVisible2 = true
} else {
this.$message.error('请先选择外协厂家')
}
},
AddType2() {
AddType2(this.外协厂家流水号, this.form2.付款金额, this.form2.付款时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息增加成功')
this.getParts()
this.getInvoice()
this.getPayment()
} else {
this.$message.error('信息增加失败')
}
})
this.dialogFormVisible2 = false
},
ChangeOpen2(row, formName) {
if (this.$refs[formName] !== undefined) {
this.$refs[formName].resetFields()
}
this.id_edit2 = row.外协付款流水号
this.param2 = 0
this.title2 = '编辑发票'
this.form2.付款金额 = row.付款金额
this.form2.付款时间 = row.付款日期
this.dialogFormVisible2 = true
},
// 编辑确定
handleChange2() {
handleChange2(this.id_edit2, this.form2.付款金额, this.form2.付款时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息修改成功')
this.getParts()
this.getInvoice()
this.getPayment()
} else {
this.$message.error('信息修改失败')
}
})
this.dialogFormVisible2 = false
},
submit2(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.param2 === 0) {
this.handleChange2()
} else {
this.AddType2()
}
} else {
return false
}
})
},
callOff2(formName) {
this.dialogFormVisible2 = false
this.$refs[formName].resetFields()
},
handleDelete2(row) {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handleDelete2(row.外协付款流水号).then(response => {
if (this.tableData3 && this.tableData3.length === 1 && this.pageCurrent3 > 1) {
this.pageCurrent3--
}
if (response.data[0].result === '1') {
this.$message.success('信息删除成功')
this.getParts()
this.getInvoice()
this.getPayment()
} else {
this.$message.error('信息删除失败')
}
@@ -385,20 +538,4 @@ export default {
background: #AEF199;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

24
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -1,8 +1,8 @@
<template>
<div>
<el-col :span="10">
<el-col style="width: auto">
<el-card>
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 150px" placeholder="机床号" @change="typeChange1()">
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="机床号" @change="typeChange1()">
<el-option
v-for="item in toolNum"
:key="item.value"
@@ -12,16 +12,16 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 100px" placeholder="组号">
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 120px" placeholder="组号">
<el-option
v-for="item in Num"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px"/>
<el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -39,7 +39,7 @@
</el-table-column>
<el-table-column label="数量" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
{{ scope.row.投产数量 }}
</template>
</el-table-column>
</el-table>
@@ -56,10 +56,10 @@
</div>
</el-card>
</el-col>
<el-col :span="14">
<el-col style="width: auto">
<el-card>
<el-button size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" border element-loading-text="拼命加载中" size="small">
<el-table-column label="序号" type="index" align="center" width="50"/>
<el-table-column label="加工状态" width="100" align="center">
<template slot-scope="scope">
@@ -84,7 +84,7 @@
{{ scope.row.计划日期 }}
</template>
</el-table-column>
<el-table-column label="工序工时" align="center" width="85px">
<el-table-column label="计划工时" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.工序工时 }}
</template>
@@ -320,14 +320,10 @@ export default {
}
</style>
<style>
.el-table .waixie {
background: #AEF199 !important;
}
.XJWXwx{
background: #9bd7fc !important;
}
.XJWXywc{
background: #AEF199 !important;
background: rgb(103,194,58) !important;
}
</style>

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

@@ -122,16 +122,16 @@
plain
@click="pageCurrent=1;searchMaterial()">查询
</el-button>
<el-button :disabled="token !== 11 && token !== 36" class="button111" 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="distribution" 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"
class="button111"
type="distribution"
icon="el-icon-refresh"
size="small"
style="margin:10px 5px 3px"
@click="CategoryMaintenance">维护物料类别
</el-button>
<el-button class="button111" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
<el-button type="distribution" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
<el-badge :value="weishenhe" class="item">
<el-button type="primary" plain size="small" @click="daishenhe()">采购部新增物料审核</el-button>
</el-badge>
@@ -1025,20 +1025,4 @@ export default {
width:190px
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -21,7 +21,7 @@
</el-card>
<el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
<el-tab-pane label="标准件" name="标准件">
<el-row style="margin-bottom: 5px">
<el-row style="margin-bottom: 3px">
<!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
<!--<el-option-->
<!--v-for="item in project"-->
@@ -87,28 +87,29 @@
:value="item.value"/>
</el-select>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>
<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>
<el-checkbox v-model="checked" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-checkbox>
<!--<el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>-->
<!--<el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>-->
<!--<div style="float:right;">-->
<!--<span style="margin-left: 0">采购员:</span>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 140px">
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 162px">
<el-option
v-for="item in person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
<el-tooltip :open-delay="1000" effect="dark" content="采购任务分配到采购员" placement="top">
<el-button
type="primary"
type="distribution"
size="small"
icon="el-icon-menu"
style="margin-left: 10px"
@click="allocateTask1">分配</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="退回勾选的未分配的物料至车间" placement="top">
<el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
<el-button
type="danger"
type="repulse"
size="small"
icon="el-icon-back"
style="margin-left: 10px"
@@ -116,20 +117,19 @@
</el-tooltip>
<!--</div>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-row style="margin-bottom: 3px">
<el-table
v-loading="loading"
:data="tableData0"
:header-cell-style="{fontFamily:'MicrosoftYaHeiUI',fontSize:'14px',fontWeight:200}"
size="mini"
height="800px"
style="width: 1285px"
height="740px"
style="width: 1265px"
border
stripe
highlight-current-row
@selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection"/>
<el-table-column align="center" label="采购状态" prop="询价状态编号" min-width="100px" width="80px">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" label="进程" prop="询价状态编号" min-width="100px" width="60px">
<template slot-scope="scope">
<span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -157,11 +157,6 @@
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px" width="140px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.项目名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -172,7 +167,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px" width="80px">
<el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px" width="90px">
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
@@ -192,31 +187,11 @@
{{ scope.row.供货商 }}
</template>
</el-table-column>
<!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
<!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.物料计划到货时间.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.操作日期.split(' ')[0] }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
<template slot-scope="scope">
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
@@ -239,6 +214,7 @@
:page-size="pageSize0"
:total="total0"
style="display:inline-block;width:50%"
small
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange0"
@current-change="handleCurrentChange0"/>
@@ -414,7 +390,8 @@
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize1"
:total="total1"
style="display:inline-block;width:50%"
small
style="display:inline-block;width:30%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
@@ -697,7 +674,8 @@ export default {
total1: 0,
pageCurrent2: 1,
pageSize2: 50,
total2: 0
total2: 0,
checked: false
}
},
computed: {
@@ -861,6 +839,8 @@ export default {
}
},
searchTable0() { // 查询标准件
console.log(this.checked)
this.checked ? this.radio = 2 : this.radio = 1
this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
@@ -1148,20 +1128,4 @@ export default {
line-height: 46px;
}
}
/*.el-table td.gutter,.el-table th.gutter{*/
/*width: 15px;*/
/*border-right-width: 0;*/
/*border-bottom-width: 0;*/
/*padding: 0;*/
/*background: red;*/
/*}*/
</style>
<style>
/*.el-table td.gutter,.el-table th.gutter{*/
/*width: 15px;*/
/*border-right-width: 0;*/
/*border-bottom-width: 0;*/
/*padding: 0;*/
/*background: white;*/
/*}*/
</style>

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

@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<el-tooltip :open-delay="1000" effect="dark" content="新增项目装箱单" placement="top">
<el-button class="button111" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
<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>
@@ -85,7 +85,7 @@
</el-card>
<el-card >
<el-button :disabled="!disabled" class="button111" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
<el-button :disabled="!disabled" type="distribution" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
<el-table
v-loading="loading"
:data="machineTableData"
@@ -199,7 +199,7 @@
</el-card>
<el-card >
<el-button :disabled="!disabled" class="button111" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
<el-button :disabled="!disabled" type="distribution" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
<el-table
v-loading="loading"
:data="spareData"
@@ -267,7 +267,7 @@
</el-card>
<el-card >
<el-button :disabled="!disabled" class="button111" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
<el-button :disabled="!disabled" type="distribution" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
<el-table
v-loading="fileLoading"
:data="fileData"
@@ -1082,21 +1082,4 @@ span{
}
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -30,7 +30,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button class="button111" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
<el-button type="distribution" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
</div>
<upload-excel-component @on-selected-file="selected"/>
</div>
@@ -490,21 +490,4 @@ a{
color: #999;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

30
src/views/TechnologyCenter/ImportParts/uploadFile.js
View File

@@ -1,4 +1,6 @@
import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
// 初始化 项目名称
export function initProject() {
@@ -6,6 +8,8 @@ export function initProject() {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_项目名称_查询数据_按时间排序'
}
@@ -17,6 +21,8 @@ export function upload(project, machine, group, designer) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '组件明细表_基本件_导入数据',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group + '&设计者=' + designer
@@ -29,6 +35,8 @@ export function upload1(designer, time, project, machine, group, num1, num2, nam
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '组件明细表_基本件_导入数据1',
param: '设计者=' + designer + '&保存时间=' + time + '&项目=' + project + '&机床=' + machine + '&组号=' + group + '&序号=' + num1 + '&图号或者型号=' + num2 + '=string&名称=' + name + '&材料或者规格=' + size + '&数量=' + num3 + '&供货商=' + supplier + '&备注=' + remark + '&标记=' + mark
@@ -41,6 +49,8 @@ export function searchPart(project, machine, group) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '导入数据_查询',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group
@@ -53,6 +63,8 @@ export function outBuyUpload(project, machine, group, designer) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '组件明细表_外购件_导入数据',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group + '&设计者=' + designer
@@ -65,6 +77,8 @@ export function outBuyUpload1(designer, time, project, machine, group, num1, num
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: '组件明细表_外购件_导入数据1',
param: '设计者=' + designer + '&保存时间=' + time + '&项目=' + project + '&机床=' + machine + '&组号=' + group + '&序号=' + num1 + '&图号或者型号=' + num2 + '&名称=' + name + '&材料或者规格=' + size + '&数量=' + num3 + '&供货商=' + supplier + '&备注=' + remark + '&标记=' + mark
@@ -77,6 +91,8 @@ export function outBuySearchPart(project, machine, group) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '导入数据_外购件_查询',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group
@@ -89,6 +105,8 @@ export function searchBasePartDetail(project, machine, group) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_综合_全部',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group
@@ -101,6 +119,8 @@ export function searchOutPartDetail(project, machine, group) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_外购件和标准件_数据导入保存_综合_全部',
param: '项目=' + project + '&机床=' + machine + '&组号=' + group
@@ -113,6 +133,8 @@ export function deleteTable1(id) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: 'PDM_零件明细表_基本件_数据导入保存_删除数据',
param: 'id=' + id
@@ -125,6 +147,8 @@ export function deleteTable2(id) {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '2',
name: 'PDM_零件明细表_外购件和标准件_数据导入保存_删除数据',
param: 'id=' + id
@@ -137,6 +161,8 @@ export function initStandard1() {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_备注'
}
@@ -148,6 +174,8 @@ export function initStandard2() {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_材料或者规格'
}
@@ -159,6 +187,8 @@ export function initStandard3() {
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_物料流水号'
}

20
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -26,7 +26,7 @@
:value="item.value"/>
</el-select>
<el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
<el-button icon="el-icon-circle-plus-outline" class="button111" size="small" @click="openUrgentItem()">加急件</el-button>
<el-button icon="el-icon-circle-plus-outline" type="distribution" size="small" @click="openUrgentItem()">加急件</el-button>
</el-card>
<el-card>
<div v-for="(file, key) in hadFile" :key="key">
@@ -571,20 +571,4 @@ a{
margin: 0px !important;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

21
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -139,7 +139,7 @@
</el-table-column>
</el-table>
<el-button
class="button111"
type="distribution"
size="small"
style="margin-top:10px"
@click="calculateContractSum">计算合同总额</el-button>
@@ -158,7 +158,7 @@
:value="item.value"/>
</el-select>
<el-button
class="button111"
type="distribution"
size="small"
style="margin-left: 7.5%; margin-top: 10px"
@click="doneContract">生成采购合同</el-button>
@@ -744,21 +744,4 @@ export default {
margin-bottom: 5px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -83,7 +83,7 @@
<!--<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-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
<el-button type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
</el-tooltip>
@@ -907,21 +907,4 @@ export default {
top: 5px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

21
src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
View File

@@ -4,7 +4,7 @@
<span>发票号:</span>
<el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
<el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
</el-card>
<el-card>
@@ -130,7 +130,7 @@
<h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
<span>发票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
<el-button :disabled="disabled" class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
<el-button :disabled="disabled" type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table-column label="名称" align="center" width="150">
<template slot-scope="scope">
@@ -765,21 +765,4 @@ export default {
margin: 0;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

87
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -24,7 +24,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
<el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
<el-button type="distribution" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
</div>
</el-card>
<el-card style="width: 45%;float: left">
@@ -501,7 +501,6 @@
import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5,
searchSupplier, deleteArrivalMX, EditArrivalOrderMX, AddArrivalOrderMX, deleteMateriel, searchTable6, searchLxPurchaseOrder, searchLxMateriel } from '@/api/WorkshopProcurement/NewArrivalList.js'
import { mapGetters } from 'vuex'
import { ExcelWaiGou } from '@/utils/request'
export default {
data() {
return {
@@ -644,7 +643,10 @@ export default {
到货金额组: [],
getRowKeys(row) {
return row.采购计划明细流水号
}
},
sup: '',
num: '',
num2: ''
}
},
computed: {
@@ -945,9 +947,10 @@ export default {
})
},
searchTable5(row) {
console.log(row)
this.sup = row.供应商名称
this.num1 = row.到货单流水号
this.num2 = row.到货单编号
this.excle_row = row
console.log(this.userId, this.id)
this.disable = row.是否关联
this.tableData6 = []
this.到货单流水号 = row.到货单流水号
@@ -1098,7 +1101,6 @@ export default {
},
handleSelectionChange(val) {
this.arrest = val
console.log(this.arrest)
},
// 选入
addMateriel() {
@@ -1161,60 +1163,20 @@ export default {
})
},
downloadExcel() {
const _ExcelWaiGou = ExcelWaiGou
this.download(`${_ExcelWaiGou}?type=Excel_NewArrivalList&folename=外购单&rec1=${this.excle_row.到货单流水号}&rec2=${this.excle_row.到货单流水号}&rec3=${this.excle_row.到货单流水号}&rec4=${this.excle_row.到货单流水号}`)
},
/**
* 下载
* @param {String} url 目标文件地址
* @param {String} filename 想要保存的文件名称
*/
download(url) {
this.getBlob(url, function(blob, filename) {
saveAs(blob, filename)
})
},
getBlob(url, cb) {
var xhr = new XMLHttpRequest()
xhr.open('GET', url, true)
xhr.responseType = 'blob'
xhr.onload = function() {
if (xhr.status === 200) {
console.log(xhr, 1111)
const name = xhr.getResponseHeader('content-disposition').split('=')[1]
cb(xhr.response, name)
}
}
xhr.send()
var param = []
param[0] = ['到货单流水号', this.num1]
param[1] = ['编号', this.num2]
param[2] = ['供应商', this.sup]
var Data = this.CreateData('12', '报表_备料管理_到货单明细查询', param)
this.exportExcel_NPOI(Data)
}
}
}
/**
* 保存
* @param {Blob} blob
* @param {String} filename 想要保存的文件名称
*/
function saveAs(blob, filename = '下载文件.xls') {
if (window.navigator.msSaveOrOpenBlob) {
navigator.msSaveBlob(blob, filename)
} else {
var link = document.createElement('a')
var body = document.querySelector('body')
link.href = window.URL.createObjectURL(blob)
link.download = filename
// fix Firefox
link.style.display = 'none'
body.appendChild(link)
link.click()
body.removeChild(link)
window.URL.revokeObjectURL(link.href)
}
}
</script>
<style scoped>
.el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td {
/* background-color: #7eaced; */
background-color: #e9f0f9;
font-weight: bold;
color: black;
}
@@ -1254,26 +1216,9 @@ function saveAs(blob, filename = '下载文件.xls') {
</style>
<style>
.el-table__footer-wrapper tbody td, .el-table__header-wrapper tbody td {
background-color: #F5F7FA;
background-color: #e9f0f9;
font-weight: bold;
color: black;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

17
src/views/WorkshopProcurement/OfflineProcurement/index.vue
View File

@@ -678,21 +678,4 @@ export default {
margin: 0
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -2,25 +2,23 @@
<div class="app-container">
<el-card>
<el-row>
<span>发票号:</span>
<el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 180px" clearable/>
<span>供应商:</span>
<el-input v-show="false" v-model="supplierName0" placeholder="供应商" size="small" style="width:130px" clearable @focus="fetchData"/>
<el-select v-model="gongyingshangValue" placeholder="供应商" style="width: 180px" size="small" filterable clearable @change="searchTable1">
<el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 140px" clearable/>
<el-input v-show="false" v-model="supplierName0" placeholder="供应商" size="small" style="width:140px;margin-left: 10px" clearable @focus="fetchData"/>
<el-select v-model="gongyingshangValue" placeholder="供应商" style="width: 180px;margin-left: 10px" size="small" filterable clearable @change="searchTable1">
<el-option
v-for="item in gongyingshang"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value"
size="mini"/>
</el-select>
<span v-show="true" class="demonstration">时间段:</span>
<span v-show="false" class="demonstration">时间段:</span>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
style="width: 300px;margin: 3px 0"
style="width: 240px;margin: 3px 10px"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
@@ -46,10 +44,10 @@
<el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
</el-tooltip>
<el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">新增到票</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">到票</el-button>
</el-row>
</el-card>
<el-card style="width: 58%;float: left">
<el-card style="float: left">
<el-table
:data="tableData1"
size="mini"
@@ -59,50 +57,51 @@
border
highlight-current-row
@row-click="searchTable02">
<el-table-column align="center" label="发票状态" width="80px">
<el-table-column align="center" label="进程" width="70px">
<template slot-scope="scope">
<span v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</span>
<span v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</span>
</template>
</el-table-column>
<el-table-column align="center" label="发票号" width="120px">
<el-table-column align="center" label="发票号" width="110px">
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column align="center" label="开票时间" prop="开票时间" width="100px">
<template slot-scope="scope">
{{ scope.row.开票时间 }}
{{ scope.row.开票时间 | formatTime }}
</template>
</el-table-column>
<el-table-column align="center" label="开票金额" width="80px">
<el-table-column align="center" label="开票金额(元)" width="100px">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
{{ scope.row.开票金额.toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="200px" show-overflow-tooltip>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="190px" width="190px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" >
<el-table-column align="center" label="备注" width="100px" >
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="300px">
<el-table-column align="center" label="操作" width="210px">
<template slot-scope="scope">
<el-tooltip :open-delay="1200" effect="dark" content="关联到货单" placement="top">
<div style="display: inline-block">
<el-tooltip :open-delay="1200" effect="dark" content="到货单" placement="top" style="margin-left: 0">
<div style="display: inline-block;margin-left: 0px">
<el-button
:disabled="Number(scope.row.是否请款)===1"
type="text"
size="mini"
icon="el-icon-share"
@click="aboutArrival(scope.row)">关联到货单</el-button>
style="margin-left: -15px"
@click="aboutArrival(scope.row)">到货单</el-button>
</div>
</el-tooltip>
<el-button type="text" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel(scope.row)">导出</el-button>
<el-button type="text" size="mini" icon="el-icon-download" style="margin-left:8px" @click="downloadExcel(scope.row)">导出</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
@@ -110,7 +109,7 @@
type="text"
size="mini"
icon="el-icon-edit-outline"
style="margin-left: 20px"
style="margin-left: 10px"
@click="editTable1(scope.row)"/>
</div>
</el-tooltip>
@@ -121,14 +120,14 @@
type="text"
size="mini"
icon="el-icon-delete"
style="margin-left: 20px"
style="margin-left: 10px"
@click="deleteTable1(scope.row)"/>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<div class="block" style="margin-top: 0px;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
@@ -140,10 +139,10 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card style="float: left;width: 41.3%;margin-left: 5px">
<el-table :data="gridData" class="subTableHeader" show-summary border size="mini" style="width: 100%">
<el-card style="float: left;margin-left: 5px">
<el-table :data="gridData" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column label="到货单编号" align="center">
<el-table-column label="到货单编号" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.到货单编号 }}
</template>
@@ -153,12 +152,12 @@
{{ scope.row.日期.split(' ')[0] }}
</template>
</el-table-column>
<el-table-column label="金额" align="center" width="80" prop="到货金额">
<el-table-column label="金额(元)" align="center" width="120" prop="到货金额">
<template slot-scope="scope">
{{ scope.row.到货金额.toFixed(2) }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="操作">
<el-table-column min-width="100" width="60" align="center" label="操作">
<template slot-scope="scope">
<el-tooltip effect="dark" content="取消关联" placement="top">
<div style="display: inline-block">
@@ -257,7 +256,6 @@
<script>
import { searchInvoice, addInvoice, editInvoice, deleteInvoice, searchSupplier, searchInvoiceDetail, searchArriveOrder, addMateriel, deleteInvoiceMX, getGongyingshang } from '@/api/WorkshopProcurement/OutsourcingMaterialsInvoice'
import { mapGetters } from 'vuex'
import { ExcelDownLoad } from '@/utils/request'
export default {
name: '', // 发票交接单
@@ -347,6 +345,31 @@ export default {
this.searchTable1()
},
methods: {
getSummaries(param) { // 合计
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
} else if (index === 3) {
const values = data.map(item => Number(parseFloat(item['到货金额'])))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] = sums[index].toFixed(2) + ' 元'
} else {
sums[index] = 'N/A'
}
}
})
return sums
},
fetchData() {
searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -557,8 +580,13 @@ export default {
})
},
downloadExcel(row) {
const _ExcelDownLoad = ExcelDownLoad
this.download(`${_ExcelDownLoad}?Fapiao=${row.发票流水号}&name=${row.供应商名称}`)
var param = []
param[0] = ['发票流水号', row.发票流水号]
param[1] = ['供应商', row.供应商名称]
var Data = this.CreateData('12', '报表_备料管理_发票明细_查询数据', param)
this.exportExcel_NPOI(Data)
// const _ExcelDownLoad = ExcelDownLoad
// this.download(`${_ExcelDownLoad}?Fapiao=${row.发票流水号}&name=${row.供应商名称}`)
},
/**
* 下载
@@ -631,34 +659,17 @@ function saveAs(blob, filename = '下载文件.xls') {
<style lang="scss">
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
background: #7eaced !important;
color: #FFFFFF;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
background-color: #ffffff !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
background-color: #e9f0f9;
}
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

20
src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
View File

@@ -29,7 +29,7 @@
icon="el-icon-search"
style="margin-left: 10px"
@click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
<el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
<el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
</el-card>
<el-row>
<el-col style="width: 1200px">
@@ -442,20 +442,4 @@ export default {
margin-bottom: 5px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -27,7 +27,7 @@
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
<el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
<el-button type="distribution" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</el-tooltip>
</el-col>
</el-card>
@@ -424,21 +424,3 @@ export default {
}
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

20
src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
View File

@@ -18,7 +18,7 @@
:value="item.value"/>
</el-select>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
<el-button class="button111" style="margin: 10px" size="small" icon="el-icon-circle-check" @click="submitInStorage">确认到货</el-button>
<el-button type="distribution" style="margin: 10px" size="small" icon="el-icon-circle-check" @click="submitInStorage">确认到货</el-button>
</el-card>
<el-card>
<el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
@@ -213,21 +213,3 @@ export default {
margin-bottom: 5px;
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

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

@@ -145,7 +145,8 @@ export default {
margin-left: 15px;
}
&.active {
background-color: rgb(52,119,190);
/*background-color: rgb(52,119,190);*/
background-color: #2A71CA;
color: #ffffff;
border-color: #ffffff;
&::before {