7-16

src/views/archive/index.vue

@@ -346,7 +346,11 @@
 
       <sw-view-pdf ref="importRef1" @guanbi="handleQuery"> </sw-view-pdf>
       <qtsw-view-pdf ref="importRef" @guanbi="handleQuery" />
-      <Supervise ref="superRef" @guanbi="handleQuery"></Supervise>
+      <Supervise
+        :showSub="showSub"
+        ref="superRef"
+        @guanbi="handleQuery"
+      ></Supervise>
       <sealApplicational
         ref="sealRef"
         @guanbi="handleQuery"
@@ -377,7 +381,7 @@ import { getHandleList, currGenerWorkFlowInfo } from "@/api/liucheng/index";
 import { getReceiveByWorkId } from "@/api/office/received";
 import { getToken, getJToken } from "@/utils/auth";
 import Cookies from "js-cookie";
-import Supervise from "@/views/liucheng/todowork/formView/Supervise.vue";
+import Supervise from "@/views/liucheng/todowork/formView/newSupervise.vue";
 import sealApplicational from "@/views/liucheng/todowork/formView/sealApplicational.vue";
 import contSeal from "@/views/liucheng/todowork/formView/contSeal.vue";
 import carApproval from "@/views/liucheng/todowork/formView/carApproval.vue";
@@ -444,6 +448,7 @@ const data = reactive({
     sortNum: null,
   },
   rules: {},
+  showSub: false,
 });
 
 const { queryParams, typeQueryParams, form, rules } = toRefs(data);
