|
|
|
@ -270,9 +270,9 @@
|
|
|
|
|
<el-select v-model="form.typeCode" placeholder="请选择检验类型" style="width: 100%;">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in checkTypes"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
:key="dict.id"
|
|
|
|
|
:label="dict.checkName"
|
|
|
|
|
:value="dict.id"
|
|
|
|
|
></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
@ -368,7 +368,7 @@
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduce } from "@/api/quality/qcProduce";
|
|
|
|
|
import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduce,getCheckTypes } from "@/api/quality/qcProduce";
|
|
|
|
|
import moment from 'moment';
|
|
|
|
|
import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
|
|
|
|
|
import ItemSelectWorkCenter from "./selectWorkCenter.vue";
|
|
|
|
@ -471,15 +471,17 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
/****/
|
|
|
|
|
getList() {
|
|
|
|
|
|
|
|
|
|
getCheckTypes() {
|
|
|
|
|
getCheckTypes().then(response => {
|
|
|
|
|
this.checkTypes = response;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
/**获取默认查询时间段**/
|
|
|
|
|
getDate() {
|
|
|
|
|
let start = this.Fungetdate (0)
|
|
|
|
|
let end = this.Fungetdate (1)
|
|
|
|
|
this.queryParams.produceDateArray.push(start,end)
|
|
|
|
|
this.queryParams.checkTimeArray.push(start,end)
|
|
|
|
|
//this.queryParams.checkTimeArray.push(start,end)
|
|
|
|
|
},
|
|
|
|
|
Fungetdate (num) {
|
|
|
|
|
var dd = new Date();
|
|
|
|
@ -494,12 +496,12 @@ export default {
|
|
|
|
|
getList() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
|
|
|
|
|
if(this.queryParams.produceDateArray!=null){
|
|
|
|
|
if(this.queryParams.produceDateArray.length>0){
|
|
|
|
|
this.queryParams.produceDateStart = moment(this.queryParams.produceDateArray[0]).format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
this.queryParams.produceDateEnd = moment(this.queryParams.produceDateArray[1]).format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(this.queryParams.checkTimeArray!=null){
|
|
|
|
|
if(this.queryParams.checkTimeArray.length>0){
|
|
|
|
|
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
}
|
|
|
|
|