Merge branch 'master' of http://121.28.134.38:2039/dudidi/wjw_jiankangzhidaozhongxin

src/views/deskWork/deskWork/submitWork.vue

@@ -274,7 +274,7 @@ export default {
             this.$refs.importRef1.showdetal2(
               this.receiverData1,
               data,
-              true,
+              false,
               "no"
             );
           });

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

@@ -61,6 +61,43 @@
                   <el-button @click="ShowStatusBar" type="primary"
                     >ShowStatusBar</el-button
                   > -->
+                    <el-form-item label="紧急程度:" prop="jjcd">
+                      <el-select
+                        :disabled="isEdit"
+                        style="width: 350px"
+                        v-model="outMessageParams.jjcd"
+                        placeholder="请选择紧急程度"
+                      >
+                        <el-option
+                          v-for="dict of urgent_type"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="密级:" prop="degree">
+                      <el-select
+                        :disabled="isEdit"
+                        style="width: 350px"
+                        v-model="outMessageParams.degree"
+                        placeholder="请选择密级"
+                      >
+                        <el-option
+                          v-for="dict of archive_levels"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="保密期限:" prop="bmqx">
+                      <el-input
+                        :disabled="isEdit"
+                        v-model="outMessageParams.bmqx"
+                        placeholder="请输入保密期限 X (年)"
+                      ></el-input>
+                    </el-form-item>
                     <el-form-item label="发文单位:" prop="outUnit">
                       <el-input
                         :disabled="isEdit"
@@ -77,6 +114,7 @@
                     </el-form-item>
                     <el-form-item label="主送单位:" prop="mainUnit">
                       <el-input
+                        :disabled="isEdit"
                         placeholder="请输入主送单位"
                         type="textarea"
                         v-model="outMessageParams.mainUnit"
@@ -84,6 +122,7 @@
                     </el-form-item>
                     <el-form-item label="抄送单位:" prop="copyUnit">
                       <el-input
+                        :disabled="isEdit"
                         placeholder="请输入抄送单位"
                         type="textarea"
                         v-model="outMessageParams.copyUnit"
@@ -104,10 +143,24 @@
                         value-format="YYYY-MM-DD"
                         v-model="outMessageParams.draftedTime"
                         type="date"
-                        placeholder="请输入来文日期"
+                        placeholder="请选择拟稿日期"
                         size="defalut"
                       />
                     </el-form-item>
+                    <el-form-item label="打印人:" prop="dyr">
+                      <el-input
+                        :disabled="isEdit"
+                        v-model="outMessageParams.dyr"
+                        placeholder="请输入打印人"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="打印份数:" prop="dyr">
+                      <el-input
+                        :disabled="isEdit"
+                        v-model="outMessageParams.dyr"
+                        placeholder="请输入打印份数"
+                      ></el-input>
+                    </el-form-item>
                     <el-form-item label="文件标题:" prop="title">
                       <el-input
                         type="textarea"
@@ -123,6 +176,7 @@
                       prop="title"
                     >
                       <el-input
+                        :disabled="isEdit"
                         v-model="outMessageParams.wordNum"
                         placeholder="请输入文件字号"
                       ></el-input>
@@ -140,7 +194,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
@@ -221,6 +277,7 @@
                   >
                     <el-form-item label="文件字号: " prop="title">
                       <el-input
+                        :disabled="isEdit"
                         v-model="outMessageParams.wordNum"
                         placeholder="请输入文件字号"
                       ></el-input>
@@ -228,6 +285,7 @@
 
                     <el-form-item label="信息公开类型:">
                       <el-select
+                        :disabled="isEdit"
                         style="width: 100%"
                         @change="changeSelect2"
                         v-model="outMessageParams.infoOpenType"
@@ -272,7 +330,6 @@
                         </el-option>
                       </el-select>
                     </el-form-item>
-
                     <!--  发送到下一步操作         -->
                     <div v-show="guidangBt != true">
                       <el-form-item
@@ -304,14 +361,14 @@
                         </el-button>
                         <el-button
                           style="display: inline-block"
-                          v-if="nowNode"
+                          v-if="nowNode && flowDatas.FK_Node != '207'"
                           @click="sendBack"
                           type="danger"
                           >退回
                         </el-button>
                         <el-button
                           style="display: inline-block"
-                          v-if="nowNode"
+                          v-if="nowNode && flowDatas.FK_Node != '207'"
                           @click="notApproved"
                           type="warning"
                           >不予审批
@@ -628,6 +685,7 @@ import print from "print-js";
 
 const { proxy } = getCurrentInstance();
 
+const { urgent_type } = proxy.useDict("urgent_type");
 const { archive_levels } = proxy.useDict("archive_levels");
 const { sw_open_type } = proxy.useDict("sw_open_type");
 const { no_open_reason } = proxy.useDict("no_open_reason");
@@ -967,10 +1025,18 @@ async function reSendFlowToNext() {
             });
             SendMsgB();
           } else {
-            ElMessage({
-              message: response.data.Message.replaceAll("@", ""),
-              type: "success",
-            });
+            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();
@@ -1362,10 +1428,7 @@ onMounted(async () => {
   dangansel.value = getUrlParameter("dangan") == "true";
   //判断当前节点是不是最后一个.
   if (hanldType.value) {
-    if (
-      formData.value.optionName.indexOf("归档") != -1 ||
-      flowDatas.value.FK_Node == "204"
-    ) {
+    if (formData.value.optionName.indexOf("归档") != -1) {
       getTypeList();
       formData.value.reviewMsg = "归档";
       guidangBt.value = true;

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

@@ -43,6 +43,42 @@
                     style="width: 320px; margin-top: 20px"
                     :model="outMessageParams"
                   >
+                    <el-form-item label="紧急程度:" prop="jjcd">
+                      <el-select
+                        :disabled="isEdit"
+                        style="width: 350px"
+                        v-model="outMessageParams.jjcd"
+                        placeholder="请选择紧急程度"
+                      >
+                        <el-option
+                          v-for="dict of urgent_type"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="密级:" prop="degree">
+                      <el-select
+                        :disabled="isEdit"
+                        style="width: 350px"
+                        v-model="outMessageParams.degree"
+                        placeholder="请选择密级"
+                      >
+                        <el-option
+                          v-for="dict of archive_levels"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="保密期限:" prop="bmqx">
+                      <el-input
+                        v-model="outMessageParams.bmqx"
+                        placeholder="请输入保密期限 X (年)"
+                      ></el-input>
+                    </el-form-item>
                     <el-form-item label="发文单位:" prop="outUnit">
                       <el-input
                         :disabled="isEdit"
@@ -86,10 +122,24 @@
                         value-format="YYYY-MM-DD"
                         v-model="outMessageParams.draftedTime"
                         type="date"
-                        placeholder="请输入来文日期"
+                        placeholder="请选择拟稿日期"
                         size="defalut"
                       />
                     </el-form-item>
+                    <el-form-item label="打印人:" prop="dyr">
+                      <el-input
+                        :disabled="isEdit"
+                        v-model="outMessageParams.dyr"
+                        placeholder="请输入打印人"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="打印份数:" prop="dyr">
+                      <el-input
+                        :disabled="isEdit"
+                        v-model="outMessageParams.dyr"
+                        placeholder="请输入打印份数"
+                      ></el-input>
+                    </el-form-item>
                     <el-form-item label="文件标题:" prop="title">
                       <el-input
                         :disabled="isEdit"

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

@@ -405,7 +405,7 @@
               </el-tab-pane>
               <el-tab-pane label="用章审批单">
                 <template #label>
-                  <span class="custom-tabs-label">
+                  <span style="font-size: 15px" class="custom-tabs-label">
                     <el-icon>
                       <SetUp />
                     </el-icon>

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

@@ -70,6 +70,36 @@
                     :rules="rules"
                     :model="receiverData"
                   >
+                    <el-form-item label="紧急程度:" prop="emergencyDegree">
+                      <el-select
+                        :disabled="isEdit"
+                        style="width: 19vw"
+                        v-model="receiverData.emergencyDegree"
+                        placeholder="请选择紧急程度"
+                      >
+                        <el-option
+                          v-for="dict of urgent_type"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="密级:" prop="degree">
+                      <el-select
+                        :disabled="isEdit"
+                        style="width: 19vw"
+                        v-model="receiverData.degree"
+                        placeholder="请选择密级"
+                      >
+                        <el-option
+                          v-for="dict of archive_levels"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
                     <el-form-item label="来文标题:" prop="title">
                       <el-input
                         :disabled="isEdit"
@@ -138,21 +168,7 @@
                         >
                       </el-select>
                     </el-form-item>
-                    <el-form-item label="紧急程度:" prop="emergencyDegree">
-                      <el-select
-                        :disabled="isEdit"
-                        style="width: 19vw"
-                        v-model="receiverData.emergencyDegree"
-                        placeholder="请输入紧急程度"
-                      >
-                        <el-option
-                          v-for="dict of urgent_type"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        />
-                      </el-select>
-                    </el-form-item>
+
                     <el-form-item label="原文链接:">
                       <el-link type="primary">
                         <el-icon class="el-icon--left"> <Document /> </el-icon>
@@ -1310,47 +1326,47 @@ const onSubmit = async () => {
     guidangData.value.workId = flowDatas.value.WorkID;
     let { archiveRes } = await saveArchive(guidangData.value);
   }
-    //todo 调用修改接口 修改
-    await receive(receiverData.value).then((response) => {});
-    // receiverData.value.feedbackFileList = [];
-    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.$modal.closeLoading();
-        } else if (response.data.VarAcceptersName == "结束") {
-          ElMessage({
-            message: response.data.Message,
-            type: "success",
-          });
-          proxy.$modal.closeLoading();
-        } else {
-          ElMessage({
-            message: response.data.Message.replaceAll("@", ""),
-            type: "success",
-          });
-        }
-        colsedialog();
+  //todo 调用修改接口 修改
+  await receive(receiverData.value).then((response) => {});
+  // receiverData.value.feedbackFileList = [];
+  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.$modal.closeLoading();
-        loadingWebLoad.value = false;
-      } else {
-        loadingWebLoad.value = false;
-        colsedialog();
+      } else if (response.data.VarAcceptersName == "结束") {
+        ElMessage({
+          message: response.data.Message,
+          type: "success",
+        });
         proxy.$modal.closeLoading();
+      } else {
+        ElMessage({
+          message: response.data.Message.replaceAll("@", ""),
+          type: "success",
+        });
       }
+      colsedialog();
+      proxy.$modal.closeLoading();
+      loadingWebLoad.value = false;
+    } else {
       loadingWebLoad.value = false;
+      colsedialog();
       proxy.$modal.closeLoading();
-    });
+    }
+    loadingWebLoad.value = false;
+    proxy.$modal.closeLoading();
+  });
 };
 
 function openRetrunWork() {}

