优化库存表格详情显示逻辑，修复合同详情对话框格式问题

src/BIZComponents/inventoryTableDetails.vue

@@ -39,7 +39,7 @@
         </el-form-item>
       </template>
       <template v-slot:customerExpectDeliveryDeadline="scope">
-        <div v-if="scope.row.arrivalWay == 1">
+        <div v-if="scope.row.arrivalWay == 1 || !scope.row.arrivalWay">
           {{ scope.row.customerExpectDeliveryDeadline }}
         </div>
         <div v-if="scope.row.arrivalWay == 2">
@@ -135,6 +135,10 @@
         type: Boolean,
         default: false
       },
+      isArrivalWay: {
+        type: Boolean,
+        default: false
+      },
       countObj: {
         type: Object,
         default: () => {
@@ -459,21 +463,19 @@
             label: '图号/件号',
             showOverflowTooltip: true
           },
-            {
+          {
             minWidth: 120,
             prop: 'modelKey',
             label: '机型',
             showOverflowTooltip: true,
-            align: 'center',
-
+            align: 'center'
           },
           {
             minWidth: 120,
             prop: 'colorKey',
             showOverflowTooltip: true,
             label: '颜色',
-            align: 'center',
-
+            align: 'center'
           },
           {
             prop: 'provenance',

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

@@ -4,15 +4,14 @@
       <headerTitle title="合同信息"></headerTitle>
       <el-row>
         <el-col :span="12">
-          <el-form-item
-            label="合同类型："
-            prop="type"
-          >
+          <el-form-item label="合同类型：" prop="type">
             {{ form.typeName }} {{ form.categoryName }}
           </el-form-item>
           <el-form-item label="来源类型：">
-         {{ sourceTypeList.find(item=>item.code==form.sourceType)?.name }}
-            </el-form-item>
+            {{
+              sourceTypeList.find((item) => item.code == form.sourceType)?.name
+            }}
+          </el-form-item>
           <el-form-item
             label="核价单："
             prop="sourceName"
@@ -41,10 +40,7 @@
           >
             {{ form.sourceName }}
           </el-form-item>
-          <el-form-item
-            label="合同名称："
-            prop="contractName"
-          >
+          <el-form-item label="合同名称：" prop="contractName">
             {{ form.contractName }}
           </el-form-item>
           <el-form-item
@@ -62,37 +58,22 @@
             {{ form.requireDeptName }}
           </el-form-item>
 
-          <el-form-item
-            label="编码："
-            prop="contractNumber"
-          >
+          <el-form-item label="编码：" prop="contractNumber">
             {{ form.contractNo }}
           </el-form-item>
-          <el-form-item
-            label="合同编号："
-            prop="contractNumber"
-          >
+          <el-form-item label="合同编号：" prop="contractNumber">
             {{ form.contractNumber }}
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item
-            label="签订日期："
-            prop="contractStartDate"
-          >
+          <el-form-item label="签订日期：" prop="contractStartDate">
             {{ form.contractStartDate }}
           </el-form-item>
-          <el-form-item
-            label="结束日期："
-            prop="contractEndDate"
-          >
+          <el-form-item label="结束日期：" prop="contractEndDate">
             {{ form.contractEndDate }}
           </el-form-item>
 
-          <el-form-item
-            label="结算方式："
-            prop="payWay"
-          >
+          <el-form-item label="结算方式：" prop="payWay">
             {{ form.settlementModeName }}
           </el-form-item>
           <el-form-item
@@ -110,10 +91,7 @@
       <headerTitle title="基本信息"></headerTitle>
       <el-row>
         <el-col :span="12">
-          <el-form-item
-            label="甲方名称："
-            prop="partaName"
-          >
+          <el-form-item label="甲方名称：" prop="partaName">
             {{ form.partaName }}
           </el-form-item>
           <el-form-item
@@ -123,44 +101,25 @@
           >
             {{ form.partaUnifiedSocialCreditCode }}
           </el-form-item>
-          <el-form-item
-            label="甲方联系人："
-            prop="partaLinkName"
-          >
+          <el-form-item label="甲方联系人：" prop="partaLinkName">
             {{ form.partaLinkName }}
           </el-form-item>
-          <el-form-item
-            label="甲方电话："
-            prop="partaTel"
-          >
+          <el-form-item label="甲方电话：" prop="partaTel">
             {{ form.partaTel }}
           </el-form-item>
-          <el-form-item
-            label="甲方传真："
-            prop="partaFax"
-          >
+          <el-form-item label="甲方传真：" prop="partaFax">
             {{ form.partaFax }}
           </el-form-item>
-          <el-form-item
-            label="	甲方Email："
-            prop="partaEmail"
-          >
+          <el-form-item label="	甲方Email：" prop="partaEmail">
             {{ form.partaEmail }}
           </el-form-item>
-          <el-form-item
-            label="甲方地址："
-            prop="partaAddress"
-          >
+          <el-form-item label="甲方地址：" prop="partaAddress">
             {{ form.partaAddress }}
           </el-form-item>
-         
         </el-col>
 
         <el-col :span="12">
-          <el-form-item
-            label="乙方名称："
-            prop="partbName"
-          >
+          <el-form-item label="乙方名称：" prop="partbName">
             {{ form.partbName }}
           </el-form-item>
           <el-form-item
@@ -170,10 +129,7 @@
           >
             {{ form.partbUnifiedSocialCreditCode }}
           </el-form-item>
-          <el-form-item
-            label="乙方联系人："
-            prop="partbLinkName"
-          >
+          <el-form-item label="乙方联系人：" prop="partbLinkName">
             {{ form.partbLinkName }}
           </el-form-item>
           <el-form-item prop="partbTel" label="乙方联系电话：">
@@ -183,20 +139,13 @@
             {{ form.partbFax }}
           </el-form-item>
 
-          <el-form-item
-            label="乙方Email："
-            prop="partbEmail"
-          >
+          <el-form-item label="乙方Email：" prop="partbEmail">
             {{ form.partbEmail }}
           </el-form-item>
 
-          <el-form-item
-            label="乙方地址："
-            prop="partbAddress"
-          >
+          <el-form-item label="乙方地址：" prop="partbAddress">
             {{ form.partbAddress }}
           </el-form-item>
-        
         </el-col>
       </el-row>
     </el-form>
@@ -209,11 +158,12 @@
       :contractBookType="form.type"
       :pricingWay="form.pricingWay"
       :isChangeCount="false"
+      :isArrivalWay="true"
       :countObj="{
-              countKey: 'contractCount',
-              unitKey: 'contractUnit',
-              unitIdKey: 'contractUnitId'
-            }"
+        countKey: 'contractCount',
+        unitKey: 'contractUnit',
+        unitIdKey: 'contractUnitId'
+      }"
     >
     </inventoryTabledetail>
 
@@ -258,7 +208,7 @@
   export default {
     mixins: [dictMixins],
     components: {
-      inventoryTabledetail,
+      inventoryTabledetail
       // fileMain
     },
     props: {
@@ -329,7 +279,7 @@
             label: '款项类型',
             align: 'center',
             formatter: (_row, _column, cellValue) => {
-              return payType.find(item=>item.value==_row.type)?.label
+              return payType.find((item) => item.value == _row.type)?.label;
             }
           },
           {
@@ -556,8 +506,8 @@
       margin-bottom: 10px;
     }
   }
-  :deep(.el-form-item){
-    margin-bottom:4px;
+  :deep(.el-form-item) {
+    margin-bottom: 4px;
   }
   .headbox {
     display: flex;