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

更新

Browse Source
This commit is contained in:
liushuai
2019-09-05 10:33:39 +08:00
parent 653abcfc59
commit afcda77786
19 changed files with 4558 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/Assembly/AssemblyExecution/index.vue
View File

@@ -168,6 +168,10 @@ export default {
},
methods: {
submitTable2(row) {
row.备注 ? row.备注 : ''
row.实际工时 ? row.实际工时 : ''
row.修补工时 ? row.修补工时 : ''
console.log(row.备注, row.计划流水号, row.实际工时, row.修补工时)
submitTable2(row.备注, row.计划流水号, row.实际工时, row.修补工时).then(res => {
if (res.data[0].result === '1') {
this.$message.success('编辑成功')

4275
src/views/ManufacturingCenter/ParseQuery/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -406,7 +406,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-col :span="8">
<el-form-item label="零件图号">
<el-select
v-model="tuhaoValue"
@@ -419,15 +419,23 @@
v-for="item in tuhao"
:key="item.value"
:label="item.label"
:value="item.value"/>
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name1 }}</div>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="8">
<el-form-item label="零件名称">
<el-input v-model="remark1" size="small" readonly style="width: 150px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格">
<el-input v-model="guige" size="small" readonly style="width: 150px;"/>
</el-form-item>
</el-col>
</el-row>
<el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px">
<el-table-column align="center" label="工艺序号" width="80">
@@ -681,6 +689,7 @@ export default {
perNum2: '',
tuhao: [],
tuhaoValue: '',
guige: '',
check1: 0,
check2: 0,
check3: 0,
@@ -1297,10 +1306,12 @@ export default {
this.CraftmanValue = this.CraftmanValue2
this.perNum = this.perNum2
this.remark1 = ''
this.guige = ''
this.tuhaoValue = ''
},
inputChange() { // 零件号改变
this.remark1 = ''
this.guige = ''
this.tuhaoValue = ''
},
// 典艺工艺查询
@@ -1368,6 +1379,7 @@ export default {
this.tuhao.push({
label: response.data[i].零件图号,
name: response.data[i].零件名称,
name1: response.data[i].规格,
value: response.data[i].工艺计划流水号
})
}
@@ -1387,11 +1399,13 @@ export default {
// 当完成工艺号改变时，零件名称改变，并获取工艺要求
numChange1() {
this.remark1 = ''
this.guige = ''
this.tableData4 = null
console.log(this.tuhaoValue)
for (let i = 0; i < this.tuhao.length; i++) {
if (this.tuhaoValue === this.tuhao[i].value) {
this.remark1 = this.tuhao[i].name
this.guige = this.tuhao[i].name1
this.num = this.tuhao[i].value
}
}

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

@@ -32,8 +32,8 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">增加</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
</el-card>
<!--投标保证金表格-->
@@ -192,7 +192,7 @@
@node-click="handleNodeClick"
/>
</div>
<el-table :data="ListPeople" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange">
<el-table :data="ListPeople" highlight-current-row height="400" size="mini" style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange">
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
@@ -225,6 +225,7 @@
<el-form-item label="实际收回日期" prop="收回日期">
<el-date-picker
v-model="form1.收回日期"
:picker-options="pickerOptions"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
@@ -261,7 +262,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="保证金金额" prop="保证金金额">
<el-input-number v-model="form2.保证金金额" :precision="2" :step="0.1" style="width: 200px" size="small"/>
<el-input-number v-model="form2.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
</el-form-item>
</el-col>
</el-row>
@@ -338,7 +339,7 @@
placeholder="请选择结果公布日期"/>
</el-form-item>
<el-form-item label="中标服务费" prop="中标服务费">
<el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :step="0.1" :max="tenderResultMax" style="width: 200px" size="small"/>
<el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :step="1" :max="tenderResultMax" style="width: 200px" size="small"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -365,7 +366,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="保证金金额" prop="保证金金额">
<el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="0.1" style="width: 200px" size="small"/>
<el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -416,6 +417,8 @@ export default {
},
data() {
return {
pickerOptions: {},
timetime: '',
treeData: [7],
entryName: [],
plannedTime: [],
@@ -446,7 +449,7 @@ export default {
radio: '',
tableData1: [],
tenderResultMax: null,
PageSize: 10,
PageSize: 30,
PageCurrent: 1,
total: null,
dataPeople: [],
@@ -514,6 +517,14 @@ export default {
this.fetchTableData1()
},
methods: {
changeTime() {
this.pickerOptions = Object.assign({}, this.pickerOptions, {
disabledDate: (time) => {
console.log(this.timetime)
return time.getTime() < Date.parse(this.timetime)
}
})
},
init() {
this.getSelect(initType, ['保证金类型', '保证金类型流水号'], 'TypeOfGoldDeposit')
this.getSelect(initType, ['保证金类型', '保证金类型流水号'], 'TypeOfGoldDeposit1')
@@ -608,6 +619,8 @@ export default {
},
TakeBack(row) {
this.addForm('form1')
this.timetime = row.投标日期
this.changeTime()
this.dialogFormVisible1 = true
this.code = row.招标保证金流水号
},

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

@@ -26,7 +26,7 @@
<el-card>
<el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
<span style="float: right">销售经理</span>
<el-table v-loading="loading3" :data="tableData3" height="192" style="width: 100%;margin-top: 10px" border>
<el-table v-loading="loading3" :data="tableData3" height="192" size="mini" style="width: 100%;margin-top: 10px" border>
<!--<el-table-column label="责权省份" align="center" min-width="80">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.省份 }}-->
@@ -69,7 +69,7 @@
</el-table>
</el-card>
<el-row>
<el-col :span="6">
<el-col :span="5">
<el-card>
<el-table
v-loading="loading1"
@@ -78,11 +78,12 @@
stripe
tooltip-effect="dark"
style="width: 100%"
height="744"
height="690"
size="mini"
border>
<el-table-column align="center" label="序号" width="80">
<template slot-scope="scope">
<el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 10;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
<el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 30;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
</template>
</el-table-column>
<el-table-column align="center" label="地区">
@@ -93,22 +94,17 @@
</el-table>
</el-card>
</el-col>
<el-col :span="18">
<el-col :span="19">
<el-card>
<el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<span style="float: right">客户信息</span>
<el-table v-loading="loading2" :data="tableData2" height="670" style="width: 100%;margin-top: 10px" border>
<el-table-column label="省份" align="center" min-width="80px">
<template slot-scope="scope">
{{ scope.row.省份 }}
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" min-width="400">
<el-table v-loading="loading2" :data="tableData2" height="620" size="mini" style="width: 100%;margin-top: 10px" border>
<el-table-column label="客户名称" align="center" min-width="340">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column label="联系人" align="center" min-width="120">
<el-table-column label="联系人" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
@@ -211,7 +207,7 @@
@node-click="handleNodeClick"
/>
</div>
<el-table :data="ListPeople" height="400" style="width: 400px;float: left;margin-left: 30px" highlight-current-row @row-click="handleChange">
<el-table :data="ListPeople" height="400" style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
@@ -361,7 +357,7 @@ export default {
radio: null, // 地区选择框
tableData2: [], // 客户表
pageCurrent: 1,
pageSize: 40,
pageSize: 30,
total: null,
AdressID: null, // 地区流水号
MarketingManagerValue: '', // 营销经理

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

@@ -29,7 +29,7 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
</el-card>
<el-card>
@@ -152,7 +152,7 @@
:value="item.value"/>
</el-select>
<div style="margin-top: 15px">
<el-table :data="tableData3" border style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
<el-table :data="tableData3" border style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
<el-table-column label="销售经理" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -668,7 +668,7 @@ export default {
endTime: '',
endTime_check: null,
param: '',
PageSize: 10,
PageSize: 30,
PageCurrent: 1,
total: null,
dialogFormVisiblePeople: false,

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

@@ -11,7 +11,7 @@
</el-select>
<span style="margin-left: 10px">销售经理：</span>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>
<el-badge :value="value" :max="99" class="item">
<el-button size="small" type="text" @click="AccountsReceivable">查看收款信息</el-button>
@@ -158,7 +158,7 @@
:expand-row-keys="expands1"
:data="tableData2"
style="width: 100%;max-height: 440px; margin-top: 15px; text-align: center"
height="350"
height="220"
highlight-current-row
border
size="mini"
@@ -286,15 +286,15 @@
<el-pagination
:current-page="PageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
:total="PageSize2"
:page-size="PageSize2"
:total="total2"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
</el-card>
<!--新增合同资金对话框-->
<el-dialog :visible.sync="dialogFormVisible2" title="新增付款计划" center width="380px">
<el-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
<el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
<el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
@@ -420,6 +420,7 @@
<el-form-item label="本次收款时间" prop="付款时间" label-width="110px">
<el-date-picker
v-model="form3.付款时间"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -524,6 +525,8 @@ export default {
}
}
return {
pickerOptions: {},
timetime: '',
name: '',
plannedTime: [],
entryName2: [],
@@ -566,10 +569,10 @@ export default {
tableData2: [],
gridData: [],
PageCurrent: 1,
PageSize: 10,
PageSize: 30,
total: null,
PageCurrent2: 1,
PageSize2: 10,
PageSize2: 30,
total2: null,
dialogFormVisible1: false, // 付款对话框可见性
dialogFormVisible2: false, // 新增对话框可见性
@@ -652,6 +655,7 @@ export default {
this.name = ''
this.dataPeople = []
this.dialogFormVisiblePeople = true
this.searchName()
},
init() {
this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
@@ -924,6 +928,7 @@ export default {
})
},
getTableData2(row) {
this.timetime = row.合同签订日期
this.moneyID = row.资金id
this.max = parseFloat(row.未支付金额)
this.contractTotal = parseFloat(row.合同总金额)
@@ -932,6 +937,7 @@ export default {
this.id3 = ''
this.listLoading2 = false
const data = response.data.rows
console.log(data, 111)
for (let i = 0; i < data.length; i++) {
data[i].未收金额 === '0' ? data[i].是否禁用收款 = true : data[i].是否禁用收款 = false
data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
@@ -946,6 +952,7 @@ export default {
data[i].计划付款时间 = data[i].计划付款时间.substring(0, data[i].计划付款时间.length - 8)
data[i].是否禁用收款 = false
if (data[i].未收金额 === '0') {
data[i].是否禁用收款 = true
data[i].状态 = '已完成'
} else {
if (data[i].状态 === '0') {
@@ -1173,9 +1180,17 @@ export default {
})
})
},
changeTime1() {
this.pickerOptions = Object.assign({}, this.pickerOptions, {
disabledDate: (time) => {
return time.getTime() < Date.parse(this.timetime)
}
})
},
handleEdit1(row) {
this.addForm('form3')
this.title = '记录阶段收款'
this.changeTime1()
this.title = '阶段记录收款'
this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
this.dialogFormVisible3 = true
this.id = row.批次资金id
@@ -1386,8 +1401,12 @@ export default {
// this.editTable(editTableData, [this.zijinID, this.form2.TotalContractAmount], 'form2', function() { this.getTableData(); this.dialogFormVisible4 = false })
},
TransferPlan(row) {
console.log(row)
this.id = row.批次资金id
this.max1 = parseFloat(row.未收金额)
this.form4.转移金额 = parseFloat(row.未收金额)
this.form4.计划阶段 = parseInt(row.付款批次) + 1
console.log(this.form4.转移金额, this.form4.计划阶段)
this.dialogFormVisible5 = true
this.Planning = []
this.addForm('form4')

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

@@ -32,8 +32,8 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
</div>
</el-card>
<el-card>
@@ -401,7 +401,7 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px">
<el-table :data="tableData3" border style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
<el-table :data="tableData3" border style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
<el-table-column label="销售经理" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -432,6 +432,7 @@
style="width: 100%"
height="400"
border
size="mini"
@row-click="biddingNum">
<el-table-column align="center" label="招标企业" width="300">
<template slot-scope="scope">
@@ -484,8 +485,8 @@
<!--客户选择-->
<el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
<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 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">
<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" show-overflow-tooltip style="height: 330px; margin-top: 20px" size="mini" @row-click="handleCustomerChange">
<el-table-column label="省份" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.省份 }}
@@ -552,6 +553,7 @@ export default {
},
data() {
return {
machineDATA: '',
name: '',
a: 1,
b: 1,
@@ -615,10 +617,10 @@ export default {
tableData2: [], // 机床信息表
tableData3: [], // 营销经理表
PageCurrent: 1,
PageSize: 20,
PageSize: 30,
total: null,
PageCurrent1: 1,
PageSize1: 10,
PageSize1: 30,
total1: null,
infoDisable: true,
hetongID: '',
@@ -1258,7 +1260,9 @@ export default {
.el-date-editor{
width:200px;
}
.hide-expand .el-table__expand-column .el-icon {
visibility: hidden;
}
.wrapper{
width: 260px;
height: 50px;

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

@@ -28,7 +28,7 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
</el-card>
<!--项目表格-->
<el-card>
@@ -94,7 +94,7 @@
size="mini"
type="primary"
icon="el-icon-circle-plus-outline"
@click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">增加记录</el-button>
@click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">新增记录</el-button>
</template>
</el-table-column>
</el-table>
@@ -267,6 +267,7 @@
<el-form-item label="开票时间" prop="开票时间">
<el-date-picker
v-model="form.开票时间"
:picker-options="pickerOptions"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
@@ -289,7 +290,7 @@
<!--客户选择-->
<el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px">
<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 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<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" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">
<el-table-column label="省份" align="center" width="80">
<template slot-scope="scope">
@@ -337,6 +338,8 @@ export default {
},
data() {
return {
pickerOptions: {},
timetime: '',
name: '',
projectid: '', // 项目流水号
entryName: [], // 项目名称数组
@@ -353,8 +356,8 @@ export default {
tableData1: [], // 合同信息表格数据
PageCurrent: 1,
PageCurrent1: 1,
PageSize1: 10,
PageSize: 10,
PageSize1: 30,
PageSize: 30,
total1: null,
total: null,
tableData2: [], // 开票记录表格数据
@@ -398,6 +401,14 @@ export default {
this.fetchTableData1()
},
methods: {
changeTime() {
this.pickerOptions = Object.assign({}, this.pickerOptions, {
disabledDate: (time) => {
console.log(this.timetime)
return time.getTime() < Date.parse(this.timetime)
}
})
},
searchName() { // 模糊查询姓名
SelectMarketingManager(this.name).then(response => {
this.dataPeople = response.data
@@ -542,6 +553,8 @@ export default {
// 打开增加开票记录对话框
openAddInvoiceRecordingDialog(row) {
this.projectid = row.项目流水号
this.timetime = row.合同签订日期
this.changeTime()
this.addForm('form')
this.title = '增加'
this.dialogFormVisible1 = true

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

@@ -25,7 +25,7 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
</el-card>
<el-card>
@@ -246,7 +246,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="保证金金额" prop="保证金金额">
<el-input-number v-model="form2.保证金金额" :precision="2" :step="0.1" style="width: 200px" size="small"/>
<el-input-number v-model="form2.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -312,7 +312,7 @@ export default {
entryName: [], // 查询条件_项目名称数组
startTime: '', // 查询条件_开始时间
endTime: '', // 查询条件_结束时间
PageSize: 10, // 项目信息表格初始一页显示十条
PageSize: 30, // 项目信息表格初始一页显示十条
PageCurrent: 1, // 项目信息表格一次翻一页
total: null,
tableData1: [], // 项目信息表格数据

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

@@ -26,7 +26,7 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSizeProject = 10;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
</el-card>
<el-card>
@@ -312,13 +312,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="保证金金额" prop="保证金金额">
<el-input-number v-model="form.保证金金额" :precision="2" :step="0.1" style="width: 200px" size="small"/>
<el-input-number v-model="form.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="缴纳日期" prop="交付日期">
<el-date-picker
v-model="form.交付日期"
:picker-options="pickerOptions"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
@@ -402,6 +403,7 @@
<el-form-item label="扣款日期" prop="扣款日期">
<el-date-picker
v-model="form2.扣款日期"
:picker-options="pickerOptions1"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
@@ -442,6 +444,7 @@
<el-form-item label="扣款日期" prop="扣款日期">
<el-date-picker
v-model="form3.扣款日期"
:picker-options="pickerOptions1"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
@@ -481,6 +484,7 @@
<el-form-item label="收回日期" prop="收回日期">
<el-date-picker
v-model="form4.收回日期"
:picker-options="pickerOptions2"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
@@ -512,12 +516,18 @@ export default {
}
}
return {
pickerOptions: {},
pickerOptions1: {},
pickerOptions2: {},
timetime: '',
timetime1: '',
timetime2: '',
listLoadingProject: false, // 项目信息加载动画
projectTableData: [], // 项目信息表格
startTime: '', // 开始时间
endTime: '', // 结束时间
PageCurrentProject: 1, // 项目信息表格翻页
PageSizeProject: 10, // 项目信息表格每页显示条数
PageSizeProject: 30, // 项目信息表格每页显示条数
totalProject: null, // 总条数
plannedTime: [], // 执行情况
entryNameValue_check: '',
@@ -540,10 +550,10 @@ export default {
tableData1Loading: false, // 安全保证金信息表加载动画
tableData2Loading: false, // 安全保证金信息表加载动画
PageCurrent: 1,
PageSize: 10,
PageSize: 30,
total: null,
PageCurrent2: 1,
PageSize2: 10,
PageSize2: 30,
total2: null,
radio: '1',
title: '',
@@ -611,6 +621,30 @@ export default {
this.searchTableDataProject()
},
methods: {
changeTime() {
this.pickerOptions = Object.assign({}, this.pickerOptions, {
disabledDate: (time) => {
console.log(this.timetime)
return time.getTime() < Date.parse(this.timetime)
}
})
},
changeTime1() {
this.pickerOptions1 = Object.assign({}, this.pickerOptions1, {
disabledDate: (time) => {
console.log(this.timetime1)
return time.getTime() < Date.parse(this.timetime1)
}
})
},
changeTime2() {
this.pickerOptions2 = Object.assign({}, this.pickerOptions2, {
disabledDate: (time) => {
console.log(this.timetime2)
return time.getTime() < Date.parse(this.timetime2)
}
})
},
init() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'entryName')
this.getSelect(initProject, ['项目名称', '项目流水号'], 'entryName1')
@@ -694,6 +728,8 @@ export default {
},
addSafetyMargin(row) {
this.title = '增加'
this.timetime = row.合同签订日期
this.changeTime()
this.dialogFormVisible1 = true
this.projectCode = row.项目流水号
this.addForm('form')
@@ -794,6 +830,9 @@ export default {
},
Withdrawing(row) {
this.title2 = '扣款'
this.timetime1 = row.交付日期
console.log(row)
this.changeTime1()
this.dialogFormVisible2 = true
this.code = row.安全保证金流水号
this.projectName = row.项目名称
@@ -839,6 +878,8 @@ export default {
TakeBack(row) {
this.code = row.安全保证金流水号
this.projectName = row.项目名称
this.timetime2 = row.交付日期
this.changeTime2()
this.form4.剩余金额 = parseFloat(row.应收回金额)
this.dialogFormVisible4 = true
},

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

@@ -178,7 +178,7 @@ export default {
dialogFormVisible1: false,
dialogFormVisible2: false, // 新增编辑弹框
total: null, // 总条数
pageSize: 10, // 每页显示条数
pageSize: 30, // 每页显示条数
pageList: 1, // 后台获取页
currentPage: 1, // 显示当前页
tableData3: [], // 表格数据

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

@@ -113,8 +113,9 @@
style="margin-left: 10px"
@click="pageCurrent=1;searchMaterial()">查询
</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
<el-button :disabled="token !== 11 && token !== 36" type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
<el-button
:disabled="token !== 11 && token !== 36"
type="warning"
icon="el-icon-refresh"
size="small"
@@ -161,12 +162,14 @@
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
:disabled="token !== 11 && token !== 36"
size="mini"
type="primary"
icon="el-icon-edit"
@click="handleEdit(scope.row)">编辑
</el-button>
<el-button
:disabled="token !== 11 && token !== 36"
size="mini"
type="danger"
icon="el-icon-delete"
@@ -455,6 +458,7 @@ import {
addVariety,
deleteVariety
} from '@/api/PurchasingCenter/MaterialManagement'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -535,6 +539,13 @@ export default {
}
}
},
computed: {
...mapGetters([
'name',
'id',
'token'
])
},
created() {
this.fetchData()
this.searchMaterialCategory()

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

@@ -506,6 +506,7 @@ export default {
this.spec ? check4 = 1 : check4 = 0
this.model ? check5 = 1 : check5 = 0
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model).then(response => {
console.log(this.tableData0)
this.tableData0 = response.data.rows
this.total0 = response.data.total
})

4
src/views/TechnologyCenter/ImportChangeParts/index.vue
View File

@@ -181,7 +181,8 @@ export default {
classificationCode
console.log(this.worksheet[j].M2.v.substring(0, 1))
this.group = this.worksheet[j].M2.v.substring(0, this.worksheet[j].M2.v.indexOf('-')) + '组'
if (this.worksheet[j].M2.v.substring(0, 1) === '9') {
console.log(this.worksheet[j].J2.v.substring(0, 2), 11111111111)
if (this.worksheet[j].M2.v.substring(0, 1) === '9' && this.worksheet[j].J2.v.substring(0, 2) === '整改') {
const response = await isExit(this.projectValue, this.worksheet[j].F2.v)
const res = response.data
if (res[0].Column1 === 0) {
@@ -240,6 +241,7 @@ export default {
} catch (e) {
console.log(e)
this.err++
this.loading = false
this.$notify.error(`导入数据错误,请检查导入文件是否正确`)
console.log(`导入数据错误${e}`)
}

71
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -34,12 +34,19 @@
:data="tableData"
:row-class-name="tableRowClassName"
size="mini"
border>
border
@row-click="searchMaterial1">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="物料状态" min-width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small">存在</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="150">
<template slot-scope="scope">
{{ scope.row.图号或者型号 }}
@@ -116,6 +123,41 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<el-table
:data="tableData10"
:cell-class-name="cell"
style="width: 100%"
size="mini"
highlight-current-row
border>
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="物料名称">
<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 align="center" label="物料型号">
<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>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
@@ -289,7 +331,7 @@
<script>
import { sleep } from '../../../utils/tool'
import { unSpecificationQuery1, specificationQuery1, unSpecificationQueryWB1, specificationQueryWB1, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX1, update, searchOldParts, getMachineNames, transferWG1, allDelete, update1 } from '../../../api/TechnologyCenter/ImportParts'
import { unSpecificationQuery1, specificationQuery1, unSpecificationQueryWB1, specificationQueryWB1, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX1, update, searchOldParts, getMachineNames, transferWG1, allDelete, update1, searchMaterial1 } from '../../../api/TechnologyCenter/ImportParts'
export default {
name: 'SpecificationData',
props: {
@@ -319,6 +361,7 @@ export default {
machineNum: '',
tableData: [],
tableDataAll: [],
tableData10: [],
listLoading: false,
unSpecification: [],
pageCurrent: 1,
@@ -409,8 +452,20 @@ export default {
this.getSelect(getMaterial, ['材料', '材料流水号'], 'materials')
},
methods: {
cell({ row, column, rowIndex, columnIndex }) {
if (row.对比类型 === 1 && columnIndex === 2) {
return 'rgb196'
}
if (row.对比类型 === 3 && columnIndex === 1) {
return 'rgb196'
}
if (row.对比类型 === 4 && columnIndex === 3) {
return 'rgb196'
}
},
async fetchData() {
this.pageCurrent = 1
this.tableData10 = []
try {
this.listLoading = true
this.total = 0
@@ -483,6 +538,13 @@ export default {
this.dialogParts = true
}
},
searchMaterial1(row) {
console.log(row)
searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => {
this.tableData10 = response.data
console.log(response.data)
})
},
allDelete() {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
confirmButtonText: '确定',
@@ -493,6 +555,7 @@ export default {
allDelete(this.projectName, this.machineValue, this.groupValue).then(response => {
if (response.data[0].result === '1') {
this.tableData = []
this.tableData10 = []
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
@@ -666,6 +729,7 @@ export default {
this.$message.success(`传递成功`)
this.tableDataAll = []
this.tableData = []
this.tableData10 = []
} else {
this.$message.error(`${this.err}个零件传递失败`)
}
@@ -686,6 +750,9 @@ export default {
.el-table .warning-row {
background: red;
}
.rgb196{
background: palevioletred !important;
}
</style>
<style scoped>

21
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -382,30 +382,12 @@ export default {
if (row.对比类型 === 1 && columnIndex === 2) {
return 'rgb196'
}
if (row.对比类型 === 2 && columnIndex === 1) {
return 'rgb196'
}
if (row.对比类型 === 2 && columnIndex === 2) {
return 'rgb196'
}
if (row.对比类型 === 3 && columnIndex === 1) {
return 'rgb196'
}
if (row.对比类型 === 4 && columnIndex === 3) {
return 'rgb196'
}
if (row.对比类型 === 5 && columnIndex === 1) {
return 'rgb196'
}
if (row.对比类型 === 5 && columnIndex === 3) {
return 'rgb196'
}
if (row.对比类型 === 6 && columnIndex === 2) {
return 'rgb196'
}
if (row.对比类型 === 6 && columnIndex === 3) {
return 'rgb196'
}
},
async fetchData() {
this.pageCurrent = 1
@@ -458,6 +440,7 @@ export default {
allDelete(this.projectName, this.machineValue, this.groupValue).then(response => {
if (response.data[0].result === '1') {
this.tableData = []
this.total = 0
this.tableData10 = []
this.$message.success('删除成功')
} else {
@@ -643,7 +626,7 @@ export default {
background: yellowgreen;
}
.rgb196{
background: palevioletred;
background: palevioletred !important;
}
</style>