From af75159618b6b090710b9515bc789fa9accdc3bd Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 九月 2023 15:44:35 +0800
Subject: [PATCH] modified: src/api/standardLibrary.js modified: src/views/basicData/index.vue modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/experiment/inspectionApplication/index.vue | 339 +++++++++++++++++++++++++-------------------------------
1 files changed, 153 insertions(+), 186 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 4d98974..6df3ed6 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -39,50 +39,42 @@
</el-form>
</div>
<div class="library-table">
- <div class="table-header">
- <div class="search-bar">
- <el-radio-group v-model="radioValue">
- <el-radio-button label="鍏ㄩ儴" />
- <el-radio-button label="寰呮彁浜�" />
- <el-radio-button label="宸叉彁浜�" />
- <el-radio-button label="宸蹭綔搴�" />
- </el-radio-group>
- </div>
- </div>
<div class="table-box">
- <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600" :cell-style="{textAlign: 'center'}"
- :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
+ <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;max-height: 600px;" :height="600"
+ :cell-style="{textAlign: 'left'}"
+ :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
:data="inspectionTable">
<el-table-column type="selection" min-width="30px" />
- <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="150px" />
- <el-table-column prop="type" label="妫�楠岀被鍨�" min-width="80px">
+ <el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="160px" />
+ <el-table-column prop="type" label="妫�楠岀被鍨�" min-width="100px">
<template slot-scope="scope">
- <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>
+ <div v-if="scope.row.type === 0"><el-tag type="success">鍘熸潗鏂欐楠�</el-tag></div>
+ <div v-if="scope.row.type === 2"><el-tag>濮旀墭妫�楠�</el-tag></div>
+ <div v-if="scope.row.type === 1"><el-tag type="warning">鎴愬搧妫�楠�</el-tag></div>
</template>
</el-table-column>
<el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="90px" />
- <el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" show-overflow-tooltip/>
- <el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="170px"/>
- <el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="80px" />
+ <el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" show-overflow-tooltip />
+ <el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="170px" />
+ <el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="90px" />
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="160px" />
<el-table-column prop="unit" label="鍗曚綅" min-width="50px" />
<el-table-column prop="num" label="鏁伴噺" min-width="50px" />
- <el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="80px" />
- <el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="80px">
+ <el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="90px" />
+ <el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="95px">
<template slot-scope="scope">
- <el-tag class="tag" :type="scope.row.inspection_status === 0 ? 'danger' : 'success'"
- disable-transitions>{{ scope.row.inspection_status === 0 ? '涓嶅悎鏍�' : '鍚堟牸' }}</el-tag>
+ <el-tag class="tag" effect="dark" type="danger" disable-transitions
+ v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
+ <el-tag class="tag" effect="dark" type="success" disable-transitions
+ v-else-if="scope.row.inspection_status == 1">鍚堟牸</el-tag>
</template>
</el-table-column>
<el-table-column prop="userName" label="鐧昏浜�" min-width="80px" />
- <el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="160px" />
- <el-table-column label="鎿嶄綔" min-width="150" fixed="right">
+ <el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="170px" />
+ <el-table-column label="鎿嶄綔" min-width="120" fixed="right">
<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" @click="delInspect(scope.row)">浣滃簾</el-button>
</template>
</el-table-column>
</el-table>
@@ -113,14 +105,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <!-- <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" /> -->
- <el-date-picker style="width: 300px" v-model="infoForm.formTime" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker style="width: 300px" disabled v-model="infoForm.formTime" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" :value="infoForm.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -128,13 +119,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欑紪鐮侊細">
- <el-input style="width: 300px" type="text" :value="infoForm.mcode" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.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="infoForm.name" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.name" placeholder="璇疯緭鍏ュ師鏉愭枡鍚嶇О"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -142,13 +133,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.specifications" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.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="infoForm.unit" placeholder="璇疯緭鍏ュ崟浣�"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.unit" placeholder="璇疯緭鍏ュ崟浣�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -156,7 +147,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.num" placeholder="璇疯緭鍏ユ暟閲�"
+ <el-input style="width: 300px" type="text" disabled :value="infoForm.num" placeholder="璇疯緭鍏ユ暟閲�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -176,13 +167,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="濮旀墭缂栧彿">
- <el-input style="width: 300px" type="text" :value="commisionSelection.entrust_coding"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.entrust_coding"
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"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.supplier"
placeholder="璇疯緭鍏ュ鎵樺崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
@@ -190,13 +181,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏍峰搧缂栧彿">
- <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�"
+ <el-input style="width: 300px" type="text" disabled :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="璇疯緭鍏ユ牱鍝佸悕绉�"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.name" placeholder="璇疯緭鍏ユ牱鍝佸悕绉�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -204,13 +195,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.specifications"
+ <el-input style="width: 300px" type="text" disabled :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.supplier"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.supplier"
placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
@@ -218,7 +209,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瀹屾垚鏈熼檺">
- <el-input style="width: 300px" type="text" :value="commisionSelection.completionDeadline"
+ <el-input style="width: 300px" type="text" disabled :value="commisionSelection.completionDeadline"
placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
@@ -238,27 +229,27 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate"
+ <el-input style="width: 300px" type="text" disabled 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="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
+ <el-input style="width: 300px" type="text" disabled 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="璇疯緭鍏ュ師鏉愭枡缂栫爜"
+ <el-form-item label="鎴愬搧缂栫爜锛�">
+ <el-input style="width: 300px" type="text" disabled 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="璇疯緭鍏ュ師鏉愭枡鍚嶇О"
+ <el-form-item label="鎴愬搧鍚嶇О锛�">
+ <el-input style="width: 300px" type="text" disabled v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -266,13 +257,13 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification"
+ <el-input style="width: 300px" type="text" disabled 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="璇疯緭鍏ュ崟浣�"
+ <el-input style="width: 300px" type="text" disabled v-model="finishedTable.unit" placeholder="璇疯緭鍏ュ崟浣�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -280,7 +271,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
+ <el-input style="width: 300px" type="text" disabled v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
autocomplete="off" />
</el-form-item>
</el-col>
@@ -296,7 +287,6 @@
</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="QUEding">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -307,52 +297,31 @@
<el-card>
<template slot-scope="scope">
<span>鐗堟湰閫夋嫨锛�</span>
- <el-select @change="ccc" v-model="selectedValue" size="small" slot="append" style="width: 220px;">
- <el-option v-for="item in BANben" :key="item" :label="item" :value="item"></el-option>
+ <el-select @change="getProductVerison" v-model="version" size="small" slot="append" style="width: 220px;">
+ <el-option v-for="(item,index) in BANben" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
</template>
</el-card>
- <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
- height="calc(80vh - 250px)" default-expand-all ref="multipleTable"
- @select-all="selectAll" @selection-change="handleSelectionChange"
- :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>
+ <el-table :data="tableData" style="width: 100%; margin-bottom: 20px;overflow-y: auto;" row-key="id" border height="40vh"
+ default-expand-all ref="multipleTable" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ <el-table-column type="index" width="50px" label="搴忓彿"></el-table-column>
+ <el-table-column prop="name" label="椤圭洰鍚嶇О" sortable>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" sortable></el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�" sortable>
+ </el-table-column>
+ <el-table-column prop="internal" label="鍐呮帶鍊�" sortable>
+ </el-table-column>
+ </el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="Standardframe = false">鍙� 娑�</el-button>
<el-button type="primary" @click="GOfrom">纭� 瀹�</el-button>
</span>
</el-dialog>
<!-- 鍘熸潗鏂欐楠屾ā鎬佹 -->
- <el-dialog title="鍘熸潗鏂欐楠�" :visible.sync="rawmaterialVisible" width="60%">
+ <el-dialog title="鍘熸潗鏂欐楠�" :visible.sync="rawmaterialVisible" width="60%" top="100px">
<div class="table-box">
- <el-table ref="multipleTable" :max-height="800" :cell-style="{textAlign: 'center'}"
+ <el-table ref="multipleTable" :max-height="600" :cell-style="{textAlign: 'center'}"
:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
:data="rawMaterialTable" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="10%" />
@@ -368,10 +337,8 @@
<el-table-column prop="surveyor" label="妫�楠屼汉" min-width="8%" />
<el-table-column prop="startTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="type" label="鐘舵��" min-width="8%">
- <template slot-scope="scope">
- <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
- {{ scope.row.state===1 ? '宸叉娴�':'寰呮娴�' }}
- </span>
+ <template>
+ <span style="color: red">寰呮楠�</span>
</template>
</el-table-column>
</el-table>
@@ -434,6 +401,7 @@
addInspect,
chooseVer,
lookProByVer,
+ delInspect
} from '@/api/experiment/planAssignments'
export default {
data() {
@@ -460,7 +428,7 @@
amount: '',
checkdate: []
},
- selectedValue: {},
+ selectedValue: null,
infoForm: {},
commisionSelection: {
entrust_coding: '',
@@ -502,7 +470,7 @@
pageSize: 10, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
- type: 0, // 榛樿涓嶉�変腑鐨勭姸鎬�
+ type: 2, // 榛樿涓嶉�変腑鐨勭姸鎬�
rawmaterialVisible: false,
commisionVisible: false,
tmp: {},
@@ -510,16 +478,14 @@
tableData: [],
tableRow: {},
BANben: [],
- // select_1: [],
- aa: {},
- listdata:[],
- ddd:{}
+ version: null,
+ listdata: [],
+ ddd: {}
}
},
watch: {
$route: {
- handler(val, oldval) {
- },
+ handler(val, oldval) {},
// 娣卞害瑙傚療鐩戝惉
deep: true
}
@@ -531,7 +497,6 @@
if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
},
methods: {
-
async selectAll() {
const res = selectAll({
type: 0
@@ -545,48 +510,44 @@
this.commisionTable = res.data
},
async handleClick(row) {
- this.inspectionTable = row;
- this.id = row.id
- this.$router.push({
- name: 'Viewdetails',
- query: {
- id: row.id
- }
- });
- this.selectInspectsList()
+ // this.$router.push({
+ // name: 'Viewdetails',
+ // query: {
+ // id: row.id
+ // }
+ // });
+ this.$router.push(`Viewdetails/${row.id}`);
},
- // validateInput() {
- // if (this.inputValue.trim() === '') {
- // }
- // }, // 杈撳叆鍊间负绌猴紝寮瑰嚭鎻愮ず淇℃伅鎴栬繘琛屽叾浠栧鐞�
- // alert('杈撳叆鍊间笉鑳戒负绌�');
- // return;
-
//鐗堟湰搴�
async chooseVer() {
const res = await chooseVer({
mcode: this.tmp.mcode,
name: this.tmp.name,
- specifications: this.tmp.specifications
+ specifications: this.tmp.specificationsId
})
- this.BANben = res.data
- this.aa = this.BANben[0]
- this.lookProByVer()
+ this.BANben = []
+ res.data.forEach(a => {
+ this.BANben.push({
+ label: "V" + a,
+ value: a
+ })
+ })
+ this.version = this.BANben[0].value;
+ this.lookProByVerFun()
},
-
//鏍囧噯搴�
- async lookProByVer() {
+ async lookProByVerFun() {
const res = await lookProByVer({
mcode: this.tmp.mcode,
name: this.tmp.name,
- specifications: this.tmp.specifications,
- version: this.aa
+ specifications: this.tmp.specificationsId,
+ version: this.version
})
this.tableData = res.data
},
- ccc(val) {
- this.aa = val
- this.lookProByVer()
+ getProductVerison(val) {
+ this.version = val
+ this.lookProByVerFun()
},
async selectInspectsList() {
// 鑾峰彇鍒嗛〉鍒楄〃
@@ -595,14 +556,13 @@
pageSize: this.currentPage,
message: this.id
})
- // this.inspectionTable = data
const data = res.data.row
data.forEach((item) => {
- var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
- var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"]
- var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
+ var formTime = item["form_time"]
+ var startTime = item["start_time"]
+ var endTime = item["end_time"]
var checkdate = startTime + '~' + endTime
- var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%d')"]
+ var createTime = item["create_time"]
item['formTime'] = formTime // 鏉ユ枡鏃ユ湡
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
item['createTime'] = createTime // 鐧昏鏃ユ湡
@@ -618,11 +578,11 @@
})
var data = res.data.row
data.forEach((item) => {
- var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
- var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"]
- var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
+ var formTime = item["form_time"]
+ var startTime = item["start_time"]
+ var endTime = item["end_time"]
var checkdate = startTime + '~' + endTime
- var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%m-%d')"]
+ var createTime = item["create_time"]
item['formTime'] = formTime // 鏉ユ枡鏃ユ湡
item['checkdate'] = checkdate // 妫�楠屾棩鏈�
item['createTime'] = createTime // 鐧昏鏃ユ湡
@@ -649,8 +609,12 @@
},
reset() {
this.countSize = 1;
- this.pageSize = 8;
- this.searchData = {};
+ this.pageSize = 10;
+ this.searchData = {
+ applicationnumber: '',
+ type: '',
+ state: '',
+ };
this.selectInspectsList();
},
//琚�変腑鐨勪俊鎭� 鍗曢��
@@ -678,29 +642,29 @@
selectAll({
type: 0
}).then(res => {
- var data = res.data
- data.forEach((item)=>{
- var checkdate = []
- checkdate.push(item['createTime'])
- checkdate.push(item['updateTime'])
- item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ var data = res.data
+ data.forEach((item) => {
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
})
- this.rawMaterialTable = res.data
+ let arr = res.data.filter((val)=>{
+ return val.type === 0;
+ })
+ this.rawMaterialTable = arr
})
-
- // this.infoForm = res.data
- // this.$router.push({ name: 'ReportForInspection' });
} else if (this.type === 1) {
this.commisionVisible = true
selectAll({
type: 2
}).then(res => {
var data = res.data
- data.forEach((item)=>{
- var checkdate = []
- checkdate.push(item['createTime'])
- checkdate.push(item['updateTime'])
- item['checkdate'] = checkdate // 妫�楠屾棩鏈�
+ data.forEach((item) => {
+ var checkdate = []
+ checkdate.push(item['createTime'])
+ checkdate.push(item['updateTime'])
+ item['checkdate'] = checkdate // 妫�楠屾棩鏈�
})
this.commisionTable = res.data
})
@@ -708,22 +672,29 @@
}, 100)
},
// 鏂板妫�楠�
- async addInspection() {
+ async addInspection() {
if (this.type === 0) {
- addInspect({
+ addInspect({
endTime: this.infoForm.checkdate[1],
formTime: this.infoForm.formTime,
mcode: this.infoForm.mcode,
name: this.infoForm.name,
num: this.infoForm.num,
specifications: this.infoForm.specifications,
+ specificationId: this.infoForm.specificationsId,
startTime: this.infoForm.checkdate[0],
supplier: this.infoForm.supplier,
type: this.type,
unit: this.infoForm.unit,
- version:this.BANben[1]
- }).then(res=>{
-
+ version: this.version
+ }).then(res => {
+ this.$message({
+ message: '娣诲姞鎴愬姛锛�',
+ type: 'success'
+ });
+ this.$router.push(`Viewdetails/${res.data}`)
+ }).catch(error=>{
+ this.$message.error(error.message);
})
}
if (this.type === 1) {
@@ -738,8 +709,7 @@
supplier: this.commisionSelection.supplier,
type: this.type,
unit: this.commisionSelection.unit,
- version:this.aa
-
+ version: this.version
})
}
if (this.type === 2) {
@@ -754,8 +724,7 @@
supplier: this.finishedTable.supplier,
type: this.type,
unit: this.finishedTable.unit,
- version:this.aa
-
+ version: this.version
})
}
this.type = 0
@@ -782,7 +751,7 @@
// console.log(this.infoForm);
// if (infoForm.checkdate == undefined) {
- // alert('璇疯緭鍏ユ楠屾椂闂�');
+ // alert('璇疯緭鍏ユ楠屾椂闂�');
// return false;
// }
// // 鏍￠獙閫氳繃
@@ -790,10 +759,10 @@
// },
//纭畾璺宠浆
QUEding() {
- if (this.infoForm.checkdate[0] == undefined||this.infoForm.checkdate[1] == undefined) {
+ if (this.infoForm.checkdate[0] == undefined || this.infoForm.checkdate[1] == undefined) {
this.$message({
- message: '璇烽�夋嫨妫�楠屾椂闂�',
- type: 'warning'
+ message: '璇烽�夋嫨妫�楠屾椂闂�',
+ type: 'warning'
});
return;
}
@@ -808,13 +777,21 @@
},
//纰哄畾瑭虫儏闋�
async GOfrom() {
- // this.addInspect()
- this.addInspection()
- // this.kk = res.data
- console.log(this.kk)
- // this.$router.push({name: 'Viewdetails',query: {id: res.data}})
- // console.log(res);
-
+ this.addInspection()
+ },
+ delInspect(row){
+ this.$confirm('鎮ㄧ‘璁ゅ垹闄よ繖鏉℃暟鎹悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ delInspect({
+ id: row.id
+ }).then(()=>{
+ this.$message.success('宸蹭綔搴�')
+ this.selectInspectsList()
+ })
+ }).catch(() => {});
}
}
}
@@ -870,7 +847,7 @@
background: #fff;
display: flex;
justify-content: space-between;
- padding: 5px 24px 0px 24px;
+ padding: 20px 24px 0px 24px;
}
.input-form {
@@ -903,16 +880,6 @@
margin-top: 50px;
display: flex;
flex-direction: column;
-
- .table-header {
- padding: 20px;
- display: flex;
- justify-content: space-between;
-
- .el-form-item {
- margin-bottom: 30px !important;
- }
- }
.table-box {
padding: 0px 20px;
--
Gitblit v1.9.3