From 92f198bd79e26fe1c31541432cf927403ce0e694 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期日, 24 九月 2023 17:15:05 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mom-before
---
src/components/view/standard.vue | 42 ++++----
src/components/view/technology.vue | 2
src/components/view/mbom.vue | 2
src/components/view/self-inspection.vue | 32 ++---
src/components/view/processInspection.vue | 173 ++++++++++++++++++++++++++++++++++
src/view/index.vue | 8 +
6 files changed, 215 insertions(+), 44 deletions(-)
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index b28101d..88c3344 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -471,4 +471,4 @@
height: 30px;
border-radius: 2px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
index e804f7e..46383dd 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -8,6 +8,7 @@
<el-button @click="handleAddNew" type="primary" size="mini" icon="el-icon-plus"
style="background: #004EA2; ">鏂板</el-button>
<el-button icon="el-icon-download" size="mini">瀵煎嚭</el-button>
+ <el-button @click="report" icon="el-icon-download" size="mini">鐢熸垚鎶ュ憡</el-button>
</el-col>
</el-row>
</div>
@@ -241,22 +242,150 @@
<div class="newPage" v-if="showLook">
<processInspectionLook :rowInfo="rowInfp" />
</div>
+ <!-- <div class="newPage" v-if="reportlook">
+ <index />
+ </div> -->
+ <el-dialog
+ title="杩囩▼妫�楠屾姤鍛�" :visible.sync="reportlook" width="40%">
+ <template>
+ <div ref="print">
+
+ <div style="margin:0 auto;">
+ <!-- <div style="text-align:center;margin-top:10px;">杩囩▼妫�楠屾姤鍛�</div> -->
+ <table class="table table-striped table-bordered" align="center" border style="width: 100%;height: 700px;" valign="center">
+ <tr>
+ <td class="column" colspan="2" rowspan="2" > <img src="../view/report/logo-2.png" style="width:100%;" /></td>
+ <td class="column" colspan="2" ><p>璁板綍鍚嶇О锛氭楠岃褰曡〃</p>Table: Inspection Record</td>
+ <td class="column" colspan="2"><p>淇濆瓨鏈熼檺锛�25骞�</p> Storage Life: 25 years</td>
+ </tr>
+ <tr>
+ <td class="column" colspan="2" > 璁板綍缂栧彿</td>
+ <td class="column" colspan="2" > 褰掓。閮ㄩ棬</td>
+ </tr>
+ <tr>
+ <td class="column"><p>闆朵欢鍚嶇О</p> Part Description</td>
+ <td class="value"></td>
+ <td class="column"><p>鍨嬪彿</p> Model</td>
+ <td class="value"></td>
+ <td class="column"><p>鍔犲伐鍗曞彿</p> Order No</td>
+ <td class="value"></td>
+ </tr>
+ <tr>
+ <td class="column"><p>妫�楠屼华鍣�</p> Inspection instrument</td>
+ <td class="value"></td>
+ <td class="column"><p>妫�楠屾暟閲�</p> Quantity to check</td>
+ <td class="value"></td>
+ <td class="column"><p>渚涜揣鍗曚綅</p> Supplier</td>
+ <td class="value"></td>
+ </tr>
+ <tr>
+ <td class="column"><p>妫�楠岄」鐩�</p> Inspection Item</td>
+
+ <td class="column" colspan="3"><p><p>妫�楠岀粨鏋�(瀹炴祴鍊�)</p> Test result (Measured value)</p></td>
+
+ <td class="column" rowspan="2" colspan="2"><p>鍒ゅ畾</p> Conclusion</td>
+ </tr>
+ <tr>
+ <td class="column"><p>鎶�鏈姹�</p> Technical Requirement</td>
+ <td class="column"><p>鍏樊</p> TOL</td>
+ <!-- <td class="daughter" >01</td> -->
+ </tr>
+ <tr>
+ <td class="column" rowspan="9" colspan="0.5">灏哄</td>
+ <td class="value" ></td>
+ <td class="column"></td>
+ <td class="value" ></td>
+
+ </tr>
+ <tr>
+ <td class="column"></td>
+ <td class="value" colspan="3"></td>
+ <td class="column"></td>
+
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+
+ <tr>
+ <td class="column" colspan="6"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+ <tr>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ <td class="value" colspan="2"></td>
+ </tr>
+
+ <tr>
+ <td class="column">鏉愯川</td>
+ <td class="value" colspan="5"></td>
+ </tr>
+ <tr >
+ <td class="column" >澶栬鎬ц兘</td>
+ <td class="value" colspan="5" style="text-align:left;">
+ <br>
+ <br>
+ <br>
+ <br>
+ </td>
+ </tr>
+ <tr>
+ <td class="column">澶囨敞</td>
+ <td class="value" colspan="5">
+ <br>
+ <br>
+ <br>
+ <br>
+ </td>
+ </tr>
+
+
+ </table>
+ </div>
+ </div>
+ </template>
+ </el-dialog>`
</div>
</template>
<script>
import processInspectionUpdate from '../view/processInspectionUpdate.vue'
import processInspectionLook from '../view/processInspectionLook.vue'
+// import index from '../view/report/index.vue'
export default {
components: {
processInspectionUpdate,
- processInspectionLook
+ processInspectionLook,
+ // index
},
data() {
return {
showUp: false,
isAddProject: false,
showLook: false,
+ reportlook: false,
detailId: 28,
rowInfp: {},
search: {
@@ -352,6 +481,12 @@
// this.getOptions();
},
methods: {
+ report() {
+ this.reportlook = true
+ // this.$nextTick(() => {
+ // this.$print(this.$refs.print);
+ // })
+ },
handleClick(row) {
this.rowInfp = row
this.showLook = true
@@ -795,4 +930,40 @@
float: right;
font-size: 13px !important;
}
+
+/* .table{
+ border-collapse: collapse;
+ border-spacing: 0;
+ background-color: transparent;
+ display: table;
+ width: 100%;
+ max-width: 100%;
+ width: 800px;
+ margin:0 auto;
+} */
+/* .table td{
+ text-align:center;
+ vertical-align:middle;
+ font-size: 14px;
+ font-family: 'Arial Normal', 'Arial';
+ color: #333333;
+ padding: 8px 12px;
+} */
+/* .table-bordered {
+ border: 1px solid #ddd;
+} */
+.column{
+ width:auto;
+ height:30px;
+ font-size: 12px;
+ text-align:center
+ /* border:1px solid #333;
+ background: #f1f1f1; */
+}
+.value{
+ width:70px;
+ height:30px;
+ border:1px solid #333;
+}
+
</style>
diff --git a/src/components/view/self-inspection.vue b/src/components/view/self-inspection.vue
index 9eb52c1..8f23b85 100644
--- a/src/components/view/self-inspection.vue
+++ b/src/components/view/self-inspection.vue
@@ -113,7 +113,6 @@
<el-col :span="12" style="line-height: 32px;">鑷椤圭洰缁存姢</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="addend">鏂板</el-button>
- <!-- <el-button icon="el-icon-edit-outline" @click="modify">淇敼</el-button> -->
<el-button icon="el-icon-delete" @click="dels">鍒犻櫎</el-button>
</el-col>
</el-row>
@@ -121,22 +120,9 @@
<div class="choose">
<span>绫诲瀷锛�</span>
<el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ <el-option v-for="(a, ai) in bigType" :key="ai" :value="a">
+ </el-option>
</el-select>
- <!-- <span>宸ュ簭锛�</span> -->
- <!-- <el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
- </el-select>
- <span>椤圭洰锛�</span>
- <el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option v-for="(a, ai) in product" key="ai" :label="a.name" :value="a.id"></el-option>
- </el-select>
- <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌�
- 璇�</span></el-button> -->
</div>
<div class="thing">
<div class="left">
@@ -147,9 +133,6 @@
<div class="custom-tree-node" slot-scope="{ node, data }">
<span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
{{data.code}} {{ data.name }}</span>
- <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
- <i class="el-icon-delete"></i>
- </el-button> -->
</div>
</el-tree>
</div>
@@ -384,6 +367,7 @@
checkTreeNode: {
id:'',
},
+ bigType: [],
tableData: [],
upIndex: 0,
selects: [],
@@ -402,10 +386,20 @@
}
},
mounted() {
+ this.chooseType()
this.selectAllleft()
this.selectAllSelf()
},
methods: {
+ chooseType() {
+ this.$axios.get(this.$api.url.chooseType).then(res => {
+ this.bigType = res.data
+ this.typeselect = res.data[0]
+ this.search.type = res.data[0]
+ this.selectAllTechTem();
+ this.selectAllTechNam();
+ })
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 3cbdff9..4a2f2be 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -89,7 +89,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="tefather" style="display: flex;">
- <el-select size="small"
+ <el-select size="small"
filterable allow-create default-first-option style="width: 100%;"
v-model="technologyForm.tefather" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭">
<el-option :value="item.father" :label="item.father" v-for="(item,index) in fatherList" :key="index"></el-option>
@@ -98,7 +98,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="宸ヨ壓鍚嶇О:" prop="tename" style="display: flex;">
- <el-input style="width: 100%;" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
+ <el-input style="width: 100%;" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
clearable v-model="technologyForm.tename"></el-input>
</el-form-item>
</el-col>
@@ -108,7 +108,7 @@
<el-form-item label="璁惧缁�:" prop="deviceGroup" style="display: flex;">
<el-select placeholder="璇烽�夋嫨璁惧缁�" size="small" style="width: 100%;"
v-model="technologyForm.deviceGroup">
- <el-option :value="item.father"
+ <el-option :value="item.father"
v-for="(item,index) in deviceList" :key="index" :label="item.father"></el-option>
</el-select>
</el-form-item>
@@ -132,7 +132,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="pfather">
- <el-select v-model="targetForm.pfather"
+ <el-select v-model="targetForm.pfather"
@change="changeFather" size="small" placeholder="璇烽�夋嫨宸ュ簭">
<el-option :value="item.name" :label="item.name" v-for="(item,index) in targetFormList" :key="index"></el-option>
</el-select>
@@ -151,7 +151,7 @@
<el-col :span="12">
<el-form-item label="椤圭洰:" prop="father">
<el-select v-model="targetForm.father"
- filterable allow-create default-first-option
+ filterable allow-create default-first-option
size="small" placeholder="璇疯緭鍏ユ垨閫夋嫨椤圭洰">
<el-option :value="item.father" :label="item.father" v-for="(item,index) in projectList" :key="index"></el-option>
</el-select>
@@ -200,16 +200,16 @@
style="width:100%;" v-model="materialForm.mfather" size="small">
<el-option v-for="(item,index) in materialFormList" :key="index"
:label="item.name" :value="item.name" ></el-option>
- </el-select>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宸ヨ壓鍚嶇О:" prop="mtechnologyId">
- <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
+ <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
v-model="materialForm.mtechnologyId" size="small">
- <el-option v-for="(item,index) in mIdList" :key="index"
+ <el-option v-for="(item,index) in mIdList" :key="index"
:value="item.id" :label="item.name"></el-option>
- </el-select>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -283,7 +283,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="profather">
- <el-select v-model="productForm.profather"
+ <el-select v-model="productForm.profather"
@change="changeProduct" placeholder="璇烽�夋嫨宸ュ簭" size="small">
<el-option v-for="(item,index) in productFormList" :key="index"
:value="item.name" :label="item.name"></el-option>
@@ -559,8 +559,8 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
- this.selectVersion()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
return
}
@@ -587,8 +587,8 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
- this.selectVersion()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
let three=two.children.filter(item=>{
@@ -610,7 +610,7 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
+ this.bomLeftAdd=false
this.selectVersion()
})
}else{
@@ -637,8 +637,8 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
- this.selectVersion()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
let specificationsDto={
@@ -658,7 +658,7 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
+ this.bomLeftAdd=false
this.selectVersion()
})
}
@@ -676,7 +676,7 @@
this.$refs[formName].resetFields();
},
leftAddBom(){
-
+
},
//鑾峰彇瀛愮粍浠舵暟鎹�
getChildData(data){
@@ -975,7 +975,7 @@
}
},
startLeftAdd(){
-
+
},
getType(typeName){
return typeName==="鎴愬搧"?1:2
@@ -1312,7 +1312,7 @@
height: calc(100% - 48px);
background-color: #fff;
display: flex;
-
+
}
.thing .left {
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 36ed1ed..5102ff6 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -559,4 +559,4 @@
}
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/view/index.vue b/src/view/index.vue
index 0c7c5f5..0d11519 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -482,7 +482,13 @@
v: "鐗╂枡娓呭崟缁存姢",
i: "font icon-shouye",
u: "mbom"
- }
+ },
+ {
+ k: 29,
+ v: "鑷椤圭洰缁存姢",
+ i: "font icon-shouye",
+ u: "self-inspection"
+ },
]
}
],
--
Gitblit v1.9.3