From fcd7ece15a86fc0cb526ee801ff8262b0db22dee Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期一, 25 十二月 2023 11:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue |   88 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue b/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
index 5a71562..f0b1d2c 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue
@@ -1,45 +1,94 @@
 <script setup>
-import request from "@/utils/request";
-import deepClone from "@/utils/deepClone";
-import {ElDatePicker, ElMessage} from "element-plus";
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import {ElDatePicker, ElMessage} from "element-plus"
 import useProductGlassTypeStore from "@/stores/productGlassType"
-import {watch} from "vue";
-import {Search} from "@element-plus/icons-vue";
-import GlassType from "@/components/sd/product/GlassType.vue";
-import router from "@/router";
+import {watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+import GlassType from "@/components/sd/product/GlassType.vue"
+import {useRouter} from  'vue-router'
+import BasicTable from '@/components/basic/BasicTable.vue'
 let productGlassTypeStore = useProductGlassTypeStore()
+let router=useRouter()
 watch(productGlassTypeStore,(newVal,oldVal) => {
-  console.log(newVal.GlassType)
   let list = productList.filter( product=>{
     return  product.glassType==newVal.GlassType
   })
 })
 
-let loading = $ref(true)
-let productList=$ref([])
+//let productList=$ref([])
+let flag = $ref(false)
 request.get("/product").then((res) => {
   if(res.code==200){
-    productList= deepClone(res.data)
-    loading=false
+    tableProp.datas= deepClone(res.data)
+    flag = true
   }else{
     ElMessage.warning(res.msg)
     router.push("/login")
   }
 })
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+let tableProp = $ref({
+  title:[
+    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+    {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
+    {title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left"},
+    {field: 'prodID', title: '缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'product', title: '鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'typeName', title: '鎵�灞炵被鍒�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'query', title: '蹇�熸煡璇�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'remarks', title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'creator', title: '鍒涘缓浜�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'createTime', title: '鍒涘缓鏃堕棿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
+  ],
+  datas:null,
+  footList:[],
+  //绛涢�夋潯浠跺垪
+  filter:{
+  },
+})
+
+
+
+const getChildren = (row,type) =>{
+  switch (type) {
+    case 'edit' : {
+      router.push({path: '/main/product/createProduct', query: { id: row.id }})
+      break
+    }
+    case 'delete': {
+      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+      break
+    }
+  }
+}
+
+const getCheckList = (row) =>{
+  alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑纭澶嶉�夋淇℃伅鍙湪鎺у埗鍙版煡鐪�')
+  console.log(row)
+}
+
 </script>
 
 <template>
 
-  <div>
-    <glass-type   style="float: left" />
+  <div style="width: 100%;height: 100%">
+      <glass-type   style="float: left" />
+      <el-button
+          id="select"
+          type="primary" :icon="Search">鏌ヨ</el-button>
 
 
-    <el-button
-        id="select"
-        type="primary" :icon="Search">鏌ヨ</el-button>
+      <basic-table style="height: 97%" v-if="flag"
+                   :tableProp="tableProp"
+                   @getCheckList="getCheckList"
+                   @getChildren="getChildren"
+      ></basic-table>
 
 
-    <el-table
+
+<!--    <el-table
         v-loading="loading"
         :data="productList"
         :header-cell-style="{ 'text-align': 'center' }"
@@ -65,7 +114,6 @@
       </el-table-column>
       <el-table-column label="鎿嶄綔" width="110" fixed  >
         <el-button link type="primary" size="small">缂栬緫</el-button>
-<!--        <el-button link type="primary" size="small">淇敼</el-button>-->
         <el-button link type="primary" size="small">鍒犻櫎</el-button>
       </el-table-column>
       <el-table-column sortable prop="prodID" label="缂栧彿" width="110"  />
@@ -75,7 +123,7 @@
       <el-table-column prop="remarks" label="澶囨敞" :show-overflow-tooltip='true' width="100" />
       <el-table-column prop="creator" label="鍒涘缓浜�" width="75" />
       <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="100" />
-    </el-table>
+    </el-table>-->
   </div>
 </template>
 

--
Gitblit v1.8.0