diff --git a/common/style/layout.css b/common/style/layout.css
index 861b865..c0ee243 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -117,12 +117,16 @@ uni-button:after {
width: 100%;
height: 70rpx;
line-height: 70rpx;
- border-bottom: 1px solid #dcdfe6;
+ border: 1px solid #dcdfe6;
+ background: #fff;
padding: 0 15rpx;
font-size: 28rpx;
color: #606266;
border-radius: 4rpx;
}
+.filter_input:disabled {
+ background: #c9c9c9;
+}
.grid-wraper {
width: 100%;
}
diff --git a/pages/ProductManage/BakeProcess.vue b/pages/ProductManage/BakeProcess.vue
index 6264b4e..969c342 100644
--- a/pages/ProductManage/BakeProcess.vue
+++ b/pages/ProductManage/BakeProcess.vue
@@ -22,13 +22,13 @@
温度
-
+
时间
-
+
diff --git a/pages/ProductManage/PointManage.vue b/pages/ProductManage/PointManage.vue
index b975291..0aee751 100644
--- a/pages/ProductManage/PointManage.vue
+++ b/pages/ProductManage/PointManage.vue
@@ -21,7 +21,6 @@
@@ -59,12 +58,7 @@
},
methods: {
handleChange1 (e) {
- console.log(e)
- // this._pointStatusQuery()
- },
- handleChange2 (e) {
- console.log(e)
- // this._pointStatusQuery()
+ this._pointStatusQuery()
},
/** 查询 */
async _pointStatusQuery () {
diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index e09a9c0..7b4cd62 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -64,6 +64,7 @@
+
@@ -86,10 +87,14 @@
dataList: [],
pkId: '',
pkObj: {},
- disabled1: false
+ disabled1: false,
+ disabled2: false,
+ disabled3: false,
+ disabled4: false
};
},
created () {
+ this._queryRawFoilList()
},
methods: {
handleChange (e) {
@@ -97,9 +102,6 @@
},
/** 初始化查询 */
async _queryRawFoilList () {
- if (!this.val1 || !this.val2) {
- return
- }
let res = await queryRawFoilList(this.val1, this.val2)
this.dataList = [...res.rows]
},
@@ -116,6 +118,9 @@
icon: 'none'
})
this.disabled1 = false
+ this.pkId = ''
+ this.pkObj = {}
+ this._queryRawFoilList()
} catch (e) {
this.disabled1 = false
}
@@ -133,6 +138,9 @@
icon: 'none'
})
this.disabled2 = false
+ this.pkId = ''
+ this.pkObj = {}
+ this._queryRawFoilList()
} catch (e) {
this.disabled2 = false
}
@@ -150,6 +158,9 @@
icon: 'none'
})
this.disabled3 = false
+ this.pkId = ''
+ this.pkObj = {}
+ this._queryRawFoilList()
} catch (e) {
this.disabled3 = false
}
@@ -167,6 +178,9 @@
icon: 'none'
})
this.disabled4 = false
+ this.pkId = ''
+ this.pkObj = {}
+ this._queryRawFoilList()
} catch (e) {
this.disabled4 = false
}
@@ -184,6 +198,6 @@
width 92rpx
.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
position sticky
- left 92rpx
+ left 89rpx
z-index 102
diff --git a/pages/ProductManage/SboProdProgress.vue b/pages/ProductManage/SboProdProgress.vue
index 2b82483..3bafaf6 100644
--- a/pages/ProductManage/SboProdProgress.vue
+++ b/pages/ProductManage/SboProdProgress.vue
@@ -97,7 +97,7 @@
},
/** 初始化查询 */
async _queryRawFoil () {
- let res = await _queryRawFoil(this.val1, this.val2, this.index)
+ let res = await queryRawFoil(this.val1, this.val2, this.index)
this.dataList = [...res.data]
}
}
@@ -109,6 +109,6 @@
width 92rpx
.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
position sticky
- left 92rpx
+ left 89rpx
z-index 102