-
+
- {{ parseTime(scope.row.incomeTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -158,7 +158,7 @@
- {{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -239,12 +239,24 @@
-
+
+
+
+
+
+
+
+
-
+
import { listIncome, getIncome, delIncome, addIncome, updateIncome ,changeIncomeStatus} from "@/api/quality/income";
+import { getCheckTypes } from "@/api/quality/qcProduce";
import ItemSelectMaterial from "./selectMaterial.vue";
import ItemSelectSupplier from "./selectSupplier.vue";
import ItemSelectUser from "./selectUser.vue";
@@ -391,6 +404,7 @@ export default {
},
// 表单参数
form: {},
+ checkTypes:[],
// 表单校验
rules: {
incomeBatchNo: [
@@ -426,9 +440,15 @@ export default {
created() {
this.getDate();
this.getList();
+ this.getCheckTypes();
},
methods: {
-
+ /****/
+ getCheckTypes() {
+ getCheckTypes('material').then(response => {
+ this.checkTypes = response;
+ });
+ },
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0)
@@ -617,7 +637,7 @@ export default {
//检验项目弹窗
handleCheckProject(row){
this.$refs.itemSelectProject.showFlag = true;
- this.$refs.itemSelectProject.init(row);
+ this.$refs.itemSelectProject.init(row,'material');
},
//提交检测结果
saveCheck(){
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index d1c077b..3a06a6e 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -159,21 +159,21 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
- {{ parseTime(scope.row.produceDate, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.produceDate, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
-
-
+
+
- {{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -266,8 +266,8 @@
-
-
+
+
diff --git a/src/views/technology/process/index.vue b/src/views/technology/process/index.vue
index 425a70b..a916475 100644
--- a/src/views/technology/process/index.vue
+++ b/src/views/technology/process/index.vue
@@ -129,6 +129,12 @@
/>
+
-
+
-