From f71832a6389efa2f851b8b7bd7a615ed2d3250e4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 13:16:16 +0800
Subject: [PATCH] 完成模具页面
---
vue.config.js | 6 +
src/views/equipment/mould/index.vue | 194 ++++++++++++++++++++++++++++++++++++++++++++----
src/views/common/ztt-table.vue | 5 +
3 files changed, 185 insertions(+), 20 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 2cf2e16..4fc75c2 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -331,6 +331,11 @@
<span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
</el-tag>
</span>
+ <span v-if="item.isTags&&scope.row[item.prop]!=null" style="text-align: center;">
+ <el-tag style="width:60px;margin: 3px;" :type="scope.row[item.prop] == '姝ｅ父' ? 'success' : (scope.row[item.prop] == '寮傚父'?'warning':(scope.row[item.prop] == '杩斾慨'?'danger':'info'))">
+ <span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
+ </el-tag>
+ </span>
<span v-else
v-html="
item.formatter(scope.row, item, scope.row[item.prop])
diff --git a/src/views/equipment/mould/index.vue b/src/views/equipment/mould/index.vue
index 7e5b89c..2bfd999 100644
--- a/src/views/equipment/mould/index.vue
+++ b/src/views/equipment/mould/index.vue
@@ -11,23 +11,133 @@
ref="mouldTable"
class="mouldTable"
>
- <template #toolbar></template>
+ <template #toolbar>
+ <el-dropdown
+ @command="handleCommand"
+ >
+ <el-button>
+ 鐘舵�佹敼鍙�<i class="el-icon-arrow-down el-icon--right"></i>
+ </el-button>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item
+ :command="item.value"
+ v-for="item in optList"
+ >{{ item.label }}</el-dropdown-item
+ >
+ </el-dropdown-menu>
+ </el-dropdown>
+ </template>
</ttable>
</basic-container>
<el-dialog
- :title="editRow==null ? '鏂板':'淇敼'"
+ :title="editRow.id==null ? '鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="40%">
<el-form :model="editRow" label-position="right" label-width="100px" ref="editForm" :rules="editRules">
- <el-form-item prop="code" label="妯″叿缂栫爜">
- <el-input v-model="editRow.code" placeholder="璇疯緭鍏ユā鍏风紪鐮佺О"></el-input>
- </el-form-item>
- <el-form-item prop="name" label="妯″叿鍚嶇О">
- <el-input v-model="editRow.name" placeholder="璇疯緭鍏ユā鍏峰悕绉�"></el-input>
- </el-form-item>
- <el-form-item prop="drawingNo" label="妯″叿鍥惧彿">
- <el-input v-model="editRow.drawingNo" placeholder="璇疯緭鍏ユā鍏峰浘鍙�"></el-input>
- </el-form-item>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item prop="model" label="妯″叿鍨嬪彿">
+ <el-input v-model="editRow.model" placeholder="璇疯緭鍏ユā鍏峰瀷鍙�" :disabled="editRow.id"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="name" label="妯″叿鍚嶇О">
+ <el-input v-model="editRow.name" placeholder="璇疯緭鍏ユā鍏峰悕绉�"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item prop="status" label="妯″叿鐘舵��">
+ <el-select v-model="editRow.status" placeholder="璇烽�夋嫨妯″叿鐘舵��" style="width: 100%;">
+ <el-option
+ v-for="item in optList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="drawingNo" label="妯″叿鍥惧彿">
+ <el-input v-model="editRow.drawingNo" placeholder="璇疯緭鍏ユā鍏峰浘鍙�"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item prop="workShop" label="杞﹂棿">
+ <el-select v-model="editRow.workShop" placeholder="璇烽�夋嫨杞﹂棿" style="width: 100%;">
+ <el-option
+ v-for="item in workshopList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="shelfNo" label="璐ф灦鍙�">
+ <el-input v-model="editRow.shelfNo" placeholder="璇疯緭鍏ヨ揣鏋跺彿"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item prop="erpOrder" label="ERP璁㈠崟鍙�">
+ <el-input v-model="editRow.erpOrder" placeholder="璇疯緭鍏RP璁㈠崟鍙�"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="texture" label="鏉愯川">
+ <el-input v-model="editRow.texture" placeholder="璇疯緭鍏ユ潗璐�"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item prop="supplier" label="渚涘簲鍟�">
+ <el-input v-model="editRow.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="userTime" label="鎶曞叆浣跨敤鏃ユ湡">
+ <el-date-picker
+ v-model="editRow.userTime"
+ type="datetime"
+ placeholder="璇锋姇鍏ヤ娇鐢ㄦ棩鏈�"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss" style="width: 100%;">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item prop="serviceLife" label="浣跨敤瀵垮懡">
+ <el-input v-model="editRow.serviceLife" placeholder="璇疯緭鍏ヤ娇鐢ㄥ鍛�"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="number" label="宸蹭娇鐢ㄦ鏁�">
+ <el-input v-model="editRow.number" placeholder="璇疯緭鍏ュ凡浣跨敤娆℃暟"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="16">
+ <el-col :span="12">
+ <el-form-item prop="person" label="璐ｄ换浜�">
+ <el-input v-model="editRow.person" placeholder="璇疯緭鍏ヨ矗浠讳汉"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="remark" label="澶囨敞">
+ <el-input v-model="editRow.remark" placeholder="璇疯緭鍏ュ娉�" type="textarea" :rows="3"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
@@ -42,13 +152,15 @@
import * as fecha from 'element-ui/lib/utils/date'
import { fetchList,addMould,updateMould,delById } from '@/api/equipment/moulde'
import { mapGetters } from 'vuex'
+import { remote } from '@/api/admin/dict'
export default {
data(){
return {
diaPrintTab: false,
editRules: {
- code: [{required:true,message:'璇疯緭鍏ユā鍏风紪鍙�',trigger:'blur'}],
- name: [{required:true,message:'璇疯緭鍏ユā鍏峰悕绉�',trigger:'blur'}]
+ model: [{required:true,message:'璇疯緭鍏ユā鍏峰瀷鍙�',trigger:'blur'}],
+ name: [{required:true,message:'璇疯緭鍏ユā鍏峰悕绉�',trigger:'blur'}],
+ status: [{required:true,message:'璇烽�夋嫨妯″叿鐘舵��',trigger:'change'}]
},
editRow: {
code: null,
@@ -118,7 +230,12 @@
label: '妯″叿鐘舵��',
isTrue: true,
isSearch: true,
- searchInfoType: 'text',
+ isTags:true,
+ searchInfoType: 'select',
+ formatter: this.workShopFormatter,
+ optList: () => {
+ return this.optList
+ },
},
{
minWidth: '140px',
@@ -205,7 +322,7 @@
isSearch: true,
searchInfoType: 'text',
},
-
+
{
minWidth: '140px',
prop: 'createTime',
@@ -225,6 +342,28 @@
minWidth: 100
},
},
+ optList:[
+ {
+ value:'姝ｅ父',
+ label:'姝ｅ父',
+ type:'success'
+ },
+ {
+ value:'寮傚父',
+ label:'寮傚父',
+ type:'danger'
+ },
+ {
+ value:'杩斾慨',
+ label:'杩斾慨',
+ type:'warning'
+ },
+ {
+ value:'鎶ュ簾',
+ label:'鎶ュ簾',
+ type:'info'
+ },
+ ],
workshopList: []
}
},
@@ -260,6 +399,8 @@
}]
}
this.table.operator = arr.length>0 ? arr : null
+ },
+ mounted(){
remote('work_shop').then((response) => {
if (response.data.code === 0) {
this.workshopList = response.data.data
@@ -267,9 +408,6 @@
this.workshopList = []
}
})
- },
- mounted(){
-
},
methods: {
handleSelectionChange(val) {
@@ -328,6 +466,7 @@
this.editRow = row
}
this.dialogVisible = true
+ this.$refs["editForm"].clearValidate()
},
formatDateTime(row, column, cellValue) {
return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd HH:mm:ss') : ''
@@ -335,6 +474,25 @@
getData() {
this.$refs.mouldTable.getDataList()
},
+ // 鏍囪鐘舵��
+ handleCommand(event) {
+ if (this.multipleSelection && this.multipleSelection.length > 0) {
+ this.multipleSelection.forEach((item) => {
+ item.status = event;
+ updateMould(item).then(res=>{
+ if(res.status===200){
+ // this.$message.success("淇敼鎴愬姛")
+ this.getData()
+ }
+ }).catch(error=>{
+ console.error(error)
+ })
+ })
+ this.$message.success('鏀瑰彉' + event + '鎴愬姛')
+ } else {
+ this.$message.error('璇烽�夋嫨妯″叿')
+ }
+ },
},
}
</script>
diff --git a/vue.config.js b/vue.config.js
index 48ce710..1bde6bf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,9 +5,11 @@
// const url = 'http://192.168.2.7:9999'
-// const url = 'https://ztms-mes.chinaztt.cn/'
+const url = 'https://ztms-mes.chinaztt.cn/'
+//
-const url = 'http://localhost:9999'
+// const url = 'http://localhost:9999'
+// const url = 'http://192.168.32.45:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3