Преглед на файлове

dvp变更管理未完成提示同时增加变更管理处理弹窗

zhangjie преди 7 месеца
родител
ревизия
52f0866bcd

+ 7 - 1
src/App.vue

@@ -78,6 +78,8 @@
           :rfmeaType="'D'"
           @close='submitApprovalVisible = false'
       />
+      <!-- 变更内容查看 -->
+      <change-content-modal ref="changeContentModal" />
     </div>
   </a-config-provider>
 </template>
@@ -89,13 +91,15 @@ import FooterToolBar from '@/components/FooterToolbar';
 import { getUrlParam } from "@/common/common";
 import utils from '@/utils/urlParamUtil';
 import SubmitApproval from '@/components/SubmitApprovalModal';
+import ChangeContentModal from "@/components/ChangeManagement/changeManagement";
 
 export default {
   name: 'App',
   components: {
     feHeader,
     FooterToolBar,
-    SubmitApproval
+    SubmitApproval,
+    ChangeContentModal
   },
   data() {
     return {
@@ -519,6 +523,8 @@ export default {
             _that.$message.warning(_that.$t('dvp.full.vehicle.dvp.dvp-frequency') + _that.$t('dvp.check-data-complete'));
           } else if (changeFlag) {
             _that.$message.warning(_that.$t('dvp.check-change-data-complete'));
+            // 变更管理未完成--变更管理处理弹窗
+            _that.$refs.changeContentModal.visible = true;
           } else {
             _that.$message.warning(_that.$t('dvp.check-data-complete'));
           }

+ 37 - 0
src/components/ChangeManagement/changeManagement.vue

@@ -0,0 +1,37 @@
+<template>
+<!-- 变更管理处理弹窗 -->
+  <a-modal
+    v-model="visible"
+    width='90vw'
+    :title="$t('base.info.change.management')"
+    style="over-flow-y:auto;"
+    :body-style= "{ height: '80vh' }"
+    :maskClosable="false"
+    destroyOnClose
+    :footer="null">
+      <change-management />
+    </a-modal>
+</template>
+
+<script>
+
+import ChangeManagement from "@/views/fullVehicle/baseInfo/changeManagement"; // 三个dvp变更管理通用
+
+export default {
+  name: 'checkChangeManagementModal',
+  components: {
+    ChangeManagement
+  },
+  data() {
+    return {
+      visible: false,
+    };
+  },
+  methods: {
+  },
+}
+</script>
+
+<style>
+
+</style>

+ 1 - 1
src/views/componentsDVP/baseInfo/changeManagement/changeContentModal.vue

@@ -222,7 +222,7 @@ export default {
     save() {
       let data = {
         id: this.changeContentId,
-        description: this.formData.description.trim()
+        description: this.formData.description
       };
       this.$api.updateChangeDescription(data).then(res => {
         if (res.flag) {

+ 2 - 2
src/views/fullVehicle/baseInfo/changeManagement/changeContentModal.vue

@@ -94,7 +94,7 @@
           <!--变更内容-->
           <a-col :lg='24' :md='24' :sm='24' :xl='24' :xs='24'>
             <a-form-item :label="$t('base.info.change-content')">
-              <a-textarea :disabled="isDisabled || !isLook" v-model="formData.description" :rows="4" :maxLength="200" allowClear :placeholder="$t('base.info.please-enter-change-content')"/>
+              <a-textarea :disabled="isDisabled || !isLook" v-model.trim="formData.description" :rows="4" :maxLength="200" allowClear :placeholder="$t('base.info.please-enter-change-content')"/>
             </a-form-item>
           </a-col>
         </a-row>
@@ -210,7 +210,7 @@ export default {
     save() {
       let data = {
         id: this.changeContentId,
-        description: this.formData.description.trim()
+        description: this.formData.description
       };
       this.$api.updateChangeDescription(data).then(res => {
         if (res.flag) {

+ 1 - 1
src/views/systemDVP/baseInfo/changeManagement/changeContentModal.vue

@@ -222,7 +222,7 @@ export default {
     save() {
       let data = {
         id: this.changeContentId,
-        description: this.formData.description.trim()
+        description: this.formData.description
       };
       this.$api.updateChangeDescription(data).then(res => {
         if (res.flag) {