From 3b02a02e6f615f167b06ca4d62d094cda777d862 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 22 一月 2024 09:55:35 +0800
Subject: [PATCH] 模具使用记录
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 24 ++++----
vue.config.js | 4
src/views/equipment/mouldrecord/index.vue | 83 ++++++---------------------
src/api/equipment/mouldRecord.js | 9 +++
src/views/equipment/mould/index.vue | 17 ++---
5 files changed, 47 insertions(+), 90 deletions(-)
diff --git a/src/api/equipment/mouldRecord.js b/src/api/equipment/mouldRecord.js
new file mode 100644
index 0000000..1792f8d
--- /dev/null
+++ b/src/api/equipment/mouldRecord.js
@@ -0,0 +1,9 @@
+import request from '@/router/axios'
+
+export function fetchList(query) {
+ return request({
+ url: '/mes/mouldRecord/page',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/views/equipment/mould/index.vue b/src/views/equipment/mould/index.vue
index c9f1616..8f82e7d 100644
--- a/src/views/equipment/mould/index.vue
+++ b/src/views/equipment/mould/index.vue
@@ -2,6 +2,7 @@
<div class="mod-config">
<basic-container>
<ttable
+ @handleSelectionChange="handleSelectionChange"
:table="table"
:ajaxFun="ajaxFun"
:prelang="prelang"
@@ -40,6 +41,7 @@
export default {
data(){
return {
+ diaPrintTab: false,
editRules: {
code: [{required:true,message:'璇疯緭鍏ユā鍏风紪鍙�',trigger:'blur'}],
name: [{required:true,message:'璇疯緭鍏ユā鍏峰悕绉�',trigger:'blur'}]
@@ -51,6 +53,7 @@
dialogVisible: false,
ajaxFun: fetchList,
prelang: 'moudle',
+ multipleSelection: [],
dataListLoading: false,
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -132,7 +135,6 @@
},
components: {
ttable,
- TableForm
},
watch: {
dialogVisible(newVal){
@@ -152,13 +154,6 @@
fun: this.addOrUpdateHandle
})
}
- if(this.permissions.equipment_mould_lableprint){
- this.table.toolbar.push({
- text: '鏍囩鎵撳嵃',
- type: 'primary',
- fun: this.lableprint
- })
- }
if(this.permissions.equipment_mould_del){
this.table.operator = [{
text: '鍒犻櫎',
@@ -171,6 +166,9 @@
},
methods: {
+ handleSelectionChange(val) {
+ this.multipleSelection = val
+ },
deleteHandle(row){
this.$confirm('鏄惁纭鍒犻櫎妯″叿鍚嶇О涓�' + row.name, '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -184,9 +182,6 @@
this.$message.success('鍒犻櫎鎴愬姛')
this.getData()
})
- },
- lableprint(){
-
},
confirmSaveOrUpdateMould(){
this.$refs.editForm.validate(valid=>{
diff --git a/src/views/equipment/mouldrecord/index.vue b/src/views/equipment/mouldrecord/index.vue
index 2a03676..cc335db 100644
--- a/src/views/equipment/mouldrecord/index.vue
+++ b/src/views/equipment/mouldrecord/index.vue
@@ -6,7 +6,7 @@
:isShowHide="true"
:ajaxFun="ajaxFun"
:prelang="prelang"
- :options="options"
+ :options="options"
ref="processconfiguration"
>
<template #toolbar>
@@ -19,8 +19,9 @@
<script>
import ttable from '@/views/common/ztt-table.vue'
-import { fetchList, } from '@/api/quality/finishedDelivery'
-
+import * as fecha from 'element-ui/lib/utils/date'
+import { fetchList, } from '@/api/equipment/mouldRecord'
+import { mapGetters } from 'vuex'
export default {
data(){
return {
@@ -51,45 +52,13 @@
{
minWidth: '140',
prop: 'packageNo',
- label: '璁惧',
+ label: '鎶ュ伐鍗曞彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},{
minWidth: '140',
prop: 'outBatchNo',
- label: '妯″叿缂栧彿',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'partNo',
- label: '妯″叿鍚嶇О',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'partName',
- label: '宸ュ簭',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'specs',
- label: '宸ユ',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'unit',
label: '鎵瑰彿',
isTrue: true,
isSearch: true,
@@ -97,55 +66,39 @@
},
{
minWidth: '140',
- prop: 'number',
- label: '浜ч噺',
+ prop: 'partNo',
+ label: '宸ュ崟缂栧彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},
{
minWidth: '140',
- prop: 'number',
- label: '瀵垮懡杞崲绯绘暟',
+ prop: 'partName',
+ label: '宸ヤ綔绔欏悕绉�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},
{
minWidth: '140',
- prop: 'number',
- label: '浣跨敤閲�',
+ prop: 'specs',
+ label: '浣跨敤浜虹紪鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},
- {
- minWidth: '140',
- prop: 'number',
- label: '鎶ュ伐鍗曞彿',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '130',
- prop: 'createUser',
- label: '鐘舵��',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
+
],
toolbar: [],
- // operator: [],
- // operatorConfig: {}
+ operator: null,
+ operatorConfig: {}
},
}
},
- // computed: {
- // ...mapGetters(['permissions'])
- // },
+ computed: {
+ ...mapGetters(['permissions'])
+ },
components: {
ttable
},
@@ -155,4 +108,4 @@
},
},
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 0afc28b..6c08e7a 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -3,7 +3,7 @@
<div class="page-header">
<div class="header-left">
<a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
- <h2 v-if="resultVal!=null && dataForm.id!=null">鏌ョ湅-鍘熸潗鏂欐楠�</h2>
+ <h2 v-if="(resultVal!=null || resultVal!='') && dataForm.id!=null">鏌ョ湅-鍘熸潗鏂欐楠�</h2>
<h2 v-else>缂栬緫-鍘熸潗鏂欐楠�</h2>
</div>
<div class="btn-group header-right">
@@ -32,12 +32,12 @@
<el-button
slot="append"
icon="el-icon-search"
- :disabled="resultVal!=null"
+ :disabled="(resultVal!=null || resultVal!='')"
@click="queryCode"></el-button>
<el-button
slot="append"
icon="el-icon-full-screen"
- :disabled="resultVal!=null"
+ :disabled="(resultVal!=null || resultVal!='')"
@click="Turnonthecamera"></el-button>
</el-input>
</el-form-item>
@@ -86,7 +86,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="鏁伴噺" prop="number">
- <el-input v-model="dataForm.number" :disabled="resultVal!=null" />
+ <el-input v-model="dataForm.number" :disabled="(resultVal!=null || resultVal!='')" />
</el-form-item>
</el-col>
</el-row>
@@ -174,7 +174,7 @@
<div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-autocomplete clearable
- :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
+ :disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null || resultVal!=''))"
@input="changeState(scope.row,scope.$index)"
v-model="scope.row.testValueList[index]"
:fetch-suggestions="querySearch"
@@ -186,7 +186,7 @@
</el-autocomplete>
<!-- <el-select style="width:100%" filterable
- :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
+ :disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null || resultVal!=''))"
v-model="scope.row.testValueList[index]"
placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
allow-create
@@ -204,7 +204,7 @@
<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" style="width:60%"
+ <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>
@@ -213,7 +213,7 @@
size="small"
slot="append"
icon="el-icon-full-screen"
- :disabled="dataForm!=null && resultVal!=null"
+ :disabled="dataForm!=null && (resultVal!=null || resultVal!='')"
@click="codeDevice(scope.row,scope.$index)"></el-button>
</div>
</template>
@@ -221,7 +221,7 @@
<el-table-column prop="note" label="妫�楠屾弿杩�" width="160" >
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
+ <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&(resultVal!=null || resultVal!=''))" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
</div>
</template>
</el-table-column>
@@ -256,7 +256,7 @@
element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
>
<el-upload
- :disabled="dataForm.rawInsNo==null || resultVal!=null"
+ :disabled="dataForm.rawInsNo==null || (resultVal!=null || resultVal!='')"
drag
ref="upload"
action="/mes/rawInsProduct/upload"
@@ -311,7 +311,7 @@
@click="delProcessConfigFile(scope.row)"
type="text"
size="small"
- :disabled="resultVal!=null"
+ :disabled="(resultVal!=null || resultVal!='')"
>鍒犻櫎</el-button
>
<el-button
@@ -346,7 +346,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔">
<template>
- <el-button type="text" :disabled="resultVal!=null && dataForm.id!=null" @click="showDialog()" size="small">涓婃姤</el-button>
+ <el-button type="text" :disabled="(resultVal!=null || resultVal!='') && dataForm.id!=null" @click="showDialog()" size="small">涓婃姤</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/vue.config.js b/vue.config.js
index 0e57583..2280c3d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,10 +4,10 @@
*/
-const url = 'http://192.168.2.7:9999'
+// const url = 'http://192.168.2.7:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'
-// const url = 'http://localhost:9999'
+const url = 'http://localhost:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3