From d7bb04a5461b7eb8beb422108a21696b21126e71 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 10 十一月 2023 13:26:39 +0800
Subject: [PATCH] modified: src/views/basic/template/index.vue modified: src/views/common/param-mergeTemplate.vue modified: src/views/technology/routing/routing-form.vue
---
src/views/technology/document/document-form.vue | 581 +++++++++++++--------------------------------------------
1 files changed, 135 insertions(+), 446 deletions(-)
diff --git a/src/views/technology/document/document-form.vue b/src/views/technology/document/document-form.vue
index 06d1f17..745bbab 100644
--- a/src/views/technology/document/document-form.vue
+++ b/src/views/technology/document/document-form.vue
@@ -12,22 +12,12 @@
</div>
<div class="page-main">
<div class="document-basic">
- <el-form
- :model="dataForm"
- :rules="dataRule"
- ref="dataForm"
- style="width: 100%"
- class="l-mes"
- :disabled="!editable"
- label-width="110px"
- >
+ <el-form :model="dataForm" :rules="dataRule" ref="dataForm" style="width: 100%" class="l-mes"
+ :disabled="!editable" label-width="110px">
<el-row>
<el-col :span="5">
<el-form-item prop="name" label="鏂囦欢鍚嶇О">
- <el-input
- v-model="dataForm.name"
- placeholder="鏂囦欢鍚嶇О"
- ></el-input>
+ <el-input v-model="dataForm.name" placeholder="鏂囦欢鍚嶇О"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
@@ -38,27 +28,16 @@
</el-col>
<el-col :span="4">
<el-form-item prop="docType" label="绫诲瀷">
- <el-select
- v-model="dataForm.docType"
- placeholder="璇烽�夋嫨绫诲瀷"
- style="width:100%"
- >
- <el-option
- v-for="(item, index) in bomTypeDbOptions"
- :label="item.label"
- :value="item.value"
- :key="index"
- >
+ <el-select v-model="dataForm.docType" placeholder="璇烽�夋嫨绫诲瀷" style="width:100%">
+ <el-option v-for="(item, index) in bomTypeDbOptions" :label="item.label" :value="item.value"
+ :key="index">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item prop="version" label="鐗堟湰鍙�">
- <el-input
- v-model="dataForm.version"
- placeholder="鐗堟湰鍙�"
- ></el-input>
+ <el-input v-model="dataForm.version" placeholder="鐗堟湰鍙�"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="3">
@@ -113,11 +92,7 @@
<el-col :span="5">
<el-form-item label="浜у搧闆朵欢鍙�" prop="partNo">
<el-input v-model="dataForm.partNo" placeholder="璇烽�夋嫨闆朵欢">
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="openPartDialog()"
- ></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openPartDialog()"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -128,12 +103,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="澶囨敞" prop="remark">
- <el-input
- type="textarea"
- v-model="dataForm.remark"
- placeholder="澶囨敞"
- style="width:360px"
- ></el-input>
+ <el-input type="textarea" v-model="dataForm.remark" placeholder="澶囨敞" style="width:360px"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -142,61 +112,24 @@
<div class="document-detail">
<el-tabs type="card" style="width: 100%;height: 100%">
- <el-tab-pane
- label="鍘熸潗鐢ㄩ噺"
- style="height: 100%"
- class="orimaterial-quantity"
- >
- <el-card
- shadow="never"
- style="margin-top: 12px;border: 1px solid #cfd5de;"
- >
+ <el-tab-pane label="鍘熸潗鐢ㄩ噺" style="height: 100%" class="orimaterial-quantity">
+ <el-card shadow="never" style="margin-top: 12px;border: 1px solid #cfd5de;">
<div slot="header">
<div>
- <el-button
- type="text"
- size="small"
- class="blue-but"
- v-if="editable"
- @click="calcMaterialCost()"
- >璁＄畻鐢ㄩ噺
+ <el-button type="text" size="small" class="blue-but" v-if="editable" @click="calcMaterialCost()">璁＄畻鐢ㄩ噺
</el-button>
- <el-button
- type="text"
- size="small"
- @click="exportMaterialCost()"
- >瀵煎嚭
+ <el-button type="text" size="small" @click="exportMaterialCost()">瀵煎嚭
</el-button>
</div>
</div>
- <el-table
- :data="materialCostList"
- border
- height="650"
- :span-method="objectSpanMethod"
- :header-cell-style="{ color: '#999' }"
- class="document-materialcost-table"
- show-summary
- :summary-method="getSummaries"
- ref="summeryTable"
- >
- <el-table-column
- label="鎴愬搧"
- prop="finishedProduct"
- align="center"
- >
+ <el-table :data="materialCostList" border height="650" :span-method="objectSpanMethod"
+ :header-cell-style="{ color: '#999' }" class="document-materialcost-table" show-summary
+ :summary-method="getSummaries" ref="summeryTable">
+ <el-table-column label="鎴愬搧" prop="finishedProduct" align="center">
</el-table-column>
- <el-table-column
- label="Bom缂栧彿"
- prop="bomNumber"
- align="center"
- >
+ <el-table-column label="Bom缂栧彿" prop="bomNumber" align="center">
</el-table-column>
- <el-table-column
- label="宸ュ簭"
- prop="operationName"
- align="center"
- >
+ <el-table-column label="宸ュ簭" prop="operationName" align="center">
</el-table-column>
<el-table-column label="鐗╂枡" prop="partName" align="center">
</el-table-column>
@@ -207,163 +140,63 @@
</el-table>
</el-card>
</el-tab-pane>
- <el-tab-pane
- class="final-product-checkout"
- label="鎴愬搧妫�娴�"
- style="height: 100%"
- >
- <TeststandardDialog
- :editable="editable"
- :documentId="Number(dataForm.id)"
- >
+ <el-tab-pane class="final-product-checkout" label="鎴愬搧妫�娴�" style="height: 100%">
+ <TeststandardDialog :editable="editable" :documentId="Number(dataForm.id)">
</TeststandardDialog>
</el-tab-pane>
<el-tab-pane label="浜у搧缁撴瀯宸ュ簭鍙傛暟" style="height: 100%">
<div class="document-related-stock-part">
- <div
- style="padding-left:18px;font-size:14px;font-weight:700;color:#000;height:20px;line-height:20px;"
- >
+ <div style="padding-left:18px;font-size:14px;font-weight:700;color:#000;height:20px;line-height:20px;">
<span>鐩稿叧搴撳瓨闆朵欢</span>
</div>
- <el-table
- :data="relatedStockPartList"
- @row-click="clickRelatedStockPart"
- highlight-current-row
- height="188px"
- :header-cell-style="relatedStockPartTableHeaderCellStyle"
- :row-style="{ height: '0' }"
- :cell-style="{ padding: '1px' }"
- >
- <el-table-column
- label="闆朵欢缂栧彿"
- prop="partNo"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table :data="relatedStockPartList" @row-click="clickRelatedStockPart" highlight-current-row
+ height="188px" :header-cell-style="relatedStockPartTableHeaderCellStyle" :row-style="{ height: '0' }"
+ :cell-style="{ padding: '1px' }">
+ <el-table-column label="闆朵欢缂栧彿" prop="partNo" align="center" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="闆朵欢鎻忚堪"
- prop="partName"
- align="center"
- width="400"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="闆朵欢鎻忚堪" prop="partName" align="center" width="400" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="宸ヨ壓璺嚎缂栧彿"
- prop="routingNo"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="宸ヨ壓璺嚎缂栧彿" prop="routingNo" align="center" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="宸ヨ壓璺嚎鐗堟湰"
- prop="routingVersion"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="宸ヨ壓璺嚎鐗堟湰" prop="routingVersion" align="center" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="宸ヨ壓鏇夸唬鍙�"
- prop="routingAlternativeNo"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="宸ヨ壓鏇夸唬鍙�" prop="routingAlternativeNo" align="center" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="宸ヨ壓鏇夸唬鎻忚堪"
- prop="routingAlternativeDesc"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="宸ヨ壓鏇夸唬鎻忚堪" prop="routingAlternativeDesc" align="center"
+ :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="BOM鍙�"
- prop="bomNo"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="BOM鍙�" prop="bomNo" align="center" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="BOM鐗堟湰"
- prop="bomVersion"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="BOM鐗堟湰" prop="bomVersion" align="center" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="BOM鏇夸唬鍙�"
- prop="bomAlternativeNo"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="BOM鏇夸唬鍙�" prop="bomAlternativeNo" align="center" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="BOM鏇夸唬鎻忚堪"
- prop="bomAlternativeDesc"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="BOM鏇夸唬鎻忚堪" prop="bomAlternativeDesc" align="center" :show-overflow-tooltip="true">
</el-table-column>
</el-table>
</div>
<el-card class="document-bom" header="BOM-宸ュ簭鍙傛暟">
<div slot="header">
<span>BOM-宸ュ簭鍙傛暟</span>
- <el-tooltip
- class="item"
- effect="dark"
- content="鍒犻櫎宸ヨ壓璺嚎"
- placement="top-start"
- v-if="editable"
- style="margin-left:5px ;"
- >
- <el-button
- style="float: right; padding: 3px 0px 3px 5px;color:red"
- type="text"
- @click="delCompleteproductstructure()"
- >鍒犻櫎
+ <el-tooltip class="item" effect="dark" content="鍒犻櫎宸ヨ壓璺嚎" placement="top-start" v-if="editable"
+ style="margin-left:5px ;">
+ <el-button style="float: right; padding: 3px 0px 3px 5px;color:red" type="text"
+ @click="delCompleteproductstructure()">鍒犻櫎
</el-button>
</el-tooltip>
- <el-tooltip
- class="item"
- effect="dark"
- content="閫夋嫨宸ヨ壓璺嚎"
- placement="top-start"
- v-if="editable"
- >
- <el-button
- style="float: right; padding: 3px 0"
- type="text"
- @click="addTechnology()"
- >娣诲姞
+ <el-tooltip class="item" effect="dark" content="閫夋嫨宸ヨ壓璺嚎" placement="top-start" v-if="editable">
+ <el-button style="float: right; padding: 3px 0" type="text" @click="addTechnology()">娣诲姞
</el-button>
</el-tooltip>
</div>
- <el-collapse
- v-model="currTechnologyBomPartName"
- accordion
- @change="handleCompleteproductstructureChange"
- >
- <el-collapse-item
- v-for="(item, i) in completeproductstructureData"
- :key="i"
- :name="item.bomRoutingId"
- >
+ <el-collapse v-model="currTechnologyBomPartName" accordion @change="handleCompleteproductstructureChange">
+ <el-collapse-item v-for="(item, i) in completeproductstructureData" :key="i" :name="item.bomRoutingId">
<template slot="title">
- <el-checkbox
- class="completeproductstructure-checkout"
- v-model="item.expand"
- disabled
- >
- <span style="font-weight:bold">宸ヨ壓璺嚎缂栧彿锛�</span
- >{{ item.routingNo }}
- <span style="font-weight:bold">闆朵欢鍙凤細</span
- >{{ item.partNo }}
- <span style="font-weight:bold">闆朵欢鍚嶇О锛�</span
- >{{ item.partName }}
- <span style="font-weight:bold">Bom缂栧彿锛�</span
- >{{ item.number == null ? '鏃�' : item.number }}
+ <el-checkbox class="completeproductstructure-checkout" v-model="item.expand" disabled>
+ <span style="font-weight:bold">宸ヨ壓璺嚎缂栧彿锛�</span>{{ item.routingNo }}
+ <span style="font-weight:bold">闆朵欢鍙凤細</span>{{ item.partNo }}
+ <span style="font-weight:bold">闆朵欢鍚嶇О锛�</span>{{ item.partName }}
+ <span style="font-weight:bold">Bom缂栧彿锛�</span>{{ item.number == null ? '鏃�' : item.number }}
</el-checkbox>
</template>
<div style="display:flex;">
@@ -373,9 +206,7 @@
item.showBom
? 'highlight-tab-class'
: 'unhighlight-tab-class'
- ]"
- @click="item.showBom = true"
- >
+ ]" @click="item.showBom = true">
BOM缁撴瀯
</div>
<div
@@ -384,44 +215,23 @@
!item.showBom
? 'highlight-tab-class'
: 'unhighlight-tab-class'
- ]"
- @click="item.showBom = false"
- >
+ ]" @click="item.showBom = false">
宸ュ簭鍙傛暟
</div>
</div>
<div class="document-bom-div" v-show="item.showBom">
- <el-tooltip
- class="item"
- effect="dark"
- content="娣诲姞鎴栨洿鎹OM缁撴瀯"
- placement="top-start"
- v-if="editable"
- style="margin-right:20px;"
- >
- <el-button
- style="float: right; padding: 3px 0px;color:#67c23a"
- type="text"
- @click="addCompleteproductstructure()"
- >娣诲姞
+ <el-tooltip class="item" effect="dark" content="娣诲姞鎴栨洿鎹OM缁撴瀯" placement="top-start" v-if="editable"
+ style="margin-right:20px;">
+ <el-button style="float: right; padding: 3px 0px;color:#67c23a" type="text"
+ @click="addCompleteproductstructure()">娣诲姞
</el-button>
</el-tooltip>
- <el-table
- :data="item.completeproductstructureDetail"
- row-key="id"
- border
- height="440"
- default-expand-all
- class="structure-detail-table"
- >
+ <el-table :data="item.completeproductstructureDetail" row-key="id" border height="440"
+ default-expand-all class="structure-detail-table">
<el-table-column prop="partNo" label="闆朵欢鍙�" width="240">
</el-table-column>
- <el-table-column
- prop="partName"
- label="闆朵欢鍚嶇О"
- width="400"
- >
+ <el-table-column prop="partName" label="闆朵欢鍚嶇О" width="400">
</el-table-column>
<el-table-column prop="qpa" label="鏁伴噺" width="180">
</el-table-column>
@@ -430,165 +240,75 @@
</el-table>
</div>
<div class="document-technology-div" v-show="!item.showBom">
- <div
- style="border: 1px solid #ebeef5;height: 440px;overflow: auto;"
- >
- <el-collapse
- v-model="currTechnologyOperationName"
- accordion
- @change="
- handleTechnologyOperationChange(
- $event,
- item.bomRoutingId
- )
- "
- >
- <el-collapse-item
- v-for="(ele, j) in item.technologyOperationData"
- :key="j"
- :name="ele.id"
- >
- <template slot="title"
- ><span style="font-weight:300"
- > 宸ュ簭鍚嶇О锛�</span
- >{{ ele.operationName }}
- <span style="font-weight:300">宸ュ簭缂栧彿锛�</span
- >{{ ele.operationNo }}
+ <div style="border: 1px solid #ebeef5;height: 440px;overflow: auto;">
+ <el-collapse v-model="currTechnologyOperationName" accordion @change="
+ handleTechnologyOperationChange(
+ $event,
+ item.bomRoutingId
+ )
+ ">
+ <el-collapse-item v-for="(ele, j) in item.technologyOperationData" :key="j" :name="ele.id">
+ <template slot="title"><span style="font-weight:300"> 宸ュ簭鍚嶇О锛�</span>{{
+ ele.operationName }}
+ <span style="font-weight:300">宸ュ簭缂栧彿锛�</span>{{ ele.operationNo }}
</template>
<el-tabs v-model="activeTemplateName" type="card">
- <el-tab-pane
- v-for="(paramTab, index) in paramTabs"
- :key="index"
- :label="paramTab.label"
- :name="paramTab.name"
- >
+ <el-tab-pane v-for="(paramTab, index) in paramTabs" :key="index" :label="paramTab.label"
+ :name="paramTab.name">
<el-table :data="paramTab.params">
- <el-table-column
- prop="parameterItem"
- label="鍚嶇О"
- align="center"
- >
+ <el-table-column prop="parameterItem" label="鍚嶇О" align="center">
<template slot-scope="scope">
- <span
- >{{ scope.row.parameterItem }}({{
- scope.row.unit
- }})</span
- >
+ <span>{{ scope.row.parameterItem }}({{
+ scope.row.unit
+ }})</span>
</template>
</el-table-column>
- <el-table-column
- prop="paramValue"
- label="鍊�"
- align="center"
- ></el-table-column>
+ <el-table-column prop="paramValue" label="鍊�" align="center"></el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="澶囨敞" style="height: 100%">
- <rich-text
- :editorId="
- 'fwb' + item.id + '-' + ele.id + '-' + j
- "
- :richContent="ele.remark"
- ></rich-text>
+ <rich-text :editorId="'fwb' + item.id + '-' + ele.id + '-' + j
+ " :richContent="ele.remark"></rich-text>
</el-tab-pane>
<el-tab-pane label="妫�娴嬫爣鍑�">
- <checkStandardTable
- ref="documentTestStandardTable"
- :dataFormId="dataForm.id"
- :routingOperationId="ele.id"
- :operationId="ele.operationId"
- :operationName="ele.operationName"
- :paramTypeOptions="paramTypeOptions"
- :bomRoutingId="
- currTechnologyBomPart == null
- ? null
- : currTechnologyBomPart.bomRoutingId
- "
- :everyBomRoutingId="item.bomRoutingId"
- :editable="editable"
- @refreshTestStandardInfo="
- refreshTestStandardInfo
- "
- ></checkStandardTable>
+ <checkStandardTable ref="documentTestStandardTable" :dataFormId="dataForm.id"
+ :routingOperationId="ele.id" :operationId="ele.operationId"
+ :operationName="ele.operationName" :paramTypeOptions="paramTypeOptions" :bomRoutingId="currTechnologyBomPart == null
+ ? null
+ : currTechnologyBomPart.bomRoutingId
+ " :everyBomRoutingId="item.bomRoutingId" :editable="editable"
+ @refreshTestStandardInfo="refreshTestStandardInfo"></checkStandardTable>
</el-tab-pane>
<el-tab-pane label="鎶芥瑙勫垯">
<div>
<div style="padding: 0px 20px;">
- <el-button
- type="primary"
- @click="openAddSpotCheckRuleDialog"
- >鏂板</el-button
- >
+ <el-button type="primary" @click="openAddSpotCheckRuleDialog">鏂板</el-button>
</div>
<div>
- <el-table
- :data="spotCheckRuleList"
- style="width: 100%"
- >
- <el-table-column
- prop="ruleNo"
- label="瑙勫垯缂栧彿"
- align="center"
- >
+ <el-table :data="spotCheckRuleList" style="width: 100%">
+ <el-table-column prop="ruleNo" label="瑙勫垯缂栧彿" align="center">
</el-table-column>
- <el-table-column
- prop="ruleName"
- label="瑙勫垯鍚嶇О"
- align="center"
- >
+ <el-table-column prop="ruleName" label="瑙勫垯鍚嶇О" align="center">
</el-table-column>
- <el-table-column
- prop="samplingOperationName"
- label="鎶芥宸ュ簭"
- align="center"
- >
+ <el-table-column prop="samplingOperationName" label="鎶芥宸ュ簭" align="center">
</el-table-column>
- <el-table-column
- prop="retrospectOperationName"
- label="杩芥函宸ュ簭"
- align="center"
- >
+ <el-table-column prop="retrospectOperationName" label="杩芥函宸ュ簭" align="center">
</el-table-column>
- <el-table-column
- prop="applyType"
- label="妫�娴嬬被鍨�"
- align="center"
- :formatter="applyTypeFormatter"
- >
+ <el-table-column prop="applyType" label="妫�娴嬬被鍨�" align="center"
+ :formatter="applyTypeFormatter">
</el-table-column>
- <el-table-column
- prop="measurement"
- label="鎶芥姣斾緥"
- align="center"
- :formatter="measurementFormatter"
- >
+ <el-table-column prop="measurement" label="鎶芥姣斾緥" align="center"
+ :formatter="measurementFormatter">
</el-table-column>
- <el-table-column
- prop="samplingPosition"
- label="鎶芥浣嶇疆"
- align="center"
- >
+ <el-table-column prop="samplingPosition" label="鎶芥浣嶇疆" align="center">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- width="100"
- align="center"
- >
+ <el-table-column label="鎿嶄綔" width="100" align="center">
<template slot-scope="scope">
- <el-button
- type="text"
- size="small"
- @click="
- openEditSpotCheckRule(scope.row)
- "
- >缂栬緫</el-button
- >
- <el-button
- type="text"
- size="small"
- @click="delSpotCheckRule(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button type="text" size="small" @click="
+ openEditSpotCheckRule(scope.row)
+ ">缂栬緫</el-button>
+ <el-button type="text" size="small"
+ @click="delSpotCheckRule(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -609,21 +329,11 @@
<div slot="header">
<span>缁撴瀯鍥�</span>
</div>
- <el-upload
- class="upload-demo"
- action="/mes/document/uploadJgt"
- :headers="headers"
- :on-preview="handleStructurePreview"
- :on-remove="handleStructureRemove"
- :on-success="handleStructureSuccess"
- :data="paramStructureDatas"
- :file-list="fileStructureList"
- :on-exceed="handleStructureExceed"
- :before-upload="beforeStructureAvatarUpload"
- list-type="picture"
- multiple
- :with-credentials="true"
- >
+ <el-upload class="upload-demo" action="/mes/document/uploadJgt" :headers="headers"
+ :on-preview="handleStructurePreview" :on-remove="handleStructureRemove"
+ :on-success="handleStructureSuccess" :data="paramStructureDatas" :file-list="fileStructureList"
+ :on-exceed="handleStructureExceed" :before-upload="beforeStructureAvatarUpload" list-type="picture"
+ multiple :with-credentials="true">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
<div slot="tip" class="el-upload__tip">
鍙兘涓婁紶jpg鍥剧墖锛屼笖涓嶈秴杩�2MB
@@ -695,33 +405,18 @@
</el-tabs>
</div>
</div>
- <completeproductstructureDialog
- :currshowlist.sync="showCompleteproductstructure"
- :queryParam="bomQueryParam"
- @listenToCompleteproductstructureEvent="selectCompleteproductstructure"
- />
- <routingDialog
- :currshowlist.sync="showTechnology"
- :queryParam="queryParam"
- @listenToRoutingEvent="selectTechnology"
- />
- <qualityStandardDialog
- :currshowlist.sync="showQualityStandard"
- @listenToSelectTestStandardEvent="selectQualityStandard"
- />
+ <completeproductstructureDialog :currshowlist.sync="showCompleteproductstructure" :queryParam="bomQueryParam"
+ @listenToCompleteproductstructureEvent="selectCompleteproductstructure" />
+ <routingDialog :currshowlist.sync="showTechnology" :queryParam="queryParam"
+ @listenToRoutingEvent="selectTechnology" />
+ <qualityStandardDialog :currshowlist.sync="showQualityStandard"
+ @listenToSelectTestStandardEvent="selectQualityStandard" />
<partDialog :currshowlist.sync="showPart" @listenToPartEvent="selectPart" />
- <spotCheckRule
- :currshowlist.sync="spotCheckRuleShow"
- :docBomId="currDocBomId"
- :routingOperationId="currRoutingOperationId"
- :routingOperationName="currRoutingOperationName"
- @refreshSpotCheckRuleList="refreshSpotCheckRuleList"
- />
- <spotCheckRuleEdit
- :currshowlist.sync="editSpotCheckRuleShow"
- :documentSamplingRuleId="currDocumentSamplingRuleId"
- @refreshSpotCheckRuleList="refreshSpotCheckRuleList"
- />
+ <spotCheckRule :currshowlist.sync="spotCheckRuleShow" :docBomId="currDocBomId"
+ :routingOperationId="currRoutingOperationId" :routingOperationName="currRoutingOperationName"
+ @refreshSpotCheckRuleList="refreshSpotCheckRuleList" />
+ <spotCheckRuleEdit :currshowlist.sync="editSpotCheckRuleShow" :documentSamplingRuleId="currDocumentSamplingRuleId"
+ @refreshSpotCheckRuleList="refreshSpotCheckRuleList" />
</div>
</template>
@@ -873,7 +568,7 @@
spotCheckRuleEdit
},
computed: {
- editable: function() {
+ editable: function () {
if (!this.dataForm.id) {
return true
}
@@ -962,15 +657,15 @@
}
// flowTemp.loadData(jsondata)
// 淇濆瓨鎸夐挳浜嬩欢
- _this.flowTemp.onBtnSaveClick = function() {
+ _this.flowTemp.onBtnSaveClick = function () {
_this.saveFlow()
}
// 閲嶇疆鎸夐挳浜嬩欢
- _this.flowTemp.onFreshClick = function() {
+ _this.flowTemp.onFreshClick = function () {
_this.getFlow()
}
// 鎵撳嵃鎸夐挳浜嬩欢
- _this.flowTemp.onPrintClick = function() {
+ _this.flowTemp.onPrintClick = function () {
_this.flowTemp.exportDiagram('娴佺▼鍥�')
}
},
@@ -1383,7 +1078,7 @@
var aa = {
id: resData.jgtList[i].id,
name: '棰勮澶у浘',
- url: 'http://127.0.0.1:6061/Image/' + resData.jgtList[i].fileName.replace("D:/file","")
+ url: '/mes/document/file?fileName=' + resData.jgtList[i].fileName
}
this.fileStructureList.push(aa)
}
@@ -1393,7 +1088,7 @@
if (resData.lct != null) {
this.fileFlowList.push({
name: '棰勮澶у浘',
- url: 'http://127.0.0.1:6061/Image/img' + resData.lct
+ url: 'http://127.0.0.1:6061/Image' + resData.lct
})
}
// 鎸傛祦绋嬪浘
@@ -1874,8 +1569,7 @@
},
handleFlowExceed(files, fileList) {
this.$message.warning(
- `褰撳墠闄愬埗閫夋嫨 1 涓祦绋嬪浘鏂囦欢锛屾湰娆￠�夋嫨浜� ${
- files.length
+ `褰撳墠闄愬埗閫夋嫨 1 涓祦绋嬪浘鏂囦欢锛屾湰娆￠�夋嫨浜� ${files.length
} 涓祦绋嬪浘鏂囦欢锛屽叡閫夋嫨浜� ${files.length + fileList.length} 涓祦绋嬪浘鏂囦欢`
)
},
@@ -2053,9 +1747,10 @@
padding: 10px 20px;
box-sizing: border-box;
}
-.el-card.is-always-shadow{
- width: 100%;
- }
+
+.el-card.is-always-shadow {
+ width: 100%;
+}
.document-flow {
background-color: #fff;
@@ -2069,30 +1764,22 @@
}
/*鑷畾涔塪isabled鐘舵�佷笅checkbox鐨勬牱寮�*/
-.completeproductstructure-checkout
- .el-checkbox__input.is-disabled.is-checked
- .el-checkbox__inner {
+.completeproductstructure-checkout .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
background-color: #006eff;
border-color: #006eff;
}
-.completeproductstructure-checkout
- .el-checkbox__input.is-disabled.is-checked
- + span.el-checkbox__label {
+.completeproductstructure-checkout .el-checkbox__input.is-disabled.is-checked+span.el-checkbox__label {
color: #006eff;
border-color: #006eff;
}
-.completeproductstructure-checkout
- .el-checkbox__input.is-disabled
- .el-checkbox__inner {
+.completeproductstructure-checkout .el-checkbox__input.is-disabled .el-checkbox__inner {
background-color: #ffffff;
cursor: pointer;
}
-.completeproductstructure-checkout
- .el-checkbox__input.is-disabled
- + span.el-checkbox__label {
+.completeproductstructure-checkout .el-checkbox__input.is-disabled+span.el-checkbox__label {
color: #606266;
cursor: pointer;
}
@@ -2161,11 +1848,13 @@
.GooFlow .ico .ico_start:before {
color: red;
}
+
.highlight-tab-class {
color: #006eff;
background: #e4e7ed;
border-top: 1px solid #006eff;
}
+
.unhighlight-tab-class {
border: 1px solid #e4e7ed;
border-bottom: none;
--
Gitblit v1.9.3