From f4cf7761a27ac68a4772ff2e2f3cf287b7429f77 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Tue, 7 Feb 2023 10:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=BC=95=E5=85=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/ali.css                        | 68 -------------------
 src/views/activiti/applyList.vue              |  4 +-
 src/views/activiti/form/ProcessUdgetPlan.vue  |  6 +-
 .../activiti/form/ProcessUdgetPlanForm.vue    | 17 ++++-
 src/views/dashboard/HomePage.vue              | 68 +++++++++++++++++++
 5 files changed, 87 insertions(+), 76 deletions(-)

diff --git a/src/assets/css/ali.css b/src/assets/css/ali.css
index 6288dc5..b43a624 100644
--- a/src/assets/css/ali.css
+++ b/src/assets/css/ali.css
@@ -6,71 +6,3 @@
     url('font_3733417_ws9m9bvag1h.woff2') format('woff'),
     url('font_3733417_ws9m9bvag1h.woff2') format('truetype');
 }
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-shenglvehao:before {
-  content: "\e708";
-}
-
-.icon-lianxiren:before {
-  content: "\e66f";
-}
-
-.icon-lianxiren1:before {
-  content: "\e654";
-}
-
-.icon-daibanrenwu:before {
-  content: "\eb29";
-}
-
-.icon-rizhi:before {
-  content: "\e627";
-}
-
-.icon-B-lianxiren:before {
-  content: "\e728";
-}
-
-.icon-process:before {
-  content: "\e75d";
-}
-
-.icon-suggest:before {
-  content: "\e767";
-}
-
-.icon-lianxiren2:before {
-  content: "\e6c4";
-}
-
-.icon-lianxiren1-copy:before {
-  content: "\eb2a";
-}
-
-.icon-lianxiren-copy:before {
-  content: "\eb2b";
-}
-
-.icon-rizhi-copy:before {
-  content: "\eb2c";
-}
-
-.icon-process-copy:before {
-  content: "\eb2d";
-}
-
-.icon-process-copy1:before {
-  content: "\eb2e";
-}
-
-.icon-suggest-copy:before {
-  content: "\eb2f";
-}
diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index ce9f41c..a718afd 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -1,4 +1,4 @@
-<template>
+<template >
   <a-card :bordered="false">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
@@ -163,7 +163,7 @@
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg ="lcModa.hieg"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
                  :itemId="lcModa.itemId"
-                 @afterSubmit="afterSub" @loadData="reloadData" @close="lcModa.visible=false,lcModa.disabled = false"></component>
+                 @afterSubmit="afterSub" @loadData="reloadData" @close="lcModa.visible=false,lcModa.disabled = false" ></component>
 <!--       -->
     </a-modal>
 
diff --git a/src/views/activiti/form/ProcessUdgetPlan.vue b/src/views/activiti/form/ProcessUdgetPlan.vue
index 93c49ce..6db9446 100644
--- a/src/views/activiti/form/ProcessUdgetPlan.vue
+++ b/src/views/activiti/form/ProcessUdgetPlan.vue
@@ -1,7 +1,7 @@
-<template>
-  <a-card :bordered="true">
+<template >
+  <a-card :bordered="false" >
 
-        <a-tabs style="text-align: center">
+        <a-tabs style="text-align: center" >
           <a-tab-pane tab="流程正文" key="1" forceRender>
             <process-udget-plan-form  :isNew="isNew" :processData="processData" :disabled="disabled"  @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData" :isPlanType="isPlanType"
                                       :isSourceCapital="isSourceCapital" :routePlanName="routePlanName" :itemId="itemId"/>
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 5934e3b..37c9f51 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -1,6 +1,6 @@
-<template>
+<template >
 
-  <a-spin :spinning="confirmLoading">
+  <a-spin :spinning="confirmLoading" >
     <j-form-container :disabled="formDisabled">
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
@@ -1334,7 +1334,7 @@
                 console.log('格式化后的数据', formData)
                 if (formData.ifDirect == null && this.routePlanName == '采购员') {
                   this.$message.error('请选择是否属于直达物资!')
-                  return
+                  return;
                 } else {
                   if (formData.ifDirect == 1) {
                     if (formData.ifInspection == null) {
@@ -1497,6 +1497,17 @@
               this.$message.error('请选择采购类型')
               return
             } else {
+              if (formData.ifDirect == null && this.routePlanName == '采购员') {
+                this.$message.error('请选择是否属于直达物资!')
+                return
+              } else {
+                if (formData.ifDirect == 1) {
+                  if (formData.ifInspection == null) {
+                    this.$message.error('请选择是否需要送检!')
+                    return
+                  }
+                }
+              }
               this.passTask()
               this.handleSubmit(true)
             }
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index cba41a1..fcb53ab 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -349,6 +349,74 @@ export default {
 <style scoped>
 @import url("/src/assets/css/ali.css");
 
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-shenglvehao:before {
+  content: "\e708";
+}
+
+.icon-lianxiren:before {
+  content: "\e66f";
+}
+
+.icon-lianxiren1:before {
+  content: "\e654";
+}
+
+.icon-daibanrenwu:before {
+  content: "\eb29";
+}
+
+.icon-rizhi:before {
+  content: "\e627";
+}
+
+.icon-B-lianxiren:before {
+  content: "\e728";
+}
+
+.icon-process:before {
+  content: "\e75d";
+}
+
+.icon-suggest:before {
+  content: "\e767";
+}
+
+.icon-lianxiren2:before {
+  content: "\e6c4";
+}
+
+.icon-lianxiren1-copy:before {
+  content: "\eb2a";
+}
+
+.icon-lianxiren-copy:before {
+  content: "\eb2b";
+}
+
+.icon-rizhi-copy:before {
+  content: "\eb2c";
+}
+
+.icon-process-copy:before {
+  content: "\eb2d";
+}
+
+.icon-process-copy1:before {
+  content: "\eb2e";
+}
+
+.icon-suggest-copy:before {
+  content: "\eb2f";
+}
+
 
 .bottom-card span {
   cursor: pointer;