bug

src/BIZComponents/inventoryTableDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="form" >
+  <el-form ref="form">
     <ele-pro-table
       ref="table"
       :needPage="false"
@@ -27,9 +27,7 @@
   import dictMixins from '@/mixins/dictMixins';
 
   import fileMain from '@/components/addDoc/index.vue';
-  import {contactQueryByCategoryIdsAPI} from "@/api/bpm/components/supplierManage/contact";
-
-
+  import { contactQueryByCategoryIdsAPI } from '@/api/bpm/components/supplierManage/contact';
 
   export default {
     mixins: [dictMixins],
@@ -69,15 +67,14 @@
         //是否显示合计
         type: Boolean,
         default: true
-      },
-      
+      }
     },
     data() {
       return {
         allPrice: 0,
 
         form: {
-        discountTotalPrice: 0,
+          discountTotalPrice: 0,
           datasource: []
         },
 
@@ -86,7 +83,7 @@
             width: 45,
             type: 'index',
             columnKey: 'index',
-            align: 'center',
+            align: 'center'
           },
           {
             width: 280,
@@ -94,21 +91,21 @@
             label: '名称',
             slot: 'productName',
             headerSlot: 'headerProductName',
-            align: 'center',
+            align: 'center'
           },
           {
             width: 120,
             prop: 'productCode',
             label: '编码',
             slot: 'productCode',
-            align: 'center',
+            align: 'center'
           },
           {
             width: 200,
             prop: 'productCategoryName',
             label: '类型',
             slot: 'productCategoryName',
-            align: 'center',
+            align: 'center'
           },
           {
             width: 120,
@@ -145,9 +142,11 @@
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return (
-                this.supplierObj&&this.supplierObj[row.productId]?.find(
-                  (item) => item.id === row.entrustedEnterpriseId
-                )?.name || ''
+                (this.supplierObj &&
+                  this.supplierObj[row.productId]?.find(
+                    (item) => item.id === row.entrustedEnterpriseId
+                  )?.name) ||
+                ''
               );
             }
           },
