嘉实需求

src/BIZComponents/inventoryTableDetails.vue

@@ -44,6 +44,20 @@
           <fileMain v-model="scope.row.otherFiles" type="view"></fileMain>
         </el-form-item>
       </template>
+      <template v-slot:customerExpectDeliveryDeadline="scope">
+        <div v-if="scope.row.arrivalWay == 1">
+          {{ scope.row.customerExpectDeliveryDeadline }}
+        </div>
+        <div v-if="scope.row.arrivalWay == 2">
+          <el-link
+            type="primary"
+            :underline="false"
+            @click.native="handleMethod(scope.row)"
+          >
+            查看分批时间
+          </el-link>
+        </div>
+      </template>
 
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
@@ -57,6 +71,8 @@
         </div>
       </template>
     </ele-pro-table>
+    <timeDialog ref="timeDialogRef" :view="true"></timeDialog>
+
   </el-form>
 </template>
 <script>
@@ -66,11 +82,12 @@
   import { contactQueryByCategoryIdsAPI } from '@/api/bpm/components/supplierManage/contact';
   const dayjs = require('dayjs');
   import {lbjtList } from '@/enum/dict.js';
+  import timeDialog from '@/components/timeDialog/index.vue';
 
   export default {
     mixins: [dictMixins],
     components: {
-      fileMain
+      fileMain,timeDialog
     },
     props: {
       isDiscountTotalPrice: {
@@ -379,12 +396,22 @@
             label: '包装规格',
             showOverflowTooltip: true
           },
+          {
+            width: 160,
+            prop: 'arrivalWay',
+            label: '到货方式',
+            align: 'center',
+            formatter: (_row, _column, cellValue) => {
+              return _row.arrivalWay==1?'一次性到货':_row.arrivalWay==2?'分批到货':''
+            },
+            show: this.isArrivalWay
+          },
           {
             width: 160,
             prop: 'customerExpectDeliveryDeadline',
             label: this.contractBookType == 1 ? '客户期望交期' : '交付日期',
             slot: 'customerExpectDeliveryDeadline',
-            headerSlot: 'headerCustomerExpectDeliveryDeadline',
+     
             align: 'center'
           },
           {
@@ -401,7 +428,7 @@
             prop: 'guaranteePeriod',
             label: '质保期',
             slot: 'guaranteePeriod',
-            headerSlot: 'headerCustomerExpectDeliveryDeadline',
+  
             align: 'center',
             formatter: (_row, _column, cellValue) => {
               return (
@@ -493,7 +520,9 @@
           return Promise.resolve({});
         }
       },
-
+      handleMethod(row) {
+        this.$refs.timeDialogRef.open(row);
+      },
       // 返回列表数据
       getTableValue() {
         let comitDatasource = this.form.datasource;

src/views/bpm/handleTask/components/inquiryManage/addDialog.vue

@@ -198,6 +198,10 @@
       };
     },
     created() {
+      this.requestDict('产地');
+      this.requestDict('质保期单位');
+      this.requestDict('生产类型');
+      this.requestDict('结算方式');
       this.getDetailData(this.businessId, 'init');
     },
 
@@ -394,6 +398,7 @@
           (item) => item.productCode == row.productCode
         )?.productCode;
         obj.supplierName = data.base.name;
+        obj.reqTotalCount=obj.totalCount
         let params = {
           ...data.base,
           supplierId: data.base.id,
@@ -447,6 +452,7 @@
             val['remark'] = '';
             item['deliveryDate'] = val.expectReceiveDate;
             val.supplierName = item.name;
+            reqTotalCount=val.totalCount
           });
 
           let supplierIndex = supplierIds.indexOf(item.supplierId);

src/views/bpm/handleTask/components/inquiryManage/inquiryTable.vue

@@ -452,7 +452,13 @@
       headerSlot: 'isRequired',
       align: 'center'
     },
-
+    {
+      minWidth: 130,
+      prop: 'reqTotalCount',
+      label: '需求数量',
+      showOverflowTooltip: true,
+      align: 'center'
+    },
     {
       minWidth: 90,
       prop: 'totalCount',
@@ -461,12 +467,6 @@
       headerSlot: 'isRequired',
       align: 'center'
     },
