Merge branch 'master' into stage

src/components/PDF/contractPDF.vue

@@ -243,12 +243,14 @@ const getDict = () => {
 };
 getDict();
 watch(
-  props.rowData,
+  props,
   () => {
-    if (props.rowData.id) {
-      getPdfData({ id: props.rowData.id });
-    } else if (props.rowData.code) {
-      getPdfData({ code: props.rowData.code });
+    if (props.rowData) {
+      if (props.rowData.id) {
+        getPdfData({ id: props.rowData.id });
+      } else if (props.rowData.code) {
+        getPdfData({ code: props.rowData.code });
+      }
     }
   },
   {

src/components/contractCom/contractDetails.vue

@@ -20,7 +20,7 @@
           :style="{ color: currentItem.id === i.id ? '#409eff' : '' }"
           @click="handleItemClick(i)"
         >
-          <div v-if="activeName === 'first'">v {{ i.version }}</div>
+          <div v-if="activeName === 'first'">{{ i.code }}</div>
           <div v-if="activeName === 'second'">
             {{ i.code }}
           </div>
@@ -216,7 +216,7 @@ getDetailsData();
 .content-box {
   display: flex;
   .left {
-    width: 100px;
+    width: 160px;
     // background: #ccc;
     .left-item {
       height: 36px;
@@ -226,7 +226,7 @@ getDetailsData();
     }
   }
   .right {
-    width: calc(100% - 100px);
+    width: calc(100% - 160px);
     padding-left: 10px;
   }
 }

src/views/salesMange/saleContract/contract/index.vue

@@ -89,7 +89,7 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="合同详情" v-if="openDetailsDialog" v-model="openDetailsDialog" width="1000">
+    <el-dialog title="合同详情" v-if="openDetailsDialog" v-model="openDetailsDialog" width="1100">
       <ContractDetails :contractId="currentContractId"></ContractDetails>
     </el-dialog>
   </div>

src/views/salesMange/shipmentMange/document/index.vue

@@ -406,7 +406,7 @@
               </td>
               <td style="text-align: center">{{ item.quantity }}</td>
               <td :rowspan="printDetails.documentsProducts.length" style="text-align: center" v-if="index === 0 && [1].includes(openStatus)">
-                {{ printDetails.sumBomVolume }}
+                {{ printDetails.sumNetWeight }}
               </td>
               <td :rowspan="printDetails.documentsProducts.length" style="text-align: center; border-right: 0" v-if="index === 0 && [1].includes(openStatus)">
                 {{ printDetails.sumRoughWeight }}