From ed6f35069824d71ee6da599a328d865eb0c58550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 四月 2024 09:16:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/sd/product/Test.vue | 53 ++++++++---------------------------------------------
1 files changed, 8 insertions(+), 45 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/Test.vue b/north-glass-erp/northglass-erp/src/views/sd/product/Test.vue
index b774da4..626a662 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/Test.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/Test.vue
@@ -1,5 +1,5 @@
<script setup>
-import BasicTable from '@/components/basic/BasicTable.vue'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
import request from "@/utils/request"
import deepClone from "@/utils/deepClone";
import {ElMessage} from "element-plus";
@@ -30,8 +30,8 @@
let tableProp = $ref({
title:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: 80 },
- { type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
+ {type: 'checkbox',fixed:"left", title: '閫夋嫨', width: 80 },
+ {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
{title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left"},
{field: 'prodID', title: '缂栧彿', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } } },
{field: 'product', title: '鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -41,38 +41,7 @@
{field: 'creator', title: '鍒涘缓浜�', sortable: true},
{field: 'createTime', title: '鍒涘缓鏃堕棿', sortable: true}
],
- datas:[
- {
- "id": 24,
- "prodID": "0101000001",
- "product": "6mm瓒呯櫧骞抽挗(澶�)+1.52PVB瓒呯櫧+6mm瓒呯櫧LNGFX85骞抽挗+20Ar鏆栬竟鏉�(缁�)+10mm瓒呯櫧LYE-80骞抽挗(鍐�) ",
- "glassType": "0101",
- "typeName": "骞抽挗",
- "totalThickness": 40,
- "thickness": 22,
- "remarks": "1",
- "state": 1,
- "creator": "寮犱笁閲�",
- "createTime": "2023-11-23",
- "updateTime": null,
- "query": "6+6+10+10+10",
- "_X_ROW_KEY": "row_11"
- },{
- "id": 24,
- "prodID": "0101000001",
- "product": "6mm瓒呯櫧骞抽挗(澶�)+1.52PVB瓒呯櫧+6mm瓒呯櫧LNGFX85骞抽挗+20Ar鏆栬竟鏉�(缁�)+10mm瓒呯櫧LYE-80骞抽挗(鍐�) ",
- "glassType": "0101",
- "typeName": "骞抽挗",
- "totalThickness": 40,
- "thickness": 22,
- "remarks": "1",
- "state": 1,
- "creator": "寮犱笁閲�",
- "createTime": "2023-11-23",
- "updateTime": null,
- "query": "6+6+10+10+10",
- "_X_ROW_KEY": "row_11"
- }],
+ datas:null,
//鑴氶儴姹傚拰
footList:['remarks'],
//绛涢�夋潯浠跺垪
@@ -89,7 +58,7 @@
let flag = $ref(false)
request.get("/product").then((res) => {
if(res.code==200){
- //tableProp.datas= res.data
+ tableProp.datas= res.data
flag = true
//console.log(res.data)
}else{
@@ -97,18 +66,16 @@
}
})
-//蹇呴』鍔犱笂
//鎺ユ敹瀛愮粍浠朵紶杩囨潵鐨勯�変腑澶嶉�夋鏁版嵁
const getCheckList = (row) =>{
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑纭澶嶉�夋淇℃伅鍙湪鎺у埗鍙版煡鐪�')
- console.log(row)
}
-//蹇呴』鍔犱笂
+
const getChildren = (row,type) =>{
switch (type) {
case 'edit' :{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
break
}
@@ -116,10 +83,7 @@
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
-
}
-
-
}
const getFilterChildren = (param) =>{
@@ -132,8 +96,7 @@
<template>
<div style="width: 100%;height: 100%;">
- <el-input v-model="tableProp.filter.product"/>
-
+<!-- <el-input v-model="tableProp.filter.product"/>-->
<basic-table v-if="flag"
:tableProp="tableProp"
@getCheckList="getCheckList"
--
Gitblit v1.8.0