yusheng 11 месяцев назад
Родитель
Сommit
ccb80963a9

+ 1 - 1
src/views/contractManage/contractBook/components/addDialog.vue

@@ -476,7 +476,7 @@
             :isTemporary="true"
             :isSalesRecord="form.type"
             :cacheKeyUrl="cacheKeyUrl"
-            :isGoods="form.type == '1'"
+            :isGoods="true"
           ></inventoryTable1>
         </el-tab-pane>
         <el-tab-pane

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

@@ -144,6 +144,7 @@
   import { contactQueryByCategoryIdsAPI } from '@/api/saleManage/contact';
   import { lbjtList } from '@/enum/dict.js';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins,tabMixins],
@@ -235,6 +236,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',

+ 11 - 0
src/views/purchasingManage/inquiryManage/components/inquiryTable.vue

@@ -318,6 +318,7 @@
   import { listByContactId } from '@/api/saleManage/contact';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import { parameterGetByCode } from '@/api/main/index.js';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -490,6 +491,16 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
+            },
+            align: 'center'
+          },
           {
             minWidth: 130,
             prop: 'reqTotalCount',

+ 12 - 0
src/views/purchasingManage/inquiryManage/components/inventoryTable.vue

@@ -126,6 +126,8 @@
   import taskinstanceDialog from '@/BIZComponents/procedure/taskinstanceDialog.vue';
   import { lbjtList } from '@/enum/dict.js';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
+
   export default {
     mixins: [dictMixins,tabMixins],
     components: {
@@ -269,6 +271,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: 'availableCountBase',

+ 11 - 0
src/views/purchasingManage/purchaseNeedManage/components/detailDialog.vue

@@ -173,6 +173,7 @@
   // import fileMain from '@/components/addDoc/index';
   import { lbjtList } from '@/enum/dict.js';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins,tabMixins],
@@ -242,6 +243,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'
+          },
           {
             width: 80,
             prop: 'doneTotalCount',

+ 23 - 8
src/views/purchasingManage/purchaseNeedManage/components/inventoryTable.vue

@@ -301,7 +301,18 @@
           </DictSelection>
         </el-form-item>
       </template>
-
+      <template v-slot:goodsLevel="{ row, $index }">
+        <el-form-item :prop="'datasource.' + $index + '.goodsLevel'">
+          <el-select v-model="row.goodsLevel" style="width: 100%">
+            <el-option
+              :label="item.label"
+              :value="item.value"
+              v-for="(item, index) in levelList"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </template>
       <template v-slot:headerProductName="{ column }">
         <span class="is-required">{{ column.label }}</span>
       </template>
@@ -363,6 +374,7 @@
   import taskinstanceDialog from '@/BIZComponents/procedure/taskinstanceDialog.vue';
   import { lbjtList } from '@/enum/dict.js';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins,tabMixins],
@@ -383,6 +395,7 @@
         name: ''
       };
       return {
+        levelList,
         cacheKeyUrl:'eos-purchaseNeedManage-inventoryTable',
         numberReg,
         defaultForm,
@@ -433,6 +446,13 @@
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            slot: 'goodsLevel',
+            align: 'center'
+          },
           {
             width: 80,
             prop: 'availableCountBase',
@@ -524,13 +544,6 @@
               }
             }
           },
-          // {
-          //   width: 120,
-          //   prop: 'approvalNumber',
-          //   align: 'center',
-          //   label: '批准文号',
-          //   showOverflowTooltip: true
-          // },
           {
             width: 120,
             prop: 'packingSpecification',
@@ -674,6 +687,8 @@
           this.$set(parasm, 'imgCode', item.imgCode);
           this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'approvalNumber', item.extField?.approvalNumber);
+          this.$set(parasm, 'goodsLevel', item.level);
+
           this.$set(
             parasm,
             'packingSpecification',

+ 11 - 0
src/views/purchasingManage/purchasePlanManage/components/detailDialog.vue

@@ -255,6 +255,7 @@
   import tabMixins from '@/mixins/tableColumnsMixin';
   import inquiryManageIndex from '@/views/purchasingManage/inquiryManage/index.vue';
   import innerBoundDetails from '@/BIZComponents/innerdetails.vue';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -380,6 +381,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'
+          },
           {
             width: 200,
             prop: 'warehouseName',

+ 22 - 1
src/views/purchasingManage/purchasePlanManage/components/inventoryTable.vue

@@ -401,6 +401,18 @@
           </template>
         </el-popconfirm>
       </template>
+      <template v-slot:goodsLevel="{ row, $index }">
+        <el-form-item :prop="'datasource.' + $index + '.goodsLevel'">
+          <el-select v-model="row.goodsLevel" style="width: 100%">
+            <el-option
+              :label="item.label"
+              :value="item.value"
+              v-for="(item, index) in levelList"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </template>
     </ele-pro-table>
     <product-list
       ref="productListRef"
@@ -441,6 +453,7 @@
   import tabMixins from '@/mixins/tableColumnsMixin';
   import { getWarehouseList } from '@/api/saleManage/saleorder';
   import warehouseAll from '@/BIZComponents/warehouseAll.vue';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -552,6 +565,13 @@
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            slot: 'goodsLevel',
+            align: 'center'
+          },
           {
             width: 200,
             prop: 'warehouseId',
@@ -719,6 +739,7 @@
         weightUnit: ''
       };
       return {
+        levelList,
         cacheKeyUrl: 'eos-purchasingManage-purchasePlanManage-inventoryTable',
         curIndex: null,
         numberReg,
@@ -923,7 +944,7 @@
           this.$set(parasm, 'imgCode', item.imgCode);
           this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'singleWeight', item.roughWeight);
-
+          this.$set(parasm, 'goodsLevel', item.level);
           this.$set(parasm, 'approvalNumber', item.extField.approvalNumber);
           this.$set(
             parasm,

+ 19 - 0
src/views/saleManage/followList/components/viewDialog.vue

@@ -54,14 +54,30 @@
             showOverflowTooltip: true,
             fixed: 'left'
           },
+          {
+            prop: 'contactName',
+            align: 'center',
+            label: '客户名称',
+            showOverflowTooltip: true,
+            minWidth: 200
+          },
+          {
+            prop: 'opportunityName',
+            label: '商机名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 200
+          },
           {
             prop: 'content',
+            align: 'center',
             label: '跟进内容',
             slot: 'content',
             showOverflowTooltip: true,
             minWidth: 200
           },
           {
+            align: 'center',
             prop: 'stageName',
             label: '跟进阶段',
             slot: 'stageName',
@@ -70,17 +86,20 @@
           },
           {
             prop: 'agreement',
+            align: 'center',
             label: '达成共识',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
+            align: 'center',
             prop: 'linkName',
             label: '客户联系人名称',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
+            align: 'center',
             prop: 'nextPlan',
             label: '下一步计划',
             showOverflowTooltip: true,