代码上传

src/Form/publicManage/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="editBtn">新 建</el-button>
-    <el-drawer append-to-body title="新 建" :visible.sync="dialogFormVisible" size="800px">
+    <el-drawer append-to-body title="新 建" :visible.sync="dialogFormVisible" size="800px" :show-close="false">
       <div class="drawer__panel">
         <span style="font-weight:bold">基本信息</span>
         <el-divider></el-divider>
@@ -30,27 +30,7 @@
               </el-radio-group>
             </el-form-item>
             </el-col>
-            <!-- <el-col :span="24">
-            <el-form-item label="保有规则" prop="isopentenure">
-              <el-radio-group v-model="form.isopentenure">
-                <el-radio :label="1">开启</el-radio>
-                <el-radio :label="0">关闭</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            </el-col> -->
             <el-col :span="24">
-            <el-form-item label="自动回收规则" prop="datafollowlimit">
-              <div>
-                <el-radio-group v-model="form.isopenrecovery">
-                  <el-radio :label="1">开启</el-radio>
-                  <el-radio :label="0">关闭</el-radio>
-                </el-radio-group>
-              </div>
-              <div v-show="form.isopenrecovery == 1">
-                <div><el-input size="mini" style="width:50px;margin-right:10px" v-model="form.datafollowlimit" />天，未跟进，自动回收至公海，负责人清空</div>
-                <div><el-input size="mini" style="width:50px;margin-right:10px" v-model="form.deallimit" />天，未成交，自动回收至公海，负责人清空</div>
-              </div>
-            </el-form-item>
             <el-form-item label="是否默认公海" prop="aa">
               <div>
                 <el-radio-group v-model="form.aa">

src/Form/publicManage/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="text" @click="editBtn">编 辑</el-button>
-    <el-drawer append-to-body title="编辑" :visible.sync="dialogFormVisible" size="800px">
+    <el-drawer append-to-body title="编辑" :visible.sync="dialogFormVisible" size="800px" :show-close="false">
       <div class="drawer__panel">
       <span style="font-weight:bold">基本信息</span>
       <el-divider></el-divider>
@@ -31,42 +31,22 @@
           </el-form-item>
           </el-col>
           <el-col :span="24">
-          <el-form-item label="保有规则" prop="isopentenure">
-            <el-radio-group v-model="form.isopentenure">
-              <el-radio :label="1">开启</el-radio>
-              <el-radio :label="0">关闭</el-radio>
-            </el-radio-group>
+          <el-form-item label="是否默认公海" prop="aa">
+            <div>
+              <el-radio-group v-model="form.aa" :disabled="form.isdefault === 1">
+                <el-radio :label="1">开启</el-radio>
+                <el-radio :label="0" >关闭</el-radio>
+              </el-radio-group>
+            </div>
           </el-form-item>
-          </el-col>
-          <el-col :span="24">
-          <el-form-item label="自动回收规则" prop="datafollowlimit">
+          <el-form-item label="是否启用" prop="isused">
             <div>
-              <el-radio-group v-model="form.isopenrecovery">
+              <el-radio-group v-model="form.isused">
                 <el-radio :label="1">开启</el-radio>
                 <el-radio :label="0">关闭</el-radio>
               </el-radio-group>
             </div>
-            <div v-show="form.isopenrecovery == 1">
-              <div><el-input size="mini" style="width:50px;margin-right:10px" v-model="form.datafollowlimit" />天，未跟进，自动回收至公海，负责人清空</div>
-              <div><el-input size="mini" style="width:50px;margin-right:10px" v-model="form.deallimit" />天，未成交，自动回收至公海，负责人清空</div>
-            </div>
           </el-form-item>
-            <el-form-item label="是否默认公海" prop="aa">
-              <div>
-                <el-radio-group v-model="form.aa" :disabled="form.isdefault === 1">
-                  <el-radio :label="1">开启</el-radio>
-                  <el-radio :label="0" >关闭</el-radio>
-                </el-radio-group>
-              </div>
-            </el-form-item>
-            <el-form-item label="是否启用" prop="isused">
-              <div>
-                <el-radio-group v-model="form.isused">
-                  <el-radio :label="1">开启</el-radio>
-                  <el-radio :label="0">关闭</el-radio>
-                </el-radio-group>
-              </div>
-            </el-form-item>
           </el-col>
         </el-form>
          <el-alert

