a

src/views/EquipmentArchives/detailsPage.vue

@@ -613,7 +613,7 @@ export default {
         type: 'PP'
       }
       listAllP(type).then(res => {
-        this.findObject(this.optionTwo.column, "brand").dicData = res.data.data.records
+        this.findObject(this.optionTwo.column, "brandId").dicData = res.data.data.records
       })
 
         // 获取供应商厂家数据

src/views/EquipmentArchives/js/optionListTwo.js

@@ -79,7 +79,7 @@ export const optionTwo = {
     },
     {
       label: "品牌",
-      prop: "brand",
+      prop: "brandId",
       type: "select",
       dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP',
       search: true,

src/views/product/detailsPage.vue

@@ -91,6 +91,7 @@ import { optionList } from "./js/optionList";
 import goodsType from '@/components/goodsType/index'
 import {getList} from "@/api/basicData/client";
 import {getList as getListpp } from "@/api/tirePartsMall/basicData/brandPage";
+import {listAllP} from "../../api/tirePartsMall/basicData/listingManagement";
 export default {
   name: "index",
   data() {
@@ -653,8 +654,7 @@ export default {
       getDetails({ goodsId: id })
         .then(res => {
           this.form = res.data.data;
-          this.form.categoryitem
-          this.form.categoryitemList = this.form.categoryitem.split(',');
+          this.form.categoryitemList = this.form.categoryitemId.split(',');
 
           this.data = res.data.data.stockGoodsList;
           this.filesList = res.data.data.filesList
@@ -717,36 +717,59 @@ export default {
         done();
         if (valid) {
           this.loadingBtn = true;
-            console.log(this.form)
+          var categoryitemId = '';
           var categoryitem = '';
           var categoryitemList = this.form.categoryitemList
           for (let key in categoryitemList) {
 
             if (categoryitemList.length - 1 != key) {
-              categoryitem += categoryitemList[key]
-              categoryitem += ','
+              categoryitemId += categoryitemList[key]
+              categoryitemId += ','
             } else {
-              categoryitem += categoryitemList[key]
+              categoryitemId += categoryitemList[key]
             }
           }
-          this.form.categoryitem = categoryitem;
-          submit({
-            ...this.form,
-            code: this.form.cname,
-            type: 0,
-            stockGoodsList: this.data,
-            filesList: this.filesList
-          }).then(res => {
-            this.$message.success("保存成功");
-            this.form = res.data.data;
-            this.data = res.data.data.stockGoodsList;
-            this.filesList = res.data.data.filesList;
-            setTimeout(() => {
-              this.backToList()
-            }, 1000);
-          }).finally(() => {
-            this.loadingBtn = false;
-          });
+
+          var data = {}
+          var obj2 = new Map();
+          var params = { type : 'GN'}
+          listAllP(params).then(res => {
+            data = res.data.data
+            obj2 = new Map();
+            for (let datum of data) {
+              obj2.set(datum.id, datum.cname)
+            }
+            for (let key in categoryitemList) {
+              var id = categoryitemList[key]
+              if (categoryitemList.length -1 > key) {
+                categoryitem += obj2.get(id)
+                categoryitem += ','
+              } else {
+                categoryitem += obj2.get(id)
+              }
+            }
+
+            this.form.categoryitemId = categoryitemId;
+            this.form.categoryitem = categoryitem;
+
+            submit({
+              ...this.form,
+              code: this.form.cname,
+              type: 0,
+              stockGoodsList: this.data,
+              filesList: this.filesList
+            }).then(res => {
+              this.$message.success("保存成功");
+              this.form = res.data.data;
+              this.data = res.data.data.stockGoodsList;
+              this.filesList = res.data.data.filesList;
+              setTimeout(() => {
+                this.backToList()
+              }, 1000);
+            }).finally(() => {
+              this.loadingBtn = false;
+            });
+          })
         } else {
           return false;
         }

src/views/product/js/optionList.js

@@ -203,6 +203,19 @@ export const option = {
       showColumn: false,
       overHidden: true,
       index: 15
+    },{
+      label: '功能分类',
+      prop: 'categoryitem',
+      filterable: true,
+      search: true,
+      type: 'select',
+      dataType: "string",
+      index: 8,
+      props: {
+        label: "cname",
+        value: "id"
+      },
+      dicUrl: "/api/blade-sales-part/brandDesc/listAll?type=GN",
     }
   ]
 }

src/views/tirePartsMall/basicData/equipmentService/index.vue

@@ -86,6 +86,10 @@ export default {
           search: true,
           overHidden: true,
         }, {
+          label: '排序',
+          prop: "sort",
+          type:'number'
+        }, {
           label: "制单人",
           search: true,
           prop: "createUserName",