用章修改 發文

src/views/clocking/sealApplication.vue

@@ -491,7 +491,8 @@ export default {
     onSubmit() {
       this.$refs["ruleFormRef"].validate((valid) => {
         this.form.useTime = this.form1.useTime;
-        if(this.fujian.length>0){
+        console.log("fujian", this.fujian);
+        if (this.fujian.length > 0) {
           this.form.fileId = this.fujian[0].response.data.fileId;
         }
         this.form.signetType = this.form1.signetType;
@@ -499,38 +500,38 @@ export default {
         this.form.activeSend = this.form1.activeSend;
         this.form.signetCopies = this.form1.signetCopies;
         if (valid) {
-          if (this.Fzr) {
-            this.$modal.loading("提交中...");
-            this.flowDatas.token = getJToken();
-            this.flowDatas.WorkID = this.workId;
-            this.flowDatas.FK_Flow = "017";
-            this.flowDatas.toNodeId = "1703";
-            console.log(this.flowDatas);
-            this.$modal.closeLoading();
-            this.$refs["selectRef"].show1(this.flowDatas);
-          } else {
-            this.$modal.loading("提交中...");
-            startUsingSeal(this.form)
-              .then((response) => {
-                ElMessage({
-                  message:
-                    "已发送到" +
-                    response.data.VarToNodeName +
-                    "节点，接收人：" +
-                    response.data.VarAcceptersName,
-                  type: "success",
-                });
-                this.$refs.fujianUpload.clearFiles();
-                this.fujian=[];
-                this.reset();
-                this.$refs.ruleFormRef.resetFields();
-                this.$modal.closeLoading();
-                this.$emit("change1");
-              })
-              .catch(() => {
-                this.$modal.closeLoading();
-              });
-          }
+          // if (this.Fzr) {
+          this.$modal.loading("提交中...");
+          this.flowDatas.token = getJToken();
+          this.flowDatas.WorkID = this.workId;
+          this.flowDatas.FK_Flow = "017";
+          this.flowDatas.toNodeId = "1703";
+          console.log(this.flowDatas);
+          this.$modal.closeLoading();
+          this.$refs["selectRef"].show1(this.flowDatas);
+          // } else {
+          //   this.$modal.loading("提交中...");
+          //   startUsingSeal(this.form)
+          //     .then((response) => {
+          //       ElMessage({
+          //         message:
+          //           "已发送到" +
+          //           response.data.VarToNodeName +
+          //           "节点，接收人：" +
+          //           response.data.VarAcceptersName,
+          //         type: "success",
+          //       });
+          //       this.$refs.fujianUpload.clearFiles();
+          //       this.fujian = [];
+          //       this.reset();
+          //       this.$refs.ruleFormRef.resetFields();
+          //       this.$modal.closeLoading();
+          //       this.$emit("change1");
+          //     })
+          //     .catch(() => {
+          //       this.$modal.closeLoading();
+          //     });
+          // }
         } else {
           this.$modal.closeLoading();
         }
@@ -540,6 +541,7 @@ export default {
     reset() {
       this.getUserInfo();
       this.getDeptTree();
+      this.fujian = [];
       // this.currentTime();
     },
     SubmitSelect(selUsers) {

src/views/flows/fwsp.vue

@@ -90,16 +90,17 @@
         >
           <tr style="height: 24vh">
             <td style="" width="150px" align="center">签&nbsp;发</td>
-            <td style="padding: 0 5px; font-size: 28px" colspan="17">
-              <!-- <div v-for="item in dataLD" :key="item">
-                <div style="padding: 0 5px">
-                  {{ item.Msg }} {{ item.EmpFromT }}
+            <td
+              align="left"
+              style="padding: 0 5px; font-size: 28px"
+              colspan="17"
+            >
+              <div v-for="item in dataLD" :key="item">
+                <div style="padding: 0 5px; color: black">
+                  {{ item.EmpFromT }}: {{ item.Msg }}
                   {{ parseTime(item.RDT, "{y}-{m}-{d} {h}:{i}:{s}") }}
                 </div>
-                <div
-                  style="line-height: 45px; height: 45px; padding: 0 5px"
-                ></div>
-              </div> -->
+              </div>
             </td>
           </tr>
 
@@ -108,16 +109,20 @@
               <div style="margin-bottom: 5px">综 合 处</div>
               审核意见
             </td>
-            <td style="padding: 0 5px; font-size: 28px" colspan="17">
-              <!-- <div v-for="item in bgsData" :key="item">
-                <div style="padding: 0 5px">
-                  {{ item.Msg }} {{ item.EmpFromT }}
+            <td
+              align="left"
+              style="padding: 0 5px; font-size: 28px"
+              colspan="17"
+            >
+              <div v-for="item in bgsData" :key="item">
+                <div style="padding: 0 5px; color: black">
+                  {{ item.EmpFromT }}: {{ item.Msg }}
                   {{ parseTime(item.RDT, "{y}-{m}-{d} {h}:{i}:{s}") }}
                 </div>
                 <div
                   style="line-height: 45px; height: 45px; padding: 0 5px"
                 ></div>
-              </div> -->
+              </div>
             </td>
           </tr>
 
@@ -125,83 +130,136 @@
             <td rowspan="2" colspan="1" style="" align="center">
               主办或会签处室意见
             </td>
-            <td colspan="9" rowspan="2" style="padding: 0 5px; font-size: 28px">
-              <!-- <div v-for="item in csData" :key="item">
+            <td
+              align="left"
+              colspan="9"
+              rowspan="2"
+              style="padding: 0 5px; font-size: 28px; color: black"
+            >
+              <div v-for="item in hqData" :key="item">
                 <div style="padding: 0 5px">
-                  {{ item.Msg }} {{ item.EmpFromT }}
-                  {{ parseTime(item.RDT, "{y}-{m}-{d} {h}:{i}:{s}") }}
+                  {{ item.EmpFromT }}: {{ item.Msg }}
                 </div>
-                <div
-                  style="line-height: 45px; height: 45px; padding: 0 5px"
-                ></div>
-              </div> -->
+              </div>
             </td>
             <td rowspan="2" colspan="1" style="width: 70px" align="center">
               政府信息公开
             </td>
-            <td colspan="6" style="width: 45%">主动公开( )；依申请公开( )</td>
+            <td colspan="6" align="left" style="width: 45%">
+              主动公开(<span
+                style="color: black"
+                v-if="this.data11.infoOpenType == '1'"
+                >√</span
+              ><span v-else>&nbsp;</span>)；依申请公开(<span
+                style="color: black"
+                v-if="this.data11.infoOpenType == '2'"
+                >√</span
+              ><span v-else>&nbsp;</span>)
+            </td>
           </tr>
           <tr style="height: 6vh">
-            <td colspan="6" style="padding: 0 5px; width: 45%">
-              不公开( )，理由：
+            <td colspan="6" align="left" style="padding: 0 5px; width: 45%">
+              不公开(<span
+                style="color: black"
+                v-if="this.data11.infoOpenType == '3'"
+                >√</span
+              ><span v-else>&nbsp;</span>)，理由：<span style="color: black">{{
+                this.data11.noOpenReason
+              }}</span>
             </td>
           </tr>
 
           <tr style="height: 8vh">
-            <td colspan="9" style="width: 400px">冀卫健康指导〔 〕号</td>
+            <td
+              align="left"
+              colspan="9"
+              style="width: 400px; font-size: 28px; padding: 0 5px"
+            >
+              {{ this.data11.wordNum }}
+            </td>
             <td align="center" colspan="2" style="padding: 0 5px; width: 180px">
               处室<br />拟稿
             </td>
-            <td style="padding: 0 5px; width: 110px" colspan="1"></td>
+            <td style="padding: 0 5px; width: 110px; color: black" colspan="1">
+              {{ this.data11.createBy }}
+            </td>
             <td align="center" colspan="2" style="padding: 0 5px; width: 120px">
               处室<br />核稿
             </td>
-            <td style="padding: 0 5px; width: 150px" colspan="2"></td>
+            <td style="padding: 0 5px; width: 150px; color: black" colspan="2">
+              <span v-if="this.bgsData[0] != undefined">{{
+                this.bgsData[0].EmpFromT
+              }}</span>
+            </td>
           </tr>
-
           <tr style="height: 12vh">
             <td style="" align="center">
               <div style="margin-bottom: 5px">文&nbsp;件</div>
               标&nbsp;题
             </td>
-            <td style="padding: 0 5px; font-size: 28px" colspan="17">
-              <!-- {{ this.data11.title }} -->
+            <td
+              style="padding: 0 5px; font-size: 28px; color: black"
+              colspan="17"
+            >
+              {{ this.data11.title }}
             </td>
           </tr>
           <tr style="height: 12vh">
             <td style="" align="center">附&nbsp;件</td>
-            <td colspan="17" style="padding: 0 5px; font-size: 28px">
-              <!-- <div v-for="item in this.data11.messageFileList" :key="item">
+            <td
+              colspan="17"
+              style="padding: 0 5px; font-size: 28px; color: black"
+            >
+              <div v-for="item in this.data11.messageFileList" :key="item">
                 <div>{{ item.name }}</div>
-              </div> -->
+              </div>
             </td>
           </tr>
           <tr style="height: 8vh">
             <td style="" align="center">主&nbsp;送</td>
-            <td colspan="17" style="font-size: 28px">
-              <!-- {{ this.data11.mainUnit }} -->
+            <td colspan="17" style="font-size: 28px; color: black">
+              {{ this.data11.mainUnit }}
             </td>
           </tr>
 
           <tr style="height: 8vh">
             <td colspan="1" style="" align="center">抄&nbsp;送</td>
-            <td colspan="18" style="padding: 0 5px; font-size: 28px">
-              <!-- {{ this.data11.copyUnit }} -->
+            <td
+              colspan="18"
+              style="padding: 0 5px; font-size: 28px; color: black"
+            >
+              {{ this.data11.copyUnit }}
             </td>
           </tr>
           <tr style="height: 8vh">
             <td colspan="1" align="center">密&nbsp;级</td>
-            <td colspan="8" style="padding: 0 5px; font-size: 28px; width: 1px">
-              <!-- {{ this.data11.copyUnit }} -->
+            <td
+              colspan="8"
+              style="
+                padding: 0 5px;
+                font-size: 28px;
+                max-width: 80px;
+                color: black;
+              "
+            >
+              {{ yzlxFormat(this.data11.degree) }}
             </td>
-            <td align="center" colspan="2" style="padding: 0 5px; width: 350px">
+            <td
+              align="center"
+              colspan="2"
+              style="padding: 0 5px; min-width: 150px"
+            >
               保密期限
             </td>
-            <td style="width: 300px" colspan="1"></td>
+            <td style="width: 300px; color: black" colspan="1">
+              {{ this.data11.bmqx }}
+            </td>
             <td align="center" colspan="3" style="padding: 0 5px; width: 250px">
               紧急程度
             </td>
-            <td style="width: 250px" colspan="2"></td>
+            <td style="width: 250px; color: black" colspan="2">
+              {{ jjFormat(this.data11.jjcd) }}
+            </td>
           </tr>
           <tr style="height: 8vh">
             <td colspan="1" align="center">校&nbsp;对</td>
@@ -211,7 +269,9 @@
             <td align="center" colspan="2" style="padding: 0 5px; width: 350px">
               打&nbsp;印
             </td>
-            <td style="width: 300px" colspan="1"></td>
+            <td style="width: 300px; color: black" colspan="1">
+              {{ this.data11.dyr }}
+            </td>
             <td align="center" colspan="3" style="padding: 0 5px; width: 250px">
               盖&nbsp;章
             </td>
@@ -219,7 +279,10 @@
           </tr>
         </table>
         <div style="height: 30px; line-height: 30px; margin-top: 15px">
-          <div style="margin-left: 620px">(共印 &nbsp; 份，存档 &nbsp; 份)</div>
+          <div style="margin-left: 620px">
+            (共印<span style="color: black">{{ this.data11.dynum }} </span
+            >份，存档 &nbsp; 份)
+          </div>
           <!-- <div style="display: inline-block; margin-left: 5px">
             1、批示意见不要越过装订线
             <br />
@@ -246,6 +309,8 @@ export default {
   props: ["data"],
   data() {
     return {
+      signet_type: useDict("signet_type").signet_type,
+      urgent_type: useDict("urgent_type").urgent_type,
       //打印
       print: {
         id: "printContent",
@@ -253,16 +318,17 @@ export default {
       YbjDatas: [],
       OpenData: [],
       bgsData: [],
+      zhcData: [],
       csData: [],
       noOpenReason: [],
       sw_open_type: useDict("sw_open_type").sw_open_type,
       no_open_reason: useDict("no_open_reason").no_open_reason,
       data11: this.data,
       dataLD: [],
+      hqData: [],
     };
   },
   created() {
-    console.log("data11", this.data11);
     // this.data11.infoOpenType;
     // this.sw_open_type.forEach((item) => {
     //   if (item.value == this.data11.infoOpenType) {
@@ -277,29 +343,47 @@ export default {
     //     this.noOpenReason.push(item.label);
     //   }
     // });
+  },
+  mounted() {
+    console.log("data11", this.data11);
     // this.getInfoData();
   },
-  mounted() {},
   methods: {
-    getInfoData() {
-      console.log("this.data.workId", this.data.workId);
-      // getFwYbjInfo(this.data.workId).then((reData) => {
-      //   console.log("reData", reData);
-      //   if (reData.data != null) {
-      //     this.YbjDatas = reData.data;
-      //     if (this.YbjDatas["203"] != undefined) {
-      //       this.dataLD = this.YbjDatas["203"];
-      //       console.log("dataLD1", this.dataLD);
-      //     }
-      //     if (this.YbjDatas["202"] != undefined) {
-      //       this.bgsData = this.YbjDatas["202"];
-      //       console.log("bgsData", this.bgsData);
-      //     }
-      //     if (this.YbjDatas["206"] != undefined) {
-      //       this.csData = this.YbjDatas["206"];
-      //     }
-      //   }
-      // });
+    yzlxFormat(row, column) {
+      return this.selectDictLabel(this.signet_type, row);
+    },
+    jjFormat(row, column) {
+      return this.selectDictLabel(this.urgent_type, row);
+    },
+    getInfoData(workId, data1) {
+      // console.log("this.data.workId", this.data11.workId);
+      this.data11 = data1;
+      getFwYbjInfo(workId).then((reData) => {
+        console.log("reData", reData);
+        if (reData.data != null) {
+          this.YbjDatas = reData.data;
+          if (this.YbjDatas["203"] != undefined) {
+            this.dataLD = this.YbjDatas["203"];
+            console.log("dataLD1", this.dataLD);
+          }
+          if (this.YbjDatas["202"] != undefined) {
+            this.bgsData = this.YbjDatas["202"];
+            console.log("bgsData", this.bgsData);
+          }
+          if (this.YbjDatas["204"] != undefined) {
+            this.zhcData = this.YbjDatas["204"];
+            console.log("bgsData", this.bgsData);
+          }
+          if (this.YbjDatas["205"] != undefined) {
+            this.hqData = this.YbjDatas["205"];
+            console.log("bgsData", this.bgsData);
+          }
+
+          if (this.YbjDatas["206"] != undefined) {
+            this.csData = this.YbjDatas["206"];
+          }
+        }
+      });
     },
     printY() {
       setTimeout(function () {

src/views/incomingMessages/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div
+    <!-- <div
       class="color"
       style="
         background-color: #f6fafd;
@@ -11,7 +11,7 @@
       "
     >
       <el-button v-print="print" plain type="primary">打印</el-button>
-    </div>
+    </div> -->
     <div
       id="printContent"
       style="
@@ -213,7 +213,7 @@
 import { getYbjInfo } from "@/api/liucheng";
 import { ElMessage } from "element-plus";
 import { useDict } from "@/utils/dict";
-
+import print from "print-js";
 export default {
   // directives: {
   //   htmlToPaper: VueHtmlToPaper,
@@ -251,6 +251,16 @@ export default {
     yzlxFormat(row, column) {
       return this.selectDictLabel(this.signet_type, row);
     },
+    printY() {
+      setTimeout(function () {
+        print({
+          printable: "printContent", //打印区域id
+          type: "html", //打印类型是html
+          scanStyles: false,
+          targetStyles: ["*"],
+        });
+      }, 500);
+    },
   },
 };
 </script>

src/views/liucheng/todowork/formView/Received.vue

@@ -76,6 +76,26 @@
                         />
                       </el-select>
                     </el-form-item>
+                    <el-form-item label="文件标题:" prop="title">
+                      <el-input
+                        type="textarea"
+                        :disabled="isEdit"
+                        v-model="outMessageParams.title"
+                        placeholder="请输入文件标题"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item
+                      label-width="120px"
+                      v-show="hanldType != true"
+                      label="文件字号:"
+                      prop="title"
+                    >
+                      <el-input
+                        :disabled="isEdit"
+                        v-model="outMessageParams.wordNum"
+                        placeholder="请输入文件字号"
+                      ></el-input>
+                    </el-form-item>
                     <el-form-item label="密级:" prop="degree">
                       <el-select
                         :disabled="isEdit"
@@ -91,8 +111,9 @@
                         />
                       </el-select>
                     </el-form-item>
-                    <el-form-item label="保密期限:" prop="bmqx">
+                    <el-form-item label="保密期限(年):" prop="bmqx">
                       <el-input
+                        type="number"
                         :disabled="isEdit"
                         v-model="outMessageParams.bmqx"
                         placeholder="请输入保密期限 X (年)"
@@ -154,33 +175,14 @@
                         placeholder="请输入打印人"
                       ></el-input>
                     </el-form-item>
-                    <el-form-item label="打印份数:" prop="dyr">
+                    <el-form-item label="打印份数:" prop="dynum">
                       <el-input
+                        type="number"
                         :disabled="isEdit"
-                        v-model="outMessageParams.dyr"
+                        v-model="outMessageParams.dynum"
                         placeholder="请输入打印份数"
                       ></el-input>
                     </el-form-item>
-                    <el-form-item label="文件标题:" prop="title">
-                      <el-input
-                        type="textarea"
-                        :disabled="isEdit"
-                        v-model="outMessageParams.title"
-                        placeholder="请输入文件标题"
-                      ></el-input>
-                    </el-form-item>
-                    <el-form-item
-                      label-width="120px"
-                      v-show="hanldType != true"
-                      label="文件字号:"
-                      prop="title"
-                    >
-                      <el-input
-                        :disabled="isEdit"
-                        v-model="outMessageParams.wordNum"
-                        placeholder="请输入文件字号"
-                      ></el-input>
-                    </el-form-item>
 
                     <el-form-item label="附件列表:">
                       <el-upload
@@ -370,7 +372,7 @@
                           type="danger"
                           >退回
                         </el-button>
-                        <el-button
+                        <!-- <el-button
                           style="display: inline-block"
                           v-if="
                             nowNode &&
@@ -380,7 +382,7 @@
                           @click="notApproved"
                           type="warning"
                           >不予审批
-                        </el-button>
+                        </el-button> -->
                       </div>
 
                       <!-- </el-form-item> -->
@@ -638,14 +640,14 @@
         <el-button type="primary" @click="submitNotApproved">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
+    <!-- <el-dialog
       title="阅办笺"
       width="60%"
       v-model="ybjState"
       :before-close="closeDialog"
     >
       <dispatch ref="dispatchRef" :data="outMessageParams"></dispatch>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -988,77 +990,55 @@ async function reSendFlowToNext() {
       guidangData.value.workId = workId.value;
       let { archiveRes } = await saveArchive(guidangData.value);
     }
-    //如果市最后一个节点则执行 完成
-    if (isEndNodeFlg.value) {
-      generNextStepAllNode(
-        flowDatas.value.FK_Flow,
-        flowDatas.value.WorkID,
-        "",
-        getJToken()
-      ).then((res) => {
-        ElMessage({
-          message: "当前工作已结束",
-          type: "success",
-        });
+    // alert("111");
+    sendFlowToNext(formData.value).then((response) => {
+      if (response.code == 200) {
+        if (
+          response.data.VarAcceptersName != "" &&
+          response.data.VarAcceptersName != "结束"
+        ) {
+          ElMessage({
+            message:
+              "已发送到" +
+              response.data.VarToNodeName +
+              "节点，接收人：" +
+              response.data.VarAcceptersName,
+            type: "success",
+          });
+          // msgValue.value = true;
+          SendMsgB();
+        } else if (response.data.VarAcceptersName == "结束") {
+          ElMessage({
+            message: response.data.Message,
+            type: "success",
+          });
+          SendMsgB();
+        } else {
+          // 检查 Message 是否包含 '@'
+          const message = response.data.Message;
+
+          // 使用条件语句决定是否调用 replaceAll
+          const updatedMessage = message.includes("@")
+            ? message.replaceAll("@", "")
+            : message;
+          ElMessage({
+            message: updatedMessage,
+            type: "success",
+          });
+
+          SendMsgB();
+        }
         proxy.$modal.closeLoading();
-        ////////关闭文件，释放资源
         webOfficeOBJ.value.WebClose();
         setTimeout(function () {
           SendMsgB();
           var setting = window.Setting;
           setting.CloseWindow();
         }, 2000);
-      });
-    } else {
-      sendFlowToNext(formData.value).then((response) => {
-        if (response.code == 200) {
-          if (
-            response.data.VarAcceptersName != "" &&
-            response.data.VarAcceptersName != "结束"
-          ) {
-            ElMessage({
-              message:
-                "已发送到" +
-                response.data.VarToNodeName +
-                "节点，接收人：" +
-                response.data.VarAcceptersName,
-              type: "success",
-            });
-            // msgValue.value = true;
-            SendMsgB();
-          } else if (response.data.VarAcceptersName == "结束") {
-            ElMessage({
-              message: response.data.Message,
-              type: "success",
-            });
-            SendMsgB();
-          } else {
-            if (response.data.Message.replaceAll("@", "")) {
-              ElMessage({
-                message: response.data.Message.replaceAll("@", ""),
-                type: "success",
-              });
-            } else {
-              ElMessage({
-                message: response.data.Message,
-                type: "success",
-              });
-            }
-
-            SendMsgB();
-          }
-          proxy.$modal.closeLoading();
-          webOfficeOBJ.value.WebClose();
-          setTimeout(function () {
-            SendMsgB();
-            var setting = window.Setting;
-            setting.CloseWindow();
-          }, 2000);
-        } else {
-          proxy.$modal.msgError("发送失败");
-        }
-      });
-    }
+      } else {
+        proxy.$modal.msgError("发送失败");
+      }
+    });
   }
 }
 
@@ -1291,7 +1271,7 @@ function Load() {
   });
 
   getOutMessageByWorkId(workId.value).then((response) => {
-    console.log("response", response);
+    console.log("response11", response);
     if (response.code == "200") {
       outMessageParams.value = response.data;
       docFile.value = response.data.sendFile;
@@ -1299,7 +1279,9 @@ function Load() {
       if (outMessageParams.value.infoOpenType == "3") {
         showNotReason.value = true;
       }
-      initWebOffice();
+      if (outMessageParams.value != undefined) {
+        initWebOffice();
+      }
     }
   });
   //chrome浏览器，HookEnabled设置为true，用于控件中和本地excel表格的焦点互相切换
@@ -1325,6 +1307,11 @@ function initWebOffice() {
     // console.log("res", res);
     // outMessageParams.value.draftedName = res.user.userName;
     console.log("outMessageParams", outMessageParams.value);
+    proxy.$refs.dispatchRef.getInfoData(
+      outMessageParams.value.workId,
+      outMessageParams.value
+    );
+
     // try{
     //   webOfficeOBJ.value.WebUrl = GetUrlbase()+upload.url;
     //webOfficeOBJ.value.RecordID = "1551950618511";  //RecordID:本文档记录编号
@@ -1370,7 +1357,6 @@ function initWebOffice() {
     //设置修订痕迹记录用户
     webOfficeOBJ.value.VBASetUserName(webOfficeOBJ.value.UserName);
     // 根据FileType设置的扩展名来创建对应的空白文档
-
     // }
     // catch(e){
     //   console.log("catch");

src/views/liucheng/todowork/formView/ReceivedQiLin.vue

@@ -58,6 +58,24 @@
                         />
                       </el-select>
                     </el-form-item>
+                    <el-form-item label="文件标题:" prop="title">
+                      <el-input
+                        :disabled="isEdit"
+                        v-model="outMessageParams.title"
+                        placeholder="请输入文件标题"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item
+                      label-width="90px"
+                      v-show="hanldType != true"
+                      label="文件字号:"
+                      prop="title"
+                    >
+                      <el-input
+                        v-model="outMessageParams.wordNum"
+                        placeholder="请输入文件字号"
+                      ></el-input>
+                    </el-form-item>
                     <el-form-item label="密级:" prop="degree">
                       <el-select
                         :disabled="isEdit"
@@ -140,24 +158,6 @@
                         placeholder="请输入打印份数"
                       ></el-input>
                     </el-form-item>
-                    <el-form-item label="文件标题:" prop="title">
-                      <el-input
-                        :disabled="isEdit"
-                        v-model="outMessageParams.title"
-                        placeholder="请输入文件标题"
-                      ></el-input>
-                    </el-form-item>
-                    <el-form-item
-                      label-width="90px"
-                      v-show="hanldType != true"
-                      label="文件字号:"
-                      prop="title"
-                    >
-                      <el-input
-                        v-model="outMessageParams.wordNum"
-                        placeholder="请输入文件字号"
-                      ></el-input>
-                    </el-form-item>
 
                     <el-form-item label="附件列表:">
                       <el-upload
@@ -171,7 +171,9 @@
                         @handleRemove="romveFile"
                         multiple
                       >
-                        <el-button type="primary">点击上传附件</el-button>
+                        <el-button v-if="!isEdit" type="primary"
+                          >点击上传附件</el-button
+                        >
                       </el-upload>
                       <div></div>
                       <el-link
@@ -314,18 +316,26 @@
                         </el-button>
                         <el-button
                           style="display: inline-block"
-                          v-if="nowNode"
+                          v-if="
+                            nowNode &&
+                            flowDatas.FK_Node != '207' &&
+                            flowDatas.FK_Node != '201'
+                          "
                           @click="sendBack"
                           type="danger"
                           >退回
                         </el-button>
-                        <el-button
+                        <!-- <el-button
                           style="display: inline-block"
-                          v-if="nowNode"
+                          v-if="
+                            nowNode &&
+                            flowDatas.FK_Node != '207' &&
+                            flowDatas.FK_Node != '201'
+                          "
                           @click="notApproved"
                           type="warning"
                           >不予审批
-                        </el-button>
+                        </el-button> -->
                       </div>
                     </div>
                     <!--   归档操作       -->
@@ -468,13 +478,26 @@
             >
             <div style="text-align: center">
               发文审批笺
-              <el-button
+              <!-- <el-button
                 type="primary"
                 icon="view"
                 style="margin-left: 5px"
                 @click="openYbj"
                 >预览</el-button
+              > -->
+              <el-button @click="printHtml" plain type="primary"
+                >打印</el-button
               >
+              <el-row :gutter="24">
+                <el-col :span="6"></el-col>
+                <el-col :span="12">
+                  <dispatch
+                    ref="dispatchRef"
+                    :data="outMessageParams"
+                  ></dispatch
+                ></el-col>
+                <el-col :span="6"></el-col>
+              </el-row>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -856,63 +879,45 @@ async function reSendFlowToNext() {
       guidangData.value.workId = workId.value;
       let { archiveRes } = await saveArchive(guidangData.value);
     }
-    //如果市最后一个节点则执行 完成
-    if (isEndNodeFlg.value) {
-      generNextStepAllNode(
-        flowDatas.value.FK_Flow,
-        flowDatas.value.WorkID,
-        "",
-        getJToken()
-      ).then((res) => {
-        ElMessage({
-          message: "当前工作已结束",
-          type: "success",
-        });
-        proxy.$modal.closeLoading();
-        ////////关闭文件，释放资源
-        webOfficeOBJ.value.CloseDocument();
-      });
-      proxy.$emit("closeViewLeave");
-    } else {
-      sendFlowToNext(formData.value).then((response) => {
-        if (response.code == 200) {
-          if (
-            response.data.VarAcceptersName != "" &&
-            response.data.VarAcceptersName != "结束"
-          ) {
-            ElMessage({
-              message:
-                "已发送到" +
-                response.data.VarToNodeName +
-                "节点，接收人：" +
-                response.data.VarAcceptersName,
-              type: "success",
-            });
-            proxy.$emit("closeViewLeave");
-            formData.value.reviewMsg = "";
 
-            // msgValue.value = true;
-          } else if (response.data.VarAcceptersName == "结束") {
-            ElMessage({
-              message: response.data.Message,
-              type: "success",
-            });
-            proxy.$emit("closeViewLeave");
-          } else {
-            ElMessage({
-              message: response.data.Message.replaceAll("@", ""),
-              type: "success",
-            });
-          }
+    sendFlowToNext(formData.value).then((response) => {
+      if (response.code == 200) {
+        if (
+          response.data.VarAcceptersName != "" &&
+          response.data.VarAcceptersName != "结束"
+        ) {
+          ElMessage({
+            message:
+              "已发送到" +
+              response.data.VarToNodeName +
+              "节点，接收人：" +
+              response.data.VarAcceptersName,
+            type: "success",
+          });
           proxy.$emit("closeViewLeave");
-          proxy.$modal.closeLoading();
-          webOfficeOBJ.value.CloseDocument();
-        } else {
-          proxy.$modal.msgError("发送失败");
+          formData.value.reviewMsg = "";
+
+          // msgValue.value = true;
+        } else if (response.data.VarAcceptersName == "结束") {
+          ElMessage({
+            message: response.data.Message,
+            type: "success",
+          });
           proxy.$emit("closeViewLeave");
+        } else {
+          ElMessage({
+            message: response.data.Message.replaceAll("@", ""),
+            type: "success",
+          });
         }
-      });
-    }
+        proxy.$emit("closeViewLeave");
+        proxy.$modal.closeLoading();
+        webOfficeOBJ.value.CloseDocument();
+      } else {
+        proxy.$modal.msgError("发送失败");
+        proxy.$emit("closeViewLeave");
+      }
+    });
   }
 }
 
@@ -1151,6 +1156,11 @@ function Load() {
 
   loadingWebLoad.value = false;
 }
+function printHtml() {
+  setTimeout(() => {
+    proxy.$refs.dispatchRef.printY();
+  }, 500);
+}
 //作用：打开远程文件
 function WebDownLoadFile() {
   loadingWebLoad.value = false;

src/views/liucheng/todowork/formView/sealApplicational.vue

@@ -414,13 +414,23 @@
                 >
                 <div style="text-align: center">
                   用章审批单
-                  <el-button
+                  <!-- <el-button
                     type="primary"
                     icon="view"
                     style="margin-left: 5px"
                     @click="openYzsp"
                     >预览</el-button
+                  > -->
+                  <el-button @click="printHtml" plain type="primary"
+                    >打印</el-button
                   >
+                  <!-- <el-row :gutter="24">
+                    <el-col :span="5"></el-col>
+                    <el-col :span="13"> -->
+                  <yzspdanVue :idInfo="idInfo" ref="yzsp"></yzspdanVue>
+                  <!-- </el-col>
+                    <el-col :span="5"></el-col>
+                  </el-row> -->
                 </div>
               </el-tab-pane>
             </el-tabs>
@@ -492,9 +502,9 @@
         </el-dialog>
       </div>
     </el-dialog>
-    <el-dialog style="width: 1000px" title="用章审批单" v-model="Yzsp">
-      <yzspdanVue :id="this.form.id" ref="yzsp"></yzspdanVue>
-    </el-dialog>
+    <!-- <el-dialog style="width: 1000px" title="用章审批单" v-model="Yzsp">
+      <yzspdanVue :idInfo="idInfo" ref="yzsp"></yzspdanVue>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -570,6 +580,7 @@ export default {
         workid: null,
         progress: "",
       },
+      idInfo: null,
       liuzhuanData: [],
       tripFlowData: {},
       NextStepNode: [],
@@ -609,6 +620,11 @@ export default {
   mounted() {},
 
   methods: {
+    printHtml() {
+      setTimeout(() => {
+        this.$refs.yzsp.printY();
+      }, 500);
+    },
     openYzsp() {
       this.Yzsp = true;
     },
@@ -681,7 +697,6 @@ export default {
 
     showDetail1(flowData) {
       console.log("flowData", flowData);
-      this.superVisionDialog = true;
       this.showBack = true;
       if (flowData.FK_Node == "1601") {
         this.showBack = false;
@@ -717,6 +732,9 @@ export default {
       sealSel(this.formData.workid).then((res) => {
         console.log("res", res);
         this.form = res.data;
+        this.idInfo = this.form.id;
+        console.log("11111111111", this.idInfo);
+        this.superVisionDialog = true;
       });
       //获取下个节点
       generNextStepNode1("017", this.formData.workid, "", getJToken()).then(

src/views/liucheng/todowork/formView/swViewPdf.vue

@@ -42,13 +42,8 @@
               </template>
               <el-row :gutter="24">
                 <el-col
-                  :span="19"
-                  style="
-                    background-color: #9ca1a7;
-                    margin-top: 1vh;
-                    padding: 0 5px;
-                    margin-left: 10px;
-                  "
+                  :span="18"
+                  style="margin-top: 1vh; padding: 0 5px; margin-left: 2vw"
                 >
                   <!--          <PdfViewer
                   ref="pdfViewRef"
@@ -62,7 +57,7 @@
                     ref="iframeRef"
                   ></iframe>
                 </el-col>
-                <el-col style="" :span="4">
+                <el-col style="height: 78vh; overflow-y: scroll" :span="5">
                   <el-form
                     ref="receivedFormRef"
                     label-width="88px"
@@ -360,13 +355,13 @@
                           type="danger"
                           >退回
                         </el-button>
-                        <el-button
+                        <!-- <el-button
                           style="display: inline-block"
                           v-if="nodeInfo"
                           @click="notApproved"
                           type="warning"
                           >不予审批
-                        </el-button>
+                        </el-button> -->
                       </div>
                     </div>
                     <!--   归档操作       -->
@@ -541,24 +536,37 @@
                 </el-table>
               </div>
             </el-tab-pane>
-            <el-tab-pane label="收文阅办笺">
+            <el-tab-pane label="收文呈办笺">
               <template #label>
                 <span class="custom-tabs-label">
                   <el-icon>
                     <SetUp />
                   </el-icon>
-                  <span>收文阅办笺</span>
+                  <span>收文呈办笺</span>
                 </span></template
               >
               <div style="text-align: center">
-                收文阅办笺
-                <el-button
+                收文呈办笺
+                <!-- <el-button
                   type="primary"
                   icon="view"
                   style="margin-left: 5px"
                   @click="openYbj"
                   >预览</el-button
+                > -->
+                <el-button @click="printHtml" plain type="primary"
+                  >打印</el-button
                 >
+                <el-row :gutter="24">
+                  <el-col :span="6"></el-col>
+                  <el-col :span="12">
+                    <incoming-message
+                      ref="incomRef"
+                      :id="receiverData.id"
+                    ></incoming-message
+                  ></el-col>
+                  <el-col :span="6"></el-col>
+                </el-row>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -605,9 +613,9 @@
         <el-button type="primary" @click="submitNodeBack">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog style="width: 1000px" title="阅办笺" v-model="ybjState">
+    <!-- <el-dialog style="width: 1000px" title="阅办笺" v-model="ybjState">
       <incoming-message ref="incomRef" :id="receiverData.id"></incoming-message>
-    </el-dialog>
+    </el-dialog> -->
   </el-dialog>
   <el-dialog
     v-model="dialogVisibleYiJiao"
@@ -868,6 +876,11 @@ function getTypeList() {
     );
   });
 }
+function printHtml() {
+  setTimeout(() => {
+    proxy.$refs.incomRef.printY();
+  }, 500);
+}
 function confirmEvent(item, index) {
   console.log(item);
   delSWFileList(item.fileId).then((res) => {

src/views/login.vue

@@ -272,12 +272,12 @@ function openAppDown() {
 }
 function openOfficeDown() {
   //
-  window.location.href = "http://192.168.3.213:9000/public/Windows系统插件.rar";
+  window.location.href = "http://61.240.156.161:9000/zdzx/Windows系统插件.rar";
 }
 function openQiLinOfficeDown() {
   //
   window.location.href =
-    "http://192.168.3.213:9000/public/国产化操作系统插件.zip";
+    "http://61.240.156.161:9000/zdzx/iWebOffice2015%E4%B8%89%E5%90%88%E4%B8%80.cab";
 }
 function openHandle() {
   window.location.href =

src/views/official/components/Received.vue

@@ -54,6 +54,50 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="文件标题:" prop="title">
+              <el-input
+                v-model="outMessageParams.title"
+                placeholder="请输入文件标题"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="文件字号: " prop="wordNum">
+              <!-- <el-select
+              placement="bottom-start"
+              v-model="outMessageParams.wordNum"
+              placeholder="请选择文件字号"
+              style="width: 350px"
+            >
+              <el-option
+                v-for="item in receive_type"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label"
+              >
+              </el-option>
+            </el-select> -->
+              <el-input
+                v-model="outMessageParams.wordNum"
+                placeholder="请选择文件字号"
+              >
+                <template #append>
+                  <el-select
+                    placement="bottom-start"
+                    v-model="selectWordNum"
+                    placeholder="选择"
+                    @change="changeSelect1"
+                    style="width: 75px"
+                  >
+                    <el-option
+                      v-for="item in receive_type"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </template>
+              </el-input>
+            </el-form-item>
             <el-form-item label="密级:" prop="degree">
               <el-select
                 style="width: 350px"
@@ -68,7 +112,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="保密期限:" prop="bmqx">
+            <el-form-item label="保密期限(年):" prop="bmqx">
               <!-- <el-date-picker
                 style="width: 100%"
                 v-model="outMessageParams.bmqx"
@@ -78,6 +122,7 @@
                 value-format="YYYY-MM-DD"
               /> -->
               <el-input
+                type="number"
                 v-model="outMessageParams.bmqx"
                 placeholder="请输入保密期限 X (年)"
               ></el-input>
@@ -203,50 +248,7 @@
                 placeholder="请输入打印份数"
               ></el-input>
             </el-form-item>
-            <el-form-item label="文件标题:" prop="title">
-              <el-input
-                v-model="outMessageParams.title"
-                placeholder="请输入文件标题"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="文件字号: " prop="wordNum">
-              <!-- <el-select
-              placement="bottom-start"
-              v-model="outMessageParams.wordNum"
-              placeholder="请选择文件字号"
-              style="width: 350px"
-            >
-              <el-option
-                v-for="item in receive_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.label"
-              >
-              </el-option>
-            </el-select> -->
-              <el-input
-                v-model="outMessageParams.wordNum"
-                placeholder="请选择文件字号"
-              >
-                <template #append>
-                  <el-select
-                    placement="bottom-start"
-                    v-model="selectWordNum"
-                    placeholder="选择"
-                    @change="changeSelect1"
-                    style="width: 75px"
-                  >
-                    <el-option
-                      v-for="item in receive_type"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.label"
-                    >
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-input>
-            </el-form-item>
+
             <el-form-item label="信息公开类型:">
               <el-select
                 style="width: 100%"

src/views/yzspdan/yzspdan.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div
+    <!-- <div
       class="color"
       style="
         background-color: #f6fafd;
@@ -11,14 +11,14 @@
       "
     >
       <el-button v-print="print" plain type="primary">打印</el-button>
-    </div>
+    </div> -->
     <div
       id="printContent"
       style="
         width: 680px;
         font-family: '宋体';
         margin: 0 auto;
-        margin-top: 15px;
+        margin-top: 45px;
       "
       class="grid-content ep-bg-purple-light"
     >
@@ -53,9 +53,12 @@
         "
       >
         <div style="display: inline-block">
-          &nbsp;日期:  {{ parseTime(YbjData.ywUsingSeal.createTime, "{y}-{m}-{d}") }}
+          &nbsp;日期:
+          {{ parseTime(YbjData.ywUsingSeal.createTime, "{y}-{m}-{d}") }}
         </div>
-        <div style="margin-top: 2px; display: inline-block; margin-right: 100px">
+        <div
+          style="margin-top: 2px; display: inline-block; margin-right: 100px"
+        >
           序号：
         </div>
       </div>
@@ -72,13 +75,13 @@
               经办人
             </td>
             <td colspan="4" style="font-size: 22px; text-align: center">
-               {{ YbjData.ywUsingSeal.useName }}
+              {{ YbjData.ywUsingSeal.useName }}
             </td>
             <td colspan="1" style="font-size: 22px; width: 22%" align="center">
               用章处室
             </td>
             <td colspan="3" style="font-size: 22px; text-align: center">
-               {{ YbjData.ywUsingSeal.useDept }}
+              {{ YbjData.ywUsingSeal.useDept }}
             </td>
           </tr>
           <tr style="height: 12vh">
@@ -92,7 +95,7 @@
               盖章日期
             </td>
             <td colspan="3" style="font-size: 22px; text-align: center">
-               {{ YbjData.ywUsingSeal.useTime }}
+              {{ YbjData.ywUsingSeal.useTime }}
             </td>
           </tr>
           <tr style="height: 12vh">
@@ -100,13 +103,13 @@
               主送单位
             </td>
             <td colspan="4" style="font-size: 22px; text-align: center">
-               {{ YbjData.ywUsingSeal.activeSend }}
+              {{ YbjData.ywUsingSeal.activeSend }}
             </td>
             <td colspan="1" style="font-size: 22px; width: 22%" align="center">
               盖章份数
             </td>
             <td colspan="3" style="font-size: 22px; text-align: center">
-               {{ YbjData.ywUsingSeal.signetCopies }}
+              {{ YbjData.ywUsingSeal.signetCopies }}
             </td>
           </tr>
           <tr style="height: 18vh">
@@ -126,10 +129,7 @@
               style="font-size: 22px; line-height: 35px; height: 35px"
               colspan="10"
             >
-              <template
-                  v-for="(item, index) in YbjData.ldpsMaps"
-                  :key="index"
-              >
+              <template v-for="(item, index) in YbjData.ldpsMaps" :key="index">
                 <div>{{ item.nickName }}：{{ item.Msg }}</div>
               </template>
             </td>
@@ -161,14 +161,14 @@
 import { getYzYbjInfo } from "@/api/offcial/seal.js";
 import { ElMessage } from "element-plus";
 import { useDict } from "@/utils/dict";
-
+import print from "print-js";
 export default {
   // directives: {
   //   htmlToPaper: VueHtmlToPaper,
   // },
 
   name: "YinetYbjIndex",
-  props: ["id"],
+  props: ["idInfo"],
   data() {
     return {
       sw_open_type: useDict("sw_open_type").sw_open_type,
@@ -185,21 +185,33 @@ export default {
         ywUsingSeal: {},
       },
       aaid: 32,
+      idInfo: this.idInfo,
     };
   },
   created() {
+    console.log("363363", this.idInfo);
     this.getInfoData();
   },
   methods: {
+    printY() {
+      setTimeout(function () {
+        print({
+          printable: "printContent", //打印区域id
+          type: "html", //打印类型是html
+          scanStyles: false,
+          targetStyles: ["*"],
+        });
+      }, 500);
+    },
     getInfoData() {
-      console.log("获取审批单内容")
-      getYzYbjInfo(this.id).then((reData) => {
+      console.log("获取审批单内容");
+      getYzYbjInfo(this.idInfo).then((reData) => {
         this.YbjData = reData.data;
       });
     },
     yzlxFormat(row, column) {
       return this.selectDictLabel(this.signet_type, row);
-    }
+    },
   },
 };
 </script>