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

workflowFile

This commit is contained in:
shijing 2021-12-23 10:09:31 +08:00
parent f3e79b3052
commit 3433bbc204
4 changed files with 165 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,5 +306,13 @@ export function scrap(id) {
})
}
//表格初始化
export function getRetrial(id) {
return request({
url: `/wpm/wproduct/${id}/wf_bhg/`,
method: 'GET',
})
}

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

@ -199,7 +199,7 @@
<img :src="originImg">
</div>
<div class="halfWidth">
<img id="canvasImg" :src="img" style="width:500px;height: 300px;display: none">
<img id="canvasImg" src="./../../assets/glass.png" style="width:500px;height: 300px;display: none">
<div style="position: relative;display: flex;flex-direction: column;
border: 1px solid #DCDFE6;">
<canvas id="canvas" width="500" height="300">
@ -282,6 +282,8 @@
that.formData.push(obj)
});
that.formData=[...that.formData];
debugger;
console.log(that.formData)
//当前表的数据存储
for(let i=0;i<this.results.length;i++){
let key = this.results[i].field_key;
@ -310,12 +312,12 @@
});
that.img = 'http://47.95.0.242:2222'+imag[0].draw_template;
let originImag= this.origins.filter(item => {
/*let originImag= this.origins.filter(item => {
return item.field_type === 'draw';
});
});*/
that.originImg = new Image();
that.originImg.crossOrigin = '';
that.originImg = originImag[0].field_value;
that.originImg = imag[0].origin_value;
listJudge.forEach(item => {
let obj = new Object();

7
hb_client/src/views/workflow/state.vue
View File

@ -130,6 +130,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="参与者" prop="participant" v-if="wfstate.participant_type==7">
<el-select style="width: 100%" v-model="participant" placeholder="请选择字段">
<el-option v-for="item in customfieldList" :key="item.id" :label="item.field_name"
:value="item.field_key">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="分配方式" prop="participant" v-if="wfstate.participant_type==2">
<el-select style="width: 100%" v-model="wfstate.distribute_type" placeholder="请选择分配方式">
<el-option label="主动接单" value="1"></el-option>

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

@ -210,11 +210,15 @@
<el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">
<el-link
type="danger"
v-if="checkPermission(['warehouse_update'])"
@click="handleScrap(scope)"
>报废
</el-link>
<el-link type="primary"
@click="handleRetrial(scope)"
>重审
</el-link>
</template>
</el-table-column>
</el-table>
@ -371,7 +375,6 @@
@recordCancel="recordCancel"
/>
</el-dialog>
<!--半成品入库-->
<el-dialog title="半成品入库" :close-on-click-modal="false" :visible.sync="dialogFormVisible">
<el-form :model="form">
@ -472,12 +475,112 @@
<el-button type="primary" @click="putins">确 定</el-button>
</div>
</el-dialog>
<!--不合格半成品重审-->
<el-dialog title="不合格半成品重审" :close-on-click-modal="false" :visible.sync="limitedRetrial">
<el-form label-width="80px" label-position="right">
<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"
>
<el-input placeholder="请输入" v-model="item.sort" />
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'int'"
:label="item.field_name"
>
<el-input
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'float'"
:label="item.field_name"
>
<el-input
type="number"
placeholder="请输入"
v-model="item.sort"
/>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'date'"
:label="item.field_name"
>
<el-date-picker
v-model="item.create_time"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 100%"
>
</el-date-picker>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'datetime'"
:label="item.field_name"
>
<el-date-picker
v-model="item.create_time"
type="datetime"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
style="width: 100%"
>
</el-date-picker>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'select'"
:label="item.field_name"
>
<el-select
style="width: 100%"
v-model="item.sort"
placeholder="请选择"
>
<el-option
v-for="item1 in item.field_choice"
:key="item1"
:label="item1"
:value="item1"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
v-else-if="item.field_type === 'selects'"
:label="item.field_name"
>
<el-select
style="width: 100%"
v-model="optio"
multiple
placeholder="请选择"
>
<el-option
v-for="item1 in item.field_choice"
:key="item1"
:label="item1"
:value="item1"
>
</el-option>
</el-select>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="limitedRetrial = false">取 消</el-button>
<el-button type="primary" @click="retrialSubmit">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import customForm from '@/components/customForm/index';
import reviewForm from '@/components/customForm/review';
import {getwproductList, wproductTest, wproductPutin, createputins,testInit,scrap} from "@/api/wpm";
import {getwproductList, wproductTest, wproductPutin, createputins,testInit,scrap,getRetrial} from "@/api/wpm";
import checkPermission from "@/utils/permission";
import {getWarehouseList} from "@/api/inm";
import {getMaterialList, getrecordformList, getrffieldList} from "@/api/mtm";
@ -581,6 +684,7 @@
outerVisible: false,
innerVisible: false,
limitedReview: false,
limitedRetrial: false,
dialogFormVisible: false,
dialogFormVisibles: false,
limitedCheckRecord: false,
@ -659,7 +763,17 @@
console.error(err);
});
},
//不合格产品重审展示
handleRetrial(scope){
getRetrial(scope.row.id).then(res=>{
debugger;
console.log(res)
})
},
//不合格产品重审提交
retrialSubmit(){
},
//夹层半成品列表
getList3() {
this.listQuery3.act_state = 26;
@ -675,8 +789,6 @@
handleCreate() {
this.dialogFormVisibles = true;
this.getWarehouseLists();//仓库
},
//批量入库
putins() {
@ -687,7 +799,6 @@
});
console.log(_this.mutipID);
createputins({
warehouse: this.form.warehouse,
wproducts: _this.mutipID,
@ -803,26 +914,32 @@
}
});
}else if(that.innerIndex==='2'){//复检
debugger;
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];
for (let i = 0; i < fieldList.length; i++) {
let obj = fieldList[i];
obj.is_testok = null;
for (let j = 0; j < originList.length; j++) {
if (that.fieldList[i].field_key === originList[j].field_key) {
if (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;
}
}
that.fieldList.push(obj)
}
debugger;
console.log(that.fieldList)
// that.fieldList = [...fieldList];
let arr = fieldList.filter(item => {
return item.field_type === 'draw'
});
@ -831,7 +948,6 @@
}
this.limitedReview = true;
}
}
})
}
},
@ -845,16 +961,28 @@
let that = this;
testInit({ wproduct: this.wproduct,form: that.recordform}).then((response) => {
if (response.data) {
// debugger;
debugger;
that.hasPicture = false;
that.recordId = response.data.id;
that.formName = response.data.form_.name;
let fieldList = response.data.record_data;
that.fieldList = [...fieldList];
that.origintest = response.data.origin_test;
// that.recordform = response.data.origin_test_.form;
let originList = response.data.origin_test_.record_data;
that.originList = [...originList];
for (let i = 0; i < fieldList.length; i++) {
let obj = fieldList[i];
obj.is_testok = null;
for (let j = 0; j < originList.length; j++) {
if (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;
}
}
that.fieldList.push(obj)
}
/*that.fieldList = [...fieldList];
that.originList = [...originList];*/
let arr = fieldList.filter(item => {
return item.field_type === 'draw'
});