src/HDrpManagement/competitor/detail/modules/addressManage/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="onshow">新增客户地址</el-button>
     <el-drawer
-        title="创建客户地址"
+        title=" 新建客户地址"
         :visible.sync="dialogFormVisible"
         size="25%"
         direction="rtl"

src/HDrpManagement/competitor/detail/modules/contacts/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="onshow">新增联系人</el-button>
     <el-drawer
-        title="创建联系人"
+        title=" 新建联系人"
         :visible.sync="dialogFormVisible"
         size="25%"
         direction="rtl"

src/HDrpManagement/publicCustomer/modules/detail/addressManage/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="onshow">新增客户地址</el-button>
     <el-drawer
-        title="创建客户地址"
+        title=" 新建客户地址"
         :visible.sync="dialogFormVisible"
         size="25%"
         direction="rtl"

src/HDrpManagement/publicCustomer/modules/detail/contacts/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="onshow">新增联系人</el-button>
     <el-drawer
-        title="创建联系人"
+        title=" 新建联系人"
         :visible.sync="dialogFormVisible"
         size="25%"
         direction="rtl"

src/HManagement/personalTarget/target/modules/addPersonal.vue

@@ -8,6 +8,7 @@
         direction="rtl"
         append-to-body
         @close="onCancel"
+        :show-close="false"
     >
       <div class="panel_Target">
         <el-row>

src/HManagement/personalTarget/target/modules/edit/index.vue

@@ -136,7 +136,7 @@ export default {
         "content": {
           "attachmentid":attachmentid,
           "sa_salestargetbillid":this.$route.query.id,
-          "year":this.mainInfo.year
+          "year":this.mainData.year
         },
       })
       if (res1.msg !== '成功') { 

src/HManagement/personalTarget/target/modules/edit/indexCopy.vue

@@ -81,7 +81,7 @@ export default {
         "content": {
           "attachmentid":attachmentid,
           "sa_salestargetbillid":this.$route.query.id,
-          "year":this.mainInfo.year
+          "year":this.mainData.year
         },
       })
       if (res1.msg !== '成功') { 

src/HManagement/projectTarget/target/modules/addProject.vue

@@ -7,6 +7,7 @@
         size="70%"
         direction="rtl"
         append-to-body
+        :show-close="false"
         @close="onCancel"
     >
       <div class="panel_Target">

src/SDrpManagement/QuotedPrice/detail/modules/historicalQuotation/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <tableLayout :layout="tablecols" :data="list">
+    <tableLayout :layout="tablecols" :data="list" fixedName="">
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'specialoffer'">
           <div v-if="scope.column.data.specialoffer === 0">
@@ -21,10 +21,7 @@
         </div>
       </template>
       <template v-slot:opreation="scope">
-<<<<<<< HEAD
-=======
         <el-button size="mini" type="text" @click="detailGo(scope.data)">详 情</el-button>
->>>>>>> 8249ebd501a41de019c344a8d6bbb7e02b929bb0
       </template>
     </tableLayout>
     <div style="margin-top:16px;text-align:right">

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -19,17 +19,17 @@
       </div>
       <div slot="customOperation" >
         <!-- 此区域提供了自定义操作按钮 -->
-        <transaction_status class="inline-16" v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid"  @shareSuccess="onSuccess"></transaction_status>
-        <statusChange class="inline-16" v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid"  @statusChangeSuccess="statusChangeSuccess"></statusChange>
+        <transaction_status class="inline-16" v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></transaction_status>
+        <statusChange class="inline-16" v-if="tool.checkAuth($route.name,'statusChange')" :id="mainData.sa_customersid"  @statusChangeSuccess="statusChangeSuccess"></statusChange>
         <!--<lock class="inline-16" v-if="tool.checkAuth($route.name,'lock')"   :id="mainData.sa_customersid" @onshow="onSuccess"></lock>-->
          <!--<unlock class="inline-16" v-if="tool.checkAuth($route.name,'unlock')" :id="mainData.sa_customersid" @onshow="onSuccess"></unlock> -->
-        <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.poolname === ''" :id="mainData.sa_customersid" @shareSuccess="onSuccess"></share>
-        <send_back style="display:inline" v-if="tool.checkAuth($route.name,'back') "  :data="mainData"  @backSuccess="onSuccess"></send_back>
-        <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" @toVoidSuccess="onSuccess"></to_void>
-        <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') "  :data="mainData" @backSuccess="onSuccess"></recovery>
+        <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.poolname === ''" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
+        <send_back style="display:inline" v-if="tool.checkAuth($route.name,'back') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></send_back>
+        <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
+        <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
       </div>
       <div slot="slot0" >
-        <detailed ref="baseDetail" :data="mainData"></detailed>
+        <detailed ref="baseDetail"></detailed>
       </div>
       <div slot="slot1" class=" normal-panel"  >
         <contacts :data="mainData"  @onSuccess="onSuccess" v-if="flag"></contacts>
@@ -115,10 +115,12 @@ export default {
         },
       })
       this.mainData = res.data
