1

src/components/PDF/contractPDFOne.vue

@@ -110,7 +110,9 @@
             />
           </td>
           <td style="width: 20%">{{ item.productName }}</td>
-          <td style="width: 15%">{{ item.productModel }} cm</td>
+          <td style="width: 15%">
+            <span v-if="item.productModel">{{ item.productModel }} cm</span>
+          </td>
           <td style="width: 12%">{{ item.packMethod }}</td>
           <td style="width: 12%">
             {{ item.productQuantity }}

src/components/PDF/samplePDF.vue

@@ -112,7 +112,9 @@
             />
           </td>
           <td style="width: 20%">{{ item.productName }}</td>
-          <td style="width: 15%">{{ item.productModel }} cm</td>
+          <td style="width: 15%">
+            <span v-if="item.productModel">{{ item.productModel }} cm</span>
+          </td>
           <td style="width: 15%">
             {{ item.productQuantity }}
           </td>

src/components/process/EHSD/Contract.vue

@@ -1857,7 +1857,7 @@ const selectContract = (businessId) => {
       for (const key in res) {
         formData.data[key] = res[key];
       }
-      formData.data.oldContractId = formData.data.id;
+      delete formData.data.oldContractId;
       delete formData.data.id;
       delete formData.data.code;
       proxy

src/views/EHSD/productLibrary/companyProduct/index.vue

@@ -109,6 +109,7 @@
                 list-type="picture-card"
                 :on-remove="handleRemove"
                 :before-upload="handleBeforeUpload"
+                :on-preview="handlePreview"
                 accept=".gif, .jpeg, .jpg, .png"
               >
                 <el-icon><Plus /></el-icon>
@@ -796,6 +797,12 @@ const handleKeyup = (val) => {
     ""
   );
 };
+
+const handlePreview = (file) => {
+  if (file && file.fileUrl) {
+    window.open(file.fileUrl, "_black");
+  }
+};
 </script>
 
 <style lang="scss" scoped>

src/views/EHSD/productLibrary/customerProduct/index.vue

@@ -133,6 +133,7 @@
                 list-type="picture-card"
                 :on-remove="handleRemove"
                 :before-upload="handleBeforeUpload"
+                :on-preview="handlePreview"
                 accept=".gif, .jpeg, .jpg, .png"
               >
                 <el-icon><Plus /></el-icon>
@@ -874,6 +875,12 @@ const remoteMethod = (keyword) => {
   }
   return;
 };
+
+const handlePreview = (file) => {
+  if (file && file.fileUrl) {
+    window.open(file.fileUrl, "_black");
+  }
+};
 </script>
 
 <style lang="scss" scoped>

src/views/finance/fundManage/accountPayment/index.vue

@@ -749,8 +749,8 @@ const getTreeList = () => {
 const getDtl = (row) => {
   proxy.post("/accountPayment/detail", { id: row.id }).then((res) => {
     formData.data = res;
-    formData.data.expensesTime = moment().format("yyyy-MM-DD HH:mm:ss");
     if (submitType.value === "add") {
+      formData.data.expensesTime = moment().format("yyyy-MM-DD HH:mm:ss");
       formData.data.currency = accountCurrency.value[0].value;
     }
     proxy
@@ -939,6 +939,7 @@ const submitCancelledOutForm = () => {
 };
 const clickDetail = () => {
   formOption.disabled = true;
+  submitType.value = "edit";
   getDtl(rowData.value);
 };
 </script>