2213980799@qq.com hace 1 año
padre
commit
3307ba7a55

+ 1 - 1
src/styles/index.scss

@@ -6,7 +6,7 @@ $--ele-font-path: '~ele-admin/es/style/fonts';
 
 
 .long-dialog-form .el-dialog__body{
-    // max-height: 700px;
+    max-height: calc(100vh - 129px);
     overflow-y: auto;
     padding-bottom: 30px;
 }

+ 8 - 1
src/views/contractManage/contractBook/components/addDialog.vue

@@ -8,8 +8,12 @@
     :close-on-click-modal="false"
     width="70%"
     append-to-body
+    :fullscreen="fullscreen"
     @close="cancel"
   >
+  <template slot="title">
+     <modalTitle :title="title" @setFullscreen="fullscreen=!fullscreen"></modalTitle>
+    </template>
     <el-form
       ref="form"
       :model="form"
@@ -515,6 +519,7 @@
 </template>
 
 <script>
+import modalTitle from '@/BIZComponents/modalTitle.vue';
 import { emailReg, phoneReg, numberReg } from 'ele-admin';
 import { acceptUnpackoptions } from '@/enum/dict';
 import inventoryTable from './inventoryTable.vue';
@@ -582,7 +587,7 @@ export default {
     parentList,
     inquiryList,
     quotationList,
-    fileMain
+    fileMain,modalTitle
   },
   data() {
     let formDef = {
@@ -626,6 +631,8 @@ export default {
     };
 
     return {
+      fullscreen:false,
+
       payWayOptions: [],
       delDetailIds: [],
       paymentTypeOptions: [

+ 8 - 1
src/views/contractManage/contractBook/components/detailDialog.vue

@@ -8,8 +8,12 @@
     :close-on-click-modal="false"
     :append-to-body="true"
     width="70%"
+    :fullscreen="fullscreen"
     @close="cancel"
   >
+  <template slot="title">
+     <modalTitle :title="title" @setFullscreen="fullscreen=!fullscreen"></modalTitle>
+    </template>
     <div class="switch">
       <div class="switch_left">
         <ul>
@@ -224,16 +228,19 @@ import { copyObj } from '@/utils/util';
 import bpmDetail from '@/views/bpm/processInstance/detail.vue';
 import inventoryTabledetail from './inventoryTabledetail.vue';
 import fileMain from '@/components/addDoc/index';
+import modalTitle from '@/BIZComponents/modalTitle.vue';
 
 export default {
   mixins: [dictMixins],
   components: {
     inventoryTabledetail,
     bpmDetail,
-    fileMain
+    fileMain,modalTitle
   },
   data() {
     return {
+      fullscreen:false,
+
       activeComp: 'main',
       tabOptions: [
         { key: 'main', name: '合同详情' },

+ 1 - 1
src/views/purchasingManage/producerManage/components/addContactDialog.vue

@@ -632,7 +632,7 @@
         :disabled="activeName == 6"
         >下一步</el-button
       >
-      <el-button type="primary" v-if="activeName == 6" @click="save"
+      <el-button type="primary" v-if="activeName == 6||title!='新建生产厂家'" @click="save"
         >保存</el-button
       >
       <el-button @click="cancel">返回</el-button>

+ 1 - 1
src/views/purchasingManage/supplierManage/components/addContactDialog.vue

@@ -408,7 +408,7 @@
         :disabled="activeName == 6"
         >下一步</el-button
       >
-      <el-button type="primary" v-if="activeName == 6" @click="save"
+      <el-button type="primary" v-if="activeName == 6||title=='新建供应商'" @click="save"
         >保存</el-button
       >
       <el-button @click="cancel">返回</el-button>

+ 7 - 1
src/views/saleManage/saleOrder/accountstatement/components/addAccountDialog.vue

@@ -6,9 +6,13 @@
     :title="title"
     :append-to-body="true"
     :close-on-click-modal="false"
+    :fullscreen="fullscreen"
     width="85%"
     :before-close="cancel"
   >
+  <template slot="title">
+     <modalTitle :title="title" @setFullscreen="fullscreen=!fullscreen"></modalTitle>
+    </template>
     <!--销售表单-->
     <sale-form
       @handleSearch="handleSearch"
@@ -65,12 +69,13 @@ import {
   submitAccountStatementApproveAPI,
   updateAccountStatementAPI
 } from '@/api/saleManage/accountstatement';
+import modalTitle from '@/BIZComponents/modalTitle.vue';
 
 export default {
   name: 'addAccountDialog',
   components: {
     InventoryTable,
-    saleForm
+    saleForm,modalTitle
   },
   //客户管理数据
   props: {
@@ -93,6 +98,7 @@ export default {
   },
   data() {
     return {
+      fullscreen:false,
       datasource: [],
       dataForm: {
         sourceType: 1,

+ 7 - 2
src/views/saleManage/saleOrder/accountstatement/components/detailDialog.vue

@@ -6,10 +6,13 @@
     :title="title"
     :append-to-body="true"
     :close-on-click-modal="false"
+    :fullscreen="fullscreen"
     width="70%"
     :before-close="cancel"
   >
-
+  <template slot="title">
+     <modalTitle :title="title" @setFullscreen="fullscreen=!fullscreen"></modalTitle>
+    </template>
     <el-card shadow="never">
       <div class="switch">
         <div class="switch_left">
@@ -63,13 +66,14 @@ import bpmDetail from '@/views/bpm/processInstance/detail.vue';
 import InventoryTable from "@/views/saleManage/saleOrder/accountstatement/components/inventoryTable.vue";
 import saleForm from "@/views/saleManage/saleOrder/accountstatement/components/saleForm.vue";
 import {infoAccountStatementAPI} from "@/api/saleManage/accountstatement";
+import modalTitle from '@/BIZComponents/modalTitle.vue';
 
 export default {
   props: ['detailDialogFlag'],
   components: {
     saleForm,
     InventoryTable,
-    bpmDetail
+    bpmDetail,modalTitle
   },
   data() {
     return {
@@ -78,6 +82,7 @@ export default {
         {key: 'main', name: '对账单详情'},
         {key: 'bpm', name: '流程详情'}
       ],
+      fullscreen:false,
 
       visible: false,
       form: {},