-    {
-      minWidth: 120,
-      prop: 'minimumOrderQuantity',
-      label: '最低订购量',
-      align: 'center'
-    },
     {
       minWidth: 80,
       prop: 'availableCountBase',
@@ -476,23 +476,46 @@
     },
     {
       minWidth: 80,
-      prop: 'doneTotalCount',
-      label: '已采数量',
+      prop: 'measuringUnit',
+      label: '单位',
+      slot: 'measuringUnit',
+      align: 'center'
+    },
+    {
+      minWidth: 120,
+      prop: 'modelType',
+      label: '型号',
+      slot: 'modelType',
+      align: 'center'
+    },
+
+    {
+      minWidth: 120,
+      prop: 'specification',
+      label: '规格',
+      slot: 'specification',
       align: 'center'
     },
+    {
+      minWidth: 120,
+      prop: 'minimumOrderQuantity',
+      label: '最低订购量',
+      align: 'center'
+    },
+
     {
       minWidth: 80,
-      prop: 'waitTotalCount',
-      label: '待采数量',
+      prop: 'doneTotalCount',
+      label: '已采数量',
       align: 'center'
     },
     {
       minWidth: 80,
-      prop: 'measuringUnit',
-      label: '计量单位',
-      slot: 'measuringUnit',
+      prop: 'waitTotalCount',
+      label: '待采数量',
       align: 'center'
     },
+
     {
       minWidth: 120,
       prop: 'singlePrice',
@@ -537,28 +560,8 @@
       showOverflowTooltip: true,
       minWidth: 200
     },
-    {
-      minWidth: 120,
-      prop: 'modelType',
-      label: '型号',
-      slot: 'modelType',
-      align: 'center'
-    },
 
-    {
-      minWidth: 120,
-      prop: 'specification',
-      label: '规格',
-      slot: 'specification',
-      align: 'center'
-    },
 
-    // {
-    //   width: 130,
-    //   prop: 'brand',
-    //   label: '品牌',
-    //   slot: 'brand'
-    // },
     {
       minWidth: 80,
       prop: 'deliveryDays',

src/views/bpm/handleTask/components/inquiryManage/inventoryTable.vue

@@ -402,6 +402,31 @@
             slot: 'availableCountBase',
             align: 'center'
           },
+          {
+            minWidth: 80,
+            prop: 'measuringUnit',
+            label: '单位',
+            slot: 'measuringUnit',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            minWidth: 130,
+            prop: 'modelType',
+            label: '型号',
+            slot: 'modelType',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+
+          {
+            minWidth: 120,
+            prop: 'specification',
+            label: '规格',
+            slot: 'specification',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
           {
             width: 120,
             prop: 'totalWeight',
@@ -439,31 +464,7 @@
                 : '';
             }
           },
-          {
-            minWidth: 80,
-            prop: 'measuringUnit',
-            label: '单位',
-            slot: 'measuringUnit',
-            showOverflowTooltip: true,
-            align: 'center'
-          },
-          {
-            minWidth: 130,
-            prop: 'modelType',
-            label: '型号',
-            slot: 'modelType',
-            showOverflowTooltip: true,
-            align: 'center'
-          },
-
-          {
-            minWidth: 120,
-            prop: 'specification',
-            label: '规格',
-            slot: 'specification',
-            showOverflowTooltip: true,
-            align: 'center'
-          },
+  
           {
             minWidth: 120,
             prop: 'imgCode',

src/views/bpm/handleTask/components/purchasePlanManage/detailDialog.vue

@@ -101,6 +101,7 @@
             :toolkit="[]"
             :datasource="form.detailList"
             row-key="id"
+            height="500px"
           >
             <template v-slot:totalCount="scope">
               <el-input-number

src/views/bpm/handleTask/components/saleOrder/detailDialog.vue

@@ -285,6 +285,7 @@
         ref="inventoryTabledetailRef"
         :isCustomerMark="true"
         :isDiscountTotalPrice="true"
+        :isArrivalWay="true"
       ></inventoryTabledetail>
       <headerTitle title="类型清单" v-if="form.needProduce == 4"></headerTitle>