@@ -401,7 +401,7 @@
-
+
{{ scope.row.姓名 }}
@@ -432,6 +432,7 @@
style="width: 100%"
height="400"
border
+ size="mini"
@row-click="biddingNum">
@@ -484,8 +485,8 @@
- 查询
-
+ 查询
+
{{ 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;
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index c2c4da9f..75f5e84f 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -28,7 +28,7 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
- 查询
+ 查询
@@ -94,7 +94,7 @@
size="mini"
type="primary"
icon="el-icon-circle-plus-outline"
- @click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">增加记录
+ @click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">新增记录
@@ -267,6 +267,7 @@
- 查询
+ 查询
@@ -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
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 278251f7..8e5e65bc 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -25,7 +25,7 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
- 查询
+ 查询
@@ -246,7 +246,7 @@
-
+
@@ -312,7 +312,7 @@ export default {
entryName: [], // 查询条件_项目名称数组
startTime: '', // 查询条件_开始时间
endTime: '', // 查询条件_结束时间
- PageSize: 10, // 项目信息表格初始一页显示十条
+ PageSize: 30, // 项目信息表格初始一页显示十条
PageCurrent: 1, // 项目信息表格一次翻一页
total: null,
tableData1: [], // 项目信息表格数据
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index c53ce35d..a9a9f63c 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -26,7 +26,7 @@
size="small"
type="date"
placeholder="请选择结束日期"/>
- 查询
+ 查询
@@ -312,13 +312,14 @@
-
+
{
+ 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
},
diff --git a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
index 99e3189d..de1aa098 100644
--- a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
+++ b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue
@@ -178,7 +178,7 @@ export default {
dialogFormVisible1: false,
dialogFormVisible2: false, // 新增编辑弹框
total: null, // 总条数
- pageSize: 10, // 每页显示条数
+ pageSize: 30, // 每页显示条数
pageList: 1, // 后台获取页
currentPage: 1, // 显示当前页
tableData3: [], // 表格数据
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index 357db828..773ec379 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -113,8 +113,9 @@
style="margin-left: 10px"
@click="pageCurrent=1;searchMaterial()">查询
- 增加
+ 增加
编辑
{
+ console.log(this.tableData0)
this.tableData0 = response.data.rows
this.total0 = response.data.total
})
diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue
index 278bbb29..78981644 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/index.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue
@@ -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}`)
}
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 26f44dce..6bfe384c 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -34,12 +34,19 @@
:data="tableData"
:row-class-name="tableRowClassName"
size="mini"
- border>
+ border
+ @row-click="searchMaterial1">
+
+
+ 不存在
+ 存在
+
+
{{ scope.row.图号或者型号 }}
@@ -116,6 +123,41 @@
@current-change="handleCurrentChange"/>
+