Merge branch 'master' into test

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

@@ -151,7 +151,6 @@
             width: 150,
             prop: 'productCategoryName',
             label: '分类',
-            slot: 'productCategoryName',
             align: 'center'
           },
           {
@@ -165,28 +164,26 @@
             width: 240,
             prop: 'productName',
             label: '名称',
-            slot: 'productName',
             align: 'center'
           },
           {
             width: 150,
             prop: 'productBrand',
             label: '牌号',
-            slot: 'productBrand',
             align: 'center'
           },
           {
             width: 150,
             prop: 'purchaseCount',
             label: '数量',
-            align: 'center'
-          },
-          {
-            width: 150,
-            prop: 'purchaseUnit',
-            label: '单位',
-            align: 'center'
+            align: 'center',
+            formatter: (row, column) => {
+              if (row.purchaseCount) {
+                return row.purchaseCount + ' ' + row.purchaseUnit;
+              }
+            }
           },
+
           {
             minWidth: 180,
             prop: 'packingSpecification',
@@ -198,16 +195,14 @@
             width: 80,
             prop: 'totalCount',
             label: '计量数量',
-            slot: 'totalCount',
-            align: 'center'
-          },
-          {
-            width: 100,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
+            align: 'center',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            }
           },
+       
           {
             minWidth: 120,
             prop: 'goodsLevel',

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

@@ -346,14 +346,19 @@
             width: 150,
             prop: 'purchaseCount',
             label: '数量',
-            align: 'center'
-          },
-          {
-            width: 150,
-            prop: 'purchaseUnit',
-            label: '单位',
-            align: 'center'
+            align: 'center',
+            formatter: (row, column) => {
+              if (row.purchaseCount) {
+                return row.purchaseCount + ' ' + row.purchaseUnit;
+              }
+            }
           },
+          // {
+          //   width: 150,
+          //   prop: 'purchaseUnit',
+          //   label: '单位',
+          //   align: 'center'
+          // },
           {
             minWidth: 180,
             prop: 'packingSpecification',
@@ -365,16 +370,20 @@
             width: 120,
             prop: 'totalCount',
             label: '计量数量',
-            slot: 'totalCount',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            },
             align: 'center'
           },
+          // {
+          //   width: 120,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   slot: 'measuringUnit',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'produceType',
@@ -404,24 +413,32 @@
             width: 120,
             prop: 'singleWeight',
             label: '单重',