src/views/official/components/Received.vue

@@ -40,12 +40,11 @@
                 >打开本地文档
               </el-button>
             </el-form-item>
-            <el-form-item label="紧急程度:" prop="emergencyDegree">
+            <el-form-item label="紧急程度:" prop="jjcd">
               <el-select
-                :disabled="isEdit"
-                style="width: 19vw"
-                v-model="outMessageParams.emergencyDegree"
-                placeholder="请输入紧急程度"
+                style="width: 350px"
+                v-model="outMessageParams.jjcd"
+                placeholder="请选择紧急程度"
               >
                 <el-option
                   v-for="dict of urgent_type"
@@ -55,6 +54,34 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="密级:" prop="degree">
+              <el-select
+                style="width: 350px"
+                v-model="outMessageParams.degree"
+                placeholder="请选择密级"
+              >
+                <el-option
+                  v-for="dict of archive_levels"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="保密期限:" prop="bmqx">
+              <!-- <el-date-picker
+                style="width: 100%"
+                v-model="outMessageParams.bmqx"
+                type="date"
+                placeholder="请选择保密期限"
+                size="defalut"
+                value-format="YYYY-MM-DD"
+              /> -->
+              <el-input
+                v-model="outMessageParams.bmqx"
+                placeholder="请输入保密期限 X (年)"
+              ></el-input>
+            </el-form-item>
             <el-form-item label="发文单位:" prop="outUnit">
               <el-input
                 v-model="outMessageParams.outUnit"
@@ -154,6 +181,7 @@
                 placeholder="请输入拟办人"
               ></el-input>
             </el-form-item>
+
             <el-form-item label="拟稿日期:" prop="draftedTime">
               <el-date-picker
                 style="width: 100%"
@@ -163,7 +191,19 @@
                 size="defalut"
               />
             </el-form-item>
-            <el-form-item label="文件标题: " prop="title">
+            <el-form-item label="打印人:" prop="dyr">
+              <el-input
+                v-model="outMessageParams.dyr"
+                placeholder="请输入打印人"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="打印份数:" prop="dynum">
+              <el-input
+                v-model="outMessageParams.dynum"
+                placeholder="请输入打印份数"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="文件标题:" prop="title">
               <el-input
                 v-model="outMessageParams.title"
                 placeholder="请输入文件标题"
@@ -185,7 +225,6 @@
               </el-option>
             </el-select> -->
               <el-input
-                disabled
                 v-model="outMessageParams.wordNum"
                 placeholder="请选择文件字号"
               >
@@ -296,6 +335,7 @@ const { urgent_type } = proxy.useDict("urgent_type");
 const { receive_type } = proxy.useDict("receive_type");
 const { sw_open_type } = proxy.useDict("sw_open_type");
 const { no_open_reason } = proxy.useDict("no_open_reason");
+const { archive_levels } = proxy.useDict("archive_levels");
 const WebOfficeStr = LoadStr();
 const fujianList = ref([]);
 const iWebOfficeDom = ref(null); //获取他的dom
@@ -363,6 +403,13 @@ const rules = reactive({
       trigger: "blur",
     },
   ],
