From ef4e46f182aee6253805e66286dee847c573cbde Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 22 五月 2024 17:18:34 +0800
Subject: [PATCH] 完成原材料、产品检验、过程检，包装检键盘切换输入框
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 1307 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 1,072 insertions(+), 235 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 46ad3e2..a9ed951 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -3,22 +3,15 @@
<div class="page-header">
<div class="header-left">
<a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
- <h2>缂栬緫-鍘熸潗鏂欐楠�</h2>
+ <h2 v-if="(resultVal!=null && resultVal!='') && dataForm.id!=null">鏌ョ湅-鍘熸潗鏂欐楠�</h2>
+ <h2 v-else>缂栬緫-鍘熸潗鏂欐楠�</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="save()">淇濆瓨</el-button>
+ <el-button @click="save()" type="primary" v-if="dataForm.id==null">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
<div class="rawMaterial-basic">
- <el-row style="width:100%;height:20px;margin-bottom:20px;" v-show="dataForm.id==null">
- <el-col :span="20">
- <span style="color:red;font-size:18px;padding: 0;margin: 0;">璇锋壂鎻忎簩缁寸爜鑾峰彇鏁版嵁</span>
- </el-col>
- <el-col :span="4" style="text-align: right;">
- <el-button>鎵弿浜岀淮鐮�</el-button>
- </el-col>
- </el-row>
<el-form
:model="dataForm"
:rules="dataRule"
@@ -27,35 +20,55 @@
class="l-mes"
label-width="110px">
<el-row>
- <el-col :span="6">
- <el-form-item prop="formTime" label="鏉ユ枡鏃ユ湡">
- <el-date-picker
- v-model="dataForm.formTime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- disabled>
-
- </el-date-picker>
+ <el-col :span="6">
+ <el-form-item label="鍘熸潗鏂欐楠岀紪鍙�" prop="rawInsNo">
+ <el-input v-model="dataForm.rawInsNo" disabled>
+ </el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item prop="name" label="鍘熸潗鏂欏悕绉�">
- <el-input v-model="dataForm.name" disabled >
+ <el-col :span="6">
+ <el-form-item label="闆朵欢鍙�" prop="code">
+ <el-input v-model="dataForm.code" :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''">
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''"
+ @click="queryCode"></el-button>
+ <el-button
+ slot="append"
+ icon="el-icon-full-screen"
+ :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''"
+ @click="Turnonthecamera"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍘熸潗鏂欑紪鐮�" prop="code">
- <el-input v-model="dataForm.code" disabled></el-input>
+ <el-form-item prop="name" label="鍘熸潗鏂欏悕绉�">
+ <el-tooltip class="item" effect="dark" :content="dataForm.name">
+ <el-input v-model="dataForm.name" disabled ></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="瑙勬牸鍨嬪彿" prop="specs">
- <el-input v-model="dataForm.specs" disabled></el-input>
+ <el-form-item prop="formTime" label="鏉ユ枡鏃ユ湡">
+ <el-date-picker
+ style="width:100%"
+ v-model="dataForm.formTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ disabled>
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
+ <el-col :span="6">
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="specs">
+ <el-tooltip class="item" effect="dark" :content="dataForm.specs">
+ <el-input v-model="dataForm.specs" disabled></el-input>
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item prop="unit" label="鍗曚綅">
<el-input
@@ -66,111 +79,423 @@
</el-col>
<el-col :span="6">
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplier">
+ <el-tooltip class="item" effect="dark" :content="dataForm.supplier" >
<el-input v-model="dataForm.supplier" disabled />
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鏁伴噺" prop="number">
- <el-input v-model="dataForm.number" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎶ユ鏃ユ湡" prop="createTime" v-if="dataForm.id!=null">
- <el-input v-model="dataForm.createTime" />
+ <el-input v-model="dataForm.number" :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''" />
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="6">
- <el-form-item label="鎶ユ浜�" prop="createUser" v-if="dataForm.id!=null">
- <el-input v-model="dataForm.createUser" />
- </el-form-item>
+ <el-col :span="6">
+ <el-form-item label="鎶ユ鏃ユ湡" prop="startTime">
+ <el-date-picker
+ disabled
+ v-model="dataForm.startTime"
+ type="datetime"
+ format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="鎶ユ鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6" v-if="dataForm.id!=null">
+ <el-form-item label="鎶ユ浜�" prop="createUser" >
+ <el-input v-model="dataForm.createUser" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6" v-if="dataForm.id!=null">
+ <el-form-item prop="projectName" label="椤圭洰鍚嶇О" >
+ <el-tooltip :disabled="dataForm.projectName==null" :content="dataForm.projectName">
+ <el-input v-model="dataForm.projectName" disabled ></el-input>
+ </el-tooltip>
+ </el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''" v-model="dataForm.remark" />
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</div>
- <div class="rawMaterial-detail">
- <el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :span="19">妫�楠岄」鐩�</el-col>
- <el-col :span="5">
- <div style="width:100%;text-align: right;">
- <el-button v-show="dataForm.id==null" size="small" @click="clickAddLine">娣诲姞妫�楠岃</el-button>
- <el-button size="small" @click="addTeatValueColumn()">娣诲姞妫�楠屽�煎垪</el-button>
- <el-button size="small" @click="delTeatValueColumn()">鍒犻櫎妫�楠屽�煎垪</el-button>
+ <div>
+ <el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
+ <el-tab-pane label="妫�楠岄」鐩�">
+ <el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
+ <el-col :span="12"></el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button v-if="dataForm.id&&resultVal==null" size="small"
+ type="primary"
+ @click="saveTable()">淇濆瓨</el-button>
+ <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
+ <el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
+ <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
+ </el-col>
+ </el-row>
+ <el-row style="width:100%;">
+ <el-col :span="24">
+ <el-table
+ :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ :cell-style="{textAlign:'center'}"
+ ref="table"
+ :data="list"
+ border
+ style="width: 100%;"
+ height="400"
+ row-key="iid"
+ default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+ <el-table-column type="index" prop="parentIndex" label="搴忓彿" width="60">
+ <template scope="scope">
+ <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="father" label="妫�楠岄」鐩�" width="160">
+ <template slot-scope="scope">
+ <el-input v-if="scope.row.children" style="width:80%" :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"
+ :ref="'inspectProject'+scope.$index"
+ :id="'inspectProject'+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, 'inspectProject')"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" label="椤圭洰" width="160">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input class="inline-input" :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.name"
+ placeholder="璇疯緭鍏ラ」鐩悕绉�"
+ :ref="'project'+scope.$index"
+ :id="'project'+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, 'project')"></el-input>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" width="160">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"
+ :ref="'unit'+scope.$index"
+ :id="'unit'+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, 'unit')"></el-input>
+ </div>
+ </template>
+
+ </el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="160">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.required"
+ placeholder="璇疯緭鍏ユ爣鍑嗗��"
+ :ref="'standard'+scope.$index"
+ :id="'standard'+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, 'standard')"></el-input>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="testValue" label="妫�娴嬪��" min-width="160" v-for="(item,index) in empiricalValueAdd" :key="index">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <!-- :disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" -->
+ <!-- @input="$nextTick(()=>{checkTestValues(scope.row)})" -->
+ <!-- @blur.capture.native="changeState(scope.row)" -->
+ <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-autocomplete clearable
+ cache="false"
+ ref="testValueInput"
+ @blur="checkTestValues(scope.row,'blur',$event)"
+ @select="checkTestValues(scope.row,'select',$event)"
+ :disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null && resultVal!=''))"
+ v-model="scope.row.testValueList[index]"
+ :fetch-suggestions="querySearch"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
+ :id="`detectionValue${index}`+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, `detectionValue${index}`)">
+ <template slot-scope="{ item }">
+ <div>{{ item.value }}</div>
+ </template>
+ </el-autocomplete>
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-select ref="" :disabled="dataForm!=null && (resultVal!=null && resultVal!='')" style="width:60%"
+ v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
+ <el-option v-for="(item,index) in deviceList"
+ :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
+ </el-select>
+ <el-button
+ size="small"
+ slot="append"
+ icon="el-icon-full-screen"
+ :disabled="dataForm!=null && (resultVal!=null && resultVal!='')"
+ @click="codeDevice(scope.row,scope.$index)"></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="note" label="妫�楠屾弿杩�" width="160" >
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input @blur="checkTestValues(scope.row,'blur',$event)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null && resultVal!=''))" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"
+ :ref="`remark`+scope.$index"
+ :id="`remark`+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, `remark`)"></el-input>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="缁撹" min-width="150">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <span v-if="scope.row.testState == 0" style="color:#F56C6C">涓嶅悎鏍�</span>
+ <span v-else-if="scope.row.testState == 1" style="color:#67C23A">鍚堟牸</span>
+ <span v-else>鏆傛棤缁撹</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="鎿嶄綔" width="150">
+ <template slot-scope="scope">
+ <div v-if="scope.row.fId!=null">
+ <el-button type="text" @click="addChildren(scope.row)">娣诲姞椤圭洰</el-button>
+ <el-button type="text" @click="delChildren(scope.row,scope.$index,true)">鍒犻櫎琛�</el-button>
+ </div>
+ <el-button v-else type="text" @click="delChildren(scope.row,scope.$index,false)">鍙栨秷</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="闄勪欢涓婁紶" type="card">
+ <div style="display: flex;justify-content:flex-end;">
+ <div></div>
+ </div>
+ <div
+ v-loading="progrecessFileLoading"
+ element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
+ >
+ <el-upload
+ :disabled="dataForm.rawInsNo==null || (resultVal!=null && resultVal!='')"
+ drag
+ ref="upload"
+ action="/mes/attachment/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-col>
- </el-row>
- <el-row style="width:100%;margin-top:-30px">
- <el-col :span="24">
- <avue-crud
- ref="crud"
- :option="tableOption"
- @current-row-change="changeEquipment"
- :data="list"
- v-model="form">
- <template slot="testValue" slot-scope="scope">
- <el-tooltip :disabled="scope.row.equipmentId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�"
- placement="top-start">
- <el-input :disabled="scope.row.equipmentId == null" v-model="scope.row.testValue"
- @blur="updateTestValue(scope.row)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- </el-tooltip>
- </template>
- <template slot="deviceName" slot-scope="scope">
- <el-select v-model="scope.row.equipmentId" filterable>
- <el-option v-for="(item,index) in deviceList"
- :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
- </el-select>
- </template>
- <template slot="testState" slot-scope="scope">
- <span v-if="scope.row.testState == 0" style="color:#F56C6C">涓嶅悎鏍�</span>
- <span v-else-if="scope.row.testState == 1" style="color:#67C23A">鍚堟牸</span>
- <span v-else>鏆傛棤缁撹</span>
- </template>
- </avue-crud>
- </el-col>
- </el-row>
+ </el-upload>
+ </div>
+ <el-table :data="processConfigFileTableData" height="260px">
+ <el-table-column
+ prop="rawInsNo"
+ align="center"
+ width="120"
+ label="鍘熸潗鏂欐楠岀紪鍙�"
+ show-overflow-tooltip
+ ></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-button
+ @click="delProcessConfigFile(scope.row)"
+ type="text"
+ size="small"
+ :disabled="(resultVal!=null && resultVal!='')"
+ >鍒犻櫎</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>
</div>
- <div class="rawMaterial-detail">
+ <div class="rawMaterial-result">
<el-row>
<el-col :span="24">妫�楠岀粨璁�</el-col>
</el-row>
<el-row style="width:100%">
<el-col :span="24">
- <avue-crud
- ref="conclusion"
- :option="option"
- :data="conclusionTable"
- v-model="conclusion">
- <template #menu>
- <el-button type="text" size="small">涓婃姤</el-button>
- </template>
- </avue-crud>
+ <el-table border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion"
+ :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ :cell-style="{textAlign:'center'}">
+ <el-table-column prop="code" width="150" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="name" width="150" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
+ <el-table-column prop="judgeState" label="妫�楠岀粨璁�">
+ <template slot-scope="scope">
+ <el-tag type="success" v-if="scope.row.testState == 1">鍚堟牸</el-tag>
+ <el-tag type="danger" v-else-if="scope.row.testState == 0">涓嶅悎鏍�</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <template>
+ <el-button type="text" :disabled="(resultVal!=null && resultVal!='') && dataForm.id!=null" @click="showDialog()" size="small">涓婃姤</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</el-col>
</el-row>
</div>
-
</div>
+ <rawMaterialPartDialog :paramObj="paramObj" :currshowlist.sync="showPart" @listenToPartEvent="selectPart" />
+ <el-dialog
+ title="涓婃姤"
+ :visible.sync="dialogVisible"
+ width="30%" class="l-mes">
+ <el-row>
+ <el-col>
+ <span>涓嶅悎鏍兼暟閲�:</span>
+ <el-input type="number" v-model="unqualifiedNum" placeholder="璇疯緭鍏ヤ笉鍚堟牸鏁伴噺"/>
+ </el-col>
+ </el-row>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitSave()">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="鎵弿"
+ :visible.sync="qrcode"
+ width="60%">
+ <div style="height: 100vh;width: 100%;">
+ <qr-code-app ref="codeCompont" @ok="getResultInfo" @cancelCodeDialog="cancelCodeDialog"></qr-code-app>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="qrcode = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="qrcode = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="璁惧鎵弿"
+ :visible.sync="deviceCode"
+ width="60%">
+ <div style="height: 100vh;width: 100%;">
+ <qr-code-app ref="codeDeviceCompont" @ok="getDeviceResultInfo" @cancelCodeDialog="cancelDeviceCodeDialog"></qr-code-app>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="deviceCode = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="deviceCode = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
<script>
-import { object,conclusion } from '@/const/crud/quality/rawMaterial'
-import { selectDevice,addRawInspects,getObj,updateRawInsProduct } from '@/api/quality/rawMaterial'
-export default {
+import {
+ selectDevice,
+ addRawInspects,
+ getObj,
+ updateRawInsProduct,
+ updateRawInspectsById,
+ updateRawInsProduct2,
+ updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
+ import {
+ getProcessConfigFiles,
+ deleteProcessConfigFile,
+ downloadProcessConfigFile
+ } from '@/api/quality/attachment'
+ import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
+ import { getStore } from '@/util/store'
+ import qrCodeApp from '@/views/common/qrCodeApp'
+ export default {
+ components:{
+ rawMaterialPartDialog,
+ qrCodeApp,
+ },
+ computed:{},
data(){
return{
- columnIndex: 2,
+ progrecessFileLoading: false,
+ processConfigFileTableData: [],
+ fileList: [],
+ headers: {
+ Authorization: 'Bearer ' + getStore({ name: 'access_token' })
+ },
+ paramData: {
+ no: '',
+ lineNumber: '',
+ type: 0
+ },
+ row: null,
+ proIndex: 0,
+ deviceCode: false,
+ qrcode: false,
+ userdata:[],
+ currentRow:[],
+ userlist:[],
+ unqualifiedNum: null,
+ dialogVisible:false,
+ resultVal: null,
+ projectList: [],
+ paramObj: {},
+ IFSData: [],
+ showPart: false,
+ // 娣诲姞鍒�
+ empiricalValueAdd: 1,
+ // 缂栬緫鏃跺瓨鍌ㄦ渶闀跨殑鍒楁暟瀛楋紝鍋氬垹闄ゅ垽鏂�
+ empiricalValueAddMaxNumber: 0,
columnList: [],
dataForm:{
id: null,
- formTime: '2023-10-28 00:00:00',
- name: 'name',
- code: 'code4',
- specs: 'specs',
- unit: 'mm',
- number: '111',
- supplier: 'supplier',
- rawInsProducts: null,
+ judgeState: null,
+ formTime: '',
+ message: '',
+ name: '',
+ code: '',
+ specs: '',
+ unit: '',
+ number: '',
+ supplier: '',
+ remark:'',
+ rawInsProducts: [{
+ deviceId: 0,
+ father:'',
+ name: '',
+ required: '',
+ testValue: '',
+ unit: '',
+ testValueList: []
+ }]
},
form: null,
list:[],
@@ -181,199 +506,699 @@
userName: '',
testState: ''
}],
- tableOption: object,
- option: conclusion,
- dataRule: {},
+ dataRule: {
+ code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }],
+ // startTime: [{ required: true, message: '璇烽�夋嫨鎶ユ鏃ユ湡', trigger: 'blur' }]
+ },
deviceList: [],
+ keyfield:['inspectProject','project','unit','standard','remark'],
+ keyfield0:['detectionValue0']
}
},
- mounted(){
+ beforeUpdate(){
+ this.$nextTick(()=>{
+ this.$refs.table.doLayout();
+ })
+ },
+ created(){
this.dataForm.id = this.$route.query.id
- this.init()
- let isShow = this.dataForm.id == null ? true : false
- this.tableOption.menu = isShow
- let len = this.tableOption.column.length
- this.tableOption.column[len-1].hide = isShow
+ this.resultVal = this.$route.params.resultVal
+ if(this.resultVal == null){
+ let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
+ val == undefined ? null : this.resultVal=val
+ }
+ this.init(this.dataForm.id)
this.getDeviceList()
},
watch:{
- 'columnList.length':function(newVal){
- const column = [{
- label: '椤圭洰',
- width: 260,
- prop: 'name',
- span: 24,
- type: 'text',
- cell: true,
- }, {
- width: 260,
- label: '鍗曚綅',
- prop: 'unit',
- span: 24,
- type: 'text',
- cell: true,
- }, {
- width: 260,
- label: '鏍囧噯鍊�',
- prop: 'required',
- type: 'text',
- span: 24,
- cell: true,
- }, {
- label: '妫�娴嬪��',
- prop: 'testValue',
- type: 'text',
- width: 260,
- slot: true,
- formSlot: true,
- cell: true,
- }, {
- label: '璇曢獙璁惧',
- prop: 'deviceName',
- type: 'select',
- cell: true,
- slot: true,
- formSlot: true,
- width: 260
- },{
- label: '缁撹',
- prop: 'testState',
- type: 'text',
- slot: true,
- formSlot: true,
- hide: true,
- fixed: 'right'
- }]
- if(newVal > 0){
- if(this.columnList.length > 0){
- this.tableOption.column = column
- this.columnList.forEach(item=>{
- this.tableOption.column.splice(4,0,item)
- })
- }
- }else{
- this.tableOption.column = column
+ dialogVisible(newVal){
+ if(newVal){
+ this.unqualifiedNum = null
}
},
+ empiricalValueAdd(newVal){
+ if(newVal!=this.keyfield0.length){
+ if(newVal>this.keyfield0.length){
+ this.keyfield0 = []
+ for(let i=0;i<newVal;i++){
+ this.keyfield0.push('detectionValue'+i)
+ }
+ }else{
+ this.keyfield0.splice(this.keyfield0.length-1,1);
+ }
+ }
+ }
},
methods:{
- changeEquipment(current,old){
- console.log(current,old)
+ querySearch(queryString, cb){
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb([{value:'鏄�'},{value:'鍚�'}]);
+ },
+ tabsClick(tab,even){
+ if(tab.index == 1){
+ if(this.dataForm.rawInsNo==null){
+ this.$message.error("璇峰厛淇濆瓨鍘熸潗鏂欐楠屼俊鎭�")
+ return
+ }
+ this.getConfigFiles();
+ }
+ },
+ getConfigFiles() {
+ const param = {
+ no: this.dataForm.rawInsNo,
+ lineNumber: this.dataForm.id,
+ type: 0
+ }
+ getProcessConfigFiles(param).then((res) => {
+ this.processConfigFileTableData = res.data.data
+ })
+ },
+ downloadProcessConfigFile(row) {
+ downloadProcessConfigFile({
+ bucket: row.bucketName,
+ fileName: row.fileName,
+ originalFileName: row.originalFileName
+ })
+ },
+ delProcessConfigFile(row) {
+ this.$confirm('鏄惁鍒犻櫎璇ラ檮浠�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ closeOnClickModal: false
+ }).then(function() {
+ return deleteProcessConfigFile(row.id)
+ }).then((data) => {
+ this.getConfigFiles()
+ })
+ },
+ submitUpload() {
+ this.paramData.no = this.dataForm.rawInsNo
+ this.paramData.lineNumber = this.dataForm.id
+ this.progrecessFileLoading = true
+ },
+ uploadSuccess() {
+ this.progrecessFileLoading = false
+ this.getConfigFiles()
+ },
+ cancelDeviceCodeDialog(){
+ this.deviceCode = false
+ },
+ getDeviceResultInfo(val){
+ let id=val.split("id@")[1]
+ if(id!=undefined&&id!=''&&id!=null){
+ let filterData=this.deviceList.filter(item=>{
+ return item.id==id
+ })[0]
+ console.log(filterData);
+ this.row.deviceId=Number(id)
+ this.updateDevice(this.row,this.proIndex)
+ }else{
+ this.$message({
+ message: '浜岀淮鐮佹湭璇嗗埆鍑鸿閲忓櫒鍏蜂俊鎭紒',
+ type: 'warning'
+ });
+ }
+ },
+ codeDevice(row,index){
+ this.row=row
+ console.log("row",row);
+ this.deviceCode =true
+ this.$refs.codeDeviceCompont.openCamera()
+ this.proIndex=index
+ },
+ getResultInfo(data){
+ if(!data.includes("part_no")){
+ this.$message({
+ message: '浜岀淮鐮佹湭璇嗗埆鍑洪浂浠朵俊鎭紒',
+ type: 'warning'
+ });
+ }
+ let obj=JSON.parse(data)
+ let info={"code":obj["part_no"]}
+ if(info.code!=undefined&&info.code!=''){
+ this.paramObj = info
+ this.showPart = true
+ }else{
+ this.$message({
+ message: '浜岀淮鐮佹湭璇嗗埆鍑洪浂浠朵俊鎭紒',
+ type: 'warning'
+ });
+ }
+ },
+ cancelCodeDialog(){
+ this.qrcode = false
+ },
+ // 鎵撳紑鐩告満
+ Turnonthecamera() {
+ this.qrcode = true
+ this.$refs.codeCompont.openCamera()
+ },
+ // 纭鍥炶皟
+ selectPart(param, nodePart, index) {
+ if (typeof param !== 'undefined') {
+ this.dataForm.rawInsNo = param.rawInsNo
+ this.dataForm.code = param.code
+ this.dataForm.name = param.name
+ this.dataForm.formTime = param.formTime
+ this.dataForm.startTime = param.formTime
+ this.dataForm.unit = param.unit
+ this.dataForm.specs = param.specs
+ this.dataForm.supplier = param.supplier
+ this.dataForm.number = param.number
+ this.dataForm.message = param.message
+ this.dataForm.projectName = param.projectName
+ this.projectList = param.rawInsProducts == null ? [] : param.rawInsProducts
+ param.rawInsProducts.forEach((o,index)=>{
+ this.clickAddLine(o,index)
+ })
+ }
+
+ },
+ queryCode(){
+ this.paramObj = {
+ code: this.dataForm.code
+ }
+ this.showPart = true
+ },
+ updateDevice(row, index) {
+ updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
+ row.testValue = null
+ row.testState = null
+ row.testValueList = []
+ row.note = null
+ }).catch(error => {
+ console.log(error)
+ })
+ },
+ checkTestState(){
+ let resultVal = '1'
+ this.list.forEach(item=>{
+ if(item.children){
+ item.children.forEach(ele=>{
+ if(ele.testState == 0){
+ resultVal = '0'
+ }
+ })
+ }
+ })
+ this.resultVal = resultVal
+ this.conclusionTable[0].testState = resultVal
+ sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,resultVal)
+ },
+ showDialog(){
+ let size = 0 //涓嶅悎鏍奸」鐩暟閲�
+ this.list.forEach(item=>{
+ if(item.children){
+ let num = item.children.filter(e=>{
+ return e.testState == 0
+ }).length
+ size+=num
+ }
+ })
+ if (size > 0) {
+ this.dialogVisible = true
+ }else{
+ this.submitSave()
+ }
+ },
+ //涓婃姤
+ submitSave(){
+ let data = {
+ id: this.dataForm.id,
+ number: this.unqualifiedNum,
+ result: this.conclusionTable[0].testState
+ }
+ updateRawInspectsById(data).then(res => {
+ if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
+ sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
+ this.$message.success("涓婃姤鎴愬姛");
+ }else{
+ this.$message.error("涓婃姤澶辫触锛�",res.data.data);
+ }
+ this.dialogVisible = false
+ this.checkTestState()
+ });
},
addTeatValueColumn(){
- let propName = 'testValue' + this.columnIndex
- this.columnList.push({
- label: '妫�娴嬪��',
- prop: propName,
- type: 'text',
- width: 260,
- $cellEdit: true,
- disabled: this.list[0].equiomentId == null
+ this.$nextTick(()=>{
+ this.empiricalValueAdd = this.empiricalValueAdd + 1;
})
- this.columnIndex+=1
+ },
+ // 娣诲姞琛�
+ clickAddLine(row,index) {
+ let ele = {
+ fId: Math.random(),
+ father: null,
+ iid: Math.random(),
+ children:[]
+ }
+ if(row){
+ ele.isIndex = true;
+ ele.parentIndex = index + 1;
+ ele.father = row.father?row.father:null
+ row.children.forEach(item => {
+ ele.children.push({
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: item.required?item.required:null,
+ rpId: null,
+ name: item.name?item.name:null,
+ unit: item.unit?item.unit:null,
+ userName: null,
+ testValue: null,
+ testValueList: [],
+ note: null,
+ testState: null
+ })
+ let arr = []
+ item.empiricalValueAddss = arr
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
+ })
+ this.list.push(ele)
+ }else{
+ ele.isIndex = true;
+ ele.parentIndex = this.list.length + 1;
+ ele.children.push({
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: null,
+ rpId: null,
+ name: null,
+ unit: '',
+ userName: null,
+ testValue: '',
+ testValueList: [],
+ note: null,
+ testState: ''
+ })
+ this.list.push(ele)
+ }
+
+ },
+ changeRowResult(){
+ if(this.list){
+ this.list.forEach(e=>{
+ if(e.children){
+ e.children.map(i=>{
+ if(i.testValueList.length>1){
+ i.testValueList = i.testValueList.splice(i.testValueList.length-1,1)
+ return i
+ // let arr = i.testValue.split(",")
+ // arr.splice((arr.length-1),1)
+ // let obj = {
+ // deviceId: i.deviceId,
+ // rpId: i.rpId,
+ // testValue: arr.join(","),
+ // note: i.note
+ // }
+ // updateRawInsProduct(obj).then(res=>{
+ // if(res.data.code === 0){
+ // this.init(this.dataForm.id)
+ // }
+ // })
+ }
+ })
+ }
+ })
+ this.saveTable()
+ }
},
delTeatValueColumn(){
- this.columnList.pop()
- },
- updateTestValue(row){
- if(row.rpId == null){
- return
- }
- let obj = {
- equiomentId: row.equipmentId,
- rpId: row.rpId,
- testValue: row.testValue
- }
- updateRawInsProduct(obj).then(res=>{
- if(res.data.code === 0){
- this.$message.success("鏇存柊鎴愬姛")
- this.init()
- }else{
- this.$message.success("鏇存柊澶辫触")
+ if (this.empiricalValueAdd - 1 > 0) {
+ if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
+ this.empiricalValueAdd = this.empiricalValueAdd - 1;
+ // this.changeRowResult()
+ this.list.forEach(i => {
+ if(i.children){
+ i.children.forEach(ele=>{
+ ele.testValueList.splice(this.empiricalValueAdd, 1);
+ })
+ }
+ });
+ this.saveTable()
}
- }).catch(error=>{
- this.$message.error(error)
- })
+ }
},
- init(){
- if(this.dataForm.id){
- getObj(this.dataForm.id).then(res=>{
+ init(id){
+ if(id){
+ getObj(id).then(res=>{
let data = res.data.data
+ this.dataForm.rawInsNo = data.rawInsNo
this.dataForm.name = data.name
this.dataForm.formTime = data.formTime
+ this.dataForm.startTime = data.startTime
+ this.dataForm.remark = data.remark
this.dataForm.code = data.code
this.dataForm.specs = data.specs
this.dataForm.unit = data.runit
this.dataForm.supplier = data.supplier
this.dataForm.number = data.number
+ this.dataForm.projectName = data.projectName
this.dataForm.createTime = data.creatTime
this.dataForm.createUser = data.createUser
let userNameList = []
this.list = []
- data.children.forEach(item=>{
- userNameList.push(item.userName)
- this.list.push({
- equipmentId: item.equiomentId,
- name: item.rpName,
- required: item.required,
- testValue: item.testValue,
- unit: item.rpUnit,
- testState: item.testState,
- rpId: item.rpId
- })
+ data.children.forEach((item,index) => {
+ if (item.children) {
+ let ele = {
+ iid: null,
+ father: null,
+ children: []
+ }
+ ele.isIndex = true;
+ ele.parentIndex = index + 1;
+ ele.iid = Math.random()
+ ele.father = item.rpFather
+ if (item.children != undefined) {
+ item.children.forEach((obj) => {
+ let arr= []
+ if(obj.userName){
+ userNameList.push(obj.userName)
+ }
+ if(obj.testValue){
+ arr = obj.testValue.split(",")
+ }
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
+ let o = {
+ deviceId: obj.deviceId,
+ deviceName: obj.deviceName,
+ iid: Math.random(),
+ required: obj.required,
+ rpId: obj.rpId,
+ name: obj.rpName,
+ unit: obj.rpUnit,
+ userName: obj.userName,
+ testValue: obj.testValue?obj.testValue:'',
+ testValueList: arr,
+ note: obj.note?obj.note:'',
+ testState: obj.testState
+ }
+ ele.children.push(o)
+ })
+ this.list.push(ele)
+ }}
})
+ let rVal = ''
+ let passNum = 0
+ let unPassNum = 0
+ this.list.forEach(item=>{
+ if(item.children){
+ item.children.forEach(ele=>{
+ if(ele.testState == 0){
+ unPassNum += 1
+ }
+ if(ele.testState == 1){
+ passNum+=1
+ }
+ })
+ }
+ })
+ rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
this.conclusionTable = [{
code: data.code,
name: data.name,
userName: Array.from(new Set(userNameList)).join(','),
- testState: ''
+ testState: this.resultVal==null?rVal:this.resultVal
}]
}).catch(error=>{
this.$message.error("鑾峰彇澶辫触",error)
})
}else{
this.conclusionTable = []
- this.tableOption.column = object.column
}
},
- save(){
- let data = this.dataForm
- data.rawInsProducts = this.list
- console.log(this.list)
- return
- addRawInspects(data).then(res=>{
- this.$message.success("淇濆瓨鎴愬姛")
- }).catch(error=>{
- this.$message.error(error)
+ selectBlur(e){
+ console.log(e,e.target.tabIndex);
+ console.log(e.target.value);
+ },
+ checkTestValues(row,currentOption,event){
+ if(row){
+ let isTrue = true
+ if(currentOption==='blur'){
+ let targetVal = event.target.value
+ if( (targetVal && ['鏄�','鍚�'].includes(targetVal)) || !targetVal){
+ isTrue = false
+ }else{
+ for(var i=0;i<row.testValueList.length;i++){
+ let val = row.testValueList[i]
+ if(val != '' && val != null){
+ if(!['鏄�','鍚�'].includes(val)){
+ let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
+ if(!reg.test(val)){
+ row.testValueList[i] = ''
+ event.target.value = ''
+ this.$message.error("璇疯緭鍏�6浣嶆暟瀛楁垨閫夋嫨鏄惁")
+ isTrue = false
+ }
+ }
+ }
+ }
+ }
+ }
+ if(!isTrue){
+ return
+ }
+ // this.changeState(row)
+ }
+ },
+ saveTable() {
+ let rawInsProducts = [];
+ this.$nextTick(()=>{
+ this.list.forEach(item=>{
+ if(item.children){
+ item.children.forEach(ele=>{
+ let obj = JSON.parse(JSON.stringify(ele))
+ obj.testValue = obj.testValueList.join(",")
+ obj.id = obj.rpId
+ delete obj.testValueList;
+ obj.name = ele.name;
+ obj.father = item.father;
+ obj.unit = ele.unit;
+ rawInsProducts.push(obj)
+ })
+ }
+ })
+ if(rawInsProducts.length>0){
+ updateRawInsProduct2(rawInsProducts).then(res => {
+ if (res.data.code == 0) {
+ this.$message.success("鏇存柊鎴愬姛")
+ } else {
+ this.$message.error("鏇存柊澶辫触")
+ }
+ this.init(this.dataForm.id)
+ })
+ }
})
},
- // 娣诲姞琛�
- clickAddLine() {
+ // 鍒犻櫎瀛愰」鐩�
+ delChildren(row,index,isParent) {
+ if(isParent){
+ let parentIndex = this.list.findIndex(el =>{
+ return el.iid == row.iid
+ })
+ this.list.splice(parentIndex,1)
+ }else{
+ let i = this.list.findIndex(el =>{
+ return el.children.find(ele => ele.iid == row.iid)
+ })
+ let childrenIndex = this.list[i].children.findIndex(el =>{
+ return el.iid == row.iid
+ })
+ if(this.list[i].children.length<2){
+ this.list.splice(i,1)
+ }else{
+ this.list[i].children.splice(childrenIndex,1)
+ }
+ }
+ },
+ //娣诲姞瀛愰」鐩�
+ addChildren(row){
let obj = {
- $cellEdit: true,
- equipmentId: null,
- name: "",
- required: "",
- testValue: "",
- unit: ""
- };
- this.list.push(obj);
+ deviceId: null,
+ deviceName: null,
+ iid: Math.random(),
+ required: null,
+ rpId: null,
+ name: null,
+ unit: '',
+ userName: null,
+ testValue: null,
+ testValueList: [],
+ note: null,
+ testState: null
+ }
+ row.children.push(obj)
+ },
+ save(){
+ this.$refs.dataForm.validate(valid=>{
+ if(valid){
+ const _than = this
+ let data = this.dataForm
+ this.list.forEach(item=>{
+ item.children.forEach(c=>{
+ c.testValue=c.testValueList.join(",")
+ c.required = c.required.replace(',','锛�').replace('(','锛�').replace(')','锛�')
+ })
+ })
+ data.rawInsProducts = this.list
+ addRawInspects(data).then(res=>{
+ this.$message.success("淇濆瓨鎴愬姛")
+ this.$router.go(-1)
+ }).catch(error=>{
+ this.$message.error(error)
+ })
+ _than.$nextTick(()=>{
+ _than.init(Number(res.data.msg))
+ })
+ }
+ })
},
getDeviceList(){
- selectDevice(null).then(res=>{
+ selectDevice().then(res=>{
this.deviceList = res.data.data
})
},
- },
- computed:{},
- components:{}
+ moveFocus(event, index, key) {
+ console.log(key, index,key)
+ let keyfield = this.insertArrayAt(this.keyfield,4,this.keyfield0);
+ // enter閿�
+ // if (event.keyCode === 13) { // 鍥炶溅
+ // if (index === this.getLen() - 1 && key === keyfield[keyfield.length - 1]) { // 鏈�鍚庝竴琛屾渶鍚庝竴涓�
+ // console.log('鏈�鍚庝竴琛屾渶鍚庝竴涓棤娉曞洖杞�')
+ // return
+ // }
+ // this.$nextTick(() => {
+ // event.target.blur()
+ // })
+ // if (key === keyfield[keyfield.length - 1]) { // 褰撳墠琛屾渶鍚庝竴涓�,璺宠浆涓嬩竴琛岀涓�涓�
+
+ // } else { // 璺宠浆涓嬩竴涓�
+ // const nextkeyindex = keyfield.findIndex(k => k === key) + 1
+ // this.$nextTick(() => {
+ // document.getElementById(keyfield[nextkeyindex] + index).focus()
+ // })
+ // }
+ // }
+
+ // 鍚戜笂 =38
+ if (event.keyCode === 38) {
+ console.log('鍚戜笂')
+ if (index === 0) { // 绗竴琛�
+ console.log('绗竴琛屾棤娉曞悜涓�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ let i = 0;
+ while (true){
+ let dom = document.getElementById(key + (index - 1-i))
+ if(dom){
+ dom.focus()
+ return
+ }else if((index-1-i)==0){
+ return
+ }
+ i++
+ }
+ }
+
+ // 涓� = 40
+ if (event.keyCode === 40) {
+ console.log('鍚戜笅')
+ if (index === this.getLen() - 1) { // 鏈�鍚庝竴琛�
+ console.log('鏈�鍚庝竴琛屾棤娉曞悜涓�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ this.$nextTick(() => {
+ let i = 0;
+ while (true){
+ let dom = document.getElementById(key + (index + 1+i))
+ console.log(dom,key + (index + 1+i))
+ if(dom){
+ dom.focus()
+ return
+ }else if((index+1+i)==this.getLen() - 1){
+ return
+ }
+ i++
+ }
+ })
+ }
+
+ // 宸� = 37
+ if (event.keyCode === 37) {
+ console.log('鍚戝乏')
+ if (index === 0 && key === keyfield[0]) { // 绗竴琛岀涓�涓�
+ console.log('绗竴琛岀涓�涓棤娉曞悜宸�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ const prevkeyindex = keyfield.findIndex(k => k === key) - 1
+ this.$nextTick(() => {
+ let dom = document.getElementById(keyfield[prevkeyindex] + index)
+ if(dom){
+ dom.focus()
+ }
+ })
+ }
+
+ // 鍙� = 39
+ if (event.keyCode === 39) {
+ console.log('鍚戝彸')
+ if (index === this.getLen() - 1 && key === keyfield[keyfield.length - 1]) { // 鏈�鍚庝竴琛屾渶鍚庝竴涓�
+ console.log('鏈�鍚庝竴琛屾渶鍚庝竴涓棤娉曞悜鍙�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ const nextkeyindex = keyfield.findIndex(k => k === key) + 1
+ this.$nextTick(() => {
+ let dom = document.getElementById(keyfield[nextkeyindex] + index)
+ if(dom){
+ dom.focus()
+ }
+ })
+ }
+ },
+ insertArrayAt(arr1, index, arr2) {
+ return arr1.slice(0, index).concat(arr2, arr1.slice(index));
+ },
+ getLen(){
+ let arr = []
+ this.list.forEach(item => {
+ arr.push(item)
+ item.children.forEach(child => {
+ arr.push(child)
+ })
+ })
+ return arr.length
+ }
+ }
}
</script>
<style>
.rawMaterial-detail {
width: 100%;
- height: 400px;
+ height: 530px;
+ padding: 10px 20px;
+ border: 1px solid #ddd;
+ background-color: #fff;
+ margin-top: 10px;
+ box-sizing: border-box;
+ /* display: flex;
+ flex-wrap: wrap; */
+}
+
+.rawMaterial-result {
+ width: 100%;
+ height: 150px;
padding: 10px 20px;
display: flex;
border: 1px solid #ddd;
@@ -385,7 +1210,7 @@
.rawMaterial-basic {
background-color: #fff;
- height: 150px;
+ height: 170px;
display: flex;
flex-wrap: wrap;
padding: 10px 20px;
@@ -558,4 +1383,16 @@
border: 1px solid #e4e7ed;
border-bottom: none;
}
+.dropdown{
+ position: relative;
+ right: 30px;
+ top: 5px;
+ color: #C0C4CC;
+ font-size: 14px;
+}
+@media (max-width: 767px) {
+ .pad-addcol-btn{
+ font-size:12px;
+ }
+}
</style>
--
Gitblit v1.9.3