diff --git a/src/api/ManufacturingCenter/ProductionPlanQuery.js b/src/api/ManufacturingCenter/ProductionPlanQuery.js
new file mode 100644
index 00000000..f2f4a098
--- /dev/null
+++ b/src/api/ManufacturingCenter/ProductionPlanQuery.js
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 获取机床
+export function searchMachine() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: 'PDM_项目名称_查询数据'
+ }
+ })
+}
+// 查询以投产零件
+export function searchtable() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '车间生产管理工艺_生产计划_查询零件',
+ param: `机床流水号=${arguments[0]}&零件图号_check=${arguments[1]}&零件图号=${arguments[2]}&投产时间_check=${arguments[3]}&开始时间=${arguments[4]}&结束时间=${arguments[5]}&加急_check=${arguments[6]}`,
+ pagination: arguments[7] + '&' + arguments[8]
+ }
+ })
+}
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 91080446..1272616c 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -4,9 +4,8 @@
- 零件图号:
- 查询
+ 查询
查询全部
@@ -32,11 +31,11 @@
v-loading="loading"
:data="tableData"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
+ :row-class-name="tableRowClassName1"
height="760"
style="width: 1110px; margin: 3px 0"
size="mini"
border
- stripe
sortable
highlight-current-row
element-loading-text="拼命加载中"
@@ -162,7 +161,7 @@ export default {
Data: [],
tableData: [], // 表格数据
total: null, // 总条数
- pageSize: 30, // 每页显示条数
+ pageSize: 100, // 每页显示条数
pageCurrent: 1, // 后台获取页
ordername: '',
order: ''
@@ -243,6 +242,7 @@ export default {
材料: this.Data[i].材料,
重量: this.Data[i].重量,
批次数量: this.Data[i].批次数量,
+ 是否加急: this.Data[i].是否加急,
备料任务接受时间: this.Data[i].备料任务接受时间,
备料任务分配时间: this.Data[i].备料任务分配时间
})
@@ -306,6 +306,12 @@ export default {
this.pageCurrent = val
this.searchTable()
},
+ tableRowClassName1({ row }) {
+ console.log(row)
+ if (row.是否加急 === '1') {
+ return 'isUrgentItem'
+ }
+ },
exportExcel() {
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
@@ -359,4 +365,8 @@ export default {
}
}
-
+
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 948c385f..0b9a6f0c 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -9,8 +9,8 @@
整改件投产
-
-
+
+
～
-
+
@@ -179,22 +179,22 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
- 加急件
-
- 打回
-
-
- 投产
-
-
- 备料投产
+
+ 合并生产
- 是否加急
+ 是否加急
-
- 合并生产
+
+ 备料投产
+
+ 投产
+
+
+ 打回
+
+ 加急件
@@ -294,25 +294,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -331,23 +331,20 @@
size="small"
type="date"
value-format="yyyy-MM-dd"
- style="top: 1px;width:250px"
+ style="top: 1px;width:160px"
placeholder="选择结束日期"/>
-
-
-
- 取消
- 确定
-
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+