暂存

src/HDrpManagement/BrandManage/component/saleclass/components/edit.vue

@@ -1,16 +1,21 @@
 <template>
   <div class="add">
-    <el-button size="mini" type="text"  @click="dialogVisible=true" v-if="type=='add'" icon="el-icon-plus">新增下级</el-button>
+    <el-button size="mini" type="text"  @click="dialogVisible=true" v-if="type === 'add'" icon="el-icon-plus">新增下级</el-button>
     <el-button size="mini" type="text" @click="editBtn" icon="el-icon-edit"  v-else>编 辑</el-button>
     <el-dialog
       :title="type == 'add' ? '新增营销类别' : '编辑营销类别'"
       :visible.sync="dialogVisible"
-      width="400px"
+      width="500px"
       append-to-body
       :before-close="handleClose">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
         <el-form-item label="营销类别名" prop="itemclassname">
-          <el-input v-model="ruleForm.itemclassname" size="small" placeholder="请输入营销类别名"></el-input>
+          <div class="flex-align-center">
+            <el-input v-model="ruleForm.itemclassname" size="small" class="inline-16" placeholder="请输入营销类别名">
+            </el-input>
+            <el-input v-model="ruleForm.num" size="small" style="width:90px" placeholder="排序">
+            </el-input>
+          </div>
         </el-form-item>
         <el-form-item label="营销类别编号" prop="itemclassnum">
           <el-input v-model="ruleForm.itemclassnum" :disabled="type!='add'" size="small" placeholder="请输入营销类别编号"></el-input>
