From 2fefc3c07619a513fe82144ea1f8d75c068bcb9e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:07:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/operation-task-pane.vue | 163 ++--
src/views/quality/finishedProductInspection/finishedProducter-print.vue | 1080 ++++++++++++++++++-------------
src/views/basic/location/index.vue | 2
vue.config.js | 1
src/views/quality/finishedProductInspection/index.vue | 24
src/views/technology/completeproductstructure/completeproductstructure-form.vue | 1
src/views/plan/manufacturingorder/customerorder.vue | 307 +++++++-
src/views/plan/manufacturingorder/productorder-form.vue | 22
src/views/product/workbench/workstationoperate-form.vue | 1
src/views/plan/customerorder/customerorder-form.vue | 4
src/views/technology/operation/operation-form.vue | 4
src/api/warehouse/location.js | 16
src/views/product/workbench/index.vue | 260 ++++---
src/views/product/workbench/taskinfo-pane.vue | 1
src/views/plan/masterproductionschedule/index.vue | 4
src/views/plan/manufacturingorder/index.vue | 16
src/views/product/workbench/feed-pane.vue | 8
src/views/basic/workstation/workstation-form.vue | 4
src/views/technology/structure/single-structure-form.vue | 4
src/api/plan/manufacturingorder.js | 8
src/views/basic/location/location-form.vue | 60 +
21 files changed, 1,253 insertions(+), 737 deletions(-)
diff --git a/src/api/plan/manufacturingorder.js b/src/api/plan/manufacturingorder.js
index cb98b76..e9b8d5d 100644
--- a/src/api/plan/manufacturingorder.js
+++ b/src/api/plan/manufacturingorder.js
@@ -80,6 +80,14 @@
})
}
+export function getProcessConfigFile(obj) {
+ return request({
+ url: '/mes/plan/customerOrder/processConfigFiles',
+ method: 'get',
+ params: obj
+ })
+}
+
export function checkOutTechnologyRouting(query) {
return request({
url: '/mes/plan/manufacturingOrder/checkout',
diff --git a/src/api/warehouse/location.js b/src/api/warehouse/location.js
index 7f1a72f..8afd1f5 100644
--- a/src/api/warehouse/location.js
+++ b/src/api/warehouse/location.js
@@ -106,3 +106,19 @@
params: query
})
}
+
+export function getIfsLocationByGroupCopy(query) {
+ return request({
+ url: '/mes/location/getIfsLocation/copy',
+ method: 'get',
+ params: query
+ })
+}
+
+export function getIfsLocationByGroupCopyAll(query) {
+ return request({
+ url: '/mes/location/getIfsLocationByGroupCopyAll',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index f0474fe..d1c959d 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -198,7 +198,7 @@
{
minWidth: '200',
prop: 'ifsLocation',
- label: 'ERP搴撲綅',
+ label: 'IFS搴撲綅',
sort: true,
isTrue: false,
isSearch: true,
diff --git a/src/views/basic/location/location-form.vue b/src/views/basic/location/location-form.vue
index c2591bf..8871e84 100644
--- a/src/views/basic/location/location-form.vue
+++ b/src/views/basic/location/location-form.vue
@@ -135,11 +135,10 @@
<el-row>
<el-col :span="12">
<el-form-item
- v-if="permissions.basic_has_ifs"
label="IFS搴撲綅"
prop="ifsLocationDesc"
>
- <!--<el-select
+ <!-- <el-select
v-model="dataForm.ifsLocation"
filterable
placeholder="璇烽�夋嫨IFS搴撲綅"
@@ -152,11 +151,11 @@
:key="index"
>
</el-option>
- </el-select>-->
+ </el-select> -->
<el-cascader
v-model="dataForm.ifsLocationDesc"
:props="locationProps"
- style="width:100%"
+ style="width:100%" filterable
></el-cascader>
</el-form-item>
</el-col>
@@ -219,6 +218,7 @@
warehouseOptions: [],
factoryOptions: [],
ifsLocationOptions: [],
+ locationTree: [],
visible: false,
dataForm: {
id: 0,
@@ -262,34 +262,39 @@
locationProps: {
lazy: true,
lazyLoad(node, resolve) {
- console.log('node', node)
const { level } = node
if (level === 0) {
getIfsLocationGroup().then((response) => {
if (response.data.code === 0) {
const _data = response.data.data
-
- const nodes = _data.map((item) => {
+ const nodes = JSON.parse(_data)["LIST_INFO"].map((item) => {
return {
- value: item.LOCATION_GROUP,
- label: item.LOCATION_GROUP,
+ value: item.LOCATION_GROUP_DESC +'-'+ item.LOCATION_GROUP,
+ label: item.LOCATION_GROUP_DESC +'-'+ item.LOCATION_GROUP,
leaf: false
}
})
+ var set = new Set()
+ nodes.forEach(a=>{
+ set.add(JSON.stringify(a))
+ })
+ var list = []
+ set.forEach(a=>{
+ list.push(JSON.parse(a))
+ })
// 閫氳繃璋冪敤resolve灏嗗瓙鑺傜偣鏁版嵁杩斿洖锛岄�氱煡缁勪欢鏁版嵁鍔犺浇瀹屾垚
- resolve(nodes)
+ resolve(list)
}
})
} else {
- getIfsLocationByGroup({ locationGroup: node.value }).then(
+ getIfsLocationByGroup({ locationNo: node.value.split('-')[1] }).then(
(response) => {
if (response.data.code === 0) {
const _data = response.data.data
-
- const nodes = _data.map((item) => {
+ const nodes = JSON.parse(_data)["LIST_INFO"].map((item) => {
return {
value: item.LOCATION_NO,
- label: item.LOCATION_NO,
+ label: item.LOCATION_DESC +' | '+ item.LOCATION_NO,
leaf: true
}
})
@@ -404,7 +409,32 @@
this.isSubmit = false
}
})
- }
+ },
+ getLocationTree(){
+ getIfsLocationGroup().then((res) => {
+ if (res.data.code === 0) {
+ var strs = JSON.parse(res.data.data)['LIST_INFO']
+ var set3 = new Set()
+ var set2 = new Set()
+ var set = []
+ strs.forEach(a=>{
+ set2.add(a['LOCATION_GROUP_DESC'] + '-' + a['LOCATION_GROUP'])
+ })
+ strs.forEach(a=>{
+ set2.forEach(b=>{
+ if((a['LOCATION_GROUP_DESC'] + '-' + a['LOCATION_GROUP'])==b){
+ set3.add(a['LOCATION_DESC'] + '-' + a['LOCATION_NO'])
+ }
+ set.push({
+ value: b,
+ label: b,
+ children: []
+ })
+ })
+ })
+ }
+ })
+ }
}
}
</script>
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 3b09630..9947e12 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -138,7 +138,7 @@
>
</el-transfer>
</el-tab-pane>
- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
+ <!-- <el-tab-pane label="浜у嚭涓嶅悎鏍煎簱浣�" name="disqualified">
<el-transfer
filterable
v-model="disqualifiedLocationIds"
@@ -159,7 +159,7 @@
@change="handleChangeQualifiedLocation"
>
</el-transfer>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="妫�楠屽緟澶勭悊搴撲綅" name="pending">
<el-transfer
filterable
diff --git a/src/views/plan/customerorder/customerorder-form.vue b/src/views/plan/customerorder/customerorder-form.vue
index 22b36b5..ec8dfc5 100644
--- a/src/views/plan/customerorder/customerorder-form.vue
+++ b/src/views/plan/customerorder/customerorder-form.vue
@@ -1299,9 +1299,6 @@
this.getConfigFiles()
},
delProcessConfigFile(row) {
- if (row.lineNumber !== this.dataForm.otcLineNo) {
- this.$message.error('涓婁紶鏂囦欢琛屽彿涓庡綋鍓嶉攢鍞鍗曡鍙蜂笉涓�鑷达紝涓嶅厑璁稿垹闄�')
- } else {
this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -1314,7 +1311,6 @@
.then((data) => {
this.getConfigFiles()
})
- }
},
downloadProcessConfigFile(row) {
downloadProcessConfigFile(
diff --git a/src/views/plan/manufacturingorder/customerorder.vue b/src/views/plan/manufacturingorder/customerorder.vue
index 8cc4949..18f47fd 100644
--- a/src/views/plan/manufacturingorder/customerorder.vue
+++ b/src/views/plan/manufacturingorder/customerorder.vue
@@ -22,18 +22,18 @@
@keyup.enter.native="dataFormSubmit()"
label-width="100px"
class="l-mes productorder-order"
- :disabled="!editable"
>
- <el-tabs type="border-card">
+ <!-- :disabled="!editable" -->
+ <el-tabs type="border-card" @tab-click="downs" v-model="activeFileName">
<el-tab-pane label="涓昏" type="card">
<el-row>
<el-col :span="12">
<el-form-item label="鍚屾鏁版嵁鏉ユ簮" prop="sourceId">
- <el-input
- v-model="dataForm.sourceId"
- placeholder=""
- :disabled="!ediSource"
- ></el-input>
+ <el-input
+ v-model="dataForm.sourceId == 0 ? '鍚屾' : '鎵嬪姩'"
+ placeholder=""
+ disabled
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -86,7 +86,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="琛屽彿" prop="coLineNo">
<el-input
v-model="dataForm.coLineNo"
@@ -94,7 +94,17 @@
:disabled="!ediSource"
></el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
+ <el-col :span="6">
+ <el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-input
+ v-model="dataForm.productName"
+ placeholder=""
+ disabled
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="12">
@@ -121,9 +131,9 @@
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="wantedDeliveryDate">
+ <el-form-item label="鏈熸湜浜よ揣鏃堕棿" prop="deliveryDate">
<el-date-picker
- v-model="dataForm.wantedDeliveryDate"
+ v-model="dataForm.deliveryDate"
style="width: 100%"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -132,7 +142,16 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12">
+ <el-form-item label="宸ヨ壓鏂囦欢鍚嶇О" prop="docName">
+ <el-input
+ v-model="dataForm.docName"
+ placeholder=""
+ disabled
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="12">
<el-form-item label="璁″垝浜よ揣鏃堕棿" prop="plannedDeliveryDate">
<el-date-picker
v-model="dataForm.plannedDeliveryDate"
@@ -143,13 +162,37 @@
>
</el-date-picker>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
- <el-card
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="璁㈠崟澶囨敞" prop="comment">
+ <el-input
+ v-model="dataForm.comment"
+ placeholder=""
+ :disabled="!ediSource"
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="浜у搧澶囨敞" prop="remark">
+ <el-input
+ v-model="dataForm.remark"
+ placeholder=""
+ :disabled="!ediSource"
+ >
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!-- <el-card
header="璁㈠崟鍙傛暟"
shadow="never"
class="productorder-order-param"
- >
+ > -->
<el-row>
<el-form-item
style="float:left;width: 50%"
@@ -166,8 +209,33 @@
</el-row>
</el-card>
</el-tab-pane>
- <el-tab-pane label="闄勪欢" type="card">
+ <el-tab-pane label="闄勪欢" type="card" name="闄勪欢">
+ <div style="display: flex;justify-content:flex-end;">
+ <div></div>
+ </div>
+ <div
+ v-loading="progrecessFileLoading"
+ element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
+ >
<el-upload
+ drag
+ ref="upload"
+ action="/mes/plan/customerOrder/upload"
+ :auto-upload="true"
+ :headers="headers"
+ :before-upload="submitUpload"
+ :on-success="uploadSuccess"
+ :data="paramData"
+ :with-credentials="true"
+ :show-file-list="false"
+ >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em>
+ </div>
+ </el-upload>
+ </div>
+ <!-- <el-upload
disabled
action=""
ref="upload"
@@ -176,10 +244,93 @@
:on-preview="handlePreview"
:with-credentials="true"
>
- </el-upload>
+ </el-upload> -->
+ <el-table :data="processConfigFileTableData" height="400px">
+ <el-table-column
+ prop="orderNumber"
+ align="center"
+ label="璁㈠崟鍙�"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <!-- <el-table-column prop="lineNumber" align="center" label="琛屽彿"> -->
+ <!-- </el-table-column> -->
+ <el-table-column
+ prop="originalFileName"
+ align="center"
+ label="鍘熸枃浠跺悕"
+ width="200"
+ >
+ </el-table-column>
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
+ </el-table-column>
+ <el-table-column prop="createUser" align="center" label="涓婁紶浜�">
+ </el-table-column>
+ <el-table-column
+ prop="createTime"
+ align="center"
+ label="涓婁紶鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column prop="updateUser" align="center" label="鏇存柊浜�">
+ </el-table-column>
+ <el-table-column
+ prop="updateTime"
+ align="center"
+ label="鏇存柊鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <!-- <el-table-column align="center" label="鏄惁鍚屾宸ヨ壓閰嶇疆鍗�">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-switch-->
+ <!-- :value="scope.row.effectiveRange"-->
+ <!-- active-value="1"-->
+ <!-- inactive-value="0"-->
+ <!-- @input="handleInput(scope.row)"-->
+ <!-- :disabled="scope.row.lineNumber !== dataForm.otcLineNo"-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column fixed="right" align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <!-- <el-button
+ @click="synchronizeFile(scope.row)"
+ type="text"
+ size="small"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
+ >鍚屾</el-button
+ > -->
+ <el-button
+ @click="delProcessConfigFile(scope.row)"
+ type="text"
+ size="small"
+ :disabled="scope.row.lineNumber !== dataForm.customerNo"
+ >鍒犻櫎</el-button
+ >
+ <el-button
+ @click="downloadProcessConfigFile(scope.row)"
+ type="text"
+ size="small"
+ >涓嬭浇</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
</el-tab-pane>
</el-tabs>
</el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="visible = false">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ :disabled="buttonDisable"
+ v-thinclick="`dataFormSubmit`"
+ v-if="editable"
+ >纭畾</el-button
+ >
+ </span>
</el-tab-pane>
</el-tabs>
</template>
@@ -196,11 +347,14 @@
addCustomerOrder,
download,
getCustomerOrder,
+ deleteProcessConfigFile,
+ downloadProcessConfigFile,
putCustomerOrder
} from '@/api/plan/customerorder'
import { remote } from '@/api/admin/dict'
import { validateSixDecimal } from '@/util/validate'
-import { getCustomer } from '../../../api/plan/manufacturingorder'
+import { getStore } from '@/util/store'
+import { getCustomer,getProcessConfigFile } from '../../../api/plan/manufacturingorder'
export default {
props: {
@@ -277,37 +431,71 @@
{ validator: validateSixDecimal, trigger: 'blur' }
]
},
+ paramData: {
+ // range: '1',
+ orderNumber: '',
+ lineNumber: ''
+ },
+ headers: {
+ Authorization: 'Bearer ' + getStore({ name: 'access_token' })
+ },
units: [],
coStates: [
+ // {
+ // value: '01plan',
+ // label: '寰呰鍒�'
+ // },
+ // {
+ // value: '03planed',
+ // label: '宸茶鍒�'
+ // },
+ // {
+ // value: '02planing',
+ // label: '璁″垝涓�'
+ // },
+ // {
+ // value: '04complete',
+ // label: '宸插畬鎴�'
+ // }
+ {
+ value: '01partUnCheck',
+ label: '闆朵欢寰呴��'
+ },
{
- value: '01plan',
+ value: '02technologyUnCheck',
+ label: '宸ヨ壓鏂囦欢寰呴��'
+ },
+ {
+ value: '03plan',
label: '寰呰鍒�'
},
{
- value: '03planed',
- label: '宸茶鍒�'
+ value: '04planed',
+ label: '宸蹭笅鍙�'
},
{
- value: '02planing',
- label: '璁″垝涓�'
+ value: '05cancel',
+ label: '宸蹭綔搴�'
},
{
- value: '04complete',
- label: '宸插畬鎴�'
+ value: '06unedit',
+ label: '璁㈠崟缂栬緫'
}
- ]
+ ],
+ processConfigFileTableData: [],
+ activeFileName: ""
}
},
computed: {
- editable: function() {
- if (!this.dataForm.id) {
- return true
- }
- if (this.dataForm.id && this.dataForm.coState !== '04complete') {
- return true
- }
- return false
- },
+ // editable: function() {
+ // if (!this.dataForm.id) {
+ // return true
+ // }
+ // if (this.dataForm.id && this.dataForm.coState !== '04complete') {
+ // return true
+ // }
+ // return false
+ // },
ediSource: function() {
if (!this.dataForm.id) {
return true
@@ -360,8 +548,8 @@
}
this.fileList = response.data.data.customerOrderAttachmentList
this.orderParamList = response.data.data.orderParamList
-
-
+ //闄勪欢
+ this.processConfigFileTableData = response.data.data.configFiles
this.title =
this.dataForm.customerName + this.dataForm.customerOrderNo
})
@@ -371,6 +559,48 @@
this.$refs.tabs.currentName = '0'
}
})
+ },
+ submitUpload() {
+ this.paramData.orderNumber = this.dataForm.contractNo
+ this.paramData.lineNumber = this.dataForm.customerNo
+ this.progrecessFileLoading = true
+ },
+ uploadSuccess() {
+ this.progrecessFileLoading = false
+ this.downs()
+ },
+ //闄勪欢鐨勬煡璇�
+ downs(label, e){
+ if(this.activeFileName=='闄勪欢'){
+ console.log('1');
+ getProcessConfigFile({
+ orderNumber: this.dataForm.contractNo,
+ lineNumber: this.dataForm.customerNo
+ }).then((res)=>{
+ this.processConfigFileTableData = res.data.data
+ })
+ }
+ },
+ downloadProcessConfigFile(row) {
+ downloadProcessConfigFile(
+ row.fileName,
+ row.bucketName,
+ row.originalFileName
+ )
+ },
+ delProcessConfigFile(row) {
+ this.$confirm('鏄惁鍒犻櫎宸ヨ壓閰嶇疆鏂囦欢', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ closeOnClickModal: false
+ })
+ .then(function() {
+ return deleteProcessConfigFile(row.id)
+ })
+ .then((data) => {
+ this.downs()
+ })
},
// 闄勪欢鐨勭偣鍑�
handlePreview(file) {
@@ -425,6 +655,9 @@
},
handleTabClick(tab, event) {
this.init(parseInt(tab.name))
+ if(tab.name){
+
+ }
},
// 闆朵欢閫夋嫨
openPartDialog() {
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 2f4af42..0e1c7b3 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -428,8 +428,8 @@
},
{
minWidth: '120',
- prop: 'orderRemark',
- label: '閿�鍞鍗曞娉�',
+ prop: 'remark',
+ label: '澶囨敞',
sort: true,
isTrue: true,
isSearch: true,
@@ -824,12 +824,12 @@
],
toolbar: [],
operator: [
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.searchStock
- }
+ // {
+ // text: '鏌ョ湅搴撳瓨',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.searchStock
+ // }
],
operatorConfig: {
fixed: 'right',
diff --git a/src/views/plan/manufacturingorder/productorder-form.vue b/src/views/plan/manufacturingorder/productorder-form.vue
index 039af71..ba11120 100644
--- a/src/views/plan/manufacturingorder/productorder-form.vue
+++ b/src/views/plan/manufacturingorder/productorder-form.vue
@@ -638,17 +638,11 @@
</el-row>
<el-row>
<el-table
- default-expand-all
- :data="components"
+ :data="components[0]"
@selection-change="structSelectionChange"
- row-key="id"
border
- :tree-props="{
- children: 'children'
- }"
style="width: 100%"
height="400px"
- :default-sort="{ prop: 'index' }"
>
<el-table-column type="selection" width="40" fixed="left" />
<el-table-column
@@ -1071,6 +1065,7 @@
data() {
return {
+ componentsTable:[],
typeOptions: [],
paramTemplateSelArr: [],
paramTemplateSelCol: 'operationTemplateNo',
@@ -1232,6 +1227,7 @@
this.getBomTypeDbOptions()
this.getManufactureAttrs('manufacture_attr_type')
this.getSysParam(sysParam.IS_REPORT_OPERATION)
+ // console.log(this.components);
},
watch: {
'dataForm.partId'(newValue, oldValue) {
@@ -1245,7 +1241,11 @@
}
}
},
-
+ components(newVal,oldVal){
+ console.log("鏂�",newVal);
+ console.log("鑰�",oldVal);
+ console.log(this.components);
+ },
currentRouting(newValue, oldValue) {
if (newValue && newValue.id) {
if (this.dataForm.id != null && this.dataForm.id !== 0) {
@@ -1295,7 +1295,8 @@
if (newValue && newValue.id) {
// 鏌ヨ浜у搧缁撴瀯瀵瑰簲鐨勭粍浠�
getBom(newValue.id).then((response) => {
- this.components = [response.data.data.tree]
+ console.log("鏌�",this.components);
+ // this.components = [response.data.data.tree]
})
}
},
@@ -1397,6 +1398,7 @@
},
// 鏌ヨ褰撳墠杞﹂棿璁㈠崟淇℃伅
getOrderInfo() {
+ let that=this
getManufacturingOrder(this.dataForm.id).then((response) => {
this.dataForm = response.data.data
// 鎶婂伐鑹烘寕涓婂幓
@@ -1416,7 +1418,7 @@
}
// 鎶婁骇鍝佺粨鏋勭粍浠舵寕涓婂幓
if (this.dataForm.bomRoot) {
- this.components = [this.dataForm.bomRoot]
+ that.components = [this.dataForm.bomRoot]
}
})
},
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index aeb9cf5..927b1ff 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -771,8 +771,8 @@
return ''
},
// 鍒犻櫎
- deleteHandle(row) {
- this.$confirm('鏄惁纭鍒犻櫎ID涓�' + row.id, '鎻愮ず', {
+ deleteMainPlan(row) {
+ this.$confirm('鏄惁纭浣滃簾ID涓�' + row.id, '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 3dd5b5f..7b41bbb 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -144,14 +144,14 @@
><span style="font-size:14px;font-weight:bold">绾胯竟浠撳悎鏍肩墿鏂�</span>
</div>
<div>
- <el-button
+ <!-- <el-button
v-if="permissions.product_feed_scan"
class="feeding-btn"
type="primary"
icon="feed-btn-feeding"
@click="scanAddFeed()"
>鎵爜鎶曟枡</el-button
- >
+ > -->
<el-button
class="feeding-btn"
type="primary"
@@ -1130,7 +1130,7 @@
><span style="font-size:14px;font-weight:bold">宸叉姇鍏ユ湭娑堣�楃墿鏂�</span>
</div>
<div>
- <el-button
+ <!-- <el-button
class="return-btn"
type="primary"
@click="submitIns()"
@@ -1141,7 +1141,7 @@
type="primary"
@click="inputHandle()"
>灏炬枡澶勭悊</el-button
- >
+ > -->
<el-button
class="return-btn"
type="primary"
diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index 026fcfe..fd3b46e 100644
--- a/src/views/product/workbench/index.vue
+++ b/src/views/product/workbench/index.vue
@@ -256,7 +256,7 @@
>
</div>
</div>
- <div class="start-end-div">
+ <div class="start-end-div" >
<div>
<span
style="margin-left:8px;font-size:12px;line-height:32px;"
@@ -528,35 +528,36 @@
</el-form-item>
</el-form>
</div>
- <div class="task-div-content">
- <div v-if="!isShowNormalTracking" class="task-list-div">
- <operationTaskPane
- ref="operateTaskDiv"
- :workstationId="dutyForm.workstationId"
- :productSn="operateTaskForm.SN"
- :orderNumber="operateTaskForm.orderNumber"
- :spec="operateTaskForm.spec"
- :outBatchNo="operateTaskForm.outBatchNo"
- :mpsNo="operateTaskForm.mpsNo"
- @changeCurrOperateTask="changeCurrOperateTask"
- @refreshReport="refreshWorkReportPageData"
- />
- </div>
- <div v-if="isShowNormalTracking" class="task-list-div">
- <operationTaskTable
- ref="operateTaskTableDiv"
- :workstationId="dutyForm.workstationId"
- :productSn="operateTaskForm.SN"
- :orderNumber="operateTaskForm.orderNumber"
- :spec="operateTaskForm.spec"
- :mpsNo="operateTaskForm.mpsNo"
- @changeCurrOperateTask="changeCurrOperateTask"
- />
- </div>
- </div>
+ <div class="task-div-content" >
+ <div v-if="!isShowNormalTracking" class="task-list-div" >
+ <operationTaskPane
+ ref="operateTaskDiv" :style="{ backgroundColor: taskStatusColor() }"
+ :workstationId="dutyForm.workstationId"
+ :productSn="operateTaskForm.SN"
+ :orderNumber="operateTaskForm.orderNumber"
+ :spec="operateTaskForm.spec"
+ :outBatchNo="operateTaskForm.outBatchNo"
+ :mpsNo="operateTaskForm.mpsNo"
+ @changeCurrOperateTask="changeCurrOperateTask"
+ @refreshReport="refreshWorkReportPageData"
+ />
+ </div>
+ <div v-if="isShowNormalTracking" class="task-list-div" >
+ <operationTaskTable
+ ref="operateTaskTableDiv" :style="{ backgroundColor: taskStatusColor() }"
+ :workstationId="dutyForm.workstationId"
+ :productSn="operateTaskForm.SN"
+ :orderNumber="operateTaskForm.orderNumber"
+ :spec="operateTaskForm.spec"
+ :mpsNo="operateTaskForm.mpsNo"
+ @changeCurrOperateTask="changeCurrOperateTask"
+ />
+ </div>
+
+ </div>
</div>
</div>
- <div :style="{ width: mainMiddleWidth }" v-show="mainMiddleShow">
+ <div :style="{ width: mainMiddleWidth } " v-show="mainMiddleShow">
<div style="height:86px;width:14px;position: absolute;top:50%">
<el-tooltip effect="dark" content="鏀剁缉" placement="left">
<img
@@ -1437,6 +1438,7 @@
box-sizing: border-box;
overflow-y: auto;
margin-bottom: 10px;
+
}
.task-list-div {
@@ -1560,6 +1562,10 @@
},
data() {
return {
+ dutyForm: {},
+ operateTaskForm: {},
+ isShowNormalTracking: false,
+ // taskStatusColor: '',
showBan: false,
dutyCanEdit: false,
saveButton: false,
@@ -1666,96 +1672,9 @@
currItem: 'task'
}
},
- computed: {
- ...mapGetters(['userInfo', 'tagWel', 'permissions'])
- },
- created() {
- document.title = '宸ヤ綔鍙扳�斺�擬ES'
- if (!this.dutyForm.workstationId) {
- const k = localStorage.getItem(storage_key)
- if (k) {
- this.dutyForm.workstationId = parseInt(k)
- }
- }
- this.initOptions()
- this.getSysParam(sysParam.SHOW_STEP_BUSINESS)
- this.getTrackingParam(sysParam.SHOW_TRACKING_TYPE)
- this.timer = setInterval(this.clockTimer, 1000)
- },
- watch: {
- 'dutyForm.workstationId'(val) {
- if (val) {
- localStorage.setItem(storage_key, val)
- }
- // 宸ヤ綔绔欐敼鍙樻椂锛屾暣涓〉闈㈢殑鍔ㄦ�佹暟鎹渶瀹炴椂鍔犺浇銆侀〉闈㈢紦瀛樻暟鎹渶 鍒濆鍖�
- this.initPageVariable()
- this.loadInfoByWorkstation()
- },
- 'dutyForm.startTime'(val, oldval) {
- if (val) {
- this.checkTime()
- } else {
- this.warningShow = false
- }
- },
- 'dutyForm.endTime'(val, oldval) {
- if (val) {
- this.checkTime()
- } else {
- this.warningShow = false
- }
- },
- 'operateTaskForm.orderNumber'(val) {
- /* this.$nextTick(() => {
- this.queryInfoForOrderNumber()
- }) */
- },
- 'operateTaskForm.spec'(val) {
- if (val == '' || val == null) {
- this.SNs = []
- this.operateTaskForm.SN = ''
- } else {
- const that = this
- that.SNs = []
- getProductSnByCustomerNoAndPartName({
- customerOrderNo: this.operateTaskForm.orderNumber,
- partName: val
- }).then((res) => {
- const result = res.data.data
- result.forEach(function(item) {
- const obj = {
- key: item,
- value: item
- }
- that.SNs.push(obj)
- })
- })
- }
- this.$nextTick(() => {
- if (this.partNames.length !== 0) {
- this.refreshOperateTasks()
- }
- })
- },
- 'operateTaskForm.SN'(val) {
- this.$nextTick(() => {
- if (this.SNs.length !== 0) {
- this.refreshOperateTasks()
- }
- })
- },
- 'operateTaskForm.outBatchNo'(val) {
- /* this.$nextTick(() => {
- this.refreshOperateTasks()
- }) */
- },
- 'operateTaskForm.mpsNo'(val) {
- /* this.$nextTick(() => {
- this.refreshOperateTasks()
- }) */
- }
- },
methods: {
+ changeCurrOperateTask() {},
+ refreshWorkReportPageData() {},
refreshOperateTasksByConditions() {
this.$nextTick(() => {
this.refreshOperateTasks()
@@ -2597,6 +2516,113 @@
beforeDestroy() {
clearInterval(this.timer)
}
+ },
+ computed: {
+ ...mapGetters(['userInfo', 'tagWel', 'permissions']),
+
+ taskStatusColor() {
+ return function() {
+ const now = new Date();
+ const threeDaysAgo = new Date(now - 3 * 24 * 60 * 60 * 1000);
+ const oneDayAgo = new Date(now - 24 * 60 * 60 * 1000);
+ const today = new Date(now);
+
+ if (threeDaysAgo <= today && today <= oneDayAgo) {
+ return 'yellow';
+ } else if (today <= threeDaysAgo) {
+ return 'blue';
+ } else {
+ return 'red';
+ }
+ };
}
+ },
+ created() {
+ document.title = '宸ヤ綔鍙扳�斺�擬ES'
+ if (!this.dutyForm.workstationId) {
+ const k = localStorage.getItem(storage_key)
+ if (k) {
+ this.dutyForm.workstationId = parseInt(k)
+ }
+ }
+ this.initOptions()
+ this.getSysParam(sysParam.SHOW_STEP_BUSINESS)
+ this.getTrackingParam(sysParam.SHOW_TRACKING_TYPE)
+ this.timer = setInterval(this.clockTimer, 1000)
+ },
+ watch: {
+ 'dutyForm.workstationId'(val) {
+ if (val) {
+ localStorage.setItem(storage_key, val)
+ }
+ // 宸ヤ綔绔欐敼鍙樻椂锛屾暣涓〉闈㈢殑鍔ㄦ�佹暟鎹渶瀹炴椂鍔犺浇銆侀〉闈㈢紦瀛樻暟鎹渶 鍒濆鍖�
+ this.initPageVariable()
+ this.loadInfoByWorkstation()
+ },
+ 'dutyForm.startTime'(val, oldval) {
+ if (val) {
+ this.checkTime()
+ } else {
+ this.warningShow = false
+ }
+ },
+ 'dutyForm.endTime'(val, oldval) {
+ if (val) {
+ this.checkTime()
+ } else {
+ this.warningShow = false
+ }
+ },
+ 'operateTaskForm.orderNumber'(val) {
+ /* this.$nextTick(() => {
+ this.queryInfoForOrderNumber()
+ }) */
+ },
+ 'operateTaskForm.spec'(val) {
+ if (val == '' || val == null) {
+ this.SNs = []
+ this.operateTaskForm.SN = ''
+ } else {
+ const that = this
+ that.SNs = []
+ getProductSnByCustomerNoAndPartName({
+ customerOrderNo: this.operateTaskForm.orderNumber,
+ partName: val
+ }).then((res) => {
+ const result = res.data.data
+ result.forEach(function(item) {
+ const obj = {
+ key: item,
+ value: item
+ }
+ that.SNs.push(obj)
+ })
+ })
+ }
+ this.$nextTick(() => {
+ if (this.partNames.length !== 0) {
+ this.refreshOperateTasks()
+ }
+ })
+ },
+ 'operateTaskForm.SN'(val) {
+ this.$nextTick(() => {
+ if (this.SNs.length !== 0) {
+ this.refreshOperateTasks()
+ }
+ })
+ },
+ 'operateTaskForm.outBatchNo'(val) {
+ /* this.$nextTick(() => {
+ this.refreshOperateTasks()
+ }) */
+ },
+ 'operateTaskForm.mpsNo'(val) {
+ /* this.$nextTick(() => {
+ this.refreshOperateTasks()
+ }) */
+ }
+ },
+
}
</script>
diff --git a/src/views/product/workbench/operation-task-pane.vue b/src/views/product/workbench/operation-task-pane.vue
index b62149e..50c7b63 100644
--- a/src/views/product/workbench/operation-task-pane.vue
+++ b/src/views/product/workbench/operation-task-pane.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <el-alert
+ <el-alert
v-if="!operationTasks || operationTasks.length == 0"
title="杩樻病鏈夊伐鍗曚笅鍙戝埌姝ゆ満鍙帮紒"
type="warning"
@@ -8,76 +8,76 @@
>
</el-alert>
<el-card
- v-for="(item, index) in operationTasks"
- @click.native="setCheckFlag(item)"
- shadow="hover"
- :key="index"
- :class="['task-item', item.checkFlag ? 'card-checked' : 'card-unchecked']"
+ v-for="(item, index) in operationTasks"
+ @click.native="setCheckFlag(item)"
+ shadow="hover"
+ :key="index"
+ :class="['task-item', item.checkFlag ? 'card-checked' : 'card-unchecked']"
+>
+ <!-- <img class="selectedImg" /> -->
+ <div class="header" >
+ <div>宸ュ崟鍙凤細{{ item.taskNo }}</div>
+ <!-- <div>璁″垝鍙凤細{{ item.mpsNo }}</div> -->
+ <div
+ :class="[
+ 'status-change-div',
+ item.checkFlag ? 'card-checked-status' : 'card-status'
+ ]"
>
- <img class="selectedImg" src="/img/workbench/icon_selected.png" />
- <div class="header">
- <div>宸ュ崟鍙凤細{{ item.taskNo }}</div>
- <!-- <div>璁″垝鍙凤細{{ item.mpsNo }}</div> -->
- <div
- :class="[
- 'status-change-div',
- item.checkFlag ? 'card-checked-status' : 'card-status'
- ]"
- >
- <el-select
- v-if="permissions.product_operationTask_state"
- v-model="item.statusAction"
- placeholder="鍔熻兘鑿滃崟"
- @change="
- changeTaskState(item.statusAction, item.status, item.id, item)
- "
- >
- <el-option
- v-for="ele in statusActions"
- :key="ele.value"
- :label="ele.label"
- :value="ele.value"
- :disabled="ele.disabled"
- >
- </el-option>
- </el-select>
- </div>
- </div>
- <div class="body">
- <div class="row">
- <div class="l">闆朵欢鍚嶇О锛�</div>
- <div class="r">{{ item.partName }}</div>
- </div>
- <div class="row">
- <div class="l">闆朵欢鍙凤細</div>
- <div class="r">{{ item.partNo }}</div>
- </div>
- <!-- <div class="row">
- <div class="l">鎴愬搧锛�</div>
- <div class="r">{{ item.productName }}</div>
- </div> -->
- <div class="row">
- <div class="l">璁″垝瀹屾垚鏃堕棿锛�</div>
- <div class="r">{{ item.planFinishDay }}</div>
- </div>
- </div>
-
- <el-progress
- class="task-progress"
- :text-inside="true"
- :stroke-width="20"
- :percentage="
- Number((item.completedQuantity / item.plannedQuantity).toFixed(2)) *
- 100 >
- 100
- ? 100
- : Number(
- (item.completedQuantity / item.plannedQuantity).toFixed(2)
- ) * 100
+ <el-select
+ v-if="permissions.product_operationTask_state"
+ v-model="item.statusAction"
+ placeholder="鍔熻兘鑿滃崟"
+ @change="
+ changeTaskState(item.statusAction, item.status, item.id, item)
"
- :format="formatPercentage(item.completedQuantity, item.plannedQuantity)"
- ></el-progress>
- </el-card>
+ >
+ <el-option
+ v-for="ele in statusActions"
+ :key="ele.value"
+ :label="ele.label"
+ :value="ele.value"
+ :disabled="ele.disabled"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="body">
+ <div class="row">
+ <div class="l">闆朵欢鍚嶇О锛�</div>
+ <div class="r">{{ item.partName }}</div>
+ </div>
+ <div class="row">
+ <div class="l">闆朵欢鍙凤細</div>
+ <div class="r">{{ item.partNo }}</div>
+ </div>
+ <!-- <div class="row">
+ <div class="l">鎴愬搧锛�</div>
+ <div class="r">{{ item.productName }}</div>
+ </div> -->
+ <div class="row">
+ <div class="l">璁″垝瀹屾垚鏃堕棿锛�</div>
+ <div class="r">{{ item.planFinishDay }}</div>
+ </div>
+ </div>
+
+ <el-progress
+ class="task-progress"
+ :text-inside="true"
+ :stroke-width="20"
+ :percentage="
+ Number((item.completedQuantity / item.plannedQuantity).toFixed(2)) *
+ 100 >
+ 100
+ ? 100
+ : Number(
+ (item.completedQuantity / item.plannedQuantity).toFixed(2)
+ ) * 100
+ "
+ :format="formatPercentage(item.completedQuantity, item.plannedQuantity)"
+ ></el-progress>
+</el-card>
</div>
</template>
<style lang="scss" scoped>
@@ -96,10 +96,13 @@
border-radius: 12px;
cursor: pointer;
position: relative;
+background:none;
box-shadow: 1px 2px 24px 1px rgba(4, 0, 0, 0.14);
+
& + .task-item {
margin-top: 10px;
}
+
&.card-checked {
// color: white;
background-image: -webkit-linear-gradient(
@@ -344,6 +347,28 @@
}
},
methods: {
+
+ // setCheckFlag(item) {
+ // this.$nextTick(() => {
+ // this.changeBackgroundColor(item.planFinishDay);
+ // });
+ // },
+ // changeBackgroundColor(dateString) {
+ // const date = new Date(dateString);
+ // const threeDaysAgo = new Date();
+ // threeDaysAgo.setDate(threeDaysAgo.getDate() - 3);
+ // const oneDayAgo = new Date();
+ // oneDayAgo.setDate(oneDayAgo.getDate() - 1);
+
+ // if (date <= threeDaysAgo) {
+ // document.body.style.backgroundColor = "blue";
+ // } else if (date <= oneDayAgo) {
+ // document.body.style.backgroundColor = "yellow";
+ // } else {
+ // document.body.style.backgroundColor = "red";
+ // }
+ // },
+
// 鐐瑰嚮宸ュ崟锛岄�変腑宸ュ崟
setCheckFlag(item) {
if (item.checkFlag) {
diff --git a/src/views/product/workbench/taskinfo-pane.vue b/src/views/product/workbench/taskinfo-pane.vue
index d5b1dd8..5752299 100644
--- a/src/views/product/workbench/taskinfo-pane.vue
+++ b/src/views/product/workbench/taskinfo-pane.vue
@@ -891,6 +891,7 @@
getGenerateSN,
getShiftProductOutByOpIdAndWsId
} from '@/api/product/personboard'
+
import {
getTemplate,
getDocumentJgt,
diff --git a/src/views/product/workbench/workstationoperate-form.vue b/src/views/product/workbench/workstationoperate-form.vue
index 2ded8dd..3c6345d 100644
--- a/src/views/product/workbench/workstationoperate-form.vue
+++ b/src/views/product/workbench/workstationoperate-form.vue
@@ -1,5 +1,6 @@
<template>
<div style="width: 100%;height: 100%"></div>
+
</template>
<style lang="scss" scoped>
.ws-header {
diff --git a/src/views/quality/finishedProductInspection/finishedProducter-print.vue b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
index afe65a7..9fdd394 100644
--- a/src/views/quality/finishedProductInspection/finishedProducter-print.vue
+++ b/src/views/quality/finishedProductInspection/finishedProducter-print.vue
@@ -1,6 +1,6 @@
<template>
- <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 20pt;">
- <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:607pt'>
+ <div id="20230721_24921" align=center x:publishsource="Excel" style="margin-top: 60pt;margin-left: 20pt;">
+ <table border=0 cellpadding=0 cellspacing=0 width=1194 style='border-collapse:collapse;table-layout:fixed;width:629pt'>
<tr class=xl6524921 height=20 style='mso-height-source:userset;height:30.0pt'>
<td colspan=3 rowspan=2 height=40 width=122 style='width:150pt;border: 1pt solid windowtext'>
<span style='mso-ignore:vglayout;margin-left:12px;margin-top:14px;width:104px;height:42px'>
@@ -12,55 +12,62 @@
<td rowspan=2 colspan=3 class=xl6824921 width=235 style='width:126pt' >鐗堟湰鍙�: A/0</td>
</tr>
<tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
- <td colspan=6 height=33 class=xl6624921 style='border-right:.5pt solid black;
- height:25.05pt;border-left:none'>璁板綍缂栧彿:ZTT/QR-8.6-05锛圓/0)</td>
- <td colspan=3 class=xl6624921 style='border-top:none;border-left:none'>褰掓。閮ㄩ棬:璐ㄩ噺淇濊瘉閮�</td>
+ <td colspan=6 height=33 class=xl6624921 style='border-right:.5pt solid black;height:25.05pt;border-left:none'>
+ 璁板綍缂栧彿:ZTT/QR-8.6-05锛圓/0)
+ </td>
+ <td colspan=3 class=xl6624921 style='border-top:none;border-left:none'>
+ 褰掓。閮ㄩ棬:璐ㄩ噺淇濊瘉閮�
+ </td>
<td colspan=2 class=xl6824921 style='border-top:none'></td>
</tr>
<tr class=xl6524921 height=33 style='mso-height-source:userset;height:25.05pt'>
- <td colspan=16 height=33 class=xl7424921 width=1194 style='height:25.05pt;
- width:897pt'>杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃</td>
+ <td colspan=16 height=33 class=xl7424921 width=1194 style='height:25.05pt; width:897pt'>
+ 杩炴帴鍣ㄥ強鎴愬搧妫�楠岃褰曡〃
+ </td>
</tr>
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>椤圭洰鍚嶇О:</td>
- <td colspan=5 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>銆�
- <p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="deviceStr"></span></p>
+ <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ 椤圭洰鍚嶇О:
+ </td>
+ <td colspan=5 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>銆�
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="deviceStr"></span>
+ </p>
</td>
<td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>妫�楠屼緷鎹�:</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>
+ <td colspan=7 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
銆� </td>
</tr>
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>浜у搧鍚嶇О:</td>
- <td colspan=4 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="product"></span></p>
- </td>
+ <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ 浜у搧鍚嶇О:
+ </td>
+ <td colspan=4 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="product"></span>
+ </p>
+ </td>
<td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鍨嬪彿:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="typedata"></span></p>
+ <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="typedata"></span>
+ </p>
</td>
<td colspan=2 class=xl6924921 style='border-top:none;border-left:none'>浜у搧鏁伴噺:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>
+ <td colspan=3 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
<p class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="number"></span></p>
+ <span lang="EN-US" style="font-family:"Arial",sans-serif" v-text="number"></span>
+ </p>
</td>
</tr>
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>妫�楠屽唴瀹�:</td>
- <td colspan=14 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>妫�楠岀粨鏋�</td>
+ <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ 妫�楠屽唴瀹�:
+ </td>
+ <td colspan=14 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
+ 妫�楠岀粨鏋�
+ </td>
</tr>
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
@@ -78,11 +85,13 @@
</td>
</tr>
+
+
<tbody v-for="(item,index) in prjdata" :key="index">
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span style="font-family:瀹嬩綋">{{item.father}}</span>
+ <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
+ <td rowspan=16 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
+ <p class="MsoNormal" align="center" style="text-align:centerdisplay:flex ;">
+ <span style="font-family:瀹嬩綋; writing-mode: vertical-rl;">{{item.father}}</span>
</p>
</td>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
@@ -91,434 +100,35 @@
<td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
<span style="font-family:瀹嬩綋">{{item.children[0].required}}</span>
</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- <span style="font-family:瀹嬩綋">{{item.children[0].inspectionValue}}</span>
+ <td colspan=1 v-for="(val,index) in item.children[0].testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{val}}</span>
</td>
+
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- <p v-if="item.children[0].testState==1" class="MsoNormal" align="center" style="text-align:center">
+ <p v-if="item.children[0].iresult ==1" class="MsoNormal" align="center" style="text-align:center">
<span lang="EN-US" style="font-family:"Arial",sans-serif">鍚堟牸</span></p>
- <p v-else class="MsoNormal" align="center" style="text-align:center">
+ <p v-if="item.children[0].iresult ==0" class="MsoNormal" align="center" style="text-align:center">
<span lang="EN-US" style="font-family:"Arial",sans-serif">涓嶅悎鏍�</span></p>
</td>
</tr>
<tr class=xl6524921 height=53 v-for="(el,index) in (item.children.slice(1))" :key="index" style='mso-height-source:userset;height:40.05pt'>
- <!-- <td rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black; height:40.05pt'>
- <p class="MsoNormal" align="center" style="text-align:center">
- <span style="font-family:瀹嬩綋"></span>
- </p>
- </td> -->
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
<span style="font-family:瀹嬩綋">{{el.iname}}</span>
</td>
<td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
<span style="font-family:瀹嬩綋">{{el.required}}</span>
</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
- <span style="font-family:瀹嬩綋">{{el.inspectionValue}}</span>
+ <td colspan=1 v-for="(testValue,index) in el.testValueList" class=xl6624921 style='border-right:.5pt solid black;border-left:none'>
+ <span style="font-family:瀹嬩綋">{{testValue}}</span>
</td>
<td colspan=2 class=xl6624921 style='border-right:.5pt solid black; border-left:none'>
- <p v-if="el.testState==1" class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif">鍚堟牸</span></p>
- <p v-else class="MsoNormal" align="center" style="text-align:center">
- <span lang="EN-US" style="font-family:"Arial",sans-serif">涓嶅悎鏍�</span></p>
+ <p class="MsoNormal" align="center" style="text-align:center">
+ <span lang="EN-US" style="font-family:"Arial",sans-serif">{{ el.iresult | formatState}}</span></p>
+
+
</td>
</tr>
</tbody>
-
-
- <!-- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr> -->
-
- <!-- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>閫氭柇/绾垮簭</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>1600VCD, lmin: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
-border-left:none'>2200VCD, lmin: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>4500VCD, lmin: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
-border-left:none'>00VCD, min: 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=4 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>閫氫俊</p><p>( 1 鎴� 2)</p></td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>1</td>
- <td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>绗﹀悎TIA Cat 5e Channel鏍囧噯锛� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=3 rowspan="4" class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>2</td>
- <td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>鍗冨厗缃戦�氫俊娴嬭瘯閫熺巼鈮�800Mbps/鐧惧厗缃戦�氫俊娴嬭瘯閫熺巼鈮�80Mbps</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鎻掑叆鎹熻�椻墹</p> <p> _________dB</p><p>鈻�1310,鈻�1550</p></td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=3 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鍥炴尝鎹熻�椻墹</p> <p> _________dB</p><p>鈻�1310,鈻�1550</p></td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=3 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>姘斿瘑鎬�</td>
- <td colspan=14 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>鎻掑骇锛�0.3MPa@60s锛夛細 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>姘村瘑鎬�</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>15MPa淇濆帇10min, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 36MPa淇濆帇2h, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>36MPa淇濆帇10min, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 75MPa淇濆帇2h, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>MPa淇濆帇 min, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- <td colspan=7 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> MPa淇濆帇 h, 2娆� 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>姘村帇鍚庨�氭柇</td>
- <td colspan=14 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>姘村帇鍚庣粷缂樼數闃�</p><p>(瑕佹眰鍚屼笂)</p></td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>娴嬭瘯鍊�</p><p>缁撴灉鏈�灏忓��</p></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>澶栬妫�鏌�</td>
- <td colspan=14 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
-
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鐢电紗闀垮害(m)</p><p>鎴栧绾块暱搴�(cm)</p></td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>娴嬭瘯缁撴灉</p><p>鍋忓樊鏈�澶у��</p></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=3 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鎻掗拡楂樹綆钀藉樊</p><p>鈮�0.6mm</p></td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>娴嬭瘯缁撴灉</p><p>鍋忓樊鏈�澶у��</p></td>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'>浜у搧_</td>
- <td colspan=2 rowspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'><p>鈻″悎鏍�</p><p>鈻′笉鍚堟牸</p></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td><td colspan=1 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=9 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>鐢电紗寮洸鍗婂緞</td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 瑕佹眰</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=2 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 瀹炴祴</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'></td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=16 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>鍙戣揣</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>浜у搧鍨嬪彿鏍稿</td>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>涓庤绠辨竻鍗曞瀷鍙蜂竴鑷�:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>浜у搧鏁伴噺娓呯偣</td>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>涓庤绠辨竻鍗曟暟閲忎竴鑷�:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>浜у搧鍞涘ご妫�鏌�</td>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>涓庤绠辨竻鍗曞唴瀹逛竴鑷�,绮樿创涓庢樉鐪间綅缃�,娌℃湁鎹熷潖:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
-
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=2 rowspan=6 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>浜у搧鍖呰妫�鏌�</td>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>鍚屼竴鍨嬪彿浜у搧鍗曠嫭鍖呰:</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
-
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>杩炲附棰滆壊涓庢枃浠惰姹備竴鑷�</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>绾哥浣跨敤閫忔槑鑳跺甫鎴栨媺浼歌啘瑁圭揣</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr><tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'>鏈ㄧ鍐呴儴蹇呴』鍨ソ娉℃搏绾�,閽夌揣鏈ㄧ,閽㈠甫鎵庣揣</td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr><tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>浣跨敤鐝嶇彔妫夋澘鍥哄畾鎻掑ご銆佹彃搴т綅缃紝鍥哄畾鎻掑骇灏剧嚎浣嶇疆</p> <p>鐢ㄦ媺绁炶啘灏嗕骇鍝佸浐瀹氬湪鐝嶇彔闈㈡澘鍐�</p></td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td>
- </tr>
- <tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
- <td colspan=10 height=53 class=xl7624921 style='border-right:.5pt solid black;
- height:40.05pt'><p>鍙戝嚭浜у搧涓嶅緱鍑虹幇浠讳綍褰㈠紡鐨勪緵搴斿晢淇℃伅锛屽寘鎷紗鐩樹笂鐨勬爣绛俱�佺數缂�</p><p>涓婁緵搴斿晢鍚嶇О绛�</p></td>
- <td colspan=3 class=xl6624921 style='border-right:.5pt solid black;
- border-left:none'> 鈻″悎鏍� 鈻′笉鍚堟牸</td> -->
- <!-- </tr> -->
<tr class=xl6524921 height=53 style='mso-height-source:userset;height:40.05pt'>
<td colspan=8 height=53 class=xl7624921 style='border-right:.5pt solid black;
height:40.05pt;text-align: left;'><p> 妫�楠�/鏃堕棿:</p></td>
@@ -536,6 +146,335 @@
<td width=235 style='width:176pt'></td>
</tr>
</table>
+ <div>
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ </span></p>
+ </div>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 350px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡鏃ユ湡<br> Report Date</span></p>
+ <p style="margin-left: 180px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�1/8<br> Page</span></p>
+ </div>
+ <div>
+ <div class="bodycs-2">
+ <p ><span class=x1111112 style='margin-left: 40px;'>妫�楠岄」鐩�:<br> Test Item</span></p>
+ <p v-for="pel in prjdata"><span class="ziti">{{pel.father}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 80px;"></span></span></p>
+ </div>
+ <div class="bodycs-3">
+ <p ><span class=x1111112 style='margin-left: 36px;'>鏍峰搧鍚嶇О:<br>Description</span></p>
+ <p ><span class="ziti">{{material}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ <div class="bodycs-3">
+ <p ><span class=x1111112 style='margin-left: 36px;'>瑙勬牸鍨嬪彿:<br>Mode Type</span></p>
+ <p ><span class="ziti">{{materialCode}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ <div class="bodycs-3">
+ <p ><span class=x1111112 style='margin-left: 36px;'>鏍峰搧鏁伴噺:<br>Quantity</span></p>
+ <p v-for="pel in prjdata"><span class="ziti">{{quantity}}</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ <div class="bodycs-3">
+ <p ><span class=x1111112 style='margin-left: 36px;'>妫�楠岀被鍒�:<br>Type of Test</span></p>
+ <p v-for="pel in prjdata"><span class="ziti">浜у搧妫�楠�</span><br><span style="display: block;height: 2px; width: 500px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ <div>
+ <div class="chilen">
+ <p ><span class="x1111113">鎵� 鍑�:<br> Approved by</span></p>
+ <p v-for="pel in prjdata"><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ <div class="chilen">
+ <p ><span class="x1111113">鏍搁獙鍛�:<br> Inspected by</span></p>
+ <p v-for="pel in prjdata"><span class="time"></span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ <div style="display: flex;margin-left: 280px;">
+ <p ><span class="x1111113">妫�楠屽憳锛�<br> Tested by</span></p>
+ <p ><span class="time">{{username}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ <div class="cldata">
+ <p ><span class="x1111113">閫佹牱鏃ユ湡:<br>Delivery Date</span></p>
+ <p v-for="pel in prjdata"><span class="time">{{tableData.updateTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ <div class="cldata">
+ <p ><span class="x1111113">娴嬭瘯鏃ユ湡:<br>Testing Date</span></p>
+ <p v-for="pel in prjdata"><span class="time">{{tableData.createTime}}</span><br><span style="display: block;height: 2px; width: 300px; background: rgb(20, 20, 22);margin-left: 75px;"></span></span></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </div>
+ </template>
+
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ </span></p>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�2/8<br> Page</span></p>
+ </div>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">鏍峰搧鐓х墖:<br>Sample锛�</span></p>
+ </div>
+ <div>
+ <table border="2px" style="width: 500px;height: 500px;margin-top: 100px;">
+ <tr style="height: 50px;">
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 200px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
+ </tr><tr></tr>
+ </table>
+ </div>
+ <div style="display: flex;margin-top: 130px;margin-left: 40px;">
+ <p ><span style="font-size:12pt;font-family:榛戜綋">鏍峰搧淇℃伅鎻忚堪Sample information description锛�<br>娴嬭瘯鍓嶆牱鍝佺姸鎬侊細Sample state of pretest <br>澶栬妫�鏌ワ細鏍峰搧澶栬鍧囨甯搞�� </span></p>
+
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </template>
+
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ </span></p>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�3/8<br> Page</span></p>
+ </div>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p class="x1111113" ><span style="display: flex;margin-top: 40px;margin-left: 40px;">鎶ュ憡姝ｆ枃锛�</span></p>
+ </div>
+ <div class="bodycs" style="margin-top: 30px;">
+ <p class=x1111112><span>{{iname}}<br>
+ </span></p>
+ <div class="bodycs-1" style="margin-top: 10px;">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">1.娴嬭瘯璁惧<br> 璁惧鍚嶇О<br>Name of Equipment</span></p>
+ <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧鍨嬪彿<br> Model</span></p>
+ <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>璁惧缂栧彿<br>Serial No.</span></p>
+ <p style="margin-left: 150px;"><span style="font-size:12pt;font-family:榛戜綋"> <br>鏍″噯鏈夋晥鏈�<br>Calibration Due Date</span></p>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: 20px;"></p>
+ </div>
+ </div>
+ <div style="margin-top: 50px;display: flex;">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">2.鍙傝�冩爣鍑哛eference standards <br>鏈妫�娴嬫墍渚濇嵁鐨勬妧鏈枃浠讹紙浠ｅ彿銆佸悕绉帮級锛�<br>Reference documents for this testing </span></p>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: 1px;"></p>
+ </div>
+ <div style="margin-top: 50px;display: flex;">
+ <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">3.鐜鏉′欢Environmental conditions锛�</span></p>
+ </div>
+ <div style="display: flex;">
+ <p style="margin-left: 50px;"><span >娓╁害(Temperature)锛氣剝 </span></p>
+ <p style="margin-left: 450px;"><span >鐩稿婀垮害(R.H.)锛�%</span></p>
+ </div>
+ <div style="margin-top: 50px;display: flex;">
+ <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">4.娴嬭瘯鐩殑Test purpose锛�</span></p>
+ </div>
+ <div style="margin-top: 50px;display: flex;">
+ <p class=x1111112 style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">5.娴嬭瘯鏂规硶Test method锛�</span></p>
+ </div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </template>
+
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ </span></p>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�4/8<br> Page</span></p>
+ </div>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">6.娴嬭瘯缁撴灉Test result锛�</span></p>
+ </div>
+ <div>
+ <table border="2px" style="width: 800px;height: 100px;margin-top: 10px;">
+ <tr style="height: 80px;">
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 80px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
+ </tr>
+ <tr style="height: 100px;">
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr style="height: 80px;">
+ <td colspan=3></td>
+ </tr>
+ </table>
+ </div>
+ <div>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">7.娴嬭瘯璧勬枡Test data锛�</span></p>
+ </div>
+ <div>
+ <table border="2px" style="width: 500px;height: 400px;margin-top: 10px;">
+ <tr style="height: 50px;">
+ <td class="x1111113"><span style="font-size 40pt;margin-left: 200px;font-family:榛戜綋">娴嬭瘯鍓嶇収鐗�</span></td>
+ </tr><tr></tr>
+ </table>
+ </div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <span
+ style='mso-spacerun:yes'> </span>
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </template>
+
+ <template>
+ <div style="margin-top: 100pt;width: 75%;">
+ <div class="head">
+ <div class="head-1">
+ <img width=174 height=58 src="../../../../public/img/image002.png">
+ </div>
+ <div class="head-2">
+ <p><span style="font-size:18pt;font-family:瀹嬩綋;margin-right: 70pt;">涓ぉ娴锋磱绯荤粺鏈夐檺鍏徃</span></p>
+ <span style="font-size:12pt;font-family:瀹嬩綋;margin-right: 70pt;">ZHONGTIAN TECHNOLOGY MARINE SYSTEMS Co.,LTD.</span>
+ </div>
+ </div>
+ <div class="bodycss">
+ <div class="bodycs">
+ <p class=x1111111><span>妫� 娴� 鎶� 鍛�<br>
+ <span class=x1111112 >Test Report</span><br>
+ </span></p>
+ <div class="bodycs-1">
+ <p style="margin-left: 40px;"><span style="font-size:12pt;font-family:榛戜綋">鎶ュ憡缂栧彿:锛圢o锛�:ZTMS01-<br>Report No.锛�</span></p>
+ <p style="margin-left: 620px;"><span style="font-size:12pt;font-family:榛戜綋">椤垫锛�5/8<br> Page</span></p>
+ </div>
+ </div>
+ <div>
+ <p style=" border-top: 1px solid black;width: 96%;margin-top: -1px;"></p>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">8.娴嬭瘯鏇茬嚎Test curve锛�</span></p>
+ </div>
+ <div>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <span> </span>
+ </div>
+ <div>
+ <p class="x1111113" ><span style="font-size 40pt;display: flex;margin-top: 40px;margin-left: 40px;;font-family:榛戜綋">9.娴嬭瘯鍚庢鏌osttest check锛�</span></p>
+ </div>
+ <div>
+ <table border="2px" style="width: 900px;height: 500px;margin-top: 30px;">
+ <tr style="height: 50px;">
+ <td colspan=2 class="x1111113"><span style="font-size 40pt;margin-left: 380px;font-family:榛戜綋">娴嬭瘯鍚庣収鐗�</span></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ </tr>
+ </table>
+ </div>
+ <div>
+ <p class="x1111113"><span >*****鎶ュ憡缁撴潫*****</span></p>
+ </div>
+ </div>
+ </div>
+ <div class="pagefooting">
+ <p><span style="font-size:8pt;font-family:瀹嬩綋;color: cornflowerblue;">
+ 鍦板潃:姹熻嫃鐪佸崡閫氬競缁忔祹鎶�鏈紑鍙戝尯鏂板紑鍗楄矾1鍙�(226010) 鐢佃瘽:051389191125 浼犵湡:051389191123
+ <br>Add: No 1 Xinkainan Road, NETDZ Nantong, Jiangsu, China (226010); TEL: 051389191125 ; Fax:051389191123
+ </span></p>
+ </div>
+ </template>
+ </div>
</div>
</template>
@@ -561,42 +500,127 @@
typedata:null,
num:null,
prjdata:[],
+ material:null,
+ materialCode:null,
+ quantity:null,
+ username:null,
+ iname:null,
+ }
+ },
+ filters:{
+ formatState(state){
+ if(state){
+ if(state == "1"){
+ return "鍚堟牸"
+ }
+ if(state == "0"){
+ return "涓嶅悎鏍�"
+ }
+ return null
+ }
+ return null
}
},
created(){
this.tableData = this.formData
- console.log("============",this.tableData)
this.initData()
- // this.initProjectList(this.projectList)
+ this.initprjdata(this.prjdata)
},
methods:{
initData(){
+ let ii = []
+ let pp = []
+ console.log("<-------------------->");
this.deviceStr = this.tableData.projectName
this.product = this.tableData.material
this.number = this.tableData.quantity
this.typedata = this.tableData.specs
+ this.material = this.tableData.material
+ this.materialCode = this.tableData.materialCode
+ this.quantity = this.tableData.quantity
+ console.log(this.tableData,"-----------11111");
this.tableData.children.forEach(el =>{
this.prjdata.push(el)
- console.log("-----",this.prjdata);
- })
-
+ el.children.forEach(kl =>{
+ if(kl.userName){
+ ii.push(kl.userName)
+ }
+ if(kl.iname){
+ pp.push(kl.iname)
+ }
+ })
+ })
+ this.username = Array.from(new Set(ii)).join(",")
+ this.iname = Array.from(new Set(pp)).join(",")
},
+ initprjdata(list){
+ console.log(list,"uuuuuuuuuuuuuuuuu");
+ const data = {
+ eId: '',
+ ename: '',
+ iname: '',
+ inote: '',
+ inspectionValue: '',
+ iresult: '',
+ required: '',
+ iunit: '',
+ itype: '',
+ testValueList: new Array(9)
+ }
+ if(list && list.length<10){
+ list.forEach(item=>{
+ if(item.children && item.children.length < 7){
+ let size = 15 - item.children.length
+ for(let j=0;j<item.children.length;j++){
+ let arr = []
+ if(item.children[j].inspectionValue){
+ arr = item.children[j].inspectionValue.split(",")
+ }
+ item.children[j].testValueList = arr
+ if(item.children[0].testValueList.length<12){
+ let num = 9 - item.children[j].testValueList.length
+ for(let i=0;i<num;i++){
+ item.children[j].testValueList.push("")
+ }
+ }
+ }
+ for(let i=0;i< size;i++){
+ item.children.push(data)
+ item.father
+ }
+ }
+ })
+ }else{
+ let size = 0
+ list.forEach(item=>{
+ if(item.children){
+ size+=item.children.length
+ }
+ })
+ if(size<15){
+ let num = 15 - size
+ for(let i=0;i<num;i++){
+ list[list.length-1].children.push(data)
+ }
+ }
+ }
+ }
},
watch:{
formData(newVal){
if(newVal){
- this.projectList = []
- console.log(newVal)
+ this.prjdata = []
+ console.log("formData鍙樺寲--",newVal)
this.tableData = newVal
this.initData()
- // this.initProjectList(this.projectList)
+ this.initprjdata(this.prjdata)
}
}
},
}
</script>
-<style scoped>
+<style lang="scss">
table{
mso-displayed-decimal-separator: "\.";
mso-displayed-thousand-separator: "\,";
@@ -1706,4 +1730,148 @@
mso-font-charset: 134;
mso-char-type: none;
}
+
+.head{
+ display: flex;
+ .head-1{
+ padding: 40px;
+ }
+ .head-2{
+ margin-left: auto;
+ margin-right: 0;
+ margin-top: 13px;
+ text-align: right;
+ }
+}
+.bodycss{
+ // margin-left: 85px;
+}
+.bodycs{
+ // margin-left: 135px;
+ margin-top: -30px;
+}
+.bodycs-1{
+ display: flex;
+ text-align: left;
+ height: 60px;
+ width: auto;
+ margin-top: -80px;
+ }
+.bodycs-2{
+ display: flex;
+ margin-left: 130px;
+ margin-top: 30px;
+}
+.bodycs-3{
+ display: flex;
+ margin-left: 140px;
+}
+.ziti{
+ display: flex;
+ margin-left: 140px;
+
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 20pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 瀹嬩綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+.time{
+ display: flex;
+ margin-left: 80px;
+ margin-top: 20px;
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 20pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 榛戜綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+
+}
+.chilen{
+ display: flex;
+ margin-left: 250px;
+}
+.cldata{
+ display: flex;
+ margin-left: 130px;
+}
+.pagefooting{
+
+}
+.x1111111{
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 50pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 榛戜綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+.x1111112{
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 20pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 榛戜綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
+.x1111113{
+ padding: 0px;
+ mso-ignore: padding;
+ color: black;
+ font-size: 20pt;
+ font-weight: 400;
+ font-style: normal;
+ text-decoration: none;
+ font-family: 榛戜綋;
+ mso-generic-font-family: auto;
+ mso-font-charset: 134;
+ mso-number-format: General;
+ text-align: general;
+ vertical-align: middle;
+ mso-background-source: auto;
+ mso-pattern: auto;
+ white-space: nowrap;
+}
</style>
\ No newline at end of file
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index def20b0..72df78d 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -21,7 +21,7 @@
<printTemplate id="printRaw" :formData="printFormData"></printTemplate>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="()=>{printDialogVisible = false;this.printFormData=null}">鍙� 娑�</el-button>
+ <el-button @click="()=>{printDialogVisible = false;printFormData=null}">鍙� 娑�</el-button>
<el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
</span>
</el-dialog>
@@ -205,45 +205,53 @@
watch:{
printFormData(newVal){
if(newVal){
+ // console.log("pData鍙樺寲--",newVal);
this.printFormData = newVal
}
}
},
methods: {
-
+ closedown(){
+ // this.printFormData = []
+ this.printDialogVisible = false;
+ },
//鎵撳嵃鎸夐挳
printFun() {
this.printDialogVisible = false;
PrintJS({
printable: "printRaw",
type: "html",
- maxWidth: 700,
- style: '@page {margin: 0 5mm}',
+ maxWidth: 950,
+ style: '@page {margin: 2.0mm 2.0mm}',
targetStyles: ["*"],
+ // importCSS: true,
+ fontSize: '30px',
ignoreElements: ["no-ignore"],
orientation: 'portrait'
});
},
//鏌ョ湅鎶ュ憡鎸夐挳
showPrint(row){
- console.log('----------');
queryById(row.id).then(res=>{
this.printFormData = res.data.data
+ this.printFormData.createTime = row.createTime
+ this.printFormData.updateTime = row.updateTime
+ // console.log(this.printFormData,"7777777777=====");
this.printDialogVisible = true
}).catch(error=>{
- console.log(error);
+ // console.log(error);
})
},
exportExcel(){
let queryParam=this.$refs.finishedProduct.getQueryParam();
delete queryParam.criteria
- console.log(queryParam);
+ // console.log(queryParam);
exportExaminationProducts(queryParam).then((res)=>{
transform(res)
})
},
deleteHandle(row){
- console.log(row.id)
+ // console.log(row.id)
this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
index c821f69..74b5c07 100644
--- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue
+++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue
@@ -134,6 +134,7 @@
<el-table-column label="闆朵欢鍚嶇О" prop="partName"></el-table-column>
<el-table-column label="鍗曚綅" prop="unit"></el-table-column>
<el-table-column label="鏁伴噺" prop="qpa"></el-table-column>
+ <el-table-column label="鐩樻暟" prop="discNum"></el-table-column>
</el-table>
<!-- <el-table
class="tree-select-table"
diff --git a/src/views/technology/operation/operation-form.vue b/src/views/technology/operation/operation-form.vue
index 6f21354..282dcc6 100644
--- a/src/views/technology/operation/operation-form.vue
+++ b/src/views/technology/operation/operation-form.vue
@@ -592,8 +592,8 @@
// }
},
init() {
- this.operationId = this.dataForm.id
- this.fetchCapabilityForOperation()
+ // this.operationId = this.dataForm.id
+ // this.fetchCapabilityForOperation()
if (this.dataForm.id) {
getObj(this.dataForm.id).then((response) => {
this.dataForm = response.data.data
diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue
index 98f13c6..87eca90 100644
--- a/src/views/technology/structure/single-structure-form.vue
+++ b/src/views/technology/structure/single-structure-form.vue
@@ -209,8 +209,8 @@
}}</span>
</template>
</el-table-column>
- <el-table-column label="鍥惧彿" prop="drawingNumber" align="center">
- </el-table-column>
+ <!-- <el-table-column label="鍥惧彿" prop="drawingNumber" align="center">
+ </el-table-column> -->
<el-table-column align="center" label="鎿嶄綔" width="85px">
<template slot-scope="scope">
<el-button
diff --git a/vue.config.js b/vue.config.js
index 8bf4a2e..d12b323 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,6 +4,7 @@
*/
const url = 'http://192.168.0.23:9999'
+ // const url = 'http://192.168.0.60:9999'
// const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
--
Gitblit v1.9.3