-            slot: 'singleWeight',
+            formatter: (row, column) => {
+              if (row.singleWeight) {
+                return row.singleWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
             width: 120,
             prop: 'totalWeight',
             label: '总重',
-            slot: 'totalWeight',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'weightUnit',
-            label: '重量单位',
-            slot: 'weightUnit',
+            formatter: (row, column) => {
+              if (row.totalWeight) {
+                return row.totalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           // {
+          //   width: 120,
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   slot: 'weightUnit',
+          //   align: 'center'
+          // },
+          // {
           //   width: 160,
           //   prop: 'pricingWay',
           //   label: '计价方式',
@@ -521,16 +538,14 @@
             prop: 'modelKey',
             label: '机型',
             showOverflowTooltip: true,
-            align: 'center',
-
+            align: 'center'
           },
           {
             minWidth: 120,
             prop: 'colorKey',
             showOverflowTooltip: true,
             label: '颜色',
-            align: 'center',
-
+            align: 'center'
           },
           {
             width: 160,
@@ -656,83 +671,49 @@
             slot: 'taskName',
             align: 'center'
           },
-          {
-            width: 120,
-            prop: 'requirementTotalCount',
-            label: '采购需求数量',
-            slot: 'requirementTotalCount',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'planTotalCount',
-            label: '采购计划数量',
-            slot: 'planTotalCount',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'inquiryTotalCount',
-            label: '采购核价数量',
-            slot: 'inquiryTotalCount',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'contractTotalCount',
-            label: '采购合同数量',
-            slot: 'contractTotalCount',
-            align: 'center'
-          },
-          {
-            width: 80,
-            prop: 'doneTotalCount',
-            label: '已采数量',
-            slot: 'doneTotalCount',
-            align: 'center'
-          },
-          {
-            width: 80,
-            prop: 'waitTotalCount',
-            label: '待采数量',
-            // slot: 'waitTotalCount',
-            align: 'center'
-          },
+
           {
             width: 120,
             prop: 'totalCount',
             label: '数量',
             slot: 'totalCount',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            },
             align: 'center'
           },
-          {
-            width: 120,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
-          },
+
           {
             width: 120,
             prop: 'singleWeight',
             label: '单重',
-            slot: 'singleWeight',
+            formatter: (row, column) => {
+              if (row.singleWeight) {
+                return row.singleWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
             width: 120,
             prop: 'totalWeight',
             label: '总重',
-            slot: 'totalWeight',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'weightUnit',
-            label: '重量单位',
-            slot: 'weightUnit',
+            formatter: (row, column) => {
+              if (row.totalWeight) {
+                return row.totalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
+          // {
+          //   width: 120,
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   slot: 'weightUnit',
+          //   align: 'center'
+          // },
 
           {
             width: 110,

src/views/bpm/handleTask/components/purchaseOrder/invoice/receiptInfo.vue

@@ -210,18 +210,22 @@
             width: 150,
             prop: 'purchaseCount',
             label: '收货数量',
-            slot: 'purchaseCount',
-            headerSlot: 'headerTotalCount',
-            align: 'center'
-          },
-          {
-            width: 150,
-            prop: 'purchaseUnit',
-            label: '单位',
-            slot: 'purchaseUnit',
+            formatter: (row, column) => {
+              if (row.purchaseCount) {
+                return row.purchaseCount + ' ' + row.purchaseUnit;
+              }
+            },
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
+          // {
+          //   width: 150,
+          //   prop: 'purchaseUnit',
+          //   label: '单位',
+          //   slot: 'purchaseUnit',
+          //   headerSlot: 'headerTotalCount',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'packingSpecification',
@@ -233,16 +237,24 @@
             width: 80,
             prop: 'totalCount',
             label: '计量数量',
-            slot: 'totalCount',
-            align: 'center'
-          },
-          {
-            width: 120,
-            prop: 'orderTotalCount',
-            label: '总数量',
-            slot: 'orderTotalCount',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            },
             align: 'center'
           },
+          // {
+          //   width: 120,
+          //   prop: 'orderTotalCount',
+          //   label: '总数量',
+          //   formatter: (row, column) => {
+          //     if (row.orderTotalCount) {
+          //       return row.orderTotalCount + ' ' + row.measuringUnit;
+          //     }
+          //   },
+          //   align: 'center'
+          // },
           {
             minWidth: 120,
             prop: 'taskName',
@@ -250,25 +262,33 @@
             slot: 'taskName',
             align: 'center'
           },
-          {
-            width: 80,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
-          },
+          // {
+          //   width: 80,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   slot: 'measuringUnit',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'singleWeight',
             label: '单重',
-            slot: 'singleWeight',
+            formatter: (row, column) => {
+              if (row.singleWeight) {
+                return row.singleWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
             width: 200,
             prop: 'sendTotalWeight',
             label: '发货总重',
-            slot: 'sendTotalWeight',
+            formatter: (row, column) => {
+              if (row.sendTotalWeight) {
+                return row.sendTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center',
             headerSlot: 'headerTotalCount'
           },
@@ -276,24 +296,32 @@
             width: 100,
             prop: 'receiveTotalWeight',
             label: '收货总重',
-            slot: 'receiveTotalWeight',
+            formatter: (row, column) => {
+              if (row.receiveTotalWeight) {
+                return row.receiveTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
             width: 100,
             prop: 'increaseTotalWeight',
             label: '增重重量',
-            slot: 'increaseTotalWeight',
-            align: 'center'
-          },
-          {
-            width: 100,
-            prop: 'weightUnit',
-            label: '重量单位',
-            slot: 'weightUnit',
+            formatter: (row, column) => {
+              if (row.increaseTotalWeight) {
+                return row.increaseTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           // {
+          //   width: 100,
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   slot: 'weightUnit',
+          //   align: 'center'
+          // },
+          // {
           //   width: 160,
           //   prop: 'pricingWay',
           //   label: '计价方式',
@@ -380,16 +408,14 @@
             prop: 'modelKey',
             label: '机型',
             showOverflowTooltip: true,
-            align: 'center',
-
+            align: 'center'
           },
           {
             minWidth: 120,
             prop: 'colorKey',
             showOverflowTooltip: true,
             label: '颜色',
-            align: 'center',
-
+            align: 'center'
           },
           {
             prop: 'productionDate',

src/views/bpm/handleTask/components/purchaseOrder/invoiceConfirm/detailDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :loading="loading" style="margin-top: 10px;">
+  <div :loading="loading" style="margin-top: 10px">
     <el-form
       ref="form"
       :model="form"
@@ -277,23 +277,32 @@
             width: 80,
             prop: 'totalCount',
             label: '收货数量',
-            align: 'center'
+            align: 'center',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            }
           },
           {
             width: 150,
             prop: 'confirmCount',
             label: '确认数量',
-            slot: 'totalCount',
+              formatter: (row, column) => {
+              if (row.confirmCount) {
+                return row.confirmCount + ' ' + row.measuringUnit;
+              }
+            },
             align: 'center'
           },
 
-          {
-            width: 80,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
-          },
+          // {
+          //   width: 80,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   slot: 'measuringUnit',
+          //   align: 'center'
+          // },
           // {
           //   width: 120,
           //   prop: 'singleWeight',
@@ -396,21 +405,19 @@
                 : '';
             }
           },
-                    {
+          {
             minWidth: 120,
             prop: 'modelKey',
             label: '机型',
             showOverflowTooltip: true,
-            align: 'center',
-
+            align: 'center'
           },
           {
             minWidth: 120,
             prop: 'colorKey',
             showOverflowTooltip: true,
             label: '颜色',
-            align: 'center',
-
+            align: 'center'
           },
           {
             prop: 'productionDate',

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/detailDialog.vue

@@ -4,78 +4,51 @@
       <headerTitle title="基本信息"></headerTitle>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item
-            label="委外发货单编码："
-            prop="code"
-          >
+          <el-form-item label="委外发货单编码：" prop="code">
             {{ form.code }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="采购订单编码："
-            prop="orderNo"
-          >
+          <el-form-item label="采购订单编码：" prop="orderNo">
             {{ form.orderNo }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="外协单位："
-            prop="contactName"
-          >
+          <el-form-item label="外协单位：" prop="contactName">
             {{ form.supplierName }}
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item
-            label="外协单位联系人："
-            prop="linkName"
-          >
+          <el-form-item label="外协单位联系人：" prop="linkName">
             {{ form.linkName }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="外协单位电话："
-            prop="linkPhone"
-          >
+          <el-form-item label="外协单位电话：" prop="linkPhone">
             {{ form.linkPhone }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="发货日期："
-            prop="sendDate"
-          >
+          <el-form-item label="发货日期：" prop="sendDate">
             {{ form.sendDate }}
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24">
         <el-col :span="8">
-          <el-form-item
-            label="发货单号："
-            prop="sendNoteNo"
-          >
+          <el-form-item label="发货单号：" prop="sendNoteNo">
             {{ form.sendNoteNo }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="订单类型："
-            prop="sourceTypeName"
-          >
+          <el-form-item label="订单类型：" prop="sourceTypeName">
             {{ form.sourceTypeName }}
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="车辆号："
-            prop="carNo"
-          >
+          <el-form-item label="车辆号：" prop="carNo">
             {{ form.carNo }}
           </el-form-item>
         </el-col>
@@ -127,7 +100,7 @@
   // import fileMain from '@/components/addDoc/index.vue';
   import { mapActions } from 'vuex';
   import dictMixins from '@/mixins/dictMixins';
-  import {lbjtList } from '@/enum/dict.js';
+  import { lbjtList } from '@/enum/dict.js';
   import { levelList } from '@/enum/dict.js';
 
   export default {
@@ -207,12 +180,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();
               }
-          
             }
           },
           {
@@ -240,18 +214,15 @@
             width: 150,
             prop: 'purchaseCount',
             label: '发货数量',
-            slot: 'purchaseCount',
-            headerSlot: 'headerTotalCount',
-            align: 'center'
-          },
-          {
-            width: 150,
-            prop: 'purchaseUnit',
-            label: '单位',
-            slot: 'purchaseUnit',
+            formatter: (row, column) => {
+              if (row.purchaseCount) {
+                return row.purchaseCount + ' ' + row.purchaseUnit;
+              }
+            },
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
+
           {
             width: 120,
             prop: 'packingSpecification',
@@ -263,7 +234,11 @@
             width: 120,
             prop: 'totalCount',
             label: '计量数量',
-            slot: 'totalCount',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            },
             align: 'center'
           },
           {
@@ -273,35 +248,37 @@
             slot: 'taskName',
             align: 'center'
           },
-          {
-            width: 120,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
-            align: 'center'
-          },
+
           {
             width: 120,
             prop: 'singleWeight',
             label: '单重',
-            slot: 'singleWeight',
+            formatter: (row, column) => {
+              if (row.singleWeight) {
+                return row.singleWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
             width: 100,
             prop: 'sendTotalWeight',
             label: '发货总重',
-            slot: 'sendTotalWeight',
-            align: 'center'
-          },
-          {
-            width: 100,
-            prop: 'weightUnit',
-            label: '重量单位',
-            slot: 'weightUnit',
+            formatter: (row, column) => {
+              if (row.sendTotalWeight) {
+                return row.sendTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           // {
+          //   width: 100,
+          //   prop: 'weightUnit',
+          //   label: '重量单位',
+          //   slot: 'weightUnit',
+          //   align: 'center'
+          // },
+          // {
           //   width: 160,
           //   prop: 'pricingWay',
           //   label: '计价方式',
@@ -329,23 +306,21 @@
             slot: 'singlePrice',
             align: 'center'
           },
-          
+
           {
             width: 120,
             prop: 'taxRate',
             label: '税率',
             formatter: (_row, _column, cellValue) => {
-              return _row.taxRate
-                ? _row.taxRate+'%'
-                : '';
+              return _row.taxRate ? _row.taxRate + '%' : '';
             },
-            align: 'center',
+            align: 'center'
           },
           {
             width: 150,
             prop: 'notaxSinglePrice',
             label: '不含税单价',
-            align: 'center',
+            align: 'center'
           },
           {
             width: 100,
@@ -392,16 +367,14 @@
             prop: 'modelKey',
             label: '机型',
             showOverflowTooltip: true,
-            align: 'center',
-
+            align: 'center'
           },
           {
             minWidth: 120,
             prop: 'colorKey',
             showOverflowTooltip: true,
             label: '颜色',
-            align: 'center',
-
+            align: 'center'
           },
           {
             width: 200,
@@ -440,7 +413,7 @@
             prop: 'technicalDrawings',
             label: '技术图纸',
             slot: 'technicalDrawings',
-       
+
             align: 'center'
           },
           {
@@ -456,7 +429,7 @@
     created() {
       this.requestDict('产地');
       this.requestDict('生产类型');
-      
+
       this.getDetailData(this.businessId);
     },
     methods: {

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/detailDialog.vue

@@ -2,9 +2,8 @@
   <div>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <div class="title"> 退货单信息</div>
-     
+
       <el-row>
-        
         <el-col :span="8">
           <el-form-item
             label="供应商名称："
@@ -82,7 +81,7 @@
             {{ form.totalAmount }}元
           </el-form-item>
         </el-col>
- 
+
         <el-col :span="8">
           <el-form-item
             label="创建时间："
@@ -101,17 +100,26 @@
             {{ form.makerName }}
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="taskDefinitionKey == 'purchaserUploadReceipt'||!taskDefinitionKey">
+        <el-col
+          :span="8"
+          v-if="
+            taskDefinitionKey == 'purchaserUploadReceipt' || !taskDefinitionKey
+          "
+        >
           <el-form-item
             prop="repliedFiles"
             label="回执附件"
             :rules="[{ required: true, trigger: 'blur' }]"
           >
-            <fileMain v-model="form.repliedFiles" :type="taskDefinitionKey == 'purchaserUploadReceipt'?'add':'view'"></fileMain>
+            <fileMain
+              v-model="form.repliedFiles"
+              :type="
+                taskDefinitionKey == 'purchaserUploadReceipt' ? 'add' : 'view'
+              "
+            ></fileMain>
           </el-form-item>
         </el-col>
 
-       
         <el-col :span="8">
           <el-form-item
             label="审核状态："
@@ -121,7 +129,7 @@
             {{ reviewStatusEnum[form.reviewStatus]?.label }}
           </el-form-item>
         </el-col>
-   
+
         <el-col :span="8">
           <el-form-item label="备注：" prop="remark" style="margin-bottom: 5px">
             {{ form.remark }}
@@ -268,42 +276,62 @@
             width: 120,
             prop: 'receiveTotalCount',
             label: '收货数量',
-            slot: 'receiveTotalCount',
+            formatter: (row, column) => {
+              if (row.receiveTotalCount) {
+                return row.receiveTotalCount + ' ' + row.measuringUnit;
+              }
+            },
             align: 'center'
           },
           {
             width: 120,
             prop: 'totalCount',
             label: '退货数量',
-            slot: 'totalCount',
-            align: 'center'
-          },
-          {
-            width: 80,
-            prop: 'measuringUnit',
-            label: '计量单位',
-            slot: 'measuringUnit',
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            },
             align: 'center'
           },
+          // {
+          //   width: 80,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   slot: 'measuringUnit',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'singleWeight',
             label: '单重',
-            slot: 'singleWeight',
+            formatter: (row, column) => {
+              if (row.singleWeight) {
+                return row.singleWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
             width: 200,
             prop: 'sendTotalWeight',
             label: '发货总重',
-            slot: 'sendTotalWeight',
+            formatter: (row, column) => {
+              if (row.sendTotalWeight) {
+                return row.sendTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
             width: 200,
             prop: 'receiveTotalWeight',
             label: '收货总重',
-            slot: 'receiveTotalWeight',
+            formatter: (row, column) => {
+              if (row.receiveTotalWeight) {
+                return row.receiveTotalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },
           {
@@ -313,20 +341,7 @@
             slot: 'increaseTotalWeight',
             align: 'center'
           },
-          // {
-          //   width: 160,
-          //   prop: 'pricingWay',
-          //   label: '计价方式',
-          //   slot: 'pricingWay',
-          //   align: 'center',
-          //   formatter: (row, column) => {
-          //     return row.pricingWay == 1
-          //       ? '按数量计费'
-          //       : row.pricingWay == 2
-          //       ? '按重量计费'
-          //       : '';
-          //   }
-          // },
+
           {
             minWidth: 120,
             prop: 'goodsLevel',
@@ -396,21 +411,19 @@
                 : '';
             }
           },
-                    {
+          {
             minWidth: 120,
             prop: 'modelKey',
             label: '机型',
             showOverflowTooltip: true,
-            align: 'center',
-
+            align: 'center'
           },
           {
             minWidth: 120,
             prop: 'colorKey',
             showOverflowTooltip: true,
             label: '颜色',
-            align: 'center',
-
+            align: 'center'
           },
           {
             width: 220,
@@ -501,12 +514,12 @@
   };
 </script>
 
-<style scoped lang="scss">  
-.title {
-  font-size: 22px;
-  font-weight: 800;
-  margin-top: 15px;
-}
+<style scoped lang="scss">
+  .title {
+    font-size: 22px;
+    font-weight: 800;
+    margin-top: 15px;
+  }
   .ele-dialog-form {
     .el-form-item {
       margin-bottom: 10px;

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

@@ -258,28 +258,24 @@
             width: 150,
             prop: 'productCategoryName',
             label: '分类',
-            align: 'center',
-            slot: 'productCategoryName'
+            align: 'center'
           },
           {
             width: 140,
             prop: 'productCode',
             label: '编码',
-            align: 'center',
-            slot: 'productCode'
+            align: 'center'
           },
           {
             width: 240,
             prop: 'productName',
             label: '名称',
-            align: 'center',
-            slot: 'productName'
+            align: 'center'
           },
           {
             width: 110,
             prop: 'batchNo',
             label: '批次号',
-            slot: 'batchNo',
             align: 'center'
           },
           {
@@ -301,28 +297,31 @@
             width: 150,
             prop: 'taskName',
             label: '工序',
-            slot: 'taskName',
             align: 'center'
           },
           {
             width: 150,
             prop: 'productBrand',
             label: '牌号',
-            align: 'center',
-            slot: 'productBrand'
+            align: 'center'
           },
           {
             width: 150,
             prop: 'purchaseCount',
             label: '数量',
-            align: 'center'
-          },
-          {
-            width: 150,
-            prop: 'purchaseUnit',
-            label: '单位',
-            align: 'center'
+            align: 'center',
+            formatter: (row, column) => {
+              if (row.purchaseCount) {
+                return row.purchaseCount + ' ' + row.purchaseUnit;
+              }
+            }
           },
+          // {
+          //   width: 150,
+          //   prop: 'purchaseUnit',
+          //   label: '单位',
+          //   align: 'center'
+          // },
           {
             minWidth: 180,
             prop: 'packingSpecification',
@@ -334,16 +333,21 @@
             width: 100,
             prop: 'totalCount',
             label: '计量数量',
-            align: 'center'
-            // slot: 'totalCount'
-          },
-          {
-            width: 100,
-            prop: 'measuringUnit',
-            label: '计量单位',
             align: 'center',
-            slot: 'measuringUnit'
+            formatter: (row, column) => {
+              if (row.totalCount) {
+                return row.totalCount + ' ' + row.measuringUnit;
+              }
+            }
+            // slot: 'totalCount'
           },
+          // {
+          //   width: 100,
+          //   prop: 'measuringUnit',
+          //   label: '计量单位',
+          //   align: 'center',
+          //   slot: 'measuringUnit'
+          // },
           {
             minWidth: 120,
             prop: 'goodsLevel',
@@ -365,7 +369,11 @@
             width: 120,
             prop: 'totalWeight',
             label: '重量',
-            slot: 'totalWeight',
+            formatter: (row, column) => {
+              if (row.totalWeight) {
+                return row.totalWeight + ' ' + row.weightUnit;
+              }
+            },
             align: 'center'
           },