+  bmqx: [
+    {
+      required: true,
+      message: "保密期限不能为空",
+      trigger: "blur",
+    },
+  ],
   draftedName: [
     {
       required: true,
@@ -370,6 +417,34 @@ const rules = reactive({
       trigger: "blur",
     },
   ],
+  dyr: [
+    {
+      required: true,
+      message: "打印人不能为空",
+      trigger: "blur",
+    },
+  ],
+  dynum: [
+    {
+      required: true,
+      message: "打印份数不能为空",
+      trigger: "blur",
+    },
+  ],
+  jjcd: [
+    {
+      required: true,
+      message: "请选择紧急程度",
+      trigger: "change",
+    },
+  ],
+  degree: [
+    {
+      required: true,
+      message: "请选择密级",
+      trigger: "change",
+    },
+  ],
   undertakerUnit: [
     {
       required: true,

src/views/official/components/ReceivedQiLin.vue

@@ -41,6 +41,43 @@
                 >打开本地文档
               </el-button>
             </el-form-item>
+            <el-form-item label="紧急程度:" prop="jjcd">
+              <el-select
+                style="width: 350px"
+                v-model="outMessageParams.jjcd"
+                placeholder="请选择紧急程度"
+              >
+                <el-option
+                  v-for="dict of urgent_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="密级:" prop="degree">
+              <el-select
+                style="width: 350px"
+                v-model="outMessageParams.degree"
+                placeholder="请选择密级"
+              >
+                <el-option
+                  v-for="dict of archive_levels"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="保密期限:" prop="bmqx">
+              <!-- <el-date-picker
+                style="width: 100%"
+                v-model="outMessageParams.bmqx"
+                type="date"
+                placeholder="请选择保密期限"
+                size="defalut"
+              /> -->
+            </el-form-item>
             <el-form-item label="发文单位:" prop="outUnit">
               <el-input
                 v-model="outMessageParams.outUnit"
@@ -149,6 +186,18 @@
                 size="defalut"
               />
             </el-form-item>
+            <el-form-item label="打印人:" prop="dyr">
+              <el-input
+                v-model="outMessageParams.dyr"
+                placeholder="请输入打印人"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="打印份数:" prop="dynum">
+              <el-input
+                v-model="outMessageParams.dynum"
+                placeholder="请输入打印份数"
+              ></el-input>
+            </el-form-item>
             <el-form-item label="文件标题: " prop="title">
               <el-input
                 v-model="outMessageParams.title"
@@ -278,8 +327,10 @@ import {
 } from "@/api/system/user";
 const { fw_unit } = proxy.useDict("fw_unit");
 const { receive_type } = proxy.useDict("receive_type");
+const { urgent_type } = proxy.useDict("urgent_type");
 const { sw_open_type } = proxy.useDict("sw_open_type");
 const { no_open_reason } = proxy.useDict("no_open_reason");
+const { archive_levels } = proxy.useDict("archive_levels");
 const props = defineProps({
   fkData: "",
 });
@@ -339,6 +390,34 @@ const rules = reactive({
       trigger: "blur",
     },
   ],
+  dyr: [
+    {
+      required: true,
+      message: "打印人不能为空",
+      trigger: "blur",
+    },
+  ],
+  dynum: [
+    {
+      required: true,
+      message: "打印份数不能为空",
+      trigger: "blur",
+    },
+  ],
+  jjcd: [
+    {
+      required: true,
+      message: "请选择紧急程度",
+      trigger: "change",
+    },
+  ],
+  degree: [
+    {
+      required: true,
+      message: "请选择密级",
+      trigger: "change",
+    },
+  ],
   outUnit: [
     {
       required: true,

src/views/official/components/swViewPdf.vue

@@ -72,6 +72,20 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="密级:" prop="degree">
+              <el-select
+                style="width: 350px"
+                v-model="receivedParams.degree"
+                placeholder="请选择密级"
+              >
+                <el-option
+                  v-for="dict of archive_levels"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item label="来文标题:" prop="title">
               <el-input
                 style="width: 400px"
@@ -308,6 +322,7 @@ const visible = ref(false);
 const isAllowed = ref(false);
 const outUnit1 = ref([]);
 const { urgent_type } = proxy.useDict("urgent_type");
+const { archive_levels } = proxy.useDict("archive_levels");
 const { receive_type } = proxy.useDict("receive_type");
 const radio1 = ref("0");
 //////////////////////////////
@@ -485,6 +500,13 @@ const data = reactive({
         trigger: "change",
       },
     ],
+    degree: [
+      {
+        required: true,
+        message: "请选择密级",
+        trigger: "change",
+      },
+    ],
   },
 });
 const { formData, upload, receivedParams, rules } = toRefs(data);