2022-9-26 10:30

src/HDrpManagement/ProductGroupMag/index.vue

@@ -2,7 +2,6 @@
   <div>
     <div class="container normal-panel normal-margin" style="display:flex">
       <add type="add" @addSuccess="$refs.list.listData()" :productData="productList" :brandData="brandList" v-if="tool.checkAuth($route.name,'update')"></add>
-      <!-- <all-del style="margin-left:16px" type="group" @deleteSuccess="$refs.list.listData()" :checkboxData="checkboxData" v-if="Object.keys(checkboxData).length > 0"></all-del> -->
       <Up type="all" style="margin-left:16px" @upSuccess="$refs.list.listData()" :id="checkboxData.map(item => item.sa_itemgroupid)" v-if="Object.keys(checkboxData).length > 0 && checkboxData[0].isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
       <Down type="all" style="margin-left:16px" @downSuccess="$refs.list.listData()" :id="checkboxData.map(item => item.sa_itemgroupid)" v-if="Object.keys(checkboxData).length > 0 && checkboxData[0].isonsale == 1 && tool.checkAuth($route.name,'down_sales')"></Down>
     </div>
@@ -91,10 +90,6 @@ export default {
       })
       this.brandList = res.data
       console.log(this.brandList,'品牌');
-    },
-    /* 新增/编辑成功 */
-    addSuccess() {
-      
     },
     checkboxCallBack(data) {
       this.checkboxData = data

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -37,7 +37,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="自定义标签" prop="tag">
+            <el-form-item label="自定义标签" prop="tag" style="margin-bottom:0px; !important">
               <el-tag
                 :key="tag"
                 v-for="tag in form.tag"
@@ -102,18 +102,7 @@ export default {
   },
   props:['type','brandData','productData','groupData'],
   watch: {
-    seleteGroup: {
-      handler(val) {
-        console.log(val);
-        
-        this.form = {
-          sa_brandid:val.sa_brandid,
-          groupname:val.groupname,
-          itemno:val.itemno,
-          tag:val.tag1
-        }
-      }
-    }
+    
   },
   created() {
     
@@ -133,7 +122,6 @@ export default {
                 "tag": this.form.tag
             }
           })
-          console.log(res);
           this.tool.showMessage(res,() => {
             this.$emit('addSuccess')
             this.dialogTableVisible = false
@@ -141,9 +129,16 @@ export default {
         }
       })
     },
-    editBtn() {
+    editBtn() {      
       this.dialogTableVisible = true
       this.seleteGroup = this.groupData
+      let temp = JSON.parse(JSON.stringify(this.seleteGroup))
+      this.form = {
+        sa_brandid:temp.sa_brandid,
+        groupname:temp.groupname,
+        itemno:temp.itemno,
+        tag:temp.tag1
+      }
     },
     handleClose(tag) {
       this.form.tag.splice(this.form.tag.indexOf(tag), 1);
@@ -185,6 +180,7 @@ export default {
 }
 .el-tag + .el-tag {
   margin-left: 10px;
+  margin-bottom: 10px;
 }
 .button-new-tag {
   margin-left: 10px;
@@ -196,6 +192,5 @@ export default {
 .input-new-tag {
   width: 90px;
   margin-left: 10px;
-  vertical-align: bottom;
 }
 </style>

src/HDrpManagement/ProductGroupMag/modules/table.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table ref="tables" :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%" @selection-change="handleSelectionChange"  border>
+    <el-table ref="tables" :header-cell-class-name="cellClass" :row-class-name="tableClassName" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%" @selection-change="handleSelectionChange"  border>
       <el-table-column
         type="selection"
         width="55" @handleSelectionChange="handleSelectionChange" @select-all="selectAll" v-if="checkbox" :selectable="isCheck">
@@ -53,7 +53,15 @@ export default {
       this.$emit('checkboxCallBack',val)      
     },
     selectAll(val) {
-      this.upOrDown = val[0] ? val[0].isonsale : ''
+
+    },
+    cellClass(row){
+      console.log(row)
+      if (row.columnIndex === 0) {
+        if(this.upOrDown === '') {
+          return 'DisableSelection'
+        }
+      }
     },
     isCheck(row,rowIndex) {
       if(this.upOrDown === '') return true
@@ -70,5 +78,9 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
+
+/deep/.el-table__header .DisableSelection > .cell {
+  display: none !important;
+}
 </style>

src/SManagement/sales_forecast/index.vue

@@ -8,7 +8,7 @@
           :list="[{label:'按产品类别预测',value:'0'},{label:'按项目及产品类别预测',value:'1'}]" style="margin-right:16px" />
       </div>
       <tableLayout v-if="salesPanelList" :layout="tablecols" :data="salesPanelList" :custom="true" height="30vh"
-        @rowClick="rowClick">
+        @rowClick="rowClick" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'periodtype'">
             <span>
@@ -22,6 +22,9 @@
           <div v-else-if="scope.column.columnname == 'date'">
             <span>{{scope.column.data.begdate}}至{{scope.column.data.enddate}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'status'">
+            <span :style="scope.column.data[scope.column.columnname] == '发布' ? 'color: rgb(82, 196, 26)' : ''">{{scope.column.data[scope.column.columnname]}}</span>
+          </div>
           <span v-else>{{scope.column.data[scope.column.columnname]}}</span>
         </template>
         <template v-slot:opreation="scope">