From ef114839bf4355b597e9ac7f5ba78e732a703770 Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期一, 07 八月 2023 09:44:13 +0800
Subject: [PATCH] 私人仓库的第一次提交
---
src/components/view/raw-ins.vue | 6
src/components/view/finishedProductInspection.vue | 246 +++++++++++++-------------
src/components/view/technical.vue | 130 ++++++++++----
src/components/view/rawInsDetail.vue | 79 ++++++--
src/components/view/rawUnqualified/raw.vue | 7
src/assets/api/controller.js | 21 ++
6 files changed, 296 insertions(+), 193 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 87c12b4..cb2bc85 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -1,8 +1,12 @@
// 鎶�鏈鐞�-鏍囧噯Bom
const standard = {
+ // 鎶�鏈鐞�-鏍囧噯Bom
selectTreeByMaterial: "material/selectTreeByMaterial", //鏌ヨ鐗╂枡鐨勬爲
selectProductByMaterial: "product/selectTreeByMaterial",//鏍规嵁鐗╂枡鏌ヨ椤圭洰琛ㄦ牸
- selectTechnologyByMaterial: "technology/select"
+ selectTechnologyByMaterial: "technology/select",
+ // 鎶�鏈鐞�-鎶�鏈枃浠�
+ selectAllOrder: "/orders/selectAllOrder",//鏌ヨ鎵�鏈夎鍗曞垪琛�
+ selectOrderById: "/orders/selectOrderById",//鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
}
// 鍘熸潗鏂欐楠�
const raw = {
@@ -10,13 +14,24 @@
selectRawInspectsListById: "rawInspect/selectRawInspectsListById/",//鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏
updaterawInsProduct:'rawInsProduct/updaterawInsProduct',//淇敼椤圭洰鐨勬楠屽��
updateRawInspectsById:"/rawInspect/updateRawInspectsById/",//涓婃姤,
- listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃
+ selectRawMaterial:"/rawInspect/selectMaterial",//鏌ヨ鍘熸潗鏂欎俊鎭�
+ selectSpBySt:"/rawInspect/selectSpBySt",//鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�,
+ addRawInspects :"/rawInspect/addRawInspects"
}
+// 鎴愬搧妫�楠�
+const finishedIns ={
+ finishedInsListPage:"/finished-inspect/list_page",//鑾峰彇鎴愬搧妫�楠屽垪琛�
+// listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃
+finishedInspectUser:"/finished-inspect/page_user",//鑾峰彇鎵�鏈変富鏈哄伐
+projectListByfinishId:"/inspection-item/list_user",//鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
+
+}
const url = {
enter: "user/enter", //鐧诲綍
...standard,
- ...raw
+ ...raw,
+ ...finishedIns
}
diff --git a/src/components/view/finishedProductInspection.vue b/src/components/view/finishedProductInspection.vue
index 7dc48e2..bc27b7e 100644
--- a/src/components/view/finishedProductInspection.vue
+++ b/src/components/view/finishedProductInspection.vue
@@ -13,31 +13,29 @@
</div>
<div class="nav">
<span>妫�楠岀粨鏋滐細</span>
- <el-select v-model="inspectionResult" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
+ <el-select v-model="searchData.inspectResult" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
+ <el-option value="1" label="鍚堟牸"></el-option>
+ <el-option value="2" label="涓嶅悎鏍�"></el-option>
</el-select>
<span>妫�楠屾棩鏈燂細</span>
<el-date-picker
- v-model="inspectionDate"
+ v-model="searchData.inspectDate"
type="date"
placeholder="閫夋嫨鏃ユ湡"
style="margin-right: 52px">
</el-date-picker>
<span>妫�楠屼汉锛�</span>
- <el-select v-model="inspecter" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
+ <el-select v-model="searchData.inspectUsername" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 52px;">
+ <el-option :value="item.id" :key="item.id" :label="item.name" v-for="item in usernameOptions"></el-option>
</el-select>
- <el-button size="mini"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌� 璇�</span></el-button>
+ <el-button size="mini" @click="()=>{searchData={};getInspectionTableData()}"><span>閲� 缃�</span></el-button>
+ <el-button size="mini" type="primary" @click="getInspectionTableData" style="background: #004EA2;"><span>鏌� 璇�</span></el-button>
</div>
<div class="content-body">
<div class="inspectionTable">
<el-table
ref="inspectionTable"
- :height="400"
- :max-height="400"
+ height="620"
:cell-style="{textAlign: 'center'}"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
:data="inspectionTable"
@@ -48,22 +46,22 @@
width="50">
</el-table-column>
<el-table-column
- prop="number"
+ prop="order_number"
label="璁㈠崟鍙�"
min-width="100"
/>
<el-table-column
- prop="username"
+ prop="customer_name"
label="瀹㈡埛鍚嶇О"
min-width="80"
/>
<el-table-column
- prop="projectname"
+ prop="project_name"
label="宸ョ▼鍚嶇О"
min-width="80"
/>
<el-table-column
- prop="tracenumber"
+ prop="quality_traceability"
label="璐ㄩ噺杩芥函鍙�"
min-width="108"
/>
@@ -73,12 +71,12 @@
min-width="100"
/>
<el-table-column
- prop="class"
+ prop="material"
label="浜у搧澶х被"
min-width="72"
/>
<el-table-column
- prop="specificationmodel"
+ prop="specifications_model"
label="瑙勬牸鍨嬪彿"
min-width="110"
/>
@@ -93,22 +91,7 @@
min-width="50"
/>
<el-table-column
- prop="machine"
- label="鏈哄彴"
- min-width="60"
- />
- <el-table-column
- prop="group"
- label="鐝粍"
- min-width="50"
- />
- <el-table-column
- prop="worker"
- label="涓绘満宸�"
- min-width="60"
- />
- <el-table-column
- prop="date"
+ prop="detectionPeriod"
label="妫�楠屾棩鏈�"
min-width="80"
/>
@@ -116,13 +99,19 @@
prop="result"
label="妫�娴嬬粨鏋�"
min-width="80"
- />
+ >
+ <template slot-scope="scope">
+ <span>{{scope.row.result===1?'鍚堟牸':'涓嶅悎鏍�'}}</span>
+ </template>
+ </el-table-column>
+
+
<el-table-column
label="鎿嶄綔"
min-width="80"
>
<template slot-scope="scope">
- <el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
+ <el-button type="text" size="small" @click="goToDetail(scope.row)">鏌ョ湅</el-button>
<el-button type="text" size="small">鎵撳嵃</el-button>
</template>
</el-table-column>
@@ -131,11 +120,11 @@
<!-- 鍒嗛〉鍣� -->
<div class="pagination">
<el-pagination
- :current-page="currentPage"
+ :current-page="pageParams.pageNo"
:page-sizes="[100, 200, 300, 400]"
- :page-size="pageSize"
+ :page-size="pageParams.pageSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="this.inspectionTable.length"
+ :total="pageParams.total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
@@ -149,93 +138,87 @@
<el-col :span="12">鏂板鎴愬搧妫�楠屽崟</el-col>
<el-col :span="12" style="text-align: right;">
<!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false -->
- <el-button @click="showAddPage = false" type="primary" size="mini" icon="el-icon-back" style="background: #004EA2; ">杩斿洖</el-button>
+ <el-button @click="()=>{showAddPage = false;showDetail = false}" type="primary" size="mini" icon="el-icon-back" style="background: #004EA2; ">杩斿洖</el-button>
</el-col>
</el-row>
- <el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="left" label-width="100px" size="mini" >
+ <el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="right" label-width="100px" size="mini" >
<div class="formwrapper">
- <el-row :gutter="450">
- <el-col :span="5">
+ <el-row>
+ <el-col :span="7">
<el-form-item label="璁㈠崟鍙凤細">
- <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.order_number" placeholder="璇疯緭鍏ヨ鍗曞彿1" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="瀹㈡埛鍚嶇О锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.username" placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.username" placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.customer_name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="宸ョ▼鍚嶇О锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.projectname" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.projectname" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.project_name" placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="450">
- <el-col :span="5">
+ <el-row >
+ <el-col :span="7">
<el-form-item label="璐ㄩ噺杩芥函鍙凤細" >
- <el-input style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quality_traceability" placeholder="璇疯緭鍏ヨ拷婧彿" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="浜у搧缂栫爜锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.code" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" /> </el-form-item>
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.material_code" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material_code" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ </el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="浜у搧鍚嶇О锛�">
- <el-select style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
<el-option value="閫夐」1"></el-option>
<el-option value="閫夐」2"></el-option>
</el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="450">
- <el-col :span="5">
+ <el-row >
+ <el-col :span="7">
<el-form-item label="瑙勬牸鍨嬪彿锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿">
+ <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿">
<el-option value="閫夐」1"></el-option>
<el-option value="閫夐」2"></el-option>
</el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="鍗曚綅锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="璇烽�夋嫨鍗曚綅">
+ <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="璇烽�夋嫨鍗曚綅">
<el-option value="閫夐」1"></el-option>
<el-option value="閫夐」2"></el-option>
</el-select>
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="7">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 180px;" v-model="addInspectionform.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quantity" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="450">
- <!-- <el-col :span="5">
- <el-form-item label="鐝粍锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.group" size="small" placeholder="璇烽�夋嫨鐝粍">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select> </el-form-item>
- </el-col> -->
- <el-col :span="5">
- <el-form-item label="涓绘満宸ワ細" >
- <el-select style="width: 180px;" v-model="addInspectionform.worker" size="small" placeholder="璇烽�夋嫨涓绘満宸�">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鏈哄彴锛�" >
- <el-select style="width: 180px;" v-model="addInspectionform.machine" size="small" placeholder="璇烽�夋嫨浜у搧鏈哄彴">
- <el-option value="閫夐」1"></el-option>
- <el-option value="閫夐」2"></el-option>
- </el-select>
- </el-form-item>
+ <el-row >
+ <el-col v-show="showDetail !== false" :span="7">
+ <el-form-item label="涓绘満宸ワ細" >
+ <el-input style="width: 180px;" v-model="finishedInsInfo.name" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
+ </el-form-item>
</el-col>
</el-row>
</div>
@@ -277,8 +260,7 @@
<el-table-column prop="operation" label="涓婃姤"></el-table-column>
</el-table>
</div>
- </div>
-
+ </div>
</div>
</template>
@@ -287,45 +269,22 @@
export default {
data(){
return {
- inspectionResult: '',
- inspectionDate: '',
- inspecter: '',
- inspectionTable:[{
- number: '8540395029753',
- username: 'jack',
- projectname: '甯冮殕杩�',
- tracenumber: '826403164021',
- code: 'C-982164',
- class: '鎴愬搧',
- specificationmodel: '8.8/15kV JLS-3.2',
- unit: '鍚�',
- quantity: '15',
- machine: '鎷夐椄鏈�',
- group: '1缁�',
- worker: '榛勫皬鏄�',
- date: '2023-08-01',
- result: '鍚堟牸',
- operation: ''
- },{
- number: '2497320327652',
- username: 'rose',
- projectname: '甯冮殕杩�',
- tracenumber: '826403164021',
- code: 'C-24114',
- class: '鎴愬搧',
- specificationmodel: '8.6/15kV JAD-3.2',
- unit: '鍚�',
- quantity: '43',
- machine: '鎷夐椄鏈�',
- group: '1缁�',
- worker: '榛勫皬鏄�',
- date: '2023-08-01',
- result: '鍚堟牸',
- operation: ''
- }],
- currentPage: 1, // 褰撳墠椤电爜
- pageSize: 100,
+ searchData:{
+ inspectionResult: '',
+ inspectionDate: '',
+ inspecter: '',
+ },
+ // 涓绘満宸ヤ笅鎷夋
+ usernameOptions:[],
+ inspectionTable:[
+ ],
+ pageParams:{
+ pageNo: 1, // 褰撳墠椤电爜
+ pageSize: 100,
+ total:0
+ },
showAddPage: false,
+ showDetail:false,
addInspectionform: [{
number: '',
username: '',
@@ -355,8 +314,13 @@
inspecter:'111',
conclusion:'',
operation:''
- }]
+ }],
+ finishedInsInfo:{}
}
+ },
+ created() {
+ this.init()
+ this.getInspectionTableData()
},
methods:{
// 姣忛〉鏉℃暟鏀瑰彉鏃惰Е鍙� 閫夋嫨涓�椤垫樉绀哄灏戣
@@ -372,6 +336,24 @@
},
handleAddNew(){
this.showAddPage=true
+ },
+ async getInspectionTableData() {
+ const {data:{row,total}} = await this.$axios.get(this.$api.url.finishedInsListPage,{params:{...this.pageParams,...this.searchData}})
+ console.log(row)
+ this.inspectionTable = row
+ this.pageParams.total = total
+ },
+ goToDetail(row) {
+ this.showAddPage = true
+ this.showDetail = true
+ this.finishedInsInfo = row
+ console.log(this.showDetail)
+ // this.addInspectionform = []
+ },
+ async init() {
+ const {data} = await this.$axios.get(this.$api.url.finishedInspectUser)
+ this.usernameOptions = data
+
}
}
@@ -433,4 +415,18 @@
background-color: #fff;
padding: 10px 12px;
}
+.rawPage{
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ overflow-y: scroll;
+}
+.rawPage .content-body{
+ flex: 1;
+}
+/* .inspectionTable{
+ flex: 1;
+ overflow-y: scroll;
+} */
+
</style>
\ No newline at end of file
diff --git a/src/components/view/raw-ins.vue b/src/components/view/raw-ins.vue
index 1808269..ed319c6 100644
--- a/src/components/view/raw-ins.vue
+++ b/src/components/view/raw-ins.vue
@@ -1,5 +1,7 @@
<style scoped>
- .raw_ins {}
+ .raw_ins {
+ height: 100%;
+ }
.raw_ins .title .el-button {
height: 32px;
@@ -110,7 +112,7 @@
</div>
<div class="thing">
<el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
- max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" border default-expand-all
+ max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" default-expand-all
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id">
<el-table-column type="selection" width="50">
</el-table-column>
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 539c4f9..cfb744d 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -83,31 +83,44 @@
<el-form v-model="detailInfo" label-position="right" label-width="120px" >
<el-row>
<el-col :span="7">
- <el-form-item label="鏉ユ枡鏃ユ湡:">
- <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.formTime"></el-input>
- <el-date-picker
- v-else
- type="date"
- v-model="detailInfo.formTime"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
+ <el-form-item label="鍘熸潗鏂欏悕绉�:">
+ <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.name"></el-input>
+ <el-select @change="checkRawName" v-else placeholder="璇烽�夋嫨椤圭洰鍚嶇О" v-model="detailInfo.name">
+ <el-option v-for="item in materialOptions" :key="item.id" :label="item.name" :value="item.name"></el-option>
+ </el-select>
</el-form-item>
+
</el-col>
<el-col :span="7">
<el-form-item label="瑙勬牸鍨嬪彿:">
- <el-input :disabled="detailId!==null" v-model="detailInfo.specifications"></el-input>
+ <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.specifications"></el-input>
+ <el-cascader
+ placeholder="璇烽�夋嫨瑙勬牸鍨嬪彿"
+ v-else
+ :disabled="specificationOptions.length===0"
+ :props="{label:'name',value:'name'}"
+ v-model="detailInfo.specificationsArr"
+ :options="specificationOptions"
+ ></el-cascader>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="鍘熸潗鏂欑紪鐮�:">
- <el-input :disabled="detailId!==null" v-model="detailInfo.code"></el-input>
+ <el-input disabled v-model="detailInfo.code"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
- <el-form-item label="鍘熸潗鏂欏悕绉�:">
- <el-input :disabled="detailId!==null" v-model="detailInfo.name"></el-input>
+ <el-form-item label="鏉ユ枡鏃ユ湡:">
+ <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.formTime"></el-input>
+ <el-date-picker
+ v-else
+ type="date"
+ value-format="yyyy-MM-dd"
+ v-model="detailInfo.formTime"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="7">
@@ -295,7 +308,7 @@
label="妫�楠屽憳"
width="542">
<template slot-scope="scope">
- <span v-for="item in scope.row.names" :key="item.username" :style="{marginRight:'8px'}">{{item}}</span>
+ <span v-for="item in scope.row.names" :key="item&&item.userName" :style="{marginRight:'8px'}">{{item}}</span>
</template>
</el-table-column>
<el-table-column
@@ -344,8 +357,9 @@
conclusion.name = this.detailInfo.name
conclusion.code = this.detailInfo.code
conclusion.names= [...new Set(this.projectTable.map(item=>item.userName))]
- console.log(this.projectTable.filter(item=>item.testState===0))
- if(this.projectTable.filter(item=>item.testState===null).length){
+ console.log(conclusion,this.projectTable)
+ console.log(this.projectTable.filter(item=>item.testState===null).length)
+ if(this.projectTable.filter(item=>item.testState===null).length===this.projectTable.length){
conclusion.testState = null
return [conclusion]
}
@@ -370,7 +384,9 @@
// 鏂板缓妫�楠屽崟鍙傛暟瀵硅薄
rawInsParams:{},
// 椤圭洰鍚嶇Оoptions
- materialOptions:[]
+ materialOptions:[],
+ specificationOptions:[]
+
}
},
methods:{
@@ -379,11 +395,19 @@
const {data} = await this.$axios.get(this.$api.url.selectRawInspectsListById+`${this.detailId}`,{params:{id:this.detailId}})
this.detailInfo = data
this.projectTable = data.rawInsProducts
- // console.log(this.projectTable)
+ console.log(data)
},
// 鏂板妫�楠屽崟
- addNewRawInspect() {
- console.log(this.detailInfo)
+ async addNewRawInspect() {
+ this.detailInfo.specifications = this.detailInfo.specificationsArr.join("-")
+ // const time = this.detailInfo.formTime
+ // this.detailInfo.formTime = `${time.getFullYear()}-${time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1}-${time.getDate() < 10 ? '0' + time.getDate() : time.getDate()}`
+ const res = await this.$axios.post(this.$api.url.addRawInspects,{...this.detailInfo},{headers:{'Content-Type':'application/json'}})
+ console.log(res)
+ this.detailId = res.data
+ this.getDetailInfo()
+
+ this.$message.success('鎻愪氦鎴愬姛')
},
// 淇敼椤圭洰鐨勬娴嬪�兼敼鍙樼粨璁�
async changeState(row){
@@ -398,8 +422,23 @@
this.getDetailInfo()
},
async getOptions() {
- const {data} = await this.$axios.get(this.$api.url.listMaterial)
+ // const {data} = await this.$axios.get(this.$api.url.listMaterial)
+ // this.materialOptions = data
+ const {data} = await this.$axios.get(this.$api.url.selectRawMaterial)
this.materialOptions = data
+ console.log(this.materialOptions)
+ },
+ checkRawName(data) {
+ console.log('閫夋嫨鍘熸潗鏂欏悕绉�',data)
+ this.materialOptions.forEach(item=>{
+ if(item.name===data){
+ console.log(item.id)
+ this.detailInfo.code = item.code
+ this.$axios.get(this.$api.url.selectSpBySt,{params:{id:item.id}}).then(res=>{
+ this.specificationOptions= res.data
+ })
+ }
+ })
}
}
}
diff --git a/src/components/view/rawUnqualified/raw.vue b/src/components/view/rawUnqualified/raw.vue
index afe2122..0293cbc 100644
--- a/src/components/view/rawUnqualified/raw.vue
+++ b/src/components/view/rawUnqualified/raw.vue
@@ -1,9 +1,10 @@
<style scoped>
.unqualifiedBox{
width: 100%;
- height: 100%;
+ max-height: 100%;
display: flex;
flex-direction: column;
+ overflow-y: scroll;
}
.unqualifiedBox .title .el-button {
height: 32px;
@@ -47,7 +48,7 @@
<div class="unqualifiedBox">
<div class="title">
<el-row>
- <el-col :span="12" style="line-height: 32px;">鍘熸潗鏂欐楠�</el-col>
+ <el-col :span="12" style="line-height: 32px;">鍘熸潗鏂欎笉鍚堟牸</el-col>
<el-col :span="12" style="text-align: right;">
<el-button icon="el-icon-download" @click="()=>{}">瀵煎嚭</el-button>
</el-col>
@@ -73,7 +74,7 @@
璇�</span></el-button>
</div>
<div class="unqualifiedTable">
- <el-table :data="unqualifiedData" height="630">
+ <el-table :data="unqualifiedData" height="620">
<el-table-column
type="selection"
width="55">
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 3e8e839..66ed8ff 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -48,7 +48,7 @@
color: #fff;
}
/* 杈撳叆妗嗙殑鏍峰紡 */
-.search-header .el-form-item .el-input .el-input__inner{
+.search-header .el-form-item .el-input >>>.el-input__inner{
width: 224px;
height: 32px ;
box-sizing: border-box;
@@ -86,6 +86,17 @@
margin-bottom: 24px;
font-size: 16px;
}
+.detail-model >>>.el-form-item__label{
+ color: rgb(51, 51, 51);
+}
+.detail-model >>>.el-input__inner{
+width: 224px;
+height: 32px;
+box-sizing: border-box;
+background: rgb(238, 238, 238);
+border: 1px solid rgb(221, 221, 221);
+border-radius:4px;
+}
</style>
@@ -102,18 +113,19 @@
<div class="search-header">
<el-form v-model="searchData" :inline="true">
<el-form-item label="璁㈠崟鍙�:">
- <el-input v-model="searchData.number"></el-input>
+ <el-input v-model="searchData.id"></el-input>
</el-form-item>
<el-form-item label="涓嬪崟鏃ユ湡:">
<el-date-picker
v-model="searchData.date"
+ value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button plain @click="resetBtn">閲� 缃�</el-button>
- <el-button @click="filteredTableData">鏌� 璇�</el-button>
+ <el-button @click="searchTechnical">鏌� 璇�</el-button>
</el-form-item>
</el-form>
</div>
@@ -128,66 +140,68 @@
width="78">
</el-table-column>
<el-table-column
- prop="date"
+ prop="id"
label="璁㈠崟鍙�"
width="124">
</el-table-column>
<el-table-column
- prop="name"
+ prop="proname"
label="宸ョ▼鍚嶇О"
width="160">
</el-table-column>
<el-table-column
- prop="address"
+ prop="code"
label="浜у搧缂栫爜"
width="168"
>
</el-table-column>
<el-table-column
- prop="name"
+ prop="type"
label="浜у搧澶х被"
width="128">
</el-table-column>
<el-table-column
- prop="address"
+ prop="specifications"
label="瑙勬牸鍨嬪彿"
width="170">
</el-table-column>
<el-table-column
- prop="name"
+ prop="unit"
label="鍗曚綅"
width="100">
</el-table-column>
<el-table-column
- prop="address"
+ prop="number"
label="鏁伴噺"
width="118"
>
</el-table-column>
<el-table-column
- prop="name"
+ prop="username"
label="涓嬪崟浜�"
width="114">
</el-table-column>
<el-table-column
- prop="address"
+ prop="createTime"
label="涓嬪崟鏃ユ湡"
width="153"
>
</el-table-column>
<el-table-column
- prop="address"
+ prop="deliveryTime"
label="浜よ揣鏃ユ湡"
width="137">
</el-table-column>
<el-table-column
- prop="address"
+ prop="state"
label="鐘舵��"
width="85"
>
+ <template slot-scope="scope">
+ {{scope.state==1?'寰呯紪鍒�':'宸茬紪鍒�'}}
+ </template>
</el-table-column>
<el-table-column
- fixed="right"
label="鎿嶄綔"
width="194">
<template slot-scope="scope">
@@ -200,80 +214,82 @@
<el-pagination
- :current-page="1"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="pageParams.pageNo"
:page-sizes="[100, 200, 300, 400]"
- :page-size="100"
+ :page-size="pageParams.pageSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="400">
+ :total="pageParams.total">
</el-pagination>
<!-- 鏌ョ湅璇︽儏妯℃�佹 -->
- <el-dialog title="鏂囦欢璇︽儏" :visible.sync="showDetail" width="687px" @close="showDetail = false">
+ <el-dialog title="鏂囦欢璇︽儏" class="detail-model" :visible.sync="showDetail" width="687px" @close="showDetail = false">
<el-form label-position="right" label-width="70px" :model="selectedRow">
<span class="formtitle">鍩烘湰淇℃伅</span>
<el-row :gutter="31">
<el-col :span="12">
<el-form-item label="璁㈠崟鍙�">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.id" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宸ョ▼鍚嶇О">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;"/>
+ <el-input :value="selectedRow.proname" :readonly="true" style="height: 32px; width: 224px;"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="31">
<el-col :span="12">
<el-form-item label="浜у搧缂栫爜">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.code" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="浜у搧澶х被">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.type" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="31">
<el-col :span="12">
<el-form-item label="瑙勬牸鍨嬪彿">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.specifications" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍗曚綅">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.unit" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="31">
<el-col :span="12">
<el-form-item label="鏁伴噺">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.number" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涓嬪崟浜�">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.custname" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="31">
<el-col :span="12">
<el-form-item label="涓嬪崟鏃ユ湡">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.createTime" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="浜よ揣鏃ユ湡">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.deliveryTime" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="31">
<el-col :span="12">
<el-form-item label="鐘舵��">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.state==1?'寰呯紪鍒�':'宸茬紪鍒�'" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
</el-row>
@@ -281,24 +297,24 @@
<el-row :gutter="31">
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.proname" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鐪佷唤">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.province" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="31">
<el-col :span="12">
<el-form-item label="浜嬩笟閮�">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.department" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涓氬姟鍛�">
- <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" />
+ <el-input :value="selectedRow.salesman" :readonly="true" style="height: 32px; width: 224px;" />
</el-form-item>
</el-col>
</el-row>
@@ -316,10 +332,13 @@
<script>
export default {
+ filters:{
+
+ },
data() {
return {
searchData:{
- number:'',
+ id:'',
date:''
},
technicalTable: [{
@@ -367,15 +386,46 @@
name: '鐜嬪皬铏�',
address: '涓婃捣甯�'
}
- ],
- showDetail: false,
- selectedRow: ''
+ ],
+ showDetail: false,
+ selectedRow: {},
+ pageParams:{
+ pageNo:1,
+ pageSize:10,
+ total:0
+ }
}
},
+ created() {
+ this.getTechnicalTableData()
+ },
methods: {
- showDetails(row){
+ async showDetails(row){
this.showDetail = true
- this.selectedRow = row
+ const res = await this.$axios.get(this.$api.url.selectOrderById,{params:{id:row.id}})
+ this.selectedRow = res.data
+ console.log(this.selectedRow)
+ },
+ async getTechnicalTableData() {
+ const res = await this.$axios.get(this.$api.url.selectAllOrder,{params:{pageSize:(this.pageParams.pageNo-1),countSize:this.pageParams.pageSize,...this.searchData}})
+ this.technicalTable = res.data.row
+ this.pageParams.total = res.data.total
+ },
+ // 澶撮儴鏉′欢鏌ヨ-閲嶇疆
+ resetBtn() {
+ this.searchData={}
+ },
+ // 澶撮儴鏉′欢鏌ヨ-鏌ヨ
+ searchTechnical() {
+ this.getTechnicalTableData()
+ },
+ handleSizeChange(value){
+ this.pageParams.pageSize = value
+ this.getTechnicalTableData()
+ },
+ handleCurrentChange(value){
+ this.pageParams.pageNo = value
+ this.getTechnicalTableData()
}
},
}
--
Gitblit v1.9.3