diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index 8a3883fb..2e91c29e 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/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 1696377b..a1a9c2b2 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -439,6 +439,8 @@
+
+
@@ -448,8 +450,6 @@
-
-
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index f72479ce..40af2337 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -1816,6 +1816,12 @@ export default {
return value;
},
editBatch() {
+ if(this.selectWork.status == 'w0'){
+ this.$modal.msgError("还未派发请到工单变更进行调整！");
+ return;
+ }
+
+
this.batchLoading = true;
const workOrdercode = this.codes[0];
getWorkOrderBatch(workOrdercode).then(response => {
diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index 9bf3a4ae..ee0aebe3 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -69,17 +69,6 @@
v-hasPermi="['quality:qcInventory:export']"
>导出
-
- 审核编辑
-
@@ -87,16 +76,16 @@
-
-
-
-
+
+
+
+
-
-
+
+
- {{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -115,6 +104,25 @@
+
+
+ 检验
+
+ 审核编辑
+
+
-
-
-
+
+
+
-
-
+
-
-
-
+
+
+
-
-
-
+
+
@@ -174,11 +180,14 @@
+
+
+
+
+
-
-
-
+
@@ -200,7 +209,6 @@
-
-
-
-
-
+
+
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/qcProduceAnalysis/index.vue b/src/views/quality/qcProduceAnalysis/index.vue
index 8e7cbe5b..1aa37c85 100644
--- a/src/views/quality/qcProduceAnalysis/index.vue
+++ b/src/views/quality/qcProduceAnalysis/index.vue
@@ -87,7 +87,7 @@
-
+
@@ -85,6 +86,7 @@