2022-9-27 16:10

src/HDrpManagement/ProductGroupMag/index.vue

@@ -8,7 +8,7 @@
     <div class="container normal-panel normal-margin">
       <list ref="list" @checkboxCallBack="checkboxCallBack">
         <template v-slot:detail="scope">
-          <el-button type="text" size="small" @click="$router.push({path:'/projectTarget_edit',query:{id:scope.data.sa_salestargetbillid,type:'onlyread'}})">详 情</el-button>
+          <product_detail :data="scope.data"  :type="'text'"></product_detail>
         </template>
         <template v-slot:groupDetail="scope">
           <add-group-detail :rowData="scope.data"/>
@@ -17,13 +17,13 @@
           <edit-group v-if="tool.checkAuth($route.name,'update')" type="edit" @addSuccess="$refs.list.listData()" :productData="productList" :brandData="brandList" :groupData="scope.data"></edit-group>
         </template>
         <template v-slot:del="scope">
-          <Del v-if="tool.checkAuth($route.name,'delete')" type="group" @deleteSuccess="$refs.list.listData()" :id="scope.data.sa_itemgroupid"></Del>
+          <Del v-if="tool.checkAuth($route.name,'delete')" type="group" @deleteSuccess="onSuccess()" :id="scope.data.sa_itemgroupid"></Del>
         </template>
         <template v-slot:up="scope">
-          <Up type="one" @upSuccess="$refs.list.listData()" :id="[scope.data.sa_itemgroupid]" v-if="scope.data.isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
+          <Up type="one" @upSuccess="onSuccess()" :id="[scope.data.sa_itemgroupid]" v-if="scope.data.isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
         </template>
         <template v-slot:down="scope">
-          <Down type="one" @downSuccess="$refs.list.listData()" :id="[scope.data.sa_itemgroupid]" v-if="scope.data.isonsale == 1 && tool.checkAuth($route.name,'down_sales')"></Down>
+          <Down type="one" @downSuccess="onSuccess()" :id="[scope.data.sa_itemgroupid]" v-if="scope.data.isonsale == 1 && tool.checkAuth($route.name,'down_sales')"></Down>
         </template>
       </list>
     </div>
@@ -31,6 +31,10 @@
 </template>
 
 <script>
+
+
+import product_detail from './modules/details.vue';
+
 import list from './modules/list'
 
 import addGroup from './modules/addGroup'
@@ -50,7 +54,8 @@ export default {
     Del,
     Up,
     Down,
-    addGroupDetail
+    addGroupDetail,
+    product_detail
   },
   data() {
     return {
@@ -105,7 +110,11 @@ export default {
     },
     checkboxCallBack(data) {
       this.checkboxData = data
-    }
+    },
+    onSuccess () {
+      console.log("执行更新")
+      this.$refs.list.listData()
+    },
   }
 }
 

src/HDrpManagement/ProductGroupMag/modules/addGroup.vue

@@ -71,7 +71,6 @@
 </template>
 
 <script>
