yusheng 11 ماه پیش
والد
کامیت
995c267f54

+ 11 - 0
src/views/bpm/handleTask/components/inquiryManage/detailDialog.vue

@@ -94,6 +94,7 @@
   import { copyObj } from '@/utils/util';
   import inquiryTable from './inquiryTable.vue';
   // import fileMain from "@/components/addDoc/index.vue";
+  import { levelList } from '@/enum/dict.js';
 
 
   export default {
@@ -169,6 +170,16 @@
             showOverflowTooltip: true,
             align: 'center',
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
+            },
+            align: 'center'
+          },
           {
             minWidth: 80,
             prop: 'totalCount',

+ 12 - 1
src/views/bpm/handleTask/components/inquiryManage/inquiryTable.vue

@@ -89,7 +89,7 @@
         </el-form-item>
       </template>
       <template v-slot:taxRate="{ row, $index }">
-        <el-form-item >
+        <el-form-item>
           <el-input
             v-model="row.taxRate"
             style="width: 100%"
@@ -346,6 +346,8 @@
   import { getInventoryTotalAPI } from '@/api/bpm/components/wms';
   import { listByContactId } from '@/api/bpm/components/saleManage/contact';
   // import headList from '@/views/saleManage/businessOpportunity/components/headList.vue';
+  import { levelList } from '@/enum/dict.js';
+
   const defaultColumns = [
     {
       width: 50,
@@ -448,6 +450,15 @@
       headerSlot: 'isRequired',
       align: 'center'
     },
+    {
+      minWidth: 120,
+      prop: 'goodsLevel',
+      label: '物品级别',
+      formatter: (_row, _column, cellValue) => {
+        return levelList.find((item) => item.value == _row.goodsLevel)?.label;
+      },
+      align: 'center'
+    },
     {
       minWidth: 130,
       prop: 'reqTotalCount',

+ 35 - 22
src/views/bpm/handleTask/components/inquiryManage/inventoryTable.vue

@@ -11,9 +11,8 @@
       class="time-form"
       :selection.sync="selection"
     >
-     
       <template v-slot:files="scope">
-        <el-form-item >
+        <el-form-item>
           <el-link
             v-for="link in scope.row.files"
             :key="link.id"
@@ -25,16 +24,16 @@
           </el-link>
         </el-form-item>
       </template>
-      
+
       <template v-slot:supplierIds="scope">
-        <el-form-item >
+        <el-form-item>
           <el-select
             v-model="scope.row['supplierIds']"
             clearable
             filterable
             multiple
             collapse-tags
-            :disabled="status=='Detail'"
+            :disabled="status == 'Detail'"
           >
             <el-option
               v-for="i in scope.row.supplierList"
@@ -45,15 +44,15 @@
           </el-select>
         </el-form-item>
       </template>
-     
-      <template v-slot:add="scope" v-if="status!='Detail'">
+
+      <template v-slot:add="scope" v-if="status != 'Detail'">
         <el-form-item style="margin-bottom: 20px">
           <el-button type="primary" @click="openSupplier(scope.row)"
             >新增报价单</el-button
           >
         </el-form-item>
       </template>
-      <template v-slot:action="scope" v-if="status!='Detail'">
+      <template v-slot:action="scope" v-if="status != 'Detail'">
         <el-popconfirm
           class="ele-action"
           title="确定要删除吗?"
@@ -80,7 +79,8 @@
   import { getInventoryTotalAPI } from '@/api/bpm/components/wms';
   // import fileMain from '@/components/addDoc/index.vue';
   // import headList from '@/views/saleManage/businessOpportunity/components/headList.vue';
-  import {lbjtList } from '@/enum/dict.js';
+  import { lbjtList } from '@/enum/dict.js';
+  // import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins],
@@ -95,7 +95,7 @@
       },
       status: {
         default: ''
-      },
+      }
     },
     data() {
       const defaultForm = {
@@ -147,7 +147,7 @@
             showOverflowTooltip: true,
             fixed: 'left',
             align: 'center',
-            show:this.status!='Detail'
+            show: this.status != 'Detail'
           },
           {
             minWidth: 100,
@@ -210,6 +210,16 @@
             showOverflowTooltip: true,
             align: 'center'
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
+            },
+            align: 'center'
+          },
           {
             minWidth: 80,
             prop: 'totalCount',
@@ -278,10 +288,9 @@
             minWidth: 200,
             showOverflowTooltip: true,
             formatter: (row, column) => {
-
               return row.provenance && row.provenance.length
                 ? row.provenance
-                    .map((item) => this.getDictValue('产地', item ))
+                    .map((item) => this.getDictValue('产地', item))
                     .join(',')
                 : '';
             }
@@ -301,12 +310,13 @@
             label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
-              if(row.produceType){
-                return row.produceType.map(item=>{
-                  return lbjtList[item]
-                }).toString()
+              if (row.produceType) {
+                return row.produceType
+                  .map((item) => {
+                    return lbjtList[item];
+                  })
+                  .toString();
               }
-
             }
           },
           // {
@@ -407,7 +417,11 @@
             //供应商列表
             item.resultList.forEach((val) => {
               //供应商产品
-              if (val.productCode == productItem.productCode&&val.batchNo == productItem.batchNo&&val.taskId == productItem.taskId) {
+              if (
+                val.productCode == productItem.productCode &&
+                val.batchNo == productItem.batchNo &&
+                val.taskId == productItem.taskId
+              ) {
                 totalCountS.push(
                   Number(val.totalCount || 0) +
                     Number(productItem.doneTotalCount || 0)
@@ -429,7 +443,7 @@
         });
       },
       filterMethod(value, row, column) {
-        let ids = row.supplierIds
+        let ids = row.supplierIds;
         if (ids.length > 0 && ids.includes(value)) {
           return row;
         }
@@ -458,8 +472,7 @@
               'availableCountBase',
               find.availableCountBase
             );
-          supplierList.push(...item.supplierList);
-
+            supplierList.push(...item.supplierList);
           });
           supplierIds = Array.from(
             new Set(supplierList.map((item) => item.id))

+ 11 - 1
src/views/bpm/handleTask/components/purchaseNeedManage/detailDialog.vue

@@ -121,6 +121,7 @@
   import timeDialog from '@/components/timeDialog/index.vue';
   // import fileMain from "@/components/addDoc/index.vue";
   import {lbjtList } from '@/enum/dict.js';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     props: {
@@ -183,7 +184,16 @@
             slot: 'totalCount',
             align: 'center'
           },
-
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
+            },
+            align: 'center'
+          },
           {
             minWidth: 120,
             prop: 'taskName',

+ 12 - 0
src/views/bpm/handleTask/components/purchasePlanManage/detailDialog.vue

@@ -202,6 +202,8 @@
   import timeDialog from '@/components/timeDialog/index.vue';
   import add from '@/views/bpm/stockManagement/storage.vue';
   import detailDialog from '@/views/bpm/stockManagement/details.vue';
+  import { levelList } from '@/enum/dict.js';
+
   export default {
     mixins: [dictMixins],
     components: {
@@ -304,6 +306,16 @@
             align: 'center',
             slot: 'totalCount'
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
+            },
+            align: 'center'
+          },
           {
             width: 200,
             prop: 'warehouseName',