+      console.log("输出数据一")
+      console.log(this.mainData)
       this.$refs['details'].param.content.type = this.$route.query.tabIndex
       this.$refs['details'].param.content.isExport = false
       this.changeDataStructure()
-      // this.flag = true
+      this.flag = true
       console.log(this.mainAreaData)
     },
     show(){
@@ -146,6 +148,10 @@ export default {
           label:'成交状态',
           value:this.mainData.tradingstatus
         },
+        {
+          label:'合作状态',
+          value:this.mainData.status
+        },
         {
           label:'负责人',
           value:this.mainData.leader.length === 0?"--":this.mainData.leader[0].name
@@ -176,6 +182,7 @@ export default {
       this.$refs.details.refreshTag()
       this.$refs.baseDetail.basicData(this.$route.query.id)
       this.$refs.baseDetail.systemData(this.$route.query.id)
+      this.queryMainData(this.$route.query.id)
     }
   },
   mounted () {

src/SDrpManagement/salerPrivatecustomer/detail/modules/addressManage/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="onshow">新增客户地址</el-button>
     <el-drawer
-        title="创建客户地址"
+        title=" 新建客户地址"
         :visible.sync="dialogFormVisible"
         size="30%"
         direction="rtl"

src/SDrpManagement/salerPrivatecustomer/detail/modules/contacts/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="onshow">新增联系人</el-button>
     <el-drawer
-        title="创建联系人"
+        title=" 新建联系人"
         :visible.sync="dialogFormVisible"
         size="25%"
         direction="rtl"

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/statusChange.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini"  block @click="onshow">状态变更</el-button>
+    <el-button size="mini"  block @click="onshow">更改合作状态</el-button>
     <el-dialog title="" :visible.sync="dialogForm" width="400px" append-to-body>
       <div slot="title" style="font-size: 15px">
         状态变更

src/SManagement/project_target/components/selectPanel.vue

@@ -34,6 +34,7 @@ export default {
       year: String(new Date().getFullYear()),
       target:'1',
       search:'',
+      yearOptions:[],
       options: [
         { label: '开票金额', value: '1' },
         { label: '订单金额', value: '2' },
@@ -60,6 +61,9 @@ export default {
       this.$emit('targetChange',data)      
     }
   },
+  mounted() {
+
+  }
 };
 </script>
 

src/SManagement/sales_forecast/modules/modelDetail.vue

@@ -3,7 +3,7 @@
     <!-- :oldFormPath="{edit:'HManagement/salesForecastTemplate/modules'}" -->
     <basicDetails
         ref="details"
-        :titleText="`${mainData.billnum}`"
+        :titleText="`提报单号:${mainData.billnum}`"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20220906154403"
@@ -29,7 +29,7 @@
             <project :mainData="mainData" @queryProduct="queryProduct"></project>
           </el-col>
           <el-col :span="24">
-            <product  :mainData="mainData" ref="prod"></product>
+            <product  :mainData="mainData" ref="prod" @onSuccess='queryMainData'></product>
           </el-col>
         </el-row>
       </div>
@@ -73,6 +73,7 @@ export default {
         {label:'提报要求',value:this.mainData.remarks},
         {label:'提报类型',value:this.mainData.isrepeat == 1 ?'月度提报':'单次提报'},
         {label:'提报时间',value:this.mainData.reportingperiod},
+        {label:'截止日期',value:this.mainData.periodend},
         {label:'预测金额',value:this.mainData.sumamount},
         {label:'负责人',value:this.mainData.createby},
         {label:'状态',value:this.mainData.status},

src/SManagement/sales_forecast/modules/product.vue

@@ -74,7 +74,7 @@
       width="180"
       fixed="right">
       <template slot-scope="scope">
-        <el-input-number :controls="true" :step-strictly="true" size="mini" v-model="scope.row.outqty" @change="qtyChange" label="输入数量"></el-input-number>
+        <el-input-number :disabled="!checkDateOut" :controls="true" :step-strictly="true" size="mini" v-model="scope.row.outqty" @change="qtyChange" label="输入数量"></el-input-number>
       </template>
     </el-table-column>
     <el-table-column
@@ -93,7 +93,7 @@
         width="90"
         fixed="right">
       <template slot-scope="scope">
-        <el-button type="text" size="small" @click="deleteProduct(scope.row)">删 除</el-button>
+        <el-button :disabled="!checkDateOut" type="text" size="small" @click="deleteProduct(scope.row)">删 除</el-button>
       </template>
     </el-table-column>
     </el-table>
@@ -134,7 +134,9 @@ export default {
       },
       list:[],
       currentPage:0,
-      total:0
+      total:0,
+      checkDateOut:false,
+      time:null
     }
   },
   methods:{
@@ -155,36 +157,43 @@ export default {
       this.param.content.pageNumber = val
       this.listData()
     },
-    async qtyChange () {
+    qtyChange () {
       this.list = this.list.filter(e=>{
         e.outamount = e.outqty * e.marketprice
         return e
       })
-      const res = await this.$api.requested({
-        "id": 20220906155003,
-        "version":1,
-        "content": {
-          "sa_salesforecastmodelid":this.mainData.sa_salesforecastmodelid,
-          "sa_salesforecastbillid":this.$route.query.id,
-          "sa_projectid": this.param.content.where.sa_projectid,
-          "itemclassinfos": this.list.map(e=>{
-            return {
-              "sa_salesforecastid":e.sa_salesforecastid,
-              "itemclassnum": e.itemclassnum,
-              "orderqty": e.orderqty,
-              "orderamount": e.orderamount,
-              "invoiceqty": e.invoiceqty,
-              "invoiceamount": e.invoiceamount,
-              "outqty": e.outqty,
-              "outamount": e.outamount,
-              "itemid":e.itemid
-            }
-          })
-        }
-      })
-      this.tool.showMessage(res,()=>{
-
-      })
+      if(this.time !== null){
+        clearTimeout(this.time);
+      }
+      this.time = setTimeout(async () => {
+        const res = await this.$api.requested({
+          "id": 20220906155003,
+          "version":1,
+          "content": {
+            "sa_salesforecastmodelid":this.mainData.sa_salesforecastmodelid,
+            "sa_salesforecastbillid":this.$route.query.id,
+            "sa_projectid": this.param.content.where.sa_projectid,
+            "itemclassinfos": this.list.map(e=>{
+              return {
+                "sa_salesforecastid":e.sa_salesforecastid,
+                "itemclassnum": e.itemclassnum,
+                "orderqty": e.orderqty,
+                "orderamount": e.orderamount,
+                "invoiceqty": e.invoiceqty,
+                "invoiceamount": e.invoiceamount,
+                "outqty": e.outqty,
+                "outamount": e.outamount,
+                "itemid":e.itemid
+              }
+            })
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+        })
+      },1000)
+     
+      
     },
     async deleteProduct (row) {
       const res = await this.$api.requested({
@@ -197,10 +206,21 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.listData()
+        this.listData(this.param.content.where.sa_projectid)
       })
     }
   },
+  watch:{
+    mainData (val) {
+      let date = new Date(this.mainData.periodend)
+      let now = Date.now()
+      if (date.getTime() < now) {
+        this.checkDateOut =  false
+      } else {
+        this.checkDateOut = true
+      }
+    }
+  },
   mounted () {
     
   }

src/SManagement/sales_forecast/modules/project.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="flex-align-center flex-between mt-10">
       <el-input style="width:200px" suffix-icon="el-icon-search" size="small" placeholder="搜索" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
-      <addProject :mainData="mainData" @onSuccess="listData(param.content.pageNumber = 1)"></addProject>
+      <addProject v-if="checkDateOut" :mainData="mainData" @onSuccess="listData(param.content.pageNumber = 1)"></addProject>
     </div>
     <el-table
       :data="list"
@@ -27,10 +27,11 @@
         label="金额">
       </el-table-column>
       <el-table-column
-        label="操作">
+        label="操作"
+        width="150">
         <template slot-scope="scope">
-          <addProduct class="inline-16" :id="scope.row.sa_projectid" :mainData="mainData" @onSuccess="rowClick(act_row)"></addProduct>
-          <el-button size="small" type="text" @click="deleteProject(scope.row)">删 除{{scope.row.sa_salesforecastid}}</el-button>
+          <addProduct v-if="checkDateOut" class="inline-16" :id="scope.row.sa_projectid" :mainData="mainData" @onSuccess="rowClick(act_row)"></addProduct>
+          <el-button size="small" type="text" :disabled="!checkDateOut" @click="deleteProject(scope.row)">删 除{{scope.row.sa_salesforecastid}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -75,7 +76,8 @@ export default {
       act_row:[],
       list:[],
       currentPage:0,
-      total:0
+      total:0,
+      checkDateOut:false,
     }
   },
   methods:{
@@ -84,7 +86,6 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      console.log(res.data[0])
       this.$emit('queryProduct',res.data[0].sa_projectid)
     },
     async deleteProject (row) {
@@ -116,6 +117,19 @@ export default {
       this.$emit('queryProduct',row.sa_projectid)
     }
   },
+  watch:{
+    mainData (val) {
+      let date = new Date(this.mainData.periodend)
+      let now = Date.now()
+      if (date.getTime() < now) {
+        console.log('已过期')
+        this.checkDateOut =  false
+      } else {
+        console.log('未过期')
+        this.checkDateOut = true
+      }
+    }
+  },
   mounted () {
     this.listData()
   }

src/api/request.js

@@ -69,6 +69,7 @@ service.interceptors.response.use(response => {
         if (response.data.code === -1) {
             router.push({path:'/'})
             // location.reload(true);
+            store.state.closeDrawerTemp = false
         }
         return response.data;
     }, error => {

src/components/dynamic-table/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%;min-height:300px"  border>
-      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : ''">
+      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->
           <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>

src/components/newLayout/modules/menu.vue

@@ -60,7 +60,6 @@ export default {
   },
   watch:{
     activeApp (val) {
-      console.log(val,'-------')
       this.show = false
       setTimeout(() => {
         this.show = true

src/components/normal-basic-layout/details/modules/followUp/addLog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="default" size="mini" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="创建跟进动态" width="600px" append-to-body :visible.sync="dialogFormVisible">
+    <el-dialog title=" 新建跟进动态" width="600px" append-to-body :visible.sync="dialogFormVisible">
       <el-form :model="form" ref="form" label-position="top" label-width="80px">
         <el-form-item label="跟进动态" prop="content">
           <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进动态" autocomplete="off"></el-input>

src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -39,7 +39,7 @@ export default {
     var that = this
     window.addEventListener("popstate", function(e) {
      that.$store.dispatch('changeDetailDrawer',false)
-     this.$emit('onSuccess')
+     that.$emit('onSuccess')
     }, false);
   }
 }

src/components/normal-basic-layout/index.vue

@@ -32,7 +32,7 @@
         </div>
         <div class="flex-align-stretch" style="min-width:800px">
           <slot name="custom"></slot>
-          <el-input style="width:200px;" placeholder="搜索" suffix-icon="el-icon-search" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" >
+          <el-input style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition.length >0?'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
       </div>

src/components/normal-basic-layout/modules/cpEdit.vue

@@ -15,8 +15,10 @@ export default {
 		formComponent(){
       if (this.oldFormPath) {
         return ()=>import(`@/${this.oldFormPath.edit}/edit.vue`)
-      } else {
+      } else if (this.formPath) {
         return ()=>import(`@/Form/${this.formPath}/edit.vue`)
+      } else {
+        return false
       }
 		}
 	},

src/utils/tool.js

@@ -38,7 +38,6 @@ export default {
     })
     // 获取当前应用表格数据
     let tablecols = active_modules[0].meta.tables
-    console.log(tablecols,'tablecols')
     return tablecols
   },