diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js index 7d5a83e..298c59c 100644 --- a/src/api/plan/workorder.js +++ b/src/api/plan/workorder.js @@ -180,4 +180,14 @@ export function getProdLineList() { method: 'get', params: {} }); -} \ No newline at end of file +} +export function getIdCardList(workorderCode){ + const data={ + workorderCode + } + return request({ + url:'/plan/pro/workorder/getIdCardList', + method:'post', + data:data + }) + } diff --git a/src/api/quality/income.js b/src/api/quality/income.js index 8a3883f..2e91c29 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -178,6 +178,17 @@ export function getWorkOrder(query) { params: query }); } + +// 查询生产过程-工单列表 +export function getPutInOrder(query) { + return request({ + url: '/quality/qcInventory/getPutInOrder', + method: 'get', + params: query + }); + } + + // 查询入库订单列表 export function getProductWorkOrder(query) { return request({ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index ef12da5..a438160 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -313,14 +313,14 @@ export default { setInterval(() => this.getAlarmData(), 1000 * 60); this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST")); this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT"); - + /** //先执行一次 this.getUnReadList(); // 实现轮询 this.timer = setInterval(() => { setTimeout(this.getUnReadList(), 30000); }, 30000); - + **/ }, components: { Breadcrumb, diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 12152de..9196b15 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -116,6 +116,20 @@ /> + + + + - + @@ -314,6 +314,20 @@ > + + + + + + + + + - - + - - + - + + + + + + + + + 搜索 重置 @@ -671,6 +685,7 @@ export default { createTime: null, updateBy: null, updateTime: null, + createTimeArray:[], loopStartArray: [], orderStartArray: [], orderEndArray: [], @@ -762,6 +777,7 @@ export default { createTime: null, updateBy: null, updateTime: null, + createTimeArray:[], loopStartArray: [], orderStartArray: [], orderEndArray: [], @@ -775,6 +791,7 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.queryParams.createTimeArray = []; this.queryParams.loopStartArray = []; this.queryParams.orderStartArray = []; this.queryParams.orderEndArray = []; diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index d4eccce..02eced7 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -347,6 +347,20 @@ /> + + + + - + + + + + + - - - + + + - - + - - - + + + - - - + + @@ -174,11 +180,14 @@ + + + + + - - - + @@ -200,7 +209,6 @@ -
@@ -208,16 +216,11 @@ 取 消
- - - - + + import { listQcInventory, getQcInventory, addQcInventory, updateQcInventory, delQcInventory } from "@/api/quality/qcInventory.js"; import { getCheckTypes } from "@/api/quality/qcProduce"; -import ItemSelectMaterial from "./selectMaterial.vue" -import ItemSelectSupplier from "./selectSupplier"; +import ItemPutInOrder from "./selectPutInOrder.vue"; import ItemSelectUser from "../qcIncome/selectUser.vue"; import ItemSelectProject from "../qcIncome/checkProjectType.vue"; import moment from 'moment'; import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js"; export default { name: "Inventory", - components: { ItemSelectMaterial,ItemSelectSupplier,ItemSelectUser,ItemSelectProject}, + components: {ItemPutInOrder,ItemSelectUser,ItemSelectProject}, dicts: ["unit","check_status","check_result"], data() { return { @@ -333,12 +335,17 @@ export default { }; }, created() { - this.getDate(); + //this.getDate(); this.getList(); this.getCheckTypes(); this.handleDefectType(); }, methods: { + productCodeFormate(row, column, cellValue){ + if(cellValue != null){ + return cellValue.slice(7,18); //返回值 + } + }, /****/ getCheckTypes() { getCheckTypes('inventory').then(response => { @@ -364,12 +371,12 @@ export default { /** 查询库存检验列表 */ getList() { this.loading = true; - console.log("--------"+this.queryParams) + if(this.queryParams.incomeTimeArray!=null && this.queryParams.incomeTimeArray.length>0){ this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); }else{ - this.queryParams.incomeTimeStart = null; + this.queryParams.incomeTimeStart = null; this.queryParams.incomeTimeEnd = null; } @@ -522,14 +529,19 @@ export default { this.form.materialCode = obj.code; }, - /**供应商选择弹出框**/ - handleSelectSupplier() { - this.$refs.itemSelectSupplier.showFlag = true; + /**工单选择弹出框**/ + handleSelectWorkOrder() { + this.$refs.itemSelectPutInOrder.showFlag = true; }, - //供应商选择确认 - onSelectSupplier(obj) { - this.form.supplierCode = obj.code; - this.form.supplierName = obj.name; + //工单选择确认 + onSelectPutInOrder(obj) { + this.form.orderNo = obj.orderNo; + this.form.materialName = obj.materialName; + this.form.materialCode = obj.materialCode; + this.form.quality = obj.quality; + this.form.incomeTime = obj.incomeTime; + this.form.supplierName = obj.supplierName;//仓库编码 + this.form.supplierCode = obj.supplierCode;//仓库名称 }, /**人员选择弹出框**/ @@ -561,7 +573,12 @@ export default { getDefectTypeListByDefectType(defectType).then(response => { this.defectTypeList = response.rows; }); - } + }, + //检验项目弹窗(二次编辑) + handleCheckProjectM(row){ + this.$refs.itemSelectProject.showFlag = true; + this.$refs.itemSelectProject.init(row,'inventory'); + }, } }; diff --git a/src/views/quality/qcInventory/selectPutInOrder.vue b/src/views/quality/qcInventory/selectPutInOrder.vue new file mode 100644 index 0000000..8f50c9b --- /dev/null +++ b/src/views/quality/qcInventory/selectPutInOrder.vue @@ -0,0 +1,141 @@ + + diff --git a/src/views/quality/qcProduceAnalysis/index.vue b/src/views/quality/qcProduceAnalysis/index.vue index 8e7cbe5..1aa37c8 100644 --- a/src/views/quality/qcProduceAnalysis/index.vue +++ b/src/views/quality/qcProduceAnalysis/index.vue @@ -87,7 +87,7 @@ - + @@ -85,6 +86,7 @@ + + + diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue index 7f8312c..b5175bc 100644 --- a/src/views/quality/qcTableXJ/index.vue +++ b/src/views/quality/qcTableXJ/index.vue @@ -58,7 +58,7 @@ - + @@ -229,6 +229,13 @@ export default { /** 查询备料单列表 */ getList() { this.loading = true; + + + if(this.queryParams.incomeTime != null){ + this.queryParams.incomeTimeStr = moment(this.queryParams.incomeTime).format('YYYY-MM-DD'); + + } + getXJCheckTableList(this.queryParams).then(response => { this.prepareList = response.rows; this.total = response.total; @@ -330,6 +337,7 @@ export default { let sr = row; this.queryParams.orderNo = sr.orderNo; + this.queryParams.shiftId = sr.shiftId; getXJCheckTableDetail(this.queryParams).then(response => { this.pOrderTableList = response; this.openReport = true; diff --git a/src/views/quality/qcTableXJAnalysis/index.vue b/src/views/quality/qcTableXJAnalysis/index.vue index 737b4ff..f04994f 100644 --- a/src/views/quality/qcTableXJAnalysis/index.vue +++ b/src/views/quality/qcTableXJAnalysis/index.vue @@ -1,6 +1,7 @@ + + + + + diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index efd35b5..fecca57 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -767,7 +767,7 @@ export default { //检验项目弹窗(二次编辑) handleCheckProjectM(row){ this.$refs.itemSelectProject.showFlag = true; - this.$refs.itemSelectProject.init(row,'material'); + this.$refs.itemSelectProject.init(row,'product'); }, //查看检验项目弹窗 diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue index 7c6db3c..f93ae87 100644 --- a/src/views/wms/product/index.vue +++ b/src/views/wms/product/index.vue @@ -448,6 +448,7 @@ append-to-body > + + +
@@ -820,9 +827,7 @@ export default { this.reset(); const productId = row.productId || this.ids; getProduct(productId).then((response) => { - this.form.id = response.data.id; - this.form.iei = response.data.iei; - this.form.manStandar = response.data.manStandar; + this.form = response.data; this.form.productCode = response.data.productCode.slice(7,18); console.log(this.form.productCode); this.openAttached = true;