1
0

3 Commity d7f406be22 ... 23dbdb35f3

Autor SHA1 Správa Dátum
  xiao-xx 23dbdb35f3 Merge branch 'master' of http://121.28.134.38:2039/dudidi/wjw_jiankangzhidaozhongxin 3 mesiacov pred
  xiao-xx fcba36cb83 增加用章审批单 3 mesiacov pred
  xiao-xx 89a1321056 增加用章审批单 3 mesiacov pred

+ 1 - 1
.env.development

@@ -9,4 +9,4 @@ VITE_APP_BASE_API = '/dev-api'
 
 
 VITE_APP_KKFILE1 ='http://192.168.1.42:8080'
-VITE_APP_KKFILE2 ="http://192.168.1.42:8201/onlinePreview?url="
+VITE_APP_KKFILE2 ="http://192.168.1.56:8201/onlinePreview?url="

+ 8 - 0
src/api/offcial/seal.js

@@ -42,3 +42,11 @@ export function delSeal(id) {
     method: 'delete'
   })
 }
+
+// 删除用章申请
+export function getYzYbjInfo(id) {
+  return request({
+    url: '/offcial/seal/getYzYbjInfo/' + id,
+    method: 'get'
+  })
+}

+ 6 - 3
src/views/clocking/sealApplication.vue

@@ -103,7 +103,7 @@
                       </el-select> </el-form-item
                   ></el-col>
                 </el-row>
-                <el-form-item prop="usingReason" label="用章事由:">
+                <el-form-item prop="usingReason" label="文件名称:">
                   <el-input
                     v-model="form1.usingReason"
                     style="max-width: 35vw"
