zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testRecordandshowgantt

This commit is contained in:
shijing 2021-12-16 23:37:32 +08:00
parent bab19a707d
commit 3a6c31ea77
7 changed files with 274 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hb_client/src/api/wpm.js
View File

@ -283,13 +283,13 @@ export function createOutputs(data) {
export function recordInit(id) {
return request({
url: `/wpm/operation_record/${id}/init/`,
url: `/wpm/operation_record/${id}/`,
method: 'GET',
})
}
//半产品复检
export function wproductReview(data) {
//testInit
export function testInit(data) {
return request({
url: '/wpm/wproduct/test_init/',
method: 'post',

42
hb_client/src/components/customForm/index.vue
View File

@ -155,9 +155,9 @@
<el-radio v-model="is_testok" :label="testokFalse">检查不合格</el-radio>
</el-form-item>
<div class="dialog-footer" style="text-align: right">
<el-button @click="innerVisible = false">取 消</el-button>
<el-button @click="recordCancel">取 消</el-button>
<el-button type="primary" @click="submitfield('1')">保存</el-button>
<el-button type="primary" @click="submitfield('2')">提交</el-button>
<el-button type="warning" @click="submitfield('2')">提交</el-button>
</div>
</el-row>
@ -188,21 +188,12 @@
type:Number,
default:null
},
origin_test: {
type:Number,
default:null
},
hasPicture:{
type:Boolean,
default:false
},
recordItem:{
type:Boolean,
default:false
}
},
mounted() {
debugger;
let that = this;
that.checkForm = {};
this.form = this.formID;
@ -214,7 +205,6 @@
that.formData.push(obj)
});
that.formData=[...formData];
debugger;
for(let i=0;i<this.results.length;i++){
let key = this.results[i].field_key;
//checkForm接收表单数据的对象
@ -280,9 +270,10 @@
},
methods:{
filterBlock(parent,rule,index,field_key){
// debugger;
debugger;
let that = this;
if(parent!==''&&parent!==null&&parent!==undefined){
debugger;
if(rule!==''&&rule!==null&&rule!==undefined){
let reg = /\{(.+?)\}/g;
//let str = rule.replace(temp,'').replace('$','');//=='有'
@ -706,7 +697,6 @@
let that = this;
that.field = []; //检查项目
let submit = isSubmit=='1'?false:true;
if(that.recordItem){//有记录
that.formData.forEach((item) => {
if(!item.is_hidden){
that.field.push({
@ -725,27 +715,9 @@
}else {//保存
this.$emit('recordSave',that.testrecord);
}
}else{//第一次操作时
that.formData.forEach((item) => {
if(!item.is_hidden){
that.field.push({
form_field: item.id,
field_value: that.checkForm[item.field_key],
is_testok: item.is_testok,//单项检查结果
is_hidden: item.is_hidden
});
}
});
if(that.origin_test!==null){
that.testrecord.origin_test = that.origin_test;
}
that.testrecord.record_data = that.field;//检查项列表
that.testrecord.is_testok = that.is_testok;//检查表检查结果
that.testrecord.form = that.formID;//检查表
that.testrecord.wproduct = that.wproductId;//半成品ID
that.testrecord.is_submited = submit;//提交状态false保存
this.$emit('formFunc',that.testrecord);//第一次保存或提交
}
},
recordCancel(){
this.$emit('recordCancel','')
},
}
}

80
hb_client/src/components/customForm/review.vue
View File

@ -9,7 +9,7 @@
<el-row>
<el-col
v-for="(item, $index) in formData"
v-show="filterBlock(item.parent,item.display_expression)"
v-show="filterBlock(item.parent,item.display_expression,$index,item.field_key)"
:key="$index"
:span="12"
style="position: relative"
@ -22,7 +22,7 @@
<el-input
disabled
class="halfWidth originBlock"
v-model="originForm[item.field_key]"
v-model="item.origin_value"
placeholder="请输入"
@input="keyChange($index,item.field_key)"
/>
@ -40,7 +40,7 @@
<el-input
disabled
class="halfWidth originBlock"
v-model="originForm[item.field_key]"
v-model="item.origin_value"
type="number"
placeholder="请输入"
@input="keyChange($index,item.field_key)"
@ -60,7 +60,7 @@
<el-input
disabled
class="halfWidth originBlock"
v-model="originForm[item.field_key]"
v-model="item.origin_value"
type="number"
placeholder="请输入"
@input="keyChange($index,item.field_key)"
@ -79,7 +79,7 @@
>
<el-date-picker
disabled
v-model="originForm[item.field_key]"
v-model="item.origin_value"
class="halfWidth originBlock"
type="date"
placeholder="选择日期"
@ -101,7 +101,7 @@
>
<el-date-picker
disabled
v-model="originForm[item.field_key]"
v-model="item.origin_value"
class="halfWidth originBlock"
type="datetime"
placeholder="选择日期"
@ -123,7 +123,7 @@
>
<el-select
disabled
v-model="originForm[item.field_key]"
v-model="item.origin_value"
class="halfWidth originBlock"
placeholder="请选择"
@change="keyChange($index,item.field_key)"
@ -155,7 +155,7 @@
>
<el-select
disabled
v-model="originForm[item.field_key]"
v-model="item.origin_value"
class="halfWidth originBlock"
multiple
placeholder="请选择"
@ -225,8 +225,10 @@
<el-radio v-model="is_testok" :label="testokFalse">检查不合格</el-radio>
</el-form-item>
<div class="dialog-footer" style="text-align: right">
<el-button @click="innerVisible = false">取 消</el-button>
<el-button type="primary" @click="submitfield">提交检查项目</el-button>
<el-button @click="recordCancel">取 消</el-button>
<!--<el-button type="primary" @click="submitfield">提交检查项目</el-button>-->
<el-button type="primary" @click="submitfield('1')">保存</el-button>
<el-button type="warning" @click="submitfield('2')">提交</el-button>
</div>
</el-row>
</el-form>
@ -257,7 +259,7 @@
type:Number,
default:0
},
origintest: {
recordId: {
type:Number,
default:0
},
@ -268,9 +270,9 @@
},
mounted() {
let that = this;
this.form = this.formID;
that.form = this.formID;
let formData=this.results;
this.origins=this.originList;
// that.origins=this.originList;
that.wproductId=this.wproduct;
that.origin_test=this.origintest;
formData.forEach(item => {
@ -297,11 +299,11 @@
that.judgeList.push(obj)
});
//原始表的数据
for(let i=0;i<this.origins.length;i++){
/*for(let i=0;i<this.origins.length;i++){
let key = this.origins[i].field_key;
that.originForm[key]=this.origins[i].field_key;
that.$set(that.originForm,key,this.origins[i].field_value)
}
}*/
//图片地址
let imag= this.formData.filter(item => {
return item.field_type === 'draw';
@ -361,7 +363,7 @@
}
},
methods:{
filterBlock(parent,rule){
filterBlock(parent,rule,index,field_key){
// debugger;
let that = this;
if(parent!==''&&parent!==null&&parent!==undefined){
@ -408,6 +410,12 @@
rea = true;
}
}
if(rea){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return rea;
}else{
let temp =rule.match(reg)[0];
@ -415,13 +423,21 @@
let a = rule.replace(key, 'yy');
a = a.replace(key, 'yy');
let yy = "'"+that.checkForm[key]+"'";
if(eval(eval(a))){
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
}
return eval(eval(a));
// return eval("'"+y+"'"+str);
}
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
return false;
}
}else{
that.formData[index].is_hidden = false;
return true;
}
},
@ -741,7 +757,7 @@
}
},
//提交检查项目
submitfield() {
submitfield(isSubmit) {
let that = this;
let drawArr = that.formData.filter(item=>{
return item.field_type==='draw';
@ -765,24 +781,38 @@
}
});
}else{
that.fieldData();
that.fieldData(isSubmit);
}
},
fieldData(){
fieldData(isSubmit){
let that = this;
that.field = []; //检查项目
let submit = isSubmit=='1'?false:true;
that.formData.forEach((item) => {
if(!item.is_hidden){
that.field.push({
form_field: item.id,
id: item.id,
field_value: that.checkForm[item.field_key],
is_testok: item.is_testok//单项检查结果
is_testok: item.is_testok,//单项检查结果
is_hidden: item.is_hidden
});
}
});
that.testrecord.form = that.formID;//检查表
// that.testrecord.form = that.formID;//检查表
that.testrecord.record_data = that.field;//检查项列表
that.testrecord.is_testok = that.is_testok;//检查表检查结果
that.testrecord.wproduct = that.wproductId;//半成品ID
this.$emit('formFunc',that.testrecord);
// that.testrecord.wproduct = that.wproductId;//半成品ID
// that.testrecord.is_submited = true;
that.testrecord.id = that.recordId;
if(submit){//提交
this.$emit('recordSubmit',that.testrecord);
}else {//保存
this.$emit('recordSave',that.testrecord);
}
},
recordCancel(){
this.$emit('recordCancel','')
},
}
}

4
hb_client/src/router/index.js
View File

@ -183,8 +183,8 @@ export const asyncRoutes = [
path: 'gantt',
name: 'gantt',
component: () => import('@/views/pm/gantt'),
meta: { title: '甘特图', perms: ['vendor_manage'] },
hidden: true
meta: { title: '甘特图', icon: 'example',perms: ['vendor_manage'] },
// hidden: true
}
]
}

17
hb_client/src/views/pm/gantt.vue
View File

@ -388,9 +388,11 @@
obj.top=20;
obj.startTime=startTime;
obj.endTime=endTime;
obj.planTime = [startTime,endTime];
obj.per=item.count;
obj.per1=item.count_real;
obj.type=3;
obj.isShow= true;
arr.push(obj);
} else if (item.children && item.children.length >= 1) {
let startTime = new Date(item.start_date).getTime();
@ -409,6 +411,7 @@
objChild.parentId=parentId;
objChild.startTime = start;
objChild.endTime = end;
objChild.planTime = [start,end];
objChild.per = child.count;
objChild.per1 = child.count_real;
objChild.type = 1;
@ -422,6 +425,7 @@
obj.top=20;
obj.startTime=startTime;
obj.endTime=endTime;
obj.planTime = [startTime,endTime];
obj.per=item.count;
obj.per1=item.count_real;
obj.type=3;
@ -515,7 +519,7 @@
if (item.children.length > 0) {
item.children.forEach((z, o) => {
z.planTime = [];
z.top = item.top + o * 40;
z.top = item.top + o * 40+40;
z.isShow = true;
z.left = this.computedTimeWidth(z.startTime);
z.widthMe = z.widthChild = this.computedTimeWidth(
@ -564,17 +568,6 @@
}
this.resetTop(rowIndex, !expand, true);
},
//分组添加子集
handleGroupAdd(row) {
this.$nextTick(() => {
this.$refs.dialogAdd.resetFields();
});
this.currentListIndex = this.list.findIndex(item => {
return item.id == row.id;
});
this.dialogVal = true;
this.isChildren = true;
},
// 根据时间计算距离
computedTimeWidth(startTime, endTime) {
let start = new Date(startTime).getTime();

221
hb_client/src/views/wpm/need.vue
View File

@ -39,7 +39,7 @@
</el-link>
<el-link
v-if="scope.row.test!==null"
@click="checkRecord(scope)"
@click="checkRecord(scope,'1')"
>检验记录
</el-link>
</template>
@ -84,11 +84,22 @@
<el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">
<el-link
v-if="checkPermission(['warehouse_update'])&&scope.row.test===null"
@click="handleInspection(scope,'2')"
>检验
</el-link>
<el-link
v-if="scope.row.test!==null"
@click="checkRecord(scope,'2')"
>检验记录
</el-link>
<!--<el-link
v-if="checkPermission(['warehouse_update'])"
@click="handleInspection(scope,'2')"
>
检验
</el-link>
</el-link>-->
</template>
</el-table-column>
</el-table>
@ -145,8 +156,12 @@
v-if="checkPermission(['warehouse_update'])"
@click="handlePutin(scope)"
>入库
</el-link
>
</el-link>
<el-link
v-if="scope.row.test!==null"
@click="checkRecord(scope)"
>检验记录
</el-link>
</template>
</el-table-column>
</el-table>
@ -193,8 +208,12 @@
v-if="checkPermission(['warehouse_update'])"
@click="handleInspection(scope)"
>检验
</el-link
>
</el-link>
<el-link
v-if="scope.row.test!==null"
@click="checkRecord(scope,'1')"
>检验记录
</el-link>
</template>
</el-table-column>
</el-table>
@ -219,7 +238,7 @@
>
</el-option>
</el-select>
<!--第一次操作时的展示-->
<!-- &lt;!&ndash;第一次操作时的展示&ndash;&gt;
<el-dialog
width="60%"
:title="formName"
@ -231,11 +250,12 @@
:hasPicture="hasPicture"
:formID="recordform"
:wproduct="wproduct"
:origin_test="origin_test"
@formFunc="formFunc"
:recordId="recordId"
@recordSubmit="recordSubmit"
@recordSave="recordSave"
/>
</el-dialog>
<!--复检检验表单-->
&lt;!&ndash;复检检验表单&ndash;&gt;
<el-dialog
width="60%"
:title="formName"
@ -247,12 +267,11 @@
:originList="originList"
:formID="recordform"
:hasPicture="hasPicture"
:recordItem="recordItem"
:wproduct="wproduct"
:origintest="origintest"
@formFunc="formFunc"
/>
</el-dialog>
</el-dialog>-->
<div slot="footer" class="dialog-footer">
<el-button @click="outerVisible = false">
取 消
@ -260,22 +279,42 @@
<el-button type="primary" @click="submitrecordform(innerIndex)">填写检查项目</el-button>
</div>
</el-dialog>
<!--保存过的检查表显示-->
<!--复检检验表单-->
<el-dialog
width="60%"
:title="formName"
@close="recordCancel"
:visible.sync="limitedReview"
:close-on-click-modal="false"
>
<reviewForm
:results="fieldList"
:originList="originList"
:formID="recordform"
:hasPicture="hasPicture"
:wproduct="wproduct"
:recordId="recordId"
@recordSubmit="recordSubmit"
@recordCancel="recordCancel"
/>
</el-dialog>
<!--非检查表显示-->
<el-dialog
width="60%"
:title="formName"
:visible.sync="recordVisible"
:close-on-click-modal="false"
@close="recordCancel"
>
<customForm
v-if="recordVisible"
:results="fieldList"
:hasPicture="hasPicture"
:formID="recordform"
:wproduct="wproduct"
:recordId="recordId"
:recordItem="recordItem"
@recordSubmit="recordSubmit"
@recordSave="recordSave"
@recordCancel="recordCancel"
/>
</el-dialog>
@ -313,8 +352,6 @@
:data="recordList"
border
height="400"
@close="pageRefresh"
@closed="pageRefresh"
>
<el-table-column type="index" width="50"/>
<el-table-column label="表单名称">
@ -386,7 +423,7 @@
<script>
import customForm from '@/components/customForm/index';
import reviewForm from '@/components/customForm/review';
import {getwproductList, wproductTest, wproductPutin, createputins,wproductReview} from "@/api/wpm";
import {getwproductList, wproductTest, wproductPutin, createputins,testInit} from "@/api/wpm";
import checkPermission from "@/utils/permission";
import {getWarehouseList} from "@/api/inm";
import {getMaterialList, getrecordformList, getrffieldList} from "@/api/mtm";
@ -480,7 +517,6 @@
isPost: false,
origin_test: null,
hasPicture: false,
recordItem: false,
outerVisible: false,
innerVisible: false,
limitedReview: false,
@ -553,7 +589,7 @@
},
//批量入库
putins() {
let _this = this
let _this = this;
_this.mutipID = []
this.$refs.multipleTable.selection.forEach((item) => {
_this.mutipID.push(item.id);
@ -584,28 +620,43 @@
//点击检验:如果有一个直接进入，如果有多个表再进行选择
handleInspection(scope,index) {
//调该物料对应的检查表
debugger;
let that = this;
this.innerIndex = index;
this.outerVisible = true;
// this.outerVisible = true;
this.wproduct = scope.row.id;//半成品ID
this.wproductactstate = scope.row.act_state;//半成品状态
this.listQueryrecordform.material = scope.row.material;//
this.listQueryrecordform.material = scope.row.material_.id;//
this.listQueryrecordform.type = 2;
this.recordform = null;
getrecordformList(this.listQueryrecordform).then((response) => {
if (response.data) {
debugger;
this.recordformList = response.data;
if(response.data.length===1){
that.recordform = response.data[0].id;
that.formName = response.data[0].name;
that.submitrecordform(index);
}else{
//弹出列表选择框
this.outerVisible = true;
}
}
});
},
//检验记录
checkRecord(scope){
//选择物料检查表
recordformChange() {
let that = this;
let arr = this.recordformList.filter(item => {
return item.id === that.recordform;
});
that.formName = arr[0].name;
// this.outerVisible = false;
// that.submitrecordform(that.innerIndex);
},
//检验记录
checkRecord(scope,index){
let that = this;
that.innerIndex = index;
that.wproduct = scope.row.id;//半成品ID
that.limitedCheckRecord = true;
getTestRecord({wproduct:scope.row.id}).then(res=>{
@ -619,10 +670,13 @@
},
//点击记录里的检验
handleInspectionRecord(scope){
debugger;
let that =this;
that.recordVisible = false;
that.recordId = scope.row.id;
that.recordform = scope.row.form;
that.formName = scope.row.form_.name;
if(that.innerIndex==='1'){//非复检
getrffieldList({form: this.recordform, page: 1, page_size: 100}).then((response) => {
if (response.data) {
that.hasPicture = false;
@ -651,14 +705,44 @@
arr.push(obj)
}
that.fieldList = arr;
that.recordItem = true;
that.$nextTick(()=>{
that.recordVisible = true;
});
})
}
});
}else if(that.innerIndex==='2'){//复检
getTestRecordItem(scope.row.id).then((res) => {
if (res.data) {
that.hasPicture = false;
let fieldList = res.data.record_data;
that.fieldList = [...fieldList];
that.origintest = res.data.origin_test;
that.recordform = res.data.origin_test_.form;
let originList = res.data.origin_test_.record_data;
that.originList = [...originList];
for (let i = 0; i < that.fieldList.length; i++) {
let obj = that.fieldList[i];
obj.is_testok = null;
for (let j = 0; j < originList.length; j++) {
if (that.fieldList[i].field_key === originList[j].field_key) {
obj.id = originList[j].id;
obj.is_testok = originList[j].is_testok;
obj.field_value = originList[j].field_value;
obj.origin_value = originList[j].field_value;
}
}
let arr = fieldList.filter(item => {
return item.field_type === 'draw'
});
if (arr.length > 0) {
that.hasPicture = true;
}
this.limitedReview = true;
}
}
})
}
},
//点击记录里的查看
handleRecordDetail(scope){
@ -667,7 +751,7 @@
//半产品复检
handleReview() {
let that = this;
wproductReview({ wproduct: this.wproduct,form: that.recordform}).then((response) => {
testInit({ wproduct: this.wproduct,form: that.recordform}).then((response) => {
if (response.data) {
that.hasPicture = false;
that.formName = response.data.name;
@ -687,47 +771,34 @@
}
});
},
//选择物料检查表
recordformChange() {
let that = this;
let arr = this.recordformList.filter(item => {
return item.id === that.recordform;
});
that.formName = arr[0].name;
},
//根据选择的表，渲染检查项目
submitrecordform(index) {
let that = this;
this.outerVisible = false;
if (that.recordform != "") {
if(index==='1'){
wproductReview({ wproduct: that.wproduct,form: that.recordform}).then((response) => {
if(index==='1'){//非复检
testInit({ wproduct: that.wproduct,form: that.recordform}).then((response) => {
if (response.data) {
debugger;
that.hasPicture = false;
that.origin_test = response.data.origin_test;
that.formName = response.data.name;
/* let fieldList = response.data.form_fields;
that.fieldList = [...fieldList];*/
let list = [];
let fieldList = response.data.form_fields;
for(let i=0;i<fieldList.length;i++){
let obj = fieldList[i];
obj.is_testok = true;
obj.field_value = null;
list.push(obj)
}
that.fieldList = list;
that.recordId = response.data.id;
getTestRecordItem(response.data.id).then((res) => {
that.formName = res.data.form_.name;
let fieldList = res.data.record_data;
that.fieldList = [...fieldList];
let arr = fieldList.filter(item => {
return item.field_type === 'draw'
});
if (arr.length > 0) {
that.hasPicture = true;
}
that.recordItem =false;
that.innerVisible = true;
that.$nextTick(()=>{
that.recordVisible = true;
});
})
}
});
}else if(index==='2'){
}else if(index==='2'){//复检
that.handleReview();
}
} else this.$message.error("请选择检查表！");
@ -760,6 +831,10 @@
if(res.code>=200){
that.$message.success("成功");
that.refreshRecord();
that.getList();
that.getList2();
that.getList1();
that.getList3();
}else{
this.$message.error(res.msg);
}
@ -780,7 +855,7 @@
}
})
},
//记录保存检查项目
//保存检查项目
recordSave(value) {
let that = this;
let id = value.id;
@ -790,7 +865,10 @@
putTestRecordItem(id,params).then((res) => {
if (res.code >= 200) {
that.recordVisible = false;
that.reload();
that.getList();
that.getList2();
that.getList1();
that.getList3();
that.refreshRecord();
}else{
this.$message.error(res.msg)
@ -811,7 +889,10 @@
subTestRecordItem(id,params).then((res) => {
if (res.code >= 200) {
that.recordVisible = false;
that.reload();
that.getList();
that.getList2();
that.getList1();
that.getList3();
that.refreshRecord();
}
});
@ -823,23 +904,13 @@
});
},
//第一次保存提交检查项目
formFunc(value) {
let that = this;
if(that.isPost){
return;
}else{
that.isPost = true;
wproductTest(value).then((res) => {
that.isPost = false;
if (res.code >= 200) {
that.innerVisible = false;
that.outerVisible = false;
that.reload()
}
}).catch(()=>{
this.isPost = true;
});
}
recordCancel() {
this.recordVisible = false;
this.limitedReview = false;
this.getList();
this.getList2();
this.getList1();
this.getList3();
},
pageRefresh(){
this.reload()

8
hb_client/src/views/wpm/operationdo.vue
View File

@ -178,7 +178,7 @@
:title="fieldList.name"
>
<el-form label-width="80px" label-position="right">
<el-row v-for="(item, $index) in fieldList.form_fields" :key="$index">
<el-row v-for="(item, $index) in fieldList.record_data" :key="$index">
<el-form-item
v-if="item.field_type === 'string'"
:label="item.field_name"
@ -779,10 +779,10 @@ export default {
recordconfirm() {
let _this = this;
_this.record_data = []; //检查项目
this.fieldList.form_fields.forEach((item) => {
this.fieldList.record_data.forEach((item) => {
_this.record_data.push({
form_field: item.id,
field_value: item.sort,
id: item.id,
field_value: item.field_value,
});
});
this.record.record_data = _this.record_data;