@@ -214,8 +213,11 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '按数量计费' : row.pricingWay == 2 ? '按重量计费':'';
-
+              return row.pricingWay == 1
+                ? '按数量计费'
+                : row.pricingWay == 2
+                ? '按重量计费'
+                : '';
             }
           },
           {
@@ -338,7 +340,12 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             headerSlot: 'headerCustomerExpectDeliveryDeadline',
-            align: 'center'
+            align: 'center',
+            formatter: (_row, _column, cellValue) => {
+              return (
+                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
+              );
+            }
           },
           {
             width: 200,
@@ -446,16 +453,20 @@
 
       //修改回显
       async putTableValue(data) {
-        console.log(data,'dasdas')
+        console.log(data, 'dasdas');
         let productList =
           (data &&
             (data.quoteProductList || data.productList || data.detailList)) ||
           [];
         if (productList) {
           this.form.datasource = productList;
-          this.allPrice = data.totalAmount || data.totalPrice||data?.contractVO?.totalPrice;
+          this.allPrice =
+            data.totalAmount || data.totalPrice || data?.contractVO?.totalPrice;
           if (this.isDiscountTotalPrice) {
-            this.form.discountTotalPrice = data.payAmount||data.discountTotalPrice||data?.contractVO?.discountTotalPrice;
+            this.form.discountTotalPrice =
+              data.payAmount ||
+              data.discountTotalPrice ||
+              data?.contractVO?.discountTotalPrice;
           }
           // this.supplierObj = await this.getSupplierObj(
           //   productList,

src/enum/dict.js

@@ -90,7 +90,7 @@ export const numberList = [
   'capacity_cycle',
   'target_unit',
   'capacity_status',
-  'date_unit',
+  // 'date_unit',
   'quality_assurance',
   'schedule_type',
   'leadtime_unit',

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

@@ -1110,7 +1110,7 @@ export default {
         [];
       if (productList) {
         productList.forEach((item) => {
-          item.guaranteePeriodUnitCode = item.guaranteePeriodUnitCode * 1 || '';
+          // item.guaranteePeriodUnitCode = item.guaranteePeriodUnitCode * 1 || '';
           //item.guaranteePeriodUnitCode
           // if (item.deliveryDays) {
           //   item['deliveryDeadline'] =

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

@@ -1136,7 +1136,7 @@ export default {
         [];
       if (productList) {
         productList.forEach((item) => {
-          item.guaranteePeriodUnitCode = item.guaranteePeriodUnitCode * 1 || '';
+          // item.guaranteePeriodUnitCode = item.guaranteePeriodUnitCode * 1 || '';
           //item.guaranteePeriodUnitCode
           // if (item.deliveryDays) {
           //   item['deliveryDeadline'] =

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

@@ -660,7 +660,7 @@
         let pos = 0;
         this.spanArr = [];
         this.form.resultList.forEach((item, index) => {
-          item.guaranteePeriodUnitCode = Number(item.guaranteePeriodUnitCode);
+          // item.guaranteePeriodUnitCode = Number(item.guaranteePeriodUnitCode);
           // console.log(item.guaranteePeriodUnitCode,'item.guaranteePeriodUnitCode')
           if (index === 0) {
             let obj = {};

src/views/bpm/handleTask/components/saleOrder/accountstatement/inventoryTable.vue

@@ -8,9 +8,9 @@
             <span>销售订单：</span>
             <span>{{ item.orderNo }}</span>
             <el-divider direction="vertical"></el-divider>
-            <span>计价方式：</span>
-            <span> {{ item.pricingWay == 1 ? '按数量计费' : '按重量计费' }}</span>
-            <el-divider direction="vertical"></el-divider>
+            <!-- <span>计价方式：</span>
+            <span> {{ item.pricingWay == 1 ? '按数量计费' : '按重量计费' }}</span> -->
+            <!-- <el-divider direction="vertical"></el-divider> -->
             <span>总金额：</span>
             <span>{{item.amountTotalPrice}}</span>
             <el-divider direction="vertical"></el-divider>
@@ -27,7 +27,7 @@
           <div  v-for="(j,i) in item.subList" :key="i">
             <ele-pro-table :show-summary="true" :summary-method="getSummaries" ref="table" row-key="id" :needPage="false"
                            :columns="getColumns(j)" max-height="500px" style="margin-bottom: 10px"
-                           :sub-title="subTypeList[j.subType]+j.statementSubOrderCode" :toolkit="[]" :datasource="j.detailList"
+                           :sub-title="getTitle(j)" :toolkit="[]" :datasource="j.detailList"
                            cache-key="systemRoleTable17-11121" class="time-form">
             </ele-pro-table>
           </div>
@@ -100,6 +100,17 @@ export default {
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            minWidth: 140,
+            prop: 'subType',
+            label: '退货产品类型',
+            slot: 'subType',
+            align: 'center',
+            show:j.subType==11,
+            showOverflowTooltip: true,formatter(_row, _column, cellValue){
+              return cellValue==11?'原货':'实物赔偿'
+            }
+          },
           {
             minWidth: 100,
             prop: 'specification',
@@ -124,17 +135,17 @@ export default {
           //   slot: 'orderNo',
           //   showOverflowTooltip: true
           // },
-          // {
-          //   minWidth: 100,
-          //   prop: 'pricingWay',
-          //   label: '计价方式',
-          //   align: 'center',
-          //   slot: 'pricingWay',
-          //   showOverflowTooltip: true,
-          //   formatter: (_row, _column, cellValue) => {
-          //     return _row.pricingWay == 1 ? '按数量计价' : '按重量计价'
-          //   }
-          // },
+          {
+            minWidth: 100,
+            prop: 'pricingWay',
+            label: '计价方式',
+            align: 'center',
+            slot: 'pricingWay',
+            showOverflowTooltip: true,
+            formatter: (_row, _column, cellValue) => {
+              return _row.pricingWay == 1 ? '按数量计价' : '按重量计价'
+            }
+          },
           {
             minWidth: 100,
             prop: 'totalCount',
@@ -186,12 +197,31 @@ export default {
           //   align: 'center',
           //   slot: 'singlePrice'
           // },
+          {
+            minWidth: 90,
+            prop: 'singlePrice',
+            label: '单价',
+            align: 'center',
+            slot: 'singlePrice',
+            show:j.subType==11
+          },
           {
             minWidth: 100,
             prop: 'discountSinglePrice',
             label: '单价',
             align: 'center',
-            slot: 'discountSinglePrice'
+            slot: 'discountSinglePrice',
+            show:j.subType!=11
+
+          },
+          {
+            minWidth: 120,
+            prop: 'totalPrice',
+            label: '合计金额',
+            slot: 'totalPrice',
+            align: 'center',
+            show:j.subType==11
+
           },
           {
             minWidth: 120,
@@ -199,6 +229,8 @@ export default {
             label: '合计金额',
             slot: 'discountTotalPrice',
             align: 'center',
+            show:j.subType!=11
+
           },
           // {
           //   minWidth: 100,
@@ -328,12 +360,37 @@ export default {
         return basicFields
       }
     },
+    getTitle(){
+        return (j)=>{
+          let title=this.subTypeList[j.subType]+(j.statementSubOrderCode||'')+' '
+          if(j.subType==11&&j.returnType){
+                 if(j.returnType=='10'){
+                  title=title+' 退货方式：全部原货 '
+                 }
+                 if(j.returnType=='20'){
+                  title=title+' 退货方式：部分原货+实物赔偿'
+                 }
+                 if(j.returnType=='30'){
+                  title=title+' 退货方式：部分原货+现金赔偿 '+' 赔偿金额：'+j.amountPayablePrice
+                 }
+                 if(j.returnType=='40'){
+                  title=title+' 退货方式：全部实物赔偿'
+                 }
+                 if(j.returnType=='50'){
+                  title=title+' 退货方式：全部现金赔偿  '+' 赔偿金额：'+j.amountPayablePrice
+                 }
+          }
+          return title
+        }
+      }
   },
   data() {
     return {
       subTypeList:{
         10:'发货单：',
         11:'退货单：',
+        12:'实物赔偿清单：',
+
       },
       subColumnsTypeList:{
         10:'发货日期',

src/views/bpm/handleTask/components/supplierManage/parentList.vue

@@ -47,7 +47,7 @@ export default {
   props: {
     classType: {
       type: Number,
-      default: 1
+      default: 2
     }
   },
   data() {