正式合并测试

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

@@ -8,7 +8,7 @@
         :loading="loading"
         :selectConfig="selectConfig"
         highlight-current-row
-        :statConfig="statConfig"
+        :statConfig='statConfig'
         :action-list="[
           {
             text: '创建合同',
@@ -400,30 +400,30 @@ const config = computed(() => {
                 },
               }
             : {},
-          // row.issue && row.issue === "0" && row.status == 30
-          //   ? {
-          //       attrs: {
-          //         label: "下发交接单",
-          //         type: "primary",
-          //         text: true,
-          //       },
-          //       el: "button",
-          //       click() {
-          //         ElMessageBox.confirm("是否确认下发交接单?", "提示", {
-          //           confirmButtonText: "确定",
-          //           cancelButtonText: "取消",
-          //           type: "warning",
-          //         }).then(() => {
-          //           proxy
-          //             .post("/contract/edit", { id: row.id, issue: 1 })
-          //             .then(() => {
-          //               ElMessage({ message: "下发成功", type: "success" });
-          //               getList();
-          //             });
-          //         });
-          //       },
-          //     }
-          //   : {},
+          row.issue && row.issue === "0" && row.status == 30
+            ? {
+                attrs: {
+                  label: "下发交接单",
+                  type: "primary",
+                  text: true,
+                },
+                el: "button",
+                click() {
+                  ElMessageBox.confirm("是否确认下发交接单?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                  }).then(() => {
+                    proxy
+                      .post("/contract/edit", { id: row.id, issue: 1 })
+                      .then(() => {
+                        ElMessage({ message: "下发成功", type: "success" });
+                        getList();
+                      });
+                  });
+                },
+              }
+            : {},
           row.status == 30
             ? {
                 attrs: {
@@ -585,19 +585,20 @@ const getList = async (req) => {
   });
 };
 const statConfig = computed(() => {
-  return [
-    {
-      label: "合计",
-      data: [],
-    },
-  ];
-});
+	return [
+		{
+			label: '合计',
+			data:[],
+		},
+		
+	]
+})
 getDict();
 if (route.query.code) {
   sourceList.value.pagination.keyword = route.query.code;
 }
 onMounted(() => {
-  getList();
+  getList()
 })
 const getTotal = () => {
   proxy.post("/contract/getHeadCustomerStatistics",sourceList.value.pagination).then((res) => {
@@ -606,6 +607,9 @@ const getTotal = () => {
       label: "合计",
       data: [
         {
+          label:'数量',
+          num:res.data.sumQuantity,
+          color:'rgb(171 0 255)',
           label: "数量",
           num: res.sumQuantity,
           color: "rgb(171 0 255)",

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

@@ -1196,8 +1196,9 @@
       <template #footer>
         <el-button @click="openPrint = false" size="large">取消</el-button>
         <el-button type="primary" @click="clickDownload()" size="large"
-          >下载PDF</el-button
+          >下载PDF </el-button
         >
+        <el-button v-print="printObj" size="large">打印</el-button>
       </template>
     </el-dialog>
 
@@ -2159,6 +2160,7 @@
         <el-button type="primary" @click="clickSave()" size="large"
           >保存</el-button
         >
+        <el-button v-print="printObj" size="large">打印</el-button>
       </template>
     </el-dialog>
 
@@ -2512,6 +2514,7 @@
         <el-button type="primary" @click="clickSave()" size="large"
           >保存</el-button
         >
+        <el-button v-print="pdfDomOne2" size="large">打印</el-button>
       </template>
     </el-dialog>
   </div>
@@ -3314,6 +3317,14 @@ const printObj = ref({
   extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
 });
 
+const pdfDomOne2 = ref({
+  id: "pdfDomOne",
+  popTitle: "",
+  extraCss:
+    "https://cdn.bootcdn.net/ajax/libs/animate.css/4.1.1/animate.compat.css, https://cdn.bootcdn.net/ajax/libs/hover.css/2.3.1/css/hover-min.css",
+  extraHead: '<meta http-equiv="Content-Language"content="zh-cn"/>',
+});
+
 const getChineseDate = (date) => {
   if (date) {
     const newDate = new Date(date);