@@ -55,19 +60,10 @@ export default {
   props:['type','rowData'],
   computed:{
   },
-  watch:{
-    currentData: {
-      handler(val) {
-        this.ruleForm.itemclassnum = val.itemclassnum
-        this.ruleForm.itemclassname = val.itemclassname
-        // this.ruleForm.itemclassfullname = val.itemclassfullname
-      }
-    }
-  },
   methods: {
     editBtn() {
-      this.dialogVisible=true
-      this.currentData = this.rowData
+      this.dialogVisible = true
+      this.ruleForm = Object.assign({},this.ruleForm,this.rowData)
     },
     handleClose() {
       this.dialogVisible = false
@@ -85,7 +81,7 @@ export default {
                 "parentid":this.rowData.itemclassid === undefined ? 0 : this.rowData.itemclassid,
                 "itemclassnum":this.ruleForm.itemclassnum,
                 "itemclassname":this.ruleForm.itemclassname,
-                // "itemclassfullname":this.ruleForm.itemclassfullname,
+                "num":this.ruleForm.num,
                 "classtype":"营销"
             }
           })

src/HDrpManagement/BrandManage/component/saleclass/index.vue

@@ -6,9 +6,11 @@
       border
       stripe
       row-key="itemclassid"
-      default-expand-all
       size="small"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column
+        width="120">
+      </el-table-column>
       <el-table-column
         prop="num"
         label="序号"
@@ -59,15 +61,16 @@
           {{scope.row.ishide === 1?'是':'否'}}
         </template>
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
         label="操作"
-        width="200">
+        width="250"
+        fixed="right">
         <template slot-scope="scope">
           <Edit class="inline-16" type="add" @addSuccess="addSuccess" :rowData="scope.row"/>
           <Edit class="inline-16" type="edit" @addSuccess="addSuccess" :rowData="scope.row"/>
           <Del  class="inline-16" :id="scope.row.itemclassid" @deleteSuccess="deleteSuccess"/>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
   </div>
 </template>

src/HDrpManagement/BrandManage/modules/edit.vue

@@ -4,13 +4,13 @@
     <el-drawer
       title="编辑品牌"
       :visible.sync="drawer"
-      size="900px"
+      size="90%"
       direction="rtl"
       append-to-body>
       <div class="drawer__panel">
         <el-form  :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="80px">
           <el-form-item  prop="brandname" label="品牌名称">
-            <el-input v-model="form.brandname"  placeholder="输入品牌名称"></el-input>
+            <el-input v-model="form.brandname"  placeholder="输入品牌名称" style="width:300px"></el-input>
           </el-form-item>
           <el-form-item  label="品牌logo">
             <uploadFile ref="upload" v-if="data.attinfos.length === 0" style="margin-top:10px" :folderid="folderid" accept=".JPG,.PNG,.jpg,.png" btntype="image" :bindData="{ownertable:'sa_brand',ownerid:form.sa_brandid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
@@ -60,7 +60,7 @@ name: "edit",
   methods:{
     onShow(){
       this.drawer = true
-      this.form = this.data
+      this.form = Object.assign({},this.form,this.data)
     },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {

src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -68,8 +68,6 @@ export default {
   },
   methods: {
     async getDetail() {
-      console.log(this.rowData);
-      
       this.params.content.sa_itemgroupid = this.rowData.sa_itemgroupid
       let res = await this.$api.requested(this.params)
       this.list = res.data

src/HDrpManagement/ProductGroupMag/modules/details copy.vue

@@ -1,106 +0,0 @@
-<template>
-    <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="right" 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: "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>
-  <style>
-  </style>

src/HDrpManagement/ProductMag/index copy.vue

@@ -1,79 +0,0 @@
-<template>
-  <div>
-    <list ref="list" @selectData="selectData">
-      <BtnGroup
-        v-if="tool.checkAuth($route.name,'update')" 
-        :rows="selectRow" 
-        slot="operation"
-        @checkProducts="checkProducts" 
-        @cancel="cancel" 
-        @onSuccess="onSuccess">
-      </BtnGroup>
-      <add v-if="tool.checkAuth($route.name,'insert')" slot="add" @onSuccess="onSuccess"></add>
-      <template v-slot:setclass="scope">
-        <saleClass :data="scope.data" @uploadSuccess="onSuccess"></saleClass>
-      </template>
-      <template v-slot:setimage="scope">
-        <SetImage :data="scope.data" @uploadSuccess="onSuccess"></SetImage>
-      </template>
-      <template v-slot:onsale="scope">
-        <onsale v-if="tool.checkAuth($route.name,'update')"  :data="scope.data" @onSuccess="onSuccess"></onsale>
-      </template>
-      <template v-slot:edit="scope">
-        <edit v-if="tool.checkAuth($route.name,'update')"  :data="scope.data" @onSuccess="onSuccess"></edit>
-      </template>
-      <template v-slot:del="scope">
-        <ondel v-if="tool.checkAuth($route.name,'delete')"  :data="scope.data" @onSuccess="onSuccess"></ondel>
-      </template>
-    </list>
-  </div>
-</template>
-
-<script>
-import add from './modules/add'
-import edit from './modules/edit'
-import ondel from './modules/del'
-import onsale from './modules/onsale'
-import BtnGroup from './modules/BtnGroup'
-import SetImage from './modules/SetImage'
-
-import list from './modules/list'
-import saleClass from './modules/saleClass'
-
-export default {
-  components:{
-    list,
-    add,
-    edit,
-    ondel,
-    onsale,
-    BtnGroup,
-    SetImage,
-    saleClass
-  },
-  data () {
-    return {
-      selectRow:[]
-    }
-  },
-  methods:{
-    onSuccess () {
-      this.$refs['list'].listData()
-    },
-    checkProducts (type) {
-       this.$refs['list'].selection(type)
-    },
-    selectData (data) {
-      this.selectRow = data
-    },
-    cancel () {
-      this.$refs['list'].clearSelection()
-    }
-  }
-}
-
-</script>
-<style>
-</style>
-<style scoped>
-</style>

src/HDrpManagement/ProductMag/index.vue

@@ -61,9 +61,9 @@
         <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</p>
         </div>
       </template>
-      <template v-slot:tbOpreation="scope">
-       <!-- <editTemp :data="scope.data.data"></editTemp> -->
-      </template>
+      <!-- <template v-slot:tbOpreation="scope">
+       <editTemp :data="scope.data.data"></editTemp>
+      </template> -->
     </basicLayout>
   </div>
 </template>

src/HDrpManagement/ProductMag/modules/components/classTree.vue

@@ -1,8 +1,12 @@
 <template>
   <div>
+    <!-- <el-empty v-if="data?data.length === 0?true:false:false" description="该品牌下暂无分类"></el-empty> -->
     <ul style="padding-left:40px;">
       <li class="class-item" v-for="item in data" :key="item.index">
-        <el-checkbox v-model="item.checked" @change="onChange">{{item.label}}</el-checkbox>
+        <div class="flex-align-center">
+          <el-checkbox v-model="item.checked" v-show="!item.hasChild" @change="onChange"></el-checkbox>&nbsp;
+          <span :style="item.hasChild?'padding-left:15px':''" style="font-size:14px">{{item.label}}</span>
+        </div>
         <tree :data="item.children"></tree>
       </li>
     </ul>

src/HDrpManagement/ProductMag/modules/saleClass.vue

@@ -8,8 +8,7 @@
         <li class="brand-item" :class="activeid === item.value?'act':''" v-for="item in classList" :key="item.index" @click="brandClick(item)">{{item.label}}</li>
       </ul>
       <div>
-        <tree :data="activeBrandData"></tree>
-        <el-cascader-panel :options="activeBrandData" :props="{ checkStrictly: true }"></el-cascader-panel>
+        <tree :data="activeBrandData" node-key="itemclassid" :check-strictly="false"></tree>
       </div>
       <div class="dialog-footer">
         <el-button size="small" @click="dialogTableVisible = false" class="normal-btn-width">取 消</el-button>
@@ -76,6 +75,8 @@ export default {
           label:node['itemclassname'],
           value:node['itemclassid'],
           itemclassnum:node['itemclassnum'],
+          itemclassid:node['itemclassid'],
+          hasChild:true,
           checked:false
         }
         if (node.subdep && node.subdep.length > 0) {
@@ -85,6 +86,8 @@ export default {
           // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
             elNode.children.push(convertToElementTree(node.subdep[index]));
           }
+        } else {
+          elNode.hasChild = false
         }
         return elNode;
       }
@@ -104,9 +107,9 @@ export default {
       const res = await this.$api.requested({
         "id": 20220927090102,
         "content": {
-            "itemclassids":this.checks,
-            "itemid": this.data.itemid,
-            "itemno":this.data.itemno
+          "itemclassids":this.checks,
+          "itemid": this.data.itemid,
+          "itemno":this.data.itemno
         }
       })
       this.tool.showMessage(res,()=>{
@@ -168,6 +171,6 @@ export default {
   cursor: pointer;
 }
 .act{
-  color: red;
+  color: #3874f6;
 }
 </style>

src/HManagement/archives_sc/archives_scclass/modules/list.vue

@@ -125,7 +125,7 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
 .el-tag + .el-tag {
   margin-left: 10px;
 }

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/sendBack.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button class="inline-16" size="mini" v-show="this.name !== this.createby"  block @click="onshow">退回至公海</el-button>
+    <el-button size="mini" v-show="this.name !== this.createby"  block @click="onshow">退回至公海</el-button>
     <el-dialog title="" :visible.sync="dialogForm" width="400px" append-to-body>
       <div slot="title" style="font-size: 15px">
         退回至公海

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/toBack.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button class="inline-16" size="mini" type="primary"  block @click="onshow">退回至公海</el-button>
+    <el-button size="mini" type="primary"  block @click="onshow">退回至公海</el-button>
   </div>
 </template>
 

src/components/newLayout/index.vue

@@ -55,11 +55,13 @@ export default {
 .body__panel{
   height: 100vh;
   /* padding-right: 16px; */
+  padding-right: 60px;
   margin-right: 10px;
   overflow-y: scroll;
 }
 .body__panel::-webkit-scrollbar{
   display:none !important;
+
 }
 .sticky {
   position: sticky;

src/components/newLayout/modules/navRight.vue

@@ -46,6 +46,7 @@ export default {
       })
     },
     handelMenuAppClick (app,type) {
+      this.$store.dispatch('changeDetailDrawer',false)
       let at_modules = this.modules.filter(e=>{
         if (e.systemmoduleid === app.systemmoduleid)
         return e
@@ -68,10 +69,11 @@ export default {
 </style>
 <style scoped>
 .nav-right{
-  position:relative;
+  position:fixed;
   right:0;
   top:0;
   height:100%;
   background:rgba(0, 0,0,.3);z-index:2000;
+  z-index: 2022;
 }
 </style>

src/components/normal-basic-layout/details/index.vue

@@ -1,17 +1,18 @@
 <template>
-  <div v-if="refreshPage">
+  <div v-if="refreshPage" style="min-width:1200px">
     <div style="margin:10px 10px 0 10px;border-radius:5px" class="container normal-panel sticky">
-      <div class="flex-align-start flex-between normal-margin">
-        <div class="flex-align-center" style="flex:1 0 auto">
-          <p style="font-size:30px;font-weight:300;margin-right:16px;max-width:500px">{{titleText?titleText:'##'}}</p>
-          <tagTemp v-if="activeApp.isdatatag" style="flex:1" ref="tag" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></tagTemp>
+      <div class="flex-align-start flex-between normal-margin" style="flex-wrap:nowrap">
+        <div>
+          <p class="main_title mt-10">{{titleText?titleText:'##'}}</p>
+          <tagTemp v-if="activeApp.isdatatag" ref="tag" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></tagTemp>
         </div>
-        <div class="flex-align-center">
+        <div class="flex-align-center" style="flex: 1 0 auto;  justify-content: flex-end;">
           <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :oldFormPath="oldFormPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
-          <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
           <div>
             <slot name="customOperation"></slot>
           </div>
+          <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
+         
           <div v-if="!pageChange">
             <el-button :disabled="rowindex === 1" size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>
             <el-button :disabled="rowindex === total" size="mini" @click="next()"><i class="el-icon-arrow-right"></i></el-button>
@@ -223,4 +224,10 @@ export default {
 .no-wrap{
   flex-wrap:nowrap !important;
 }
+.main_title{
+  font-size:30px;
+  font-weight:300;
+  margin-right:16px;
+  line-height: 2rem;
+}
 </style>

src/components/normal-basic-layout/details/modules/datalog/index.vue

@@ -3,14 +3,16 @@
     <div v-if="list.length === 0">
       <el-empty description="暂无记录"></el-empty>
     </div>
-    <el-timeline v-else>
-      <el-timeline-item
-        v-for="(activity, index) in list"
-        :key="index"
-        :timestamp="activity.actiondate">
-        {{activity.remarks}}
-      </el-timeline-item>
-    </el-timeline>
+    <div v-else style="height:calc(100vh - 250px);overflow-y:scroll">
+      <el-timeline>
+        <el-timeline-item
+          v-for="(activity, index) in list"
+          :key="index"
+          :timestamp="activity.actiondate">
+          {{activity.remarks}}
+        </el-timeline-item>
+      </el-timeline>
+    </div>
   </div>
 </template>
 
@@ -34,7 +36,6 @@ export default {
         }
       })
       this.list = res.data
-      console.log(res,'log')
     }
   },
   mounted () {

src/components/normal-basic-layout/details/modules/tags/tag.vue

@@ -1,33 +1,36 @@
 <template>
   <div>
     <!-- <p class="detail__head__label">标签展示:</p> -->
-    <div v-if="showTag" class="flex-align-center">
-      <el-tag style="margin-right:10px" color="#FA8C16" v-for="item in systemtag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
-      <el-tag style="margin-right:10px" color="#FAAB16" v-for="item in datatag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
+    <div class="flex-align-center">
+      <p v-if="systemtag.length === 0 && datatag.length === 0"  style="margin-right:5px;color:#ccc" >暂无标签</p>
+      <el-tag style="margin-right:5px" color="#FA8C16" v-for="item in systemtag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
+      <div v-if="showTag">
+        <el-tag style="margin-right:5px" color="#FAAB16" v-for="item in datatag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
+      </div>
+      <el-select
+        v-if="!showTag"
+        ref="sle"
+        style="width:500px;"
+        v-model="datatag"
+        multiple
+        placeholder="请选择标签"
+        size="mini"
+        @visible-change="addTag"
+        @change="addTag"
+        @remove-tag="removetag">
+        <el-option
+          v-for="item in option"
+          :key="item.index"
+          :label="item.tag"
+          :value="item.tag"
+          :disabled="hasDisabledTag(item)">
+          <span style="float: left">{{ item.tag }}</span>
+          <span style="float: right; color: #8492a6; font-size: 12px">{{ item.helptips?item.helptips:'暂无描述' }}</span>
+        </el-option>
+      </el-select>
       <!-- <el-button type="text" @click="showTag = false">+</el-button> -->
-      <img src="@/assets/icons/tag.svg" @click="showTag = false" height="20" alt="">
+      <img v-show="showTag" src="@/assets/icons/tag.svg" @click="showTag = false" height="20" alt="">
     </div>
-    <el-select
-      v-else
-      ref="sle"
-      style="width:30%;"
-      v-model="datatag"
-      multiple
-      placeholder="请选择标签"
-      size="mini"
-      @visible-change="addTag"
-      @change="addTag"
-      @remove-tag="removetag">
-      <el-option
-        v-for="item in option"
-        :key="item.index"
-        :label="item.tag"
-        :value="item.tag"
-        :disabled="hasDisabledTag(item)">
-        <span style="float: left">{{ item.tag }}</span>
-        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.helptips?item.helptips:'暂无描述' }}</span>
-      </el-option>
-    </el-select>
   </div>
 </template>
 

src/style/style.css

@@ -11,6 +11,7 @@
 }
 body{
   color: #333333;
+  min-width: 1200px;
 
 }