2023-7-19

src/components/listTemplate/index.vue

@@ -91,6 +91,7 @@
   let { selectedColumns } = storeToRefs(colStore)
   let { historyRoutes } = storeToRefs(routeTabs)
   const router = useRouter()
+  const emit = defineEmits(['emitRes'])
   const props = defineProps({
     param: Object,
     tableName:String,
@@ -130,6 +131,7 @@
   const tableData = async ()=>{
     loading.value = true
     const res = await Api.requested(props.param)
+    emit('emitRes',res)
     dataSource.value = res.data
     total.value = res.total
     sort.value = res.sort

src/operation/moduleNormal/areaManage/index.vue

@@ -2,10 +2,22 @@
   <listTemp ref="list" :param="param" :tableName="'areaTable'" :searchType="searchType" @emitRes="listData">
     <template #operation>
       <Add @onSuccess="$refs.list.tableData()"></Add>
+      
     </template>
     <template #tb_cell="{data}">
       <template v-if="data.column.dataIndex === 'operation'">
         <Edit :data="data.record" @onSuccess="$refs.list.tableData()"></Edit>
+        <customBtn
+          :btnName="data.record.isused ? '停用' : '启用'"
+          idName="20230608152702"
+          keyName="w_areaid"
+          :id="data.record.w_areaid"
+          type="link"
+          size="middle"
+          :paramData="[{key:'isused',value:data.record.isused ? 0 : 1}]"
+          :message="data.record.isused ? '确定停用当前区域吗?' : '确定启用当起区域吗?'"
+          @onSuccess="$refs.list.tableData"
+        />
       </template>
       <template v-if="data.column.dataIndex === 'isused'">
         <span :style="{color:utils.statusAndColor(data.record.isused ? '启用' : '停用')}">{{ data.record.isused ? '启用' : '停用' }}</span>
@@ -17,6 +29,7 @@
 
 <script setup>
 import listTemp from '@/components/listTemplate/index.vue'
+import customBtn from '@/components/customHandleBtn/index.vue'
 import Add from './modules/Add.vue'
 import Edit from './modules/Edit.vue'
 import {ref, defineProps, defineEmits, onMounted, toRef, toRefs} from 'vue'
@@ -47,6 +60,7 @@ let createDeep = (array) => {
       sequence:node['sequence'],
       siteid:node['siteid'],
       w_areaid:node['w_areaid'],
+      key:node['w_areaid'],
       children:[]
     }
     if (node.sub && node.sub.length > 0) {

src/operation/moduleNormal/controlPanel/modules/updataBtn.vue

@@ -6,6 +6,7 @@
     @cancel="cancel"
     style="background: red;"
     :showCancel="false"
+    overlayClassName="custom"
   >
   <template #icon>
   </template>
@@ -38,13 +39,13 @@ let updateData = () => {
 </script>
 
 <style>
-.ant-popover-message {
+.custom .ant-popover-message {
   padding-bottom: 0;
 }
-.ant-popover-message-title {
+.custom .ant-popover-message-title {
   padding: 0 !important;
 }
-.ant-popover-buttons{
+.custom .ant-popover-buttons{
    display: none !important;
 }
 </style>

src/operation/moduleNormal/productCategory/index.vue

@@ -59,6 +59,7 @@ let createDeep = (array) => {
       sequence:node['sequence'],
       w_prodclassid:node['w_prodclassid'],
       parentname:node['parentname'],
+      key:node['w_prodclassid'],
       children:[]
     }
     if (node.sub && node.sub.length > 0) {

src/operation/moduleNormal/productManage/modules/Add.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-button type="primary" :disabled="disabled" @click="visible=true" style="margin-right:10px">新建</a-button>
+  <a-button type="primary" :disabled="disabled" @click="addBtn" style="margin-right:10px">新建</a-button>
   <a-drawer
     v-model:visible="visible"
     class="custom-class"
@@ -110,6 +110,14 @@ let classParam = ref({
 let enterpriseList = ref([])
 let typeList = ref([])
 let formRef = ref()
+
+let addBtn = async () => {
+  visible.value = true
+  getEnterpriseList()
+  let res = await base.optiontypeselect('prodtype')
+  typeList.value = res.data
+}
+
 let onSubmit = async () => {
   let isCheck = await formRef.value.validateFields()
   if (!isCheck) return
@@ -138,16 +146,9 @@ let getEnterpriseList = async () => {
     }
   })
   enterpriseList.value = res.data
-  console.log(enterpriseList.value)
+  console.log(res,'企业res');
+  console.log(enterpriseList.value,'企业')
 }
-
-onMounted(async () => {
-  getEnterpriseList()
-  let res = await base.optiontypeselect('prodtype')
-  typeList.value = res.data
-  console.log(typeList,'分类数据');
-})
-
 </script>
 
 <style scoped>

src/operation/moduleNormal/productManage/modules/selectSiteProduct.vue

@@ -207,7 +207,6 @@ let getEnterpriseList = async () => {
     }
   })
   enterpriseList.value = res.data
-  console.log(enterpriseList.value)
 }
 
 /*改变产品分类列表数据结构 sub:[] => children:[] */