From 44f9e74915e5dbdac912d81d95ba60284bec140c Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 26 八月 2023 11:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/inspectionApplication/index.vue | 226 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 166 insertions(+), 60 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 219169e..8fbad77 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -82,7 +82,7 @@
label="妫�楠岀被鍨�"
min-width="80px">
<template slot-scope="scope">
- <div v-if="scope.row.type === 0" ><span>鍘熸潗鏂欐楠�</span></div>
+ <div v-if="scope.row.type === 0" ><span >鍘熸潗鏂欐楠�</span></div>
<div v-if="scope.row.type === 1" ><span>濮旀墭妫�楠�</span></div>
<div v-if="scope.row.type === 2" ><span>鎴愬搧妫�楠�</span></div>
</template>
@@ -154,7 +154,7 @@
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
- <el-button type="text" size="small" >鎻愪氦</el-button>
+ <!-- <el-button type="text" size="small" >鎻愪氦</el-button> -->
<el-button type="text" size="small" >浣滃簾</el-button>
</template>
</el-table-column>
@@ -164,7 +164,7 @@
<el-pagination
class="pagination"
:current-page="currentPage"
- :page-sizes="[5, 10, 20, 30]"
+ :page-sizes="[ 10, 20, 30,40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@@ -174,6 +174,7 @@
</div>
</div>
</div>
+ <!-- 瀵硅瘽妗� -->
<div class="checkType">
<el-dialog
title="鏂板妫�楠屽崟"
@@ -182,9 +183,9 @@
>
<div class="check-box">
<el-radio-group v-model="type" @change="handleRadioChange">
- <el-radio :label="0" border>鍘熸潗鏂欐楠�</el-radio>
- <el-radio :label="1" border>濮旀墭妫�楠�</el-radio>
- <el-radio :label="2" border>鎴愬搧妫�楠�</el-radio>
+ <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >鍘熸潗鏂欐楠�</el-radio>
+ <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="1" border>濮旀墭妫�楠�</el-radio>
+ <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="2" border>鎴愬搧妫�楠�</el-radio>
</el-radio-group>
</div>
<div v-if="type === 0 || type === ''">
@@ -192,43 +193,43 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.dateSurvey" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.dateSurvey" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" :value="infoForm.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欑紪鐮侊細">
- <el-input style="width: 300px" type="text" :value="infoForm.materialCoding" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.materialCoding" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欏悕绉帮細">
- <el-input style="width: 300px" type="text" :value="infoForm.materialName" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.materialName" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.specificationsModels" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.specificationsModels" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -251,43 +252,43 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.formTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.formTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="璇疯緭鍏ュ鎵樺崟浣�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="璇疯緭鍏ュ鎵樺崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="濮旀墭缂栧彿锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="濮旀墭鍚嶇О锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.specifications" placeholder="璇疯緭鍏ュ瀷鍙疯鏍�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.specifications" placeholder="璇疯緭鍏ュ瀷鍙疯鏍�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.num" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.num" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -310,43 +311,43 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欑紪鐮侊細">
- <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欏悕绉帮細">
- <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -366,11 +367,88 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="checkTypeVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="addInspection">纭� 瀹�</el-button>
+ <!-- <el-button type="primary" @click="addInspection">纭� 瀹�</el-button> -->
+ <el-button type="primary" @click="QUEding">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
</div>
+
+ <!-- 纭畾璺宠浆鍩烘湰搴撳脊绐� -->
+ <el-dialog
+ title="鏍囧噯搴�"
+ :visible.sync="Standardframe"
+ width="48%"
+
+ >
+ <!-- <el-form :model="form">
+ <el-form-item label="璇烽�夋嫨瀹℃牳缁撴灉:" :label-width="formLabelWidth">
+ </el-form-item>
+ </el-form> -->
+
+ <!-- <div slot="footer" class="dialog-footer"> -->
+ <el-table
+ :data="tableData"
+ style="width: 100%; margin-bottom: 20px"
+ row-key="name"
+ border
+ height="calc(100vh - 250px)"
+ default-expand-all
+ ref="multipleTable"
+ @select="selectTr"
+ @select-all="selectAll"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+ >
+ <el-table-column type="selection" label="搴忓彿"> </el-table-column>
+ <el-table-column
+ type="index"
+ width="50px"
+ label="搴忓彿"
+ ></el-table-column>
+ <el-table-column label="椤圭洰鍚嶇О" sortable>
+ <template scope="scope">
+ <el-tag
+ ><div
+ class="firstDiv"
+ :style="`color: ${
+ scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
+ }`"
+ >
+ {{ scope.row.code == "[1]" ? "01" : "02" }}
+ </div>
+ <span style="color: black">{{ scope.row.name }}</span></el-tag
+ >
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅"
+ sortable
+ ></el-table-column>
+ <el-table-column label="鏍囧噯鍊�" sortable>
+ <template scope="scope">
+ <el-input
+ v-if="scope.row.edit === true || scope.row.code === '[2]'"
+ @blur="requiredOnfocus(scope)"
+ v-model="scope.row.required"
+ placeholder="璇疯緭鍏ユ爣鍑嗗��"
+ ></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="internal" label="鍐呮帶鍊�" sortable>
+ <template scope="scope">
+ <el-input
+ v-if="scope.row.edit === true || scope.row.code === '[2]'"
+ @blur="requiredOnfocus(scope)"
+ v-model="scope.row.internal"
+ placeholder="璇疯緭鍏ュ唴鎺у��"
+ ></el-input>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- </div> -->
+ </el-dialog>
+
<!-- 鍘熸潗鏂欐楠屾ā鎬佹 -->
<el-dialog
title="鍘熸潗鏂欐楠�"
@@ -390,7 +468,7 @@
type="selection"
label=""
min-width="10%"
- />
+ />
<el-table-column
type="index"
label="搴忓彿"
@@ -490,7 +568,7 @@
/>
<el-table-column
prop="formTime"
- label="鏉ユ枡鏃ユ湡"
+ label="濮旀墭bian'ha"
min-width="10%"
/>
<el-table-column
@@ -528,17 +606,18 @@
<el-button @click="commisionVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="handleCommisionSelection">纭� 瀹�</el-button>
</span>
- </div>
+ </div>
</el-dialog>
</template>
<template v-else>
<router-view />
+
</template>
</div>
</template>
-
+
<script>
- import { selectInspectsList, selectAll, addInspect} from '@/api/experiment/planAssignments'
+ import { selectInspectsList, selectAll, addInspect,getCommisionList} from '@/api/experiment/planAssignments'
export default {
data() {
return {
@@ -546,8 +625,9 @@
searchData: {
applicationnumber: '',
type: '',
- state: ''
+ state: '',
},
+ icode:'',
inspectionTable: [],
rawMaterialTable: [],
commisionTable: [{
@@ -623,13 +703,14 @@
}],
currentPage: 1,
total: 20, // 鎬绘潯鏁�
- pageSize: 5, // 姣忛〉鐨勬暟鎹潯鏁�
+ pageSize: 8, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
type: '', // 榛樿涓嶉�変腑鐨勭姸鎬�
rawmaterialVisible: false,
commisionVisible: false,
- tmp: ''
+ tmp: '',
+ Standardframe: false
}
},
watch: {
@@ -649,9 +730,30 @@
if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
},
methods: {
+ async handleClick(row){
+ // console.log(item);
+ // const res = await ddd({goodId:id})
+ // this.$message({
+ // message: '鎭枩浣狅紝杩欐槸涓�鏉℃垚鍔熸秷鎭�',
+ // type: 'success'
+ // });
+
+ // console.log(res);
+ this.inspectionTable = row;
+ console.log(row.id);
+ this.id = row.id
+ this.$router.push({name:'Viewdetails',query: {id:row.id}});
+ this.selectInspectsList()
+ },
+ //濮旀墭妫�楠�
+ async getCommisionList() {
+ const res = await getCommisionList({pageNo:1,pageSize:10 })
+ this.commisionTable = res.data
+ console.log(this.commisionTable);
+ },
async selectInspectsList() {
// 鑾峰彇鍒嗛〉鍒楄〃
- const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage })
+ const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.id})
// this.inspectionTable = data
// console.log(res.data.row)
const data = res.data.row
@@ -703,17 +805,15 @@
this.total = this.inspectionTable.length
},
reset(){
- this.searchData = {
- applicationnumber: '',
- type: '',
- state: ''
- }
- this.selectInspectsList()
+ this.countSize = 1;
+ this.pageSize = 8;
+ this.searchData = { };
+ this.selectInspectsList();
},
- //琚�変腑鐨勪俊鎭� 鍗曢��
+ //琚�変腑鐨勪俊鎭� 鍗曢��
handleSelectionChange(val) {
if (val.length > 1) {
- this.$refs.multipleTable.clearSelection();
+ this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(val.pop())
}
this.tmp = val[0]
@@ -727,9 +827,9 @@
this.rawmaterialVisible = false
},
async handleRadioChange(){
- console.log(this.type)
if(this.type === 0){
- // 鍘熸潗鏂欐姤妫�
+ 鍘熸潗鏂欐姤妫�
+
this.rawmaterialVisible = true
const res = await selectAll({type: this.type})
var data = res.data
@@ -739,19 +839,21 @@
checkdate.push(item['updateTime'])
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
})
- this.rawMaterialTable = data
+ // this.infoForm = res.data
+ // this.$router.push({ name: 'ReportForInspection' });
}else if(this.type === 1){
this.commisionVisible = true
- const res = await selectAll({type: this.type})
- var data = res.data
- data.forEach((item)=>{
- var checkdate = []
- checkdate.push(item['startTime'])
- checkdate.push(item['endTime'])
- item['checkdate_'] = item['startTime'] + '~' + item['endTime']
- item['checkdate'] = checkdate // 妫�楠屾棩鏈�
- })
+ const res = await getCommisionList({pageNo:1,pageSize:10})
+ // var data = res.data
+ // data.forEach((item)=>{
+ // var checkdate = []
+ // checkdate.push(item['startTime'])
+ // checkdate.push(item['endTime'])
+ // item['checkdate_'] = item['startTime'] + '~' + item['endTime']
+ // item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ // })
this.commisionTable = res.data
+ // this.$router.push({ name: 'CommissionInspection' });
}
},
// 鏂板妫�楠�
@@ -814,11 +916,15 @@
console.log(`褰撳墠椤�: ${val}`)
this.currentPage = val
this.selectInspectsList()
+ },
+ //纭畾璺宠浆
+ QUEding(){
+ this.Standardframe = true
}
}
}
</script>
-
+
<style lang="scss" scoped>
.checkType{
.check-box{
@@ -833,7 +939,7 @@
border-color: #b3d8ff;
::v-deep .el-radio__label{
color: #333 !important;
-
+
}
}
height: auto;
@@ -876,7 +982,7 @@
display: flex;
justify-content: flex-end;
}
-
+
.getDataBtn, .createBtn {
margin-left: 10px; /* Optional: Add some space between the buttons */
}
--
Gitblit v1.9.3