ccc

src/views/EquipmentArchives/detailsPage.vue

@@ -201,6 +201,7 @@ import {
 } from "@/api/basicData/EquipmentArchives";
 import { getGoodstype } from "@/api/basicData/product";
 import {getFee, saveFile} from "../../api/landTransportation";
+import {getDictionary} from "../../api/system/dictbiz";
 export default {
   name: "index",
   data() {
@@ -522,10 +523,10 @@ export default {
             this.findObject(this.optionList.column, "goodsTypeId").dicData = res.data.data;
         });
         // 获取品牌数据
-        getListpp().then(res=>{
-            this.findObject(this.optionList.column, "brand").dicData = res.data.data.records
-            this.findObject(this.optionTwo.column, "brand").dicData = res.data.data.records
-        })
+        // getListpp().then(res=>{
+        //     this.findObject(this.optionList.column, "brand").dicData = res.data.data.records
+        //     this.findObject(this.optionTwo.column, "brand").dicData = res.data.data.records
+        // })
         // 获取供应商厂家数据
         GYSgetList(1,20, {corpType:'GYS'}).then(res=>{
             this.findObject(this.optionTwo.column, "corpId").dicData = res.data.data.records
@@ -616,6 +617,12 @@ export default {
               this.goodsListSave = []
               // 获取产品弹窗的左侧类型
               this.getGoodstypefun()
+              var dict = {
+                code : 'unit'
+              }
+              getDictionary(dict).then(res => {
+                this.findObject(this.optionTwo.column, "unit").dicData = res.data.data;
+              })
               this.productonLoad(this.productPage, this.productSearch);
               this.productVisible = true
           } else {

src/views/EquipmentArchives/js/optionList.js

@@ -63,6 +63,7 @@ export const option = {
       label: "联系人",
       prop: "contacts",
       overHidden: true,
+      search: true,
       index: 3
     },
     {
@@ -137,7 +138,7 @@ export const optionList = {
   editBtn: false,
   delBtn: false,
   border: true,
-  menuWidth: 120,
+  menuWidth: 200,
   stripe: true,
   index: true,
   indexSlot: true,

src/views/EquipmentArchives/js/optionListTwo.js

@@ -73,6 +73,7 @@ export const optionTwo = {
     {
       label: "规格",
       prop: "specs",
+      search: true,
       span: 6,
       index: 15
     },
@@ -80,6 +81,8 @@ export const optionTwo = {
       label: "品牌",
       prop: "brand",
       type: "select",
+      dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP',
+      search: true,
       props: {
         label: "cname",
         value: "id"

src/views/product/detailsPage.vue

@@ -398,10 +398,10 @@ export default {
                 prop: "categoryitem",
                 type: "select",
                 props: {
-                    label: "dictValue",
-                    value: "dictValue"
+                    label: "cname",
+                    value: "id"
                 },
-                dicUrl: "/api/blade-system/dict-biz/dictionary?code=functional_classification",
+                dicUrl: "/api/blade-sales-part/brandDesc/listAll?type=GN",
                 span: 6,
             },
           {

src/views/tirePartsMall/basicData/brandPage/detailsPage.vue

@@ -77,6 +77,10 @@ export default {
           prop: "createTime",
           disabled:true
         }, {
+          label: '排序',
+          prop: "sort",
+          type:'number'
+        }, {
           label: '备注',
           prop: "remarks",
           type: 'textarea',
@@ -151,6 +155,7 @@ export default {
         done();
         if (valid) {
           this.loadingBtn = true;
+          this.form.type = 'PP'
           submit({
             ...this.form
           }).then(res => {

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

@@ -209,6 +209,7 @@ export default {
     },
     onLoad(page, params = {}) {
       params = {
+        type : 'PP',
         ...params,
         current: page.currentPage,
         size: page.pageSize,

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

@@ -78,17 +78,6 @@ export default {
           prop: "createTime",
           disabled: true
         }, {
-          label: '类型',
-          prop: "type",
-          type: 'select',
-          dicData: [{
-            label: 'PP',
-            value: 'PP'
-          }, {
-            label: 'GN',
-            value: 'GN'
-          }]
-        }, {
           label: '排序',
           prop: "sort",
           type:'number'
@@ -167,6 +156,7 @@ export default {
         done();
         if (valid) {
           this.loadingBtn = true;
+          this.form.type = 'GN'
           submit({
             ...this.form
           }).then(res => {

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

@@ -205,13 +205,12 @@ export default {
     },
     searchChange(params, done) {
       done();
-      this.page.type = 'PP' +
-        ''
       console.log(this.page)
       this.onLoad(this.page, params)
     },
     onLoad(page, params = {}) {
       params = {
+        type : 'GN',
         ...params,
         current: page.currentPage,
         size: page.pageSize,