暂存

src/Form/recvoucher/add.vue

@@ -12,8 +12,8 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="经销商:" prop="enterprisename">
-                <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>
+              <el-form-item label="选择企业:" prop="enterprisename">
+                <el-input v-model="form.enterprisename"  placeholder="选择企业" @focus="enterpriseList"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" >

src/Form/recvoucher/edit.vue

@@ -12,8 +12,8 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="经销商:" prop="enterprisename">
-                <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>
+              <el-form-item label="选择企业:" prop="enterprisename">
+                <el-input v-model="form.enterprisename"  placeholder="选择企业" @focus="enterpriseList"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" >

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

@@ -21,7 +21,7 @@
           <el-input v-model="ruleForm.itemclassnum" :disabled="type!='add'" size="small" placeholder="请输入营销类别编号"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-checkbox v-model="ruleForm.istool" :true-label="1" :false-label="0">是否工具</el-checkbox>
+          <el-checkbox :disabled="type == 'add'" v-model="ruleForm.istool" :true-label="1" :false-label="0">是否工具</el-checkbox>
           <el-checkbox v-model="ruleForm.ishide" :true-label="1" :false-label="0">是否隐藏</el-checkbox>
         </el-form-item>
       </el-form>
@@ -84,7 +84,7 @@ export default {
             "content": {
                 "itemclassid":this.type == 'add' ? 0 : this.rowData.itemclassid,     
                 "sa_brandid":this.rowData.sa_brandid,
-                "parentid":this.rowData.itemclassid === undefined ? 0 : this.rowData.itemclassid,
+                "parentid":this.type == 'add' ? this.rowData.itemclassid : 0,
                 "itemclassnum":this.ruleForm.itemclassnum,
                 "itemclassname":this.ruleForm.itemclassname,
                 "istool":this.ruleForm.istool,

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -12,7 +12,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="品牌:" prop="sa_brandid">
-                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" @change="getProductList(params.content.pageNumber = 1,$refs.table.allArr=[])" style="width: 100%">
+                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" style="width: 100%">
                   <el-option v-for="item in brandList()" :key="item.sa_brandid" :label="item.brandname"
                              :value="item.sa_brandid" size="small">
                   </el-option>
@@ -22,7 +22,7 @@
             <el-col :span="8">
               <el-form-item label="默认商品:" prop="sequence">
                 <selectProduct ref="product" @selectRow="productChange" :productData="tableData">
-                  <el-input readonly type="text" slot="input" size="small" @focus="$refs.product.visible=true" v-model="form.itemname"></el-input>
+                  <el-input v-model="form.itemname" :disabled="tableData.length == 0" readonly type="text" slot="input" size="small" @focus="$refs.product.tableData=tableData,$refs.product.visible=true"></el-input>
                 </selectProduct>
               </el-form-item>
             </el-col>
@@ -68,8 +68,10 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
+        itemname:'',
         tag: [],
-        sequence:''
+        sequence:'',
+        sa_itemgroupid:0,
       },
       rules: {
         sa_brandid: [
@@ -94,6 +96,7 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
+        itemname:'',
         tag: []
       },
       this.tableData = []
@@ -107,6 +110,10 @@ export default {
       this.tableData = this.tableData.filter(e=>{
         return e.itemid !== row.itemid
       })
+      if (this.tableData.findIndex(item => item.itemno == this.form.itemno) == -1) {
+        this.form.itemno = ''
+        this.form.itemname = ''
+      }
     },
     async submit() {
       if (this.tableData.length === 0) 
@@ -116,20 +123,19 @@ export default {
         })
       const res = await this.$api.requested({
         "id": "20220922164303",
-        "content": {
-          "sa_itemgroupid":0,     //sa_itemgroupid<=0时 为新增
-          "sa_brandid":this.form.sa_brandid,
-          "groupname":this.form.groupname,
-          "itemno":"",
-          "sequence":this.form.sequence,
-          "tag": []
-        }
+        "content": this.form
       })
       this.tool.showMessage(res,()=>{
         this.groupdata = res.data
         this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
       })
     },
+    productChange (data) {
+      this.form.itemno = data.itemno
+      this.form.itemname = data.itemname
+      this.$refs.product.visible = false
+      
+    },
     async onSuccess () {
       const res = await this.$api.requested({
         "id": "20220922164303",

src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -118,6 +118,39 @@ export default {
       console.log(this.productList);
       
     },
+    createTreeData (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        var elNode = {
+          num:node['num'],
+          itemclassfullname:node['itemclassfullname'],
+          itemclassname: node["itemclassname"],
+          parentid:node['parentid'],
+          itemclassid:node['itemclassid'],
+          itemclassnum:node['itemclassnum'],
+          sa_brandid:that.data.sa_brandid,
+          ishide:node['ishide'],
+          isdeep:node['isdeep'],
+          istool:node['istool'],
+          children: []
+        }
+          
+        if (node.subdep && node.subdep.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.subdep.length; index++) {
+          // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+          elNode.children.push(convertToElementTree(node.subdep[index]));
+          }
+        }
+        return elNode;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
+    },
     async addProduct (data) {
       let res = await this.$api.requested({
         "id": 20221124110202,

src/HDrpManagement/dispatch/details/index.vue

@@ -55,7 +55,7 @@ import { log } from '@antv/g2plot/lib/utils'
             "sa_dispatchid":this.$route.query.id
           }
         })
-        this.mainData = res.data.recvice
+        this.mainData = res.data
         console.log(this.mainData)
         this.changeDataStructure()
       },

src/HDrpManagement/logistics/details/index.vue

@@ -110,12 +110,15 @@
             label:'运费',
             value:this.mainData.freightamount
           },
+          {
+            label:'收货人',
+            value:this.mainData.name
+          },
           {
             label:'寄件方式',
             value:this.mainData.paytype
           },
           
-
           {
             label:'状态',
             value:this.mainData.status,

src/HManagement/siteManage/systemRemind/components/edit.vue

@@ -110,7 +110,6 @@ export default {
       
       this.dialogFormVisible = true
       this.form = Object.assign({},this.form,this.data)
-      this.form.remindmode = JSON.parse(this.data.remindmode)
     },
     onSubmit(){
       this.$refs['form'].validate(async (valid) => {

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -6,7 +6,7 @@
         <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li :class="brand_act === ''?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
+        <li :class="!brand_act?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
         <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
@@ -32,7 +32,7 @@ export default {
       itemclass:[],
       activeClass:{},
       field_act:'',
-      brand_act:'',
+      brand_act:0,
       class_act:''
     }
   },
@@ -71,18 +71,18 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = ''
+      this.brand_act = 0
     },
 
     async queryClass () {
       const res = await this.$api.requested({
-        "id":"20220922110403","content":{"sa_brandid":this.brand_act}
+        "id":"20220922110403","content":{"sa_brandid":this.brand_act,where:{istool:0}}
       })
       console.log(res.data,'pop')
       this.itemclass = res.data[0].ttemclass
     },
     clickBrand (id) {
-      this.brand_act = id
+      this.brand_act = id ? id : 0
       this.queryClass()
     },
     clickField (item) {

src/SDrpManagement/Products/modules/Select.vue

@@ -2,15 +2,15 @@
   <div class="border-bottom">
     <div>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">领域:</li>
-        <li :class="field_act === item.tradefield?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+        <li :class="field_act === ''?'act':''" class="brand-item" @click="clickField('')">全部领域</li>
+        <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">品牌:</li>
+        <li :class="!brand_act?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
         <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">分类:</li>
+        <li :class="class_act === ''?'act':''" class="brand-item" @click="clickClass('')">全部分类</li>
         <li :class="class_act === item.itemclassnum?'act':''" class="brand-item" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
       <classTree style="padding-left:31px" :data="activeClass.subdep" @onClassChange="change"></classTree>
@@ -31,9 +31,9 @@ export default {
       fields:[],
       itemclass:[],
       activeClass:{},
-      field_act:0,
+      field_act:'',
       brand_act:0,
-      class_act:0
+      class_act:''
     }
   },
   props: {
@@ -57,9 +57,8 @@ export default {
             }
         }
       })
-      this.queryBrands()
       this.fields = res1.data
-      this.field_act = res1.data[0].tradefield
+      this.field_act = ''
     },
     async queryBrands () {
       const res = await this.$api.requested({
@@ -72,32 +71,34 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = this.brands[0].sa_brandid
-      this.queryClass()
+      this.brand_act = 0
     },
 
     async queryClass () {
       const res = await this.$api.requested({
-        "id":"20220922110403","content":{"sa_brandid":this.brand_act}
+        "id":"20220922110403","content":{"sa_brandid":this.brand_act,where:{istool:1}}
       })
-      if ( res.data.length > 0) {
-        this.itemclass =  res.data[0].ttemclass
-        res.data[0].ttemclass.length > 0?this.clickClass(res.data[0].ttemclass[0]):''
-      }
-
+      console.log(res.data,'pop')
+      this.itemclass = res.data[0].ttemclass
     },
     clickBrand (id) {
-      this.brand_act = id
+      this.brand_act = id ? id : 0
       this.queryClass()
     },
     clickField (item) {
-      this.field_act = item.tradefield
+      this.field_act = item ? item.sys_enterprise_tradefieldid : ''
       this.$emit('clickField',item)
     },
     clickClass (item) {
-      this.activeClass = item
-      this.class_act = item.itemclassnum
-      this.change(item)
+      if (item) {
+        this.activeClass = item
+        this.class_act = item.itemclassnum
+        this.change(item)
+      } else {
+        this.class_act = ''
+        this.$emit('onClassChange',item)
+      }
+      
     },
     change(n) {
       console.log(n)
@@ -109,6 +110,7 @@ export default {
   },
   mounted () {
     this.queryAgentiInfo()
+    this.queryBrands()
   }
 }
 

src/template/selectProduct/index.vue

@@ -119,7 +119,6 @@ import uploadFile from '@/components/upload/hw_obs_upload'
 import previewImage from '@/components/previewImage/index'
 
 export default {
-  props:['productData'],
   data () {
     return {
       params:{
@@ -175,7 +174,7 @@ export default {
   mounted () {
   },
   created () {
-    if (this.productData) this.tableData = this.productData
+
   }
 }