Skip to content

M
mes-ui
Commit 614278c5 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents e4c76f0a 9f471fef
Hide whitespace changes
Inline Side-by-side
Showing with 1054 additions and 81 deletions
pages/aps/aps/components/check.vue 0 → 100644
View file @ 614278c5
<template>
<div>
<h3 class="tc" v-if="data.res">
<Icon type="md-checkmark-circle" size="32" color="green"/>
数据检查通过
</h3>
<h3 class="tc" v-else>
<Icon type="md-close-circle" size="32" color="red"/>
数据检查失败
</h3>
<div>
<Tabs>
<TabPane v-for="(item,key,index) in list" :key="key" :label="key" :name="key">
<Table :columns="init(item)" :data="item" height="500" border></Table>
</TabPane>
</Tabs>
</div>
</div>
</template>
<script>
export default {
name: "",
data() {
return {
datas:{},
};
},
props:{
data:Object,
default:()=>{
return {
res:true,
datas:{},
}
}
},
computed:{
list(){
var data={};
var item=JSON.parse(this.data.datas);
for(var key in item)
{
if(item[key]&& item[key].length>0){
data[key]= item[key];
}
}
return data;
}
},
methods:{
init(items){
var cols=[];
if(items.length>0){
for(var key in items[0]){
let col={
key:key,
title:key
}
cols.push(col);
}
}
return cols;
}
}
};
</script>
<style lang="less" >
</style>
\ No newline at end of file
pages/aps/aps/index.vue
View file @ 614278c5
...@@ -14,31 +14,36 @@ ...@@ -14,31 +14,36 @@
:easy="true" :easy="true"
> >
<template slot="easySearch"> <template slot="easySearch">
<div><Select <div>
placeholder="选择排序优先级" <Select
v-model="tempValue" placeholder="选择排序优先级"
style="width: 150px;" v-model="tempValue"
@on-change="tempValueChange" style="width: 150px;"
clearable @on-change="tempValueChange"
> clearable
<Option v-for="(item,index) in listTemp" :key="index" :value="item.id" :label="item.name"></Option> >
</Select> <Option
<a style="font-weight: bold;" @click="openaddModalTemp"> v-for="(item,index) in listTemp"
<Icon type="md-color-palette" size="14" />&nbsp;自定义排序模板 :key="index"
</a> :value="item.id"
<a style="font-weight: bold;" @click="openDuration"> :label="item.name"
<Icon type="md-create" size="14" />&nbsp;修改外协工期 ></Option>
</a> </Select>
<a style="font-weight: bold;" @click="openaddModalTemp">
<Icon type="md-color-palette" size="14" />&nbsp;自定义排序模板
</a>
<a style="font-weight: bold;" @click="openDuration">
<Icon type="md-create" size="14" />&nbsp;修改外协工期
</a>
<Select placeholder="选择历史方案" style="width: 150px;"></Select> <Select placeholder="选择历史方案" style="width: 150px;"></Select>
</div> </div>
</template> </template>
<template slot="searchBack"> <template slot="searchBack"></template>
</template>
<template slot="searchForm"> <template slot="searchForm">
<Search /> <Search />
</template> </template>
<template slot="buttons"> <template slot="buttons">
<DatePicker <DatePicker
type="date" type="date"
placeholder="设置基准日期" placeholder="设置基准日期"
style="width: 150px;" style="width: 150px;"
...@@ -52,7 +57,8 @@ ...@@ -52,7 +57,8 @@
type="primary" type="primary"
@click="goResults" @click="goResults"
style="background:#515A6E;border:solid 1px #515A6E" style="background:#515A6E;border:solid 1px #515A6E"
>查看历史方案</Button> >历史方案</Button>
<Button type="primary" @click="resultModal=true">Result</Button>
<Button type="primary" @click="openApsModal">APS排产</Button> <Button type="primary" @click="openApsModal">APS排产</Button>
</template> </template>
<template slot="batch"> <template slot="batch">
...@@ -78,6 +84,9 @@ ...@@ -78,6 +84,9 @@
<Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel"> <Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel">
<p>确定进行APS排产？</p> <p>确定进行APS排产？</p>
</Modal> </Modal>
<Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="checkOk" @on-cancel="cancel">
<CheckResult :data="result"></CheckResult>
</Modal>
<Modal v-model="apsCheckModal" title="确定APS排产" @on-ok="apsCheckOk" @on-cancel="cancel"> <Modal v-model="apsCheckModal" title="确定APS排产" @on-ok="apsCheckOk" @on-cancel="cancel">
<p>已有排产方案，是否移出排产池？</p> <p>已有排产方案，是否移出排产池？</p>
</Modal> </Modal>
...@@ -103,13 +112,15 @@ import Add from "./options"; ...@@ -103,13 +112,15 @@ import Add from "./options";
import Temp from "./temp"; import Temp from "./temp";
import Duration from "./duration"; import Duration from "./duration";
import Expand from "./components/excute"; import Expand from "./components/excute";
import CheckResult from "./components/check";
export default { export default {
name: "list", name: "list",
components: { components: {
Add, Add,
Expand, Expand,
Temp, Temp,
Duration Duration,
CheckResult
}, },
data() { data() {
return { return {
...@@ -117,6 +128,11 @@ export default { ...@@ -117,6 +128,11 @@ export default {
easySearch: { easySearch: {
keys: { op: "notes", value: null } keys: { op: "notes", value: null }
}, },
result: {
res: true,
datas: {}
},
resultModal: false,
entity: { entity: {
setTime: "" setTime: ""
}, },
...@@ -512,6 +528,7 @@ export default { ...@@ -512,6 +528,7 @@ export default {
this.deletedlModal = false; this.deletedlModal = false;
this.apsModal = false; this.apsModal = false;
this.apsCheckModal = false; this.apsCheckModal = false;
this.resultModal = false;
}, },
onDragDrop(a, b) { onDragDrop(a, b) {
//拖拽排序 //拖拽排序
...@@ -575,41 +592,8 @@ export default { ...@@ -575,41 +592,8 @@ export default {
Api.apsdatachecked() Api.apsdatachecked()
.then(res1 => { .then(res1 => {
if (res1.success) { if (res1.success) {
if (res1.result.res) { this.result=res1.result;
// this.$Message.success("数据校验成功"); this.resultModal=true;
//排产计算
let paramsTime = {
setTime: this.entity.setTime
};
Api.apsprepareandcalc(paramsTime)
.then(res2 => {
if (res2.success) {
if (res2.result.res) {
this.$Message.success("排产计算成功");
this.circleModal = false;
this.$router.push({
path: "/aps/results"
// params: { customerId: id }
});
} else {
this.circleModal = false;
this.$Message.error(res2.result.msg);
}
} else {
this.circleModal = false;
this.$Message.error("操作失败：排产计算");
}
})
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
} else {
this.circleModal = false;
this.$Message.success("数据校验失败");
}
} else { } else {
this.circleModal = false; this.circleModal = false;
this.$Message.error("操作失败：数据校验"); this.$Message.error("操作失败：数据校验");
...@@ -637,6 +621,37 @@ export default { ...@@ -637,6 +621,37 @@ export default {
}.bind(this) }.bind(this)
); );
}, },
checkOk() {
//排产计算
let paramsTime = {
setTime: this.entity.setTime
};
Api.apsprepareandcalc(paramsTime)
.then(res2 => {
if (res2.success) {
if (res2.result.res) {
this.$Message.success("排产计算成功");
this.circleModal = false;
this.$router.push({
path: "/aps/results"
// params: { customerId: id }
});
} else {
this.circleModal = false;
this.$Message.error(res2.result.msg);
}
} else {
this.circleModal = false;
this.$Message.error("操作失败：排产计算");
}
})
.catch(
function(err) {
this.circleModal = false;
this.$Message.error("操作失败");
}.bind(this)
);
},
//打开设置参数 //打开设置参数
openAddModel(type, row) { openAddModel(type, row) {
if (type == 2) { if (type == 2) {
......
pages/dncmnc/mnc/analysis.vue
View file @ 614278c5
<template> <template>
<div>数据分析表 <div>
<Echart1 ></Echart1> <a class="back_href" @click="goView">
<Icon type="ios-undo-outline" size="24" />返回设备监控
</a>
<!-- 数据分析表 -->
<Echart1 ></Echart1>
</div> </div>
</template> </template>
<script> <script>
...@@ -73,6 +77,11 @@ export default { ...@@ -73,6 +77,11 @@ export default {
}; };
}, },
methods: {}, methods: {
goView(){
//返回设备监控页面
this.$router.push("/dncmnc/mnc");
},
},
}; };
</script> </script>
pages/implement/components/entryrecordfiles.vue
View file @ 614278c5
...@@ -70,7 +70,22 @@ export default { ...@@ -70,7 +70,22 @@ export default {
render: (h, params) => { render: (h, params) => {
let id = params.row.id let id = params.row.id
if (!this.isedit) { if (!this.isedit) {
return h('div', '') return h(
'A',
{
attrs: {
href: fileUrlDown + params.row.data_content2,
target: '_blank'
},
props: {},
style: {
color: '#249E91',
marginRight: '5px',
cursor: 'pointer'
}
},
'查看'
)
} else { } else {
return h( return h(
'div', 'div',
......
pages/produce/execute/components/functional.vue
View file @ 614278c5
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</a> </a>
</li> </li>
<li> <li>
<a @click="gnFunto(10,'质量检验')" :class="{active:gnFlag == 8}"> <a @click="gnFunto(10,'质量检验')" :class="{active:gnFlag == 10}">
<img src="@/assets/imgicon/execute/ex09.png" alt /> 质量检验 <img src="@/assets/imgicon/execute/ex09.png" alt /> 质量检验
</a> </a>
</li> </li>
......
pages/produce/execute/datafilling/backCheck.vue 0 → 100644
View file @ 614278c5
<template>
<Form ref="form" :model="mod" :label-width="100">
<Row class="rowTitle100">
<Col :span="12">
<span class="ml20">产品号</span>
<Select
multiple
@on-change="productonchange"
v-model="product_ID"
class="w200"
>
<Option
v-for="item in product_List"
:value="item.productids"
:key="item.index"
>{{ item.productcodes }}</Option>
</Select>
</Col>
</Row>
<Row class="rowTitle100">
<Col :span="12">
<FormItem label="备注" >
<Input v-model="mod.check_Result" type="textarea" :rows="4" maxlength="100" show-word-limit></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">确定</Button>
</FormItem>
</Form>
</template>
<script>
import service from '@/plugins/request'
export default {
name: 'backCheck',
components: {},
data() {
return {
disabled: false,
isCurrentUser: false,
mod: {
id: 0,
dispatch_id: 0,
execute_id: 0,
order_id: '',
routingHeaderId: 0,
routingDetailId: 0,
product_code: '',
board_code: '',
checkerIds: '',
checkerNames: '',
check_Status: 0,
check_Result: '',
checker: 0,
checkName: '',
check_time: null
},
recordList: [],
isMain: 1,
productisabled: false,
product_ID: [],
board_ID: [],
product_List: [],
board_List: []
}
},
mounted() {},
watch: {},
methods: {
handleSubmit() {
let state = true
if (this.product_ID.length == 0) {
state = false
this.$Message.error('请选择要打回的产品')
return
}
this.mod.product_code = this.product_ID.join(',')
this.mod.board_code = this.board_ID.join(',')
if (state) {
var url = `${PlanUrl}/ordercheckresult/savecheckresult`
service
.post(`${url}`, this.mod)
.then((response) => {
if (response.success) {
this.$Message.success('操作成功')
this.$parent.$parent.loadproduct()
this.$parent.$parent.backCheckModal = false
}
})
.catch((error) => {
this.$Message.error('保存失败')
})
}
},
handleClose() {},
loadentry(entryModel, fillModel) {
this.mod.dispatch_id = entryModel.id
this.mod.execute_id = entryModel.executeId
this.mod.order_id = entryModel.order_id
this.mod.routingHeaderId = entryModel.routingHeaderId
this.mod.routingDetailId = entryModel.routingDetailId
this.mod.checkName = this.$store.state.userInfo.userName
this.mod.check_Status = 3
this.product_code = ''
this.board_code = ''
this.isCurrentUser = false
this.isMain = entryModel.isMain
this.product_ID = []
this.board_ID = []
this.productisabled = fillModel.productisabled
this.product_ID.push(fillModel.product_ID)
this.board_ID.push(fillModel.board_ID)
this.product_List = fillModel.product_List
this.board_List = fillModel.board_List
},
productonchange(e) {},
boardonchange(e) {
this.product_ID = []
for (let i = 0; i < this.board_List.length; i++) {
let obj = this.board_List[i]
for (let j = 0; j < e.length; j++) {
if (obj.boardNumber == e[j]) {
this.product_ID.push(obj.productids)
}
}
}
}
}
}
</script>
\ No newline at end of file
pages/produce/execute/datafilling/check.vue
View file @ 614278c5
<template> <template>
<h2>数据检验</h2> <div class="data-filling">
</template> <div class="data-title flex">
<div class="fg">
<span class="ml20">产品号</span>
<Select
:multiple="false"
class="select-produt-name"
@on-change="productonchange"
v-model="product_ID"
>
<!-- <Option value="" class="option_text">请选择</Option> -->
<Option
v-for="item in product_List"
:value="item.productids"
:key="item.index"
>{{ item.productcodes }}</Option>
</Select>
</div>
<div class="tr">
<Button type="primary" @click="QcCardChecker(3)" class="title_btn ml10">检验员</Button>
<Button type="primary" @click="jybackCheck()" class="title_btn ml10">打回</Button>
<Button type="primary" @click="SendCheckRecord()" class="title_btn ml10">送检记录</Button>
</div>
</div>
<div class="table-i">
<Table border :columns="columns12" :data="recorddata">
<template slot-scope="{ row,index }" slot="selffillin">
<template v-if="row.inspect_type.split(',').indexOf('1')>-1">
<template
v-if="row.fillintype == 1"
>{{row.selfchecklist.user_name}} {{row.selfchecklist.addTime}}</template>
<template v-else-if="row.fillintype ==2">
<op class="view">{{row.selfchecklist.fill_in_content}}</op>
{{row.selfchecklist.user_name}} {{row.selfchecklist.addTime}}
</template>
<template v-else>
<op
v-if="row.selfchecklist.fillinstatus!=0"
class="view"
@click="showrecordData(row,1,false)"
v-text="row.selfchecklist.user_name+' '+row.selfchecklist.addTime"
></op>
</template>
</template>
</template>
<!--互检-->
<template slot-scope="{ row,index }" slot="mutualfillin">
<template v-if="row.inspect_type.split(',').indexOf('2')>-1">
<template>
<template
v-if="row.fillintype == 1"
>{{row.mutualchecklist.user_name}} {{row.mutualchecklist.addTime}}</template>
<template v-else-if="row.fillintype ==2">
<op class="view">{{row.mutualchecklist.fill_in_content}}</op>
{{row.mutualchecklist.user_name}} {{row.mutualchecklist.addTime}}
</template>
<template v-else>
<op
v-if="row.mutualchecklist.fillinstatus!=0"
class="view"
@click="showrecordData(row,2,false)"
v-text="row.mutualchecklist.user_name+' '+row.mutualchecklist.addTime"
></op>
</template>
</template>
</template>
</template>
<template slot-scope="{ row,index }" slot="seizurefillin">
<template v-if="row.inspect_type.split(',').indexOf('3')>-1">
<!--未填报-->
<template v-if="row.seizurechecklist.fillinstatus==0">
<!--自检完成-->
<template v-if="productobj.productstatus==3">
<Checkbox
v-model="row.seizurechecklist.checkstatus"
@on-change="seizurechecklistcheck(index,$event)"
v-if="row.fillintype == 1"
></Checkbox>
<Input
v-model="row.seizurechecklist.fill_in_content"
v-else-if="row.fillintype == 2"
placeholder="请输入..."
@on-blur="seizurechecklistinput(index,$event)"
></Input>
<template v-else>
<op
class="view"
@click="showrecordData(row,3,true)"
v-if="row.seizurechecklist.fill_in_content==''"
v-text="row.fillintype_str"
></op>
<op class="view" @click="showrecordData(row,3,true)" v-else v-text="look"></op>
</template>
</template>
</template>
<template v-else>
<template
v-if="row.fillintype == 1"
>{{row.seizurechecklist.user_name}} {{row.seizurechecklist.addTime}}</template>
<template v-else-if="row.fillintype ==2">
<op class="view">{{row.seizurechecklist.fill_in_content}}</op>
{{row.seizurechecklist.user_name}} {{row.seizurechecklist.addTime}}
</template>
<template v-else>
<op
class="view"
@click="showrecordData(row,3,false)"
v-text="row.seizurechecklist.user_name+' '+row.seizurechecklist.addTime"
></op>
</template>
</template>
</template>
</template>
<template slot-scope="{ row,index }" slot="isPhotograph">
<template v-if="row.isPhotograph==0">
<op class="view"></op>
</template>
<template v-else>
<op class="view" @click="showPhoto(row,true)" v-if="row.movieid==''">上传</op>
<op class="view" @click="showPhoto(row,true)" v-else>查看</op>
</template>
</template>
</Table>
</div>
<Modal
v-model="usercardModal"
title="刷卡汇报"
width="500"
:footer-hide="true"
:mask-closable="false"
>
<usercard ref="usercard" @on-ok="ok"></usercard>
</Modal>
<Modal
v-model="entryrecorddataModal"
title="数据包列表"
width="940"
:footer-hide="true"
:mask-closable="false"
>
<entryrecorddata ref="entryrecorddata" @binddataid="binddataid"></entryrecorddata>
</Modal>
<Modal
v-model="entryrecordfilesModal"
title="附件列表"
width="940"
:footer-hide="true"
:mask-closable="false"
>
<entryrecordfiles @binddataid="binddataid" ref="entryrecordfiles"></entryrecordfiles>
</Modal>
<Modal
v-model="entryrecordmovieModal"
title="上传照片"
width="1340"
height="500"
:footer-hide="true"
:mask-closable="false"
>
<entryrecordMovie @bindPhotoid="bindPhotoid" ref="entryrecordMovie"></entryrecordMovie>
</Modal>
<Modal
v-model="sendCheckRecordModal"
title="送检记录"
width="1340"
:footer-hide="true"
:mask-closable="false"
>
<sendCheckRecord ref="sendCheckRecord"></sendCheckRecord>
</Modal>
<Modal
v-model="backCheckModal"
title="打回"
width="1340"
:footer-hide="true"
:mask-closable="false"
>
<backCheck ref="backCheck"></backCheck>
</Modal>
</div>
</template>
<script> <script>
export default { import service from "@/plugins/request";
name: '', import usercard from "./usercard.vue";
data() {
return { import entryrecorddata from "./entryrecorddata.vue";
import entryrecordMovie from "./entryrecordMovie.vue";
import sendCheckRecord from "./sendCheckRecord.vue";
import entryrecordfiles from "./entryrecordfiles.vue";
import backCheck from "./backCheck.vue";
export default {
name: "starOrder",
props: ["row"],
components: {
usercard,
entryrecorddata,
entryrecordMovie,
sendCheckRecord,
entryrecordfiles,
backCheck
},
data() {
return {
product_List: [],
product_ID: "",
disabled: false,
ishavself: true,
ishavhj: true,
ishavzj: true,
board_ID: "",
board_List: [],
productobj:{productstatus:-1},
usercardModal: false,
sendCheckModal: false,
entryrecorddataModal: false,
entryrecordfilesModal: false,
entryrecordmovieModal: false,
sendCheckRecordModal: false,
backCheckModal:false,
recorddata: [],
entryModel: {},
look: "查看",
qc_show_data: null, //表格列表row
qc_show_fill_in_user_type: null, //1，2，3；自检，互检，检验员
datasearch: {
entryID: this.row.id,
isMain: 1,
productcode: "",
execute_id: this.row.executeId,
order_id: this.row.orderId
},
columns12: [
{ title: "序号", type: "index", width: "70", align: "center" },
{ title: "参数名称", key: "check_params", tooltip: true },
{
title: "检验类型",
key: "inspect_type",
render(h, params) {
return h("state", {
props: {
code: "QC.checktype",
value: params.row.inspect_type
}
});
}
},
{ title: "汇报类型", key: "fillintype_str", width: 100 },
{ title: "标准指标", key: "standard" },
{ title: "生产要求", key: "production_requirement", tooltip: true },
{ title: "检测内容", key: "check_content", tooltip: true },
{
title: "操作员",
key: "fillintype",
renderHeader: (h, params) => {
return h("div", [
h(
"Checkbox",
{
props: {
value: this.isselfCheckAll
},
on: {
"on-change": () => {
this.handleselfCheckAll(); //点击修改下面Checkbox的状态
}
}
},
"操作员"
)
]);
},
slot: "selffillin"
},
{
title: "互检员",
key: "mutual",
renderHeader: (h, params) => {
return h("div", [
h(
"Checkbox",
{
props: {
value: this.ismutualCheckAll
},
on: {
"on-change": () => {
this.handlemutualCheckAll(); //点击修改下面Checkbox的状态
}
}
},
"互检员"
)
]);
},
slot: "mutualfillin"
},
{
title: "检验员",
key: "seizure",
renderHeader: (h, params) => {
return h("div", [
h(
"Checkbox",
{
props: {
value: this.isseizureCheckAll
},
on: {
"on-change": () => {
this.handleseizureCheckAll(); //点击修改下面Checkbox的状态
}
}
},
"检验员"
)
]);
},
slot: "seizurefillin"
},
{
title: "是否拍照",
key: "isPhotograph",
width: 100,
slot: "isPhotograph"
},
{
title: "模板",
key: "qualityTemplate",
width: 80,
render: (h, params) => {
return h(
"div",
{
class: "icon_box"
},
[
h(
"A",
{
attrs: {
href: fileUrlDown + params.row.qualityTemplate,
target: "_blank"
},
props: {},
style: {
color: "#249E91",
marginRight: "5px",
cursor: "pointer"
}
},
params.row.qualityTemplateName
)
]
);
}
}
]
};
},
created() {
console.log(this.row);
this.entryModel.executeId = this.row.executeId;
this.entryModel.order_id = this.row.order_id;
this.entryModel.id = this.row.id;
this.entryModel.routingHeaderId = this.row.headid;
this.entryModel.routingDetailId = this.row.routingdetailId;
this.entryModel.isMain = 1;
this.datasearch.entryID = this.row.id;
this.datasearch.isMain = 1;
this.datasearch.productcode = this.datasearch.productcode;
this.datasearch.execute_id = this.row.executeId;
this.datasearch.order_id = this.row.orderId;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
this.loadproduct();
},
methods: {
loaddata() {
var url = `${PlanUrl}/orderexecutequalityrecord/getentryqcrecordlist`;
service.get(url, this.datasearch).then(response => {
this.recorddata = response.result;
this.ishavself = true;
this.ishavhj = true;
this.ishavzj = true;
for (let i = 0; i < this.recorddata.length; i++) {
let obj = this.recorddata[i];
let checktypes = obj.inspect_type.split(",");
if (checktypes.indexOf("1") > -1) {
this.ishavself = false;
}
if (checktypes.indexOf("2") > -1) {
this.ishavhj = false;
}
if (checktypes.indexOf("3") > -1) {
this.ishavzj = false;
}
}
});
},
loadproduct() {
let entry = {
dispatch_id: this.row.id,
execute_id: this.row.executeId,
order_id: this.row.orderId,
routingHeaderId: this.row.headid,
routingDetailId: this.row.routingdetailId
};
var url = `${PlanUrl}/ordercheck/getentryproductcode?entryID=`+this.row.id;
service.get(url, entry).then(response => {
this.product_List = response.result;
for (let i = 0; i < this.product_List.length; i++) {
let obj = this.product_List[i];
if (obj.productstatus == 3) {
this.datasearch.productcode = obj.productids;
this.product_ID = obj.productids;
this.productobj = obj;
break;
}
}
this.loaddata();
});
},
productonchange(v) {
this.datasearch.productcode = v;
for (let i = 0; i < this.product_List.length; i++) {
let obj = this.product_List[i]
if (obj.productids == e) {
this.productobj = obj
}
}
this.loaddata();
},
showrecordData(params, fill_in_user_type, isedit) {
this.qc_show_data = params; //表格列表row
this.qc_show_fill_in_user_type = fill_in_user_type; //1，2，3；自检，互检，检验员
if (params.fillintype == 3) {
//fillintype 1 选择框 2 输入框 3 附件 4 键值对数据
//附件页面
this.entryrecordfilesModal = true;
this.$refs.entryrecordfiles.loadpage(
params,
fill_in_user_type,
this.product_ID,
this.board_ID,
isedit
);
} else if (params.fillintype == 4) {
//数据包页面
this.entryrecorddataModal = true;
this.$refs.entryrecorddata.loadpage(
params,
fill_in_user_type,
this.product_ID,
this.board_ID,
isedit
);
}
},
binddataid(qc_card_id, fill_in_user_type, content) {
for (let i = 0; i < this.recorddata.length; i++) {
let obj = this.recorddata[i];
if (obj.qc_card_id == qc_card_id) {
if (fill_in_user_type == 1) {
obj.selfchecklist.fill_in_content = content;
} else if (fill_in_user_type == 2) {
obj.mutualchecklist.fill_in_content = content;
} else if (fill_in_user_type == 3) {
obj.seizurechecklist.fill_in_content = content;
}
}
}
},
showPhoto(params, isedit) {
this.entryrecordmovieModal = true;
this.$refs.entryrecordMovie.loadpage(
params,
this.product_ID,
this.board_ID,
isedit
);
},
ok() {
this.usercardModal = false;
this.loadproduct();
// this.loaddata();
},
bindPhotoid(qc_card_id, content) {
for (let i = 0; i < this.recorddata.length; i++) {
let obj = this.recorddata[i];
if (obj.qc_card_id == qc_card_id) {
obj.movieid = content;
}
}
},
handleselfCheckAll() {
this.isselfCheckAll = !this.isselfCheckAll;
for (let i = 0; i < this.recorddata.length; i++) {
let obj = this.recorddata[i];
if (obj.fillintype == 1) {
obj.selfchecklist.fill_in_content = this.isselfCheckAll ? "1" : "0";
obj.selfchecklist.checkstatus = this.isselfCheckAll;
}
}
},
handlemutualCheckAll() {
this.ismutualCheckAll = !this.ismutualCheckAll;
for (let i = 0; i < this.recorddata.length; i++) {
let obj = this.recorddata[i];
if (obj.fillintype == 1) {
obj.mutualchecklist.fill_in_content = this.ismutualCheckAll
? "1"
: "0";
obj.mutualchecklist.checkstatus = this.ismutualCheckAll;
}
}
},
handleseizureCheckAll() {
this.isseizureCheckAll = !this.isseizureCheckAll;
for (let i = 0; i < this.recorddata.length; i++) {
let obj = this.recorddata[i];
if (obj.fillintype == 1) {
obj.seizurechecklist.fill_in_content = this.isseizureCheckAll
? "1"
: "0";
obj.seizurechecklist.checkstatus = this.isseizureCheckAll;
}
}
},
show(index) {
this.$Modal.info({
title: "User Info",
content: `Name：${this.data6[index].name}<br>Age：${this.data6[index].age}<br>Address：${this.data6[index].address}`
});
},
remove(index) {
this.data6.splice(index, 1);
},
// change(e) {
// this.entity.productQuantity = e.length + ''
// },
QcCardChecker(fill_in_user_type) {
this.$refs.usercard.product_List = this.product_List;
let fillModel = {
fill_in_user_type: fill_in_user_type, //自检，互检
// productisabled: this.productisabled,
product_ID: this.product_ID,
// board_ID: this.board_ID,
product_List: this.product_List
// board_List: this.board_List
};
let recordList = [];
for (let i = 0; i < this.recorddata.length; i++) {
let obj = this.recorddata[i];
let checktypes = obj.inspect_type.split(",");
if (fill_in_user_type == 1) {
//自检
if (checktypes.indexOf("1") > -1) {
// &&
// obj.selfchecklist != null &&
// obj.selfchecklist.fill_in_content != null &&
// obj.selfchecklist.fill_in_content != ""
if (
(obj.selfchecklist != null &&
obj.selfchecklist.fill_in_content != null &&
obj.selfchecklist.fill_in_content != "" &&
obj.selfchecklist.fillinstatus == "0") ||
this.productobj.productstatus == 4 //打回重写填报
) {
let qc = {
qc_card_id: obj.qc_card_id,
movieid: obj.movieid,
Fillintype: obj.fillintype,
fill_in_content: obj.selfchecklist.fill_in_content,
fillinstatus: "1",
dispatch_id: obj.dispatch_id
};
recordList.push(qc);
} }
}
} else if (fill_in_user_type == 2) {
//互检
if (checktypes.indexOf("2") > -1) {
//是否需要互检，2和3需要互检和专检 inspect_type
if (
(obj.mutualchecklist.fillinstatus == "0" &&
obj.mutualchecklist != null &&
obj.mutualchecklist.fill_in_content != null &&
obj.mutualchecklist.fill_in_content != "") ||
this.productobj.productstatus == 4 //打回重写填报
) {
let qc = {
qc_card_id: obj.qc_card_id,
movieid: obj.movieid,
Fillintype: obj.fillintype,
fill_in_content: obj.mutualchecklist.fill_in_content,
fillinstatus: "1",
dispatch_id: obj.dispatch_id
};
recordList.push(qc);
}
}
} else if (fill_in_user_type == 3) {
if (checktypes.indexOf("3") > -1) {
if (
(obj.seizurechecklist.fillinstatus == "0" &&
obj.seizurechecklist != null &&
obj.seizurechecklist.fill_in_content != null &&
obj.seizurechecklist.fill_in_content != "") ||
this.productobj.productstatus == 4
) {
if (obj.isPhotograph == 1 && obj.movieid == "") {
this.$Message.success("第" + (i + 1) + "项需上传找照片");
state = false;
return;
}
let qc = {
qc_card_id: obj.qc_card_id,
movieid: obj.movieid,
Fillintype: obj.fillintype,
fill_in_content: obj.seizurechecklist.fill_in_content,
fillinstatus: "1"
};
recordList.push(qc);
}
}
} }
}
if (recordList.length == 0) {
this.$Message.success("填报项为空,请进行填报");
return;
}
this.usercardModal = true;
this.$refs.usercard.loadentry(this.entryModel, fillModel, recordList);
},
selfchecklistcheck(index, e) {
this.recorddata[index].selfchecklist.checkstatus = e;
this.recorddata[index].selfchecklist.fill_in_content = e ? "1" : "0";
},
selfchecklistinput(index, e) {
this.recorddata[index].selfchecklist.fill_in_content = e;
},
mutualchecklistcheck(index, e) {
this.recorddata[index].mutualchecklist.checkstatus = e;
this.recorddata[index].mutualchecklist.fill_in_content = e ? "1" : "0";
},
mutualchecklistinput(index, e) {
this.recorddata[index].mutualchecklist.fill_in_content = e;
},
seizurechecklistcheck(index, e) {
this.recorddata[index].seizurechecklist.checkstatus = e;
this.recorddata[index].seizurechecklist.fill_in_content = e ? "1" : "0";
},
seizurechecklistinput(index, e) {
this.recorddata[index].seizurechecklist.fill_in_content = e.target.value;
},
SendCheck() {
this.sendCheckModal = true;
this.$refs.sendCheck.loadentry(this.entryModel);
},
SendCheckRecord() {
this.sendCheckRecordModal = true;
this.$refs.sendCheckRecord.load(this.entryModel.id);
},
jybackCheck() {
let fillModel = {
// productisabled: this.productisabled,
product_ID: this.product_ID,
// board_ID: '',
product_List: this.product_List
// board_List: []
};
this.backCheckModal = true;
this.$refs.backCheck.loadentry(this.entryModel, fillModel);
} }
}
};
</script> </script>
<style lang="less">
<style lang="" scoped> .data-filling {
padding: 10px;
</style> width: 100%;
\ No newline at end of file .data-title {
margin-bottom: 10px;
.ml20 {
padding: 8px;
float: left;
}
.select-produt-name {
width: 200px;
float: left;
}
}
.table-i {
margin: 0 20px;
}
}
</style>
pages/produce/execute/datafilling/entryrecordfiles.vue
View file @ 614278c5
...@@ -70,7 +70,22 @@ export default { ...@@ -70,7 +70,22 @@ export default {
render: (h, params) => { render: (h, params) => {
let id = params.row.id let id = params.row.id
if (!this.isedit) { if (!this.isedit) {
return h('div', '') return h(
'A',
{
attrs: {
href: fileUrlDown + params.row.data_content2,
target: '_blank'
},
props: {},
style: {
color: '#249E91',
marginRight: '5px',
cursor: 'pointer'
}
},
'查看'
)
} else { } else {
return h( return h(
'div', 'div',
......
pages/produce/execute/datafilling/index.vue
View file @ 614278c5
...@@ -246,6 +246,7 @@ export default { ...@@ -246,6 +246,7 @@ export default {
ishavzj: true, ishavzj: true,
board_ID: "", board_ID: "",
board_List: [], board_List: [],
productobj:{productstatus:-1},
usercardModal: false, usercardModal: false,
sendCheckModal: false, sendCheckModal: false,
entryrecorddataModal: false, entryrecorddataModal: false,
......
pages/produce/execute/datafilling/sendCheck.vue
View file @ 614278c5
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<span class="ml20">产品号</span> <span class="ml20">产品号</span>
<Select <Select
multiple multiple
@on-change="productonchange" @on-change="productonchange"
v-model="product_ID" v-model="product_ID"
...@@ -64,7 +63,7 @@ export default { ...@@ -64,7 +63,7 @@ export default {
checker: 0, checker: 0,
check_time: null check_time: null
}, },
isall:[], isall:false,
isMain: 1, isMain: 1,
productisabled: false, productisabled: false,
product_ID: [], product_ID: [],
......
pages/produce/execute/datafilling/sendCheckRecord.vue
View file @ 614278c5
...@@ -42,11 +42,7 @@ export default { ...@@ -42,11 +42,7 @@ export default {
width: '100', width: '100',
key: 'product_code' key: 'product_code'
}, },
{
title: '板号',
width: '100',
key: 'board_code'
},
{ {
title: '送检检验员', title: '送检检验员',
width: '150', width: '150',
......
pages/produce/execute/datafilling/usercard.vue
View file @ 614278c5
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
handleClose() {}, handleClose() {},
loadentry(entryModel, fillModel, recordList) { loadentry(entryModel, fillModel, recordList) {
this.user.dispatch_id = recordList[0].dispatch_id this.user.dispatch_id = entryModel.id
this.user.execute_id = entryModel.executeId; this.user.execute_id = entryModel.executeId;
this.user.order_id = entryModel.order_id; this.user.order_id = entryModel.order_id;
this.user.routingHeaderId = entryModel.routingHeaderId; this.user.routingHeaderId = entryModel.routingHeaderId;
......
pages/produce/execute/index.vue
View file @ 614278c5
...@@ -144,7 +144,7 @@ row.routingdetailId=this.$route.query.routid; ...@@ -144,7 +144,7 @@ row.routingdetailId=this.$route.query.routid;
this.detail = () => import("./datafilling/check"); this.detail = () => import("./datafilling/check");
} //质量检验 } //质量检验
if (number == 9) { if (number == 9) {
this.$Message.info("尊敬的用户，您没有该权限！"); // this.$Message.info("尊敬的用户，您没有该权限！");
// this.detail = () => import("./testdata/index"); // this.detail = () => import("./testdata/index");
} //测试数据 } //测试数据
}, },
......
pages/produce/execute/testdata/index.vue
View file @ 614278c5
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<Icon type="md-play" /> <Icon type="md-play" />
测试数据</a> 测试数据</a>
</div> </div>
<div class="star flex fc-b" v-else-if="starmodal"> <div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button> <Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button> <Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment