浏览代码

供应商价格维护bug修改

asd26269546 2 年之前
父节点
当前提交
2b5926b591

+ 9 - 0
src/api/product-material/warehouse/index.js

@@ -56,3 +56,12 @@ export function warehouseDel(data = {}) {
   })
 }
 
+
+// 删除warehouse 
+export function getListByRole(data = {}) {
+  return request({
+    url: '/api/blade-user/getListByRole',
+    method: 'post',
+    data: data,
+  })
+}

+ 12 - 6
src/views/product-material/supply/priceMaintenance.vue

@@ -18,10 +18,15 @@
         <el-table-column
           label="供应商类型"
           align="left"
-          prop="type"
+          prop="supplierType"
           width="140"
-          :formatter="(row) => dictDataEcho(row.type, supplyTypeList)"
-        />
+        >
+          <template slot-scope="scope">
+            <span v-for="i in supplyTypeList" :key="i.dictKey">
+              <span v-if="scope.row.supplierType == i.dictKey">{{ i.dictValue }}</span>
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="供应商名称" align="left" prop="supplierName" />
         <el-table-column
           label="产品类型"
@@ -214,6 +219,7 @@ export default {
         materialCode: "",
         materialType: "",
       },
+      
       btnForm: {
         otherButton: {
           list: [
@@ -245,14 +251,14 @@ export default {
         },
         {
           label: "供应商类型",
-          prop: "type",
+          prop: "supplierType",
           data: [],
         },
       ],
       queryDialog: false,
       tableList: [],
       loading: false,
-      total: null,
+      total: 0,
       open: false,
       titleText: "add",
       form: {
@@ -278,7 +284,7 @@ export default {
     this.supplyTypeList = businessDictData.find(
       (item) => item.code === "supplyType"
     ).children;
-
+    console.log(this.supplyTypeList)
     this.selectConfig[1].data = this.supplyTypeList.map((item) => ({
       label: item.dictValue,
       value: item.dictKey,

+ 1 - 1
src/views/product-material/warehouse/addWarehouse.vue

@@ -43,7 +43,7 @@
                 <el-option
                   v-for="item in customerSelectList"
                   :key="item.id"
-                  :label="item.name"
+                  :label="item.realName"
                   :value="item.id"
                 >
                 </el-option>

+ 2 - 3
src/views/product-material/warehouse/index.vue

@@ -140,9 +140,8 @@ export default {
       label: item.dictValue,
       value: item.dictKey,
     }));
-
-    customerList({ pageNum: 1, pageSize: 999 }).then((res) => {
-      this.customerSelectList = res.data.data.records;
+    API.getListByRole({ roleId: '1620698154897735682' }).then((res) => {
+      this.customerSelectList = res.data.data;
     });
     this.getList();
   },