-import { log } from '@antv/g2plot/lib/utils'
 export default {
   data () {
     return {

src/HDrpManagement/ProductGroupMag/modules/delete.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="display:inline">
+  <div class="inline-16">
     <el-popconfirm title="确定删除当前数据吗？" @confirm="deleteRow()">
       <el-button slot="reference" size="small" type="text">删 除</el-button>
     </el-popconfirm>

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -1,12 +1,104 @@
 <template>
-    <div >
-        <el-button size="small" type="text" >详 情</el-button>
+    <div class="inline-16">
+        <el-button size="small" type="text" @click="onShow">详情</el-button>
+        <el-dialog
+        title="商品组详情"
+        :visible.sync="drawer"
+        width="650px"
+
+    >
+      <div>
+        <el-row :gutter="50">
+          <el-form  ref="form"  size="mini" label-position="left" label-width="80px" disabled> 
+            <el-col :span="15">
+              <el-form-item   label="商品组名:">
+                <p v-if="form.groupname">{{form.groupname}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item   label="商品组号:">
+                <p v-if="form.groupnum">{{form.groupnum}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item   label="品牌名称:">
+                <p v-if="form.brandname">{{form.brandname}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="15">
+              <el-form-item   label="是否上架:">
+                <p v-if="form.isonsale">上架</p>
+                <p v-else>下架</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item   label="产品名:">
+                <p v-if="form.itemname">{{form.itemname}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item   label="产品类别:">
+                <p v-if="form.itemclassname">{{form.itemclassname}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item   label="标签:">
+                <div v-if="tag">
+                  <div v-for="(item,index) in form.tag1" :key="index" style="float:left;margin-left: 2%;margin-top: 2%;" >
+                    <el-tag  size="small">{{form.tag1[index]}}</el-tag>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item   label="创建人员:">
+                <p v-if="form.createby">{{form.createby}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item   label="更新人员:">
+                <p v-if="form.changeby">{{form.changeby}}</p>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+    </el-dialog>
     </div>
   </template>
   
   <script>
   export default {
-    name: "deatails"
+    name: "detail",
+    props:["data"],
+    data(){
+        return {
+            drawer:false,
+            isonsale:"",
+            tag:"",
+            form:[]
+        }
+    },
+    methods: {
+        onShow(){
+            this.drawer = true
+            console.log(this.data)
+            this.form = this.data
+            if(this.form.tag1.length > 0){
+              this.tag = true
+            }else {
+              this.tag = false
+            }
+            
+            if(this.form.isonsale === 0){
+              this.isonsale = false
+            }else{
+              this.isonsale = true
+            }
+        }
+    },
+    mounted(){
+    }
   }
   
   </script>

src/HDrpManagement/ProductGroupMag/modules/down.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <el-popconfirm title="确定删除当前数据吗？" @confirm="deleteRow()">
+  <div class="inline-16">
+    <el-popconfirm title="确定下架当前数据吗？" @confirm="deleteRow()">
       <el-button slot="reference" size="small" type="text" v-if="type=='one'">下 架</el-button>
       <el-button slot="reference" size="small" type="warning" v-else>批量下架</el-button>
     </el-popconfirm>

src/HDrpManagement/ProductGroupMag/modules/list.vue

@@ -1,8 +1,17 @@
 <template>
   <div>
-    <table1 :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght" :checkbox="true" v-on="$listeners" fixedName="operation">
+    <select_proGro  @searchActive="searchActive" ></select_proGro>
+    <table1 :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght" :checkbox="true" v-on="$listeners">
       <template v-slot:customcol="scope">
-        <p >{{scope.column.data[scope.column.columnname]}}</p>
+        <div v-if="scope.column.columnname === 'isonsale'">
+          <span v-if="scope.column.data[scope.column.columnname] === 0"
+            >下架
+          </span>
+          <span v-if="scope.column.data[scope.column.columnname] === 1"
+            >上架
+          </span>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
         <div style="display:flex;justify-content:space-around">
@@ -14,7 +23,8 @@
           <slot name="del" :data="scope.data"></slot>
         </div>
       </template>
-    </table1>
+      </table1>
+    <!-- </tableLayout> -->
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background
@@ -31,19 +41,25 @@
 </template>
 
 <script>
+import select_proGro from './search'
 import table1 from './table'
 export default {
   name: "list",
   data() {
     return {
+      tableHieght:400,
       tablecols:[],
       list:[],
       total:0,
       currentPage:0,
+      isonsale:true,
+      isonsales:false,
       params:{
         "id": "20220922164403",
         "version":1,
         "content": {
+          pageNumber:1,
+          pageSize:10,
           "nocache":true,
           "where":{
             "condition":""
@@ -52,20 +68,24 @@ export default {
       }
     }
   },
-  components:{table1},
+  components:{
+    select_proGro,
+    table1
+  },
   mounted() {
     this.listData();
   },
   methods:{
     async listData(){
-      console.log("输出")
       const res=await this.$api.requested(this.params)
-      console.log("输出")
-      console.log(res)
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
     },
+    searchActive(data) {
+      this.params.content.where.condition = data
+      this.listData()
+    },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.params.content.pageSize = val

src/HDrpManagement/ProductGroupMag/modules/search.vue

@@ -0,0 +1,44 @@
+<template>
+    <div class="container border-bottom">
+        <span>搜索: </span>
+        <el-input
+            with="200"
+            type="text"
+            v-model="search"
+            placeholder="商品组名"
+            size="small"
+            clearable
+            @searchActive="queryClick"
+            @keyup.enter.native="queryClick()"
+            @clear="queryClick"
+        >
+        <i slot="prefix" class="el-icon-search"  @click="queryClick()"></i>
+        </el-input>
+    </div>
+</template>
+<script>
+export default {
+    name:'search',
+    data(){
+        return {
+            search:""
+        }
+    },
+    methods:{
+        queryClick(){
+            this.$emit('searchActive',this.search)
+        }
+        
+    }
+}
+</script>
+<style scoped>
+    .el-input {
+        width: 200px;
+        margin-right: 16px;
+    }
+    /deep/.el-input__prefix {
+    display: flex;
+    align-items: center;
+    }
+</style>

src/HDrpManagement/ProductGroupMag/modules/up.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <el-popconfirm title="确定删除当前数据吗？" @confirm="deleteRow()">
+  <div class="inline-16">
+    <el-popconfirm title="确定上架当前数据吗？" @confirm="deleteRow()">
       <el-button slot="reference" size="small" type="text" v-if="type=='one'">上 架</el-button>
     <el-button slot="reference" size="small" type="warning" v-else>批量上架</el-button>
     </el-popconfirm>