@@ -412,7 +412,7 @@ export default {
           { required: true, trigger: "blur", message: "请输入您的姓名" },
         ],
         usingReason: [
-          { required: true, trigger: "blur", message: "请输入用章事由" },
+          { required: true, trigger: "blur", message: "请输入文件名称" },
         ],
         activeSend: [
           { required: true, trigger: "blur", message: "请输入主送单位" },
@@ -478,6 +478,7 @@ export default {
       var days = diff / (1000 * 60 * 60 * 24);
       this.form1.dayNum = Math.floor(days) + 1;
     },
+
     getUserInfo() {
       getInfo().then((res) => {
         console.log("res", res);
@@ -503,7 +504,7 @@ export default {
             this.flowDatas.token = getJToken();
             this.flowDatas.WorkID = this.workId;
             this.flowDatas.FK_Flow = "017";
-            this.flowDatas.toNodeId = null;
+            this.flowDatas.toNodeId = "1703";
             console.log(this.flowDatas);
             this.$modal.closeLoading();
             this.$refs["selectRef"].show1(this.flowDatas);
@@ -519,6 +520,8 @@ export default {
                     response.data.VarAcceptersName,
                   type: "success",
                 });
+                this.$refs.fujianUpload.clearFiles();
+                this.fujian=[];
                 this.reset();
                 this.$refs.ruleFormRef.resetFields();
                 this.$modal.closeLoading();

+ 5 - 1
src/views/clocking/selectUser.vue

@@ -237,8 +237,12 @@ export default {
   methods: {
     // 查询表数据
     getList1(formDatas) {
+      var toNodeId="602"
+    if(formDatas.toNodeId!=""&&formDatas.toNodeId!=undefined){
+      toNodeId=formDatas.toNodeId
+    }
       console.log("formDatas", formDatas);
-      GenerNextStepNodeEmpsNoWorkId(formDatas.FK_Flow, "602", "", "").then(
+      GenerNextStepNodeEmpsNoWorkId(formDatas.FK_Flow,toNodeId, "", "").then(
         (res) => {
           this.allUserList = res.Emps;
           this.userList = res.Emps;

+ 2 - 2
src/views/liucheng/todowork/formView/sealApplicational.vue

@@ -123,7 +123,7 @@
                             </el-select> </el-form-item
                         ></el-col>
                       </el-row>
-                      <el-form-item prop="usingReason" label="用章事由:">
+                      <el-form-item prop="usingReason" label="文件名称:">
                         <el-input
                           disabled
                           v-model="form.usingReason"
@@ -493,7 +493,7 @@
       </div>
     </el-dialog>
     <el-dialog style="width: 1000px" title="用章审批单" v-model="Yzsp">
-      <yzspdanVue ref="yzsp"></yzspdanVue>
+      <yzspdanVue :id="this.form.id" ref="yzsp"></yzspdanVue>
     </el-dialog>
   </div>
 </template>

+ 23 - 31
src/views/yzspdan/yzspdan.vue

@@ -53,9 +53,9 @@
         "
       >
         <div style="display: inline-block">
-          &nbsp;日期:{{ YbjData.yOffcialReceive.serial }}
+          &nbsp;日期:  {{ parseTime(YbjData.ywUsingSeal.createTime, "{y}-{m}-{d}") }}
         </div>
-        <div style="margin-top: 2px; display: inline-block; margin-right: 70px">
+        <div style="margin-top: 2px; display: inline-block; margin-right: 100px">
           序号:
         </div>
       </div>
@@ -72,13 +72,13 @@
               经办人
             </td>
             <td colspan="4" style="font-size: 22px; text-align: center">
-              <!-- {{ YbjData.yOffcialReceive.sender }} -->
+               {{ 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.yOffcialReceive.documentNum }} -->
+               {{ YbjData.ywUsingSeal.useDept }}
             </td>
           </tr>
           <tr style="height: 12vh">
@@ -86,13 +86,13 @@
               印章类型
             </td>
             <td colspan="4" style="font-size: 22px; text-align: center">
-              <!-- {{ YbjData.yOffcialReceive.sender }} -->
+              {{ yzlxFormat(YbjData.ywUsingSeal.signetType) }}
             </td>
             <td colspan="1" style="font-size: 22px; width: 22%" align="center">
               盖章日期
             </td>
             <td colspan="3" style="font-size: 22px; text-align: center">
-              <!-- {{ YbjData.yOffcialReceive.documentNum }} -->
+               {{ YbjData.ywUsingSeal.useTime }}
             </td>
           </tr>
           <tr style="height: 12vh">
@@ -100,13 +100,13 @@
               主送单位
             </td>
             <td colspan="4" style="font-size: 22px; text-align: center">
-              <!-- {{ YbjData.yOffcialReceive.sender }} -->
+               {{ 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.yOffcialReceive.documentNum }} -->
+               {{ YbjData.ywUsingSeal.signetCopies }}
             </td>
           </tr>
           <tr style="height: 18vh">
@@ -117,16 +117,7 @@
               colspan="10"
               style="font-size: 22px; line-height: 35px; height: 35px"
             >
-              <!-- <div
-                v-if="YbjData.ldpsMaps != undefined && YbjData.ldpsMaps != null"
-              >
-                <template
-                  v-for="(item, index) in YbjData.ldpsMaps"
-                  :key="index"
-                >
-                  <div>{{ item.nickName }}:{{ item.Msg }}</div>
-                </template>
-              </div> -->
+              {{ YbjData.ywUsingSeal.usingReason }}
             </td>
           </tr>
           <tr style="height: 18vh">
@@ -135,16 +126,12 @@
               style="font-size: 22px; line-height: 35px; height: 35px"
               colspan="10"
             >
-              <!-- <div
-                v-if="YbjData.nbyjMaps != undefined && YbjData.nbyjMaps != null"
-              >
-                <template
-                  v-for="(item, index) in YbjData.nbyjMaps"
+              <template
+                  v-for="(item, index) in YbjData.ldpsMaps"
                   :key="index"
-                >
-                  <span>{{ item.nickName }}:{{ item.Msg }}</span>
-                </template>
-              </div> -->
+              >
+                <div>{{ item.nickName }}:{{ item.Msg }}</div>
+              </template>
             </td>
           </tr>
         </table>
@@ -171,7 +158,7 @@
 </template>
 <script>
 // import { VueHtmlToPaper } from "vue-html-to-paper";
-import { getYbjInfo } from "@/api/liucheng";
+import { getYzYbjInfo } from "@/api/offcial/seal.js";
 import { ElMessage } from "element-plus";
 import { useDict } from "@/utils/dict";
 
@@ -185,6 +172,7 @@ export default {
   data() {
     return {
       sw_open_type: useDict("sw_open_type").sw_open_type,
+      signet_type: useDict("signet_type").signet_type,
 
       //打印
       print: {
@@ -194,20 +182,24 @@ export default {
         cbcsStr: "",
         nbyjStr: "",
         ldpsStr: "",
-        yOffcialReceive: {},
+        ywUsingSeal: {},
       },
       aaid: 32,
     };
   },
-  mounted() {
+  created() {
     this.getInfoData();
   },
   methods: {
     getInfoData() {
-      getYbjInfo(this.id).then((reData) => {
+      console.log("获取审批单内容")
+      getYzYbjInfo(this.id).then((reData) => {
         this.YbjData = reData.data;
       });
     },
+    yzlxFormat(row, column) {
+      return this.selectDictLabel(this.signet_type, row);
+    }
   },
 };
 </script>