商品管理调整

src/HDrpManagement/ProductMag/detail/index.vue

@@ -5,6 +5,7 @@
         :titleText="mainData.itemname"
         :editData="mainData"
         :mainAreaData="mainAreaData"
+        modelName="商品管理"
         turnPageId="20220923140602"
         idname="itemid"
         ownertable="plm_item"

src/HDrpManagement/ProductMag/modules/add.vue

@@ -41,9 +41,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="siteid === 'HY'">
-              <el-form-item label="商品大类" prop="tags">
-                <el-select v-model="form.tags" style="width:100%">
-                  <el-option v-for="item in tagList" :key="item.index" :value="item.tag" :label="item.tag"></el-option>
+              <el-form-item label="商品大类" prop="categories">
+                <el-select v-model="form.categories" style="width:100%">
+                  <el-option v-for="item in categoriesList" :key="item.index" :value="item.value" :label="item.remarks"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -373,7 +373,8 @@ export default {
         "prodline": "",
         "device": "",
         "packqty":'1',
-        "tags":''
+        "tags":'',
+        "categories":""
       },
       rules:{
          itemno: [
@@ -397,7 +398,7 @@ export default {
         tradefields: [
           { required: true,message:'请选择领域', trigger:'change'}
         ],
-        tags: [
+        categories: [
           { required: true,message:'请选择商品大类', trigger:'change'}
         ],
       },
@@ -414,7 +415,7 @@ export default {
       actuatortype:[], // 执行器类型
       actuatorbrand:[],// 执行器品牌
       connectionmode:[],// 连接形式
-      tagList:[],//商品大类
+      categoriesList:[],//商品大类
       siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
@@ -437,7 +438,7 @@ export default {
       this.actuatortypeData()
       this.actuatorbrandData()
       this.connectionmodeData()
-      this.getTagList()
+      this.getCategoriesList()
     },
     // 查询领域
     async fieldData () {
@@ -535,7 +536,14 @@ export default {
             ownerid:res.data.itemid,
             usetype:'default'
           }
-          this.setTag(res.data.itemid,res.data.rowindex)
+         /* this.setTag(res.data.itemid,res.data.rowindex)*/
+          this.$refs['form'].resetFields();
+          this.$refs['upload'].toUpload()
+          this.$emit('onSuccess')
+          this.refresh()
+          this.dialogFormVisible = false
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/productmagDetail',query:{id:res.data.itemid,rowindex:res.data.rowindex}})
         })
       })
 
@@ -585,7 +593,8 @@ export default {
         "width": '', //可选
         "length": '', //可选
         "packqty":'1',
-        "tags":''
+        "tags":'',
+        "categories":""
       }
     },
     unitChange () {
@@ -646,7 +655,8 @@ export default {
         "specalnote": "",
         "prodline": "",
         "device": "",
-        "packqty":"1"
+        "packqty":"1",
+        "categories":""
       }
     },
     itemnoChange(){
@@ -657,17 +667,9 @@ export default {
     },
 
     /*获取可选商品大类*/
-    async getTagList () {
-      let res = await this.$api.requested({
-        "id": 20221013104401,
-        "content": {
-          "isExport":1,
-          "pageNumber":1,
-          "pageSize":100,
-          "sys_systemtagid":22,
-        }
-      })
-      this.tagList = res.data
+    async getCategoriesList () {
+      let res = await this.$store.dispatch('optiontypeselect','categories')
+      this.categoriesList= res.data
     },
     hasDisabledTag (item) {
       let arr = []

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -41,9 +41,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="siteid === 'HY'">
-              <el-form-item label="商品大类" prop="tags">
-                <el-select v-model="form.tags" style="width:100%">
-                  <el-option v-for="item in tagList" :key="item.index" :value="item.tag" :label="item.tag"></el-option>
+              <el-form-item label="商品大类" prop="categories">
+                <el-select v-model="form.categories" style="width:100%">
+                  <el-option v-for="item in categoriesList" :key="item.index" :value="item.value" :label="item.remarks"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -378,7 +378,8 @@ export default {
         "specalnote": "",
         "prodline": "",
         "device": "",
-        "tags":""
+        "tags":"",
+        "categories":""
       },
       rules:{
          itemno: [
@@ -402,7 +403,7 @@ export default {
         tradefields: [
           { required: true,message:'请选择领域', trigger:'change'}
         ],
-        tags: [
+        categories: [
           { required: true,message:'请选择商品大类', trigger:'change'}
         ],
       },
@@ -420,7 +421,8 @@ export default {
       actuatorbrand:[],// 执行器品牌
       connectionmode:[],// 连接形式
       tagList:[],
-      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
+      categoriesList:[]
     }
   },
   methods:{
@@ -439,8 +441,7 @@ export default {
       this.actuatortypeData()
       this.actuatorbrandData()
       this.connectionmodeData()
-      this.getTagList()
-      this.getSelectTag()
+      this.getCategoriesList()
     },
     async queryMain(fn) {
       const res = await this.$api.requested({
@@ -553,8 +554,8 @@ export default {
           this.$refs['form'].resetFields();
           this.$refs['upload'].toUpload()
 
-        /*  this.$emit('onSuccess')
-          this.refresh()*/
+          this.$emit('onSuccess')
+          this.refresh()
           this.dialogFormVisible = false
         })
       })
@@ -661,7 +662,8 @@ export default {
         "erpitemname": "",
         "specalnote": "",
         "prodline": "",
-        "device": ""
+        "device": "",
+        "categories":""
       }
     },
     clearCover () {
@@ -674,30 +676,10 @@ export default {
       this.form.erpitemno = this.form.erpitemno.replace(/^\s+|\s+$/g,'')
     },
     /*获取可选商品大类*/
-    async getTagList () {
-      let res = await this.$api.requested({
-        "id": 20221013104401,
-        "content": {
-          "isExport":1,
-          "pageNumber":1,
-          "pageSize":100,
-          "sys_systemtagid":22,
-        }
-      })
-      this.tagList = res.data
+    async getCategoriesList () {
+      let res = await this.$store.dispatch('optiontypeselect','categories')
+      this.categoriesList= res.data
     },
-    /*获取当前已选商品大类*/
-    async getSelectTag(){
-      const res = await this.$api.requested({
-        "id": 20220929085401,
-        "content": {
-          "ownertable":"plm_item",
-          "ownerid":this.$route.query.id
-        }
-      })
-      console.log(res.data,'已选商品大类')
-      this.form.tags = res.data.datatag[0]
-    }
   },
   mounted () {
 

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

@@ -4,7 +4,7 @@
       <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" @sysTag="sysTag"></tagTemp>
+          <tagTemp v-if="activeApp.isdatatag" ref="tag" :categories="editData.categories" :modelName="modelName" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess" @sysTag="sysTag"></tagTemp>
         </div>
         <div class="flex-align-center" style="flex: 1 0 auto;  justify-content: flex-end;">
           <div>
@@ -101,7 +101,7 @@ import taskTemp from './modules/task/index.vue'
 import reportCenter from '../reportCenter/index'
 import {mapGetters} from 'vuex'
 export default {
-  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status','typeTask','isGroup','isBatch'],
+  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status','typeTask','isGroup','isBatch','modelName'],
   data () {
     return {
       isTop:true,

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

@@ -2,6 +2,7 @@
   <div>
     <!-- <p class="detail__head__label">标签展示:</p> -->
     <div class="flex-align-center">
+      <el-tag v-if="categories && siteid === 'HY' && modelName === '商品管理'" color="#3874F6" size="small" type="primary" effect="dark" class="inline-16">{{categories}}</el-tag>
       <p v-if="systemtag.length === 0 && datatag.length === 0"  style="margin-right:5px;color:#ccc" >暂无标签</p>
       <el-tag style="margin-right:5px" color="#3874F6" v-for="item in systemtag" :key="item.rowindex" size="small" type="primary" effect="dark">{{item}}</el-tag>
       <div v-if="showTag">
@@ -36,14 +37,15 @@
 
 <script>
 export default {
-  props:['ownertable'],
+  props:['ownertable','categories','modelName'],
   data () {
     return {
       datatag:[],
       option:[],
       mutextag:[],
       systemtag:[],
-      showTag:true
+      showTag:true,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{