@@ -469,97 +474,104 @@ function closeViewLeave() {
   paperQiLinData.value = null;
 }
 function openPdfViewer(rowData) {
-  currGenerWorkFlowInfo({ workID: rowData.workId, token: getJToken() }).then(
-    (resdata) => {
-      if (resdata.FK_Flow == "012") {
-        getReceiveByWorkId(resdata.WorkID).then((response) => {
-          nextTick(() => {
-            proxy.$refs["importRef"].show(response.data, resdata, false);
+  console.log("rowData", rowData);
+  if (rowData.archiveFormNo == "016") {
+    proxy.$refs.superRef.showDetail1(rowData);
+    showSub.value = true;
+  } else {
+    currGenerWorkFlowInfo({ workID: rowData.workId, token: getJToken() }).then(
+      (resdata) => {
+        console.log("resdata", resdata);
+        if (resdata.FK_Flow == "012") {
+          getReceiveByWorkId(resdata.WorkID).then((response) => {
+            nextTick(() => {
+              proxy.$refs["importRef"].show(response.data, resdata, false);
+            });
           });
-        });
-      } else if (resdata.FK_Flow == "003") {
-        getReceiveByWorkId(resdata.WorkID).then((response) => {
-          nextTick(() => {
-            proxy.$refs["importRef1"].showdetal2(
-              response.data,
-              resdata,
-              false,
+        } else if (resdata.FK_Flow == "003") {
+          getReceiveByWorkId(resdata.WorkID).then((response) => {
+            nextTick(() => {
+              proxy.$refs["importRef1"].showdetal2(
+                response.data,
+                resdata,
+                false,
+                "no"
+              );
+            });
+          });
+        } else if (resdata.FK_Flow == "002") {
+          var agent = navigator.userAgent.toLowerCase();
+          if (agent.indexOf("windows") > -1) {
+            handleOpenAppReceived(
+              resdata.WorkID,
+              resdata.NodeName,
+              resdata.FK_Flow,
               "no"
             );
-          });
-        });
-      } else if (resdata.FK_Flow == "002") {
-        var agent = navigator.userAgent.toLowerCase();
-        if (agent.indexOf("windows") > -1) {
-          handleOpenAppReceived(
-            resdata.WorkID,
-            resdata.NodeName,
-            resdata.FK_Flow,
-            "no"
-          );
-        } else {
-          handleOpenAppReceivedQiLin(resdata, "no");
-        }
-      } else if (resdata.FK_Flow == "005") {
-        var agent = navigator.userAgent.toLowerCase();
-        if (agent.indexOf("windows") > -1) {
-          handleOpenAppReceived(
-            resdata.WorkID,
-            resdata.NodeName,
-            resdata.FK_Flow
-          );
-        } else {
-          handleOpenAppReceivedQiLin(resdata);
-        }
-      } else if (resdata.FK_Flow == "008") {
-        var agent = navigator.userAgent.toLowerCase();
-        if (agent.indexOf("windows") > -1) {
-          this.handleOpenAppReceived1(
-            resdata.WorkID,
-            resdata.NodeName,
-            resdata.FK_Flow
-          );
-        } else {
-          handleOpenAppPaperQiLin1(resdata);
+          } else {
+            handleOpenAppReceivedQiLin(resdata, "no");
+          }
+        } else if (resdata.FK_Flow == "005") {
+          var agent = navigator.userAgent.toLowerCase();
+          if (agent.indexOf("windows") > -1) {
+            handleOpenAppReceived(
+              resdata.WorkID,
+              resdata.NodeName,
+              resdata.FK_Flow
+            );
+          } else {
+            handleOpenAppReceivedQiLin(resdata);
+          }
+        } else if (resdata.FK_Flow == "008") {
+          var agent = navigator.userAgent.toLowerCase();
+          if (agent.indexOf("windows") > -1) {
+            this.handleOpenAppReceived1(
+              resdata.WorkID,
+              resdata.NodeName,
+              resdata.FK_Flow
+            );
+          } else {
+            handleOpenAppPaperQiLin1(resdata);
+          }
+        } else if (resdata.FK_Flow == "006") {
+          proxy.$refs.tripRef.showDetail1(resdata);
+          proxy.$refs.tripRef.closeSendNext();
+        } else if (resdata.FK_Flow == "007") {
+          proxy.$refs.teacherRef.showDetail1(resdata);
+          proxy.$refs.teacherRef.closeSendNext();
+        } else if (data.FK_Flow == "009") {
+          leaveDialog.value = true;
+          showTable.value = true;
+          WorkId.value = data.WorkID;
+          trueLeave.value = true;
+          FKNode1.value = data.FK_Node;
+          FK_Flow.value = data.FK_Flow;
+          nodeName.value = data.NodeName;
+        } else if (data.FK_Flow == "010") {
+          InfoDialog.value = true;
+          WorkId1.value = data.WorkID;
+          showcolumn.value = true;
+          FK_Flow.value = data.FK_Flow;
+          nodeName.value = data.NodeName;
+        } else if (data.FK_Flow == "015") {
+          proxy.$refs.carRef.showDetail1(data);
+          proxy.$refs.carRef.closeSendNext();
+        } else if (data.FK_Flow == "020") {
+          proxy.$refs.workRef.showDetail1(data);
+          proxy.$refs.workRef.closeSendNext();
+        } else if (data.FK_Flow == "016") {
+          // proxy.$refs.superRef.showDetail1(data);
+          // proxy.$refs.superRef.closeSendNext();
+        } else if (data.FK_Flow == "017") {
+          proxy.$refs.sealRef.showDetail1(data);
+          proxy.$refs.sealRef.closeSendNext();
+        } else if (data.FK_Flow == "018") {
+          proxy.$refs.contSealRef.showDetail1(data);
+          proxy.$refs.contSealRef.closeSendNext();
         }
-      } else if (resdata.FK_Flow == "006") {
-        proxy.$refs.tripRef.showDetail1(resdata);
-        proxy.$refs.tripRef.closeSendNext();
-      } else if (resdata.FK_Flow == "007") {
-        proxy.$refs.teacherRef.showDetail1(resdata);
-        proxy.$refs.teacherRef.closeSendNext();
-      } else if (data.FK_Flow == "009") {
-        leaveDialog.value = true;
-        showTable.value = true;
-        WorkId.value = data.WorkID;
-        trueLeave.value = true;
-        FKNode1.value = data.FK_Node;
-        FK_Flow.value = data.FK_Flow;
-        nodeName.value = data.NodeName;
-      } else if (data.FK_Flow == "010") {
-        InfoDialog.value = true;
-        WorkId1.value = data.WorkID;
-        showcolumn.value = true;
-        FK_Flow.value = data.FK_Flow;
-        nodeName.value = data.NodeName;
-      } else if (data.FK_Flow == "015") {
-        proxy.$refs.carRef.showDetail1(data);
-        proxy.$refs.carRef.closeSendNext();
-      } else if (data.FK_Flow == "020") {
-        proxy.$refs.workRef.showDetail1(data);
-        proxy.$refs.workRef.closeSendNext();
-      } else if (data.FK_Flow == "016") {
-        proxy.$refs.superRef.showDetail1(data);
-        proxy.$refs.superRef.closeSendNext();
-      } else if (data.FK_Flow == "017") {
-        proxy.$refs.sealRef.showDetail1(data);
-        proxy.$refs.sealRef.closeSendNext();
-      } else if (data.FK_Flow == "018") {
-        proxy.$refs.contSealRef.showDetail1(data);
-        proxy.$refs.contSealRef.closeSendNext();
       }
-    }
-  );
+    );
+  }
 }
 //麒麟（论文）
 function handleOpenAppPaperQiLin1(data, nowShow) {

src/views/beOnDuty/dutyArrangement.vue

@@ -65,6 +65,7 @@
             plain
             icon="Checked"
             size="mini"
+            v-hasPermi="['system:rules:query']"
             >值班规则</el-button
           >
         </el-col>

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

@@ -152,17 +152,17 @@
                       label="进展情况"
                     >
                       <template #default="scope">
-                      <el-input
+                        <el-input
                           v-if="
-                      scope.row.submitState == '0' &&
-                      this.userId == scope.row.userId
-                      "
+                            scope.row.submitState == '0' &&
+                            this.userId == scope.row.userId
+                          "
                           v-model="scope.row.progress"
                           type="textarea"
                           :autosize="{ minRows: 2, maxRows: 4 }"
                           placeholder="请输入进展情况"
-                      ></el-input>
-                      <span v-else>{{ scope.row.progress }}</span>
+                        ></el-input>
+                        <span v-else>{{ scope.row.progress }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column
@@ -242,16 +242,28 @@
                         </el-link>
                       </template>
                     </el-table-column>
-                    <el-table-column align="center" prop=""   width="68" label="审核领导" >
-                      <template #default="scope"  >
-                        <span  >{{ scope.row.leaderName }}</span>
+                    <el-table-column
+                      align="center"
+                      prop=""
+                      width="68"
+                      label="审核领导"
+                    >
+                      <template #default="scope">
+                        <span>{{ scope.row.leaderName }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column align="center"  width="268"  prop="" label="领导意见" >
-                      <template #default="scope"  >
+                    <el-table-column
+                      align="center"
+                      width="268"
+                      prop=""
+                      label="领导意见"
+                    >
+                      <template #default="scope">
                         <el-input
-                          v-if="this.userId == scope.row.leaderUserId &&
-                            scope.row.submitState == '1'&& scope.row.leaderApprove=='0'
+                          v-if="
+                            this.userId == scope.row.leaderUserId &&
+                            scope.row.submitState == '1' &&
+                            scope.row.leaderApprove == '0'
                           "
                           v-model="scope.row.leaderMsg"
                           type="textarea"
@@ -261,9 +273,21 @@
                         <span v-else>{{ scope.row.leaderMsg }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column align="center" width="68"  prop="" label="领导审核结果" >
-                      <template #default="scope"  >
-                        <span  >{{ selectDictLabel(leader_approve, scope.row.leaderApprove) }} </span>
+                    <el-table-column
+                      align="center"
+                      width="68"
+                      prop=""
+                      label="领导审核结果"
+                    >
+                      <template #default="scope">
+                        <span
+                          >{{
+                            selectDictLabel(
+                              leader_approve,
+                              scope.row.leaderApprove
+                            )
+                          }}
+                        </span>
                       </template>
                     </el-table-column>
                     <el-table-column
@@ -285,7 +309,7 @@
                           size="small"
                           >修改</el-button
                         > -->
-<!--                        <el-button
+                        <!--                        <el-button
                           v-if="
                             scope.row.submitState == '0' &&
                             this.userId == scope.row.userId
@@ -439,7 +463,10 @@
                       </el-button> -->
                     </div>
                     <div style="text-align: center; width: 100%" v-else>
-                      <el-button :loading="loadingWebLoad" @click="guanbidialog"
+                      <el-button
+                        v-if="showSub == 'true'"
+                        :loading="loadingWebLoad"
+                        @click="guanbidialog"
                         >提交
                       </el-button>
                     </div>
@@ -680,6 +707,7 @@ export default {
     "trueLeave",
     "closeDialog",
     "editInfo",
+    "showSub",
   ],
   components: { selectUser },
   data() {
@@ -824,17 +852,16 @@ export default {
         this.$modal.msgWarning("请填写领导意见");
         return;
       } else {
-
         this.dataInfo.id = row.id;
         this.dataInfo.leaderMsg = row.leaderMsg;
         this.dataInfo.leaderApprove = "1";
         // this.dataInfo.supervisionId
-        const _dataInfo =this.dataInfo
-        const _row =row
+        const _dataInfo = this.dataInfo;
+        const _row = row;
         this.$modal
           .confirm("是否确认退回")
           .then(function () {
-            _row.leaderApprove="1";
+            _row.leaderApprove = "1";
             return leaderApprove(_dataInfo);
           })
           .then(() => {
@@ -854,12 +881,13 @@ export default {
         this.dataInfo.id = row.id;
         this.dataInfo.leaderMsg = row.leaderMsg;
         this.dataInfo.leaderApprove = "2";
-        console.log(this.dataInfo)
-        const _dataInfo =this.dataInfo
-        const _row =row
-        this.$modal.confirm("是否确认通过")
+        console.log(this.dataInfo);
+        const _dataInfo = this.dataInfo;
+        const _row = row;
+        this.$modal
+          .confirm("是否确认通过")
           .then(function () {
-            _row.leaderApprove="1";
+            _row.leaderApprove = "1";
             return leaderApprove(_dataInfo);
           })
           .then(() => {
@@ -1117,8 +1145,8 @@ export default {
       //     this.isEdit = false;
       //   }
       // });
-      this.idNow = flowData.id;
-      getSupervision(flowData.id).then((res) => {
+      this.idNow = flowData.id || flowData.workId;
+      getSupervision(this.idNow).then((res) => {
         console.log("res", res);
         this.form = res.data;
         this.dataInfo.supervisionId = res.data.id;

src/views/offcial/mysupervision/index.vue

@@ -152,11 +152,7 @@
           <dict-tag :options="progress_eva" :value="scope.row.progressEva" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="发起人"
-        align="center"
-        prop="departmentHead"
-      />
+      <el-table-column label="发起人" align="center" prop="departmentHead" />
       <!-- <el-table-column label="工作id" align="center" prop="workId" /> -->
       <!-- <el-table-column label="完成时限内容" align="center" prop="doneContent" /> -->
       <el-table-column width="80" label="是否催办" align="center" prop="isCb">
@@ -215,12 +211,21 @@
           >
          -->
           <el-button
+            v-if="scope.row.submitState != 0"
             link
             type="warning"
             icon="view"
             @click="handleView(scope.row)"
             >查看</el-button
           >
+          <el-button
+            v-else
+            link
+            type="primary"
+            icon="edit"
+            @click="handleEdit(scope.row)"
+            >编辑</el-button
+          >
           <el-button
             v-if="scope.row.submitState == '2'"
             v-hasPermi="['offcial:supervision:edit']"
@@ -228,7 +233,8 @@
             type="primary"
             icon="TopRight"
             @click="saveArchive1(scope.row)"
-            >归档</el-button >
+            >归档</el-button
+          >
           <el-button
             v-if="scope.row.submitState == '2'"
             v-hasPermi="['offcial:supervision:reapply']"
@@ -236,9 +242,10 @@
             type="success"
             icon="TopRight"
             @click="handleUpdate(scope.row)"
-            >再次发起</el-button >
+            >再次发起</el-button
+          >
           <el-button
-            v-if="scope.row.isCb == 'Y'&&scope.row.progressEva!=1"
+            v-if="scope.row.isCb == 'Y' && scope.row.progressEva != 1"
             v-hasPermi="['offcial:supervision:expediting']"
             link
             type="danger"
@@ -376,6 +383,11 @@ function addDuban() {
 }
 function handleEdit(row) {
   console.log("row", row);
+  dialogVisibleSupervise.value = true;
+  reset();
+  const _id = row.id || ids.value;
+  idNow.value = _id;
+  zaici.value = "7";
 }
 function isRowSelectable(row) {
   // 只有状态为'active'的行可选
@@ -484,21 +496,21 @@ function handleAdd() {
 
 /** 再次发起操作 */
 function saveArchive1(row) {
-  var archiveData={
-    archiveFormNo:"016",
-    workId:row.id,
+  var archiveData = {
+    archiveFormNo: "016",
+    workId: row.id,
   };
-   saveArchive(archiveData).then(res=>{
-     var superData={
-       id: row.id,
-       submitState: "3",
-     };
-     updateSupervision(superData).then((response) => {
-       proxy.$modal.msgSuccess("归档成功");
-       open.value = false;
-       getList();
-     });
-   })
+  saveArchive(archiveData).then((res) => {
+    var superData = {
+      id: row.id,
+      submitState: "3",
+    };
+    updateSupervision(superData).then((response) => {
+      proxy.$modal.msgSuccess("归档成功");
+      open.value = false;
+      getList();
+    });
+  });
 }
 /** 再次发起操作 */
 function handleUpdate(row) {

src/views/offcial/supervision/index.vue

@@ -152,11 +152,7 @@
           <dict-tag :options="progress_eva" :value="scope.row.progressEva" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="发起人"
-        align="center"
-        prop="departmentHead"
-      />
+      <el-table-column label="发起人" align="center" prop="departmentHead" />
       <!-- <el-table-column label="工作id" align="center" prop="workId" /> -->
       <!-- <el-table-column label="完成时限内容" align="center" prop="doneContent" /> -->
       <el-table-column width="80" label="是否催办" align="center" prop="isCb">
@@ -214,7 +210,11 @@
             >编辑</el-button
           >
           <el-button
-            v-if="scope.row.submitState != null && scope.row.isCb != 'Y' && scope.row.progressEva!=1"
+            v-if="
+              scope.row.submitState != null &&
+              scope.row.isCb != 'Y' &&
+              scope.row.progressEva != 1
+            "
             v-hasPermi="['offcial:supervision:expediting']"
             link
             type="danger"

vite.config.js

@@ -44,8 +44,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
-          // target: "http://192.168.3.213:8080",
-          target: "http://192.168.1.42:8080",
+          target: "http://192.168.3.213:8080",
+          // target: "http://192.168.1.220:8080",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },