addEditFromApiPop暂存

PC/InterFace.Dash/src/components/addEditFromApiPop/index.vue

@@ -9,11 +9,15 @@
     class="searchPageComponents"
     :fullscreen="true"
     style="width:calc(100% - 28px);left:14px;top:14px;height:calc(100% - 28px)"
+    v-loading="Loading.addEditApiLoading"
   >
+    <!-- 表单 -->
+    <div v-if="active === 0" style="height: 100%;">
       <!-- 标题 -->
       <div class="dialogOuterTitle">{{formTitle}}</div>
       <!-- 表单 -->
       <el-form 
+        class="addEditFrom"
         ref="addEditFrom_Ref"
         v-if="formData"
         :model="formData"
@@ -81,15 +85,44 @@
         </el-row>
       </el-form>
       <!-- 操作按钮 -->
-    <span slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="show = false">取 消</el-button>
         <el-button type="primary" @click="submitHandle()">确 定</el-button>
-    </span>
+      </div>
+    </div>
+    <!-- 成功提示 -->
+    <div v-if="active === 1">
+      <el-result icon="success" title="成功提示" :subTitle="formTitle + '成功'">
+        <template slot="extra">
+          <el-button type="primary" size="medium" @click="exitHandle"
+            >退出</el-button
+          >
+        </template>
+      </el-result>
+    </div>
+    <!-- 错误提示 -->
+    <div v-if="active === 2">
+      <el-result icon="error" title="错误提示" :subTitle="formTitle + '失败'">
+        <template slot="extra">
+          <el-button type="primary" size="medium" @click="changeActive(0)"
+            >返回</el-button
+          >
+          <el-button type="primary" size="medium" @click="exitHandle"
+            >退出</el-button
+          >
+        </template>
+      </el-result>
+    </div>
   </el-dialog>
 </template>
 <script>
+import { postCreate, postUpdate } from "@/api/wms-api"
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { tableMixins } from "@/mixins/TableMixins"
+import * as allUrlOption from '@/utils/baseData/urlOption'
 export default {
   name:"addEditFromApiPop",
+  mixins:[ LoadingMixins,tableMixins ],
   props: {
     // 编辑行数据
     editRowData:{
@@ -100,10 +133,32 @@ export default {
     handleType:{
       type: String,
       default: null
+    },
+    // 提交事件
+    submitForm:{
+      type:Function,
+      default:null
+    },
+    // 特殊的【新增】接口，如果没有就走路由下的配置文件
+    addSubmitUrl:{
+      type: String,
+      default: null
+    },
+    // 特殊的【编辑】接口，如果没有就走路由下的配置文件
+    editSubmitUrl:{
+      type: String,
+      default: null
     }
   },
   data () {
     return {
+      // 新增
+      URLOption_base:allUrlOption[this.$route.name].baseURL,
+      // 新增
+      URLOption_add:allUrlOption[this.$route.name].addURL,
+      // 编辑
+      URLOption_edit:allUrlOption[this.$route.name].editURL,
+      active:0,//显示内容：0表单 1成功 2失败
       show:true,
       formTitle:null,//form名称
       formData:{},//表单数据
@@ -128,6 +183,10 @@ export default {
       let _dtoList_type = this.handleType == 'add' ? 'C' : 'U'
       let _dtoList = data[this.$route.name][_dtoList_type].dtoList
       this.formItemData = JSON.parse(JSON.stringify(_dtoList))
+      // 编辑格式：特殊处理默认值
+      if(this.handleType == 'edit' && this.editRowData){
+
+      }
       // 表单验证格式化
       this.formRules={}
       _dtoList.forEach(item=>{
@@ -162,22 +221,52 @@ export default {
     // 提交表单
     submitHandle(){
       this.$refs.addEditFrom_Ref.validate((valid) => {
+        if(this.submitForm){
+          this.submitForm(valid,this.formData,this.handleType,this.formItemData,this.formRules)
+          return
+        }
+        let _updata = this.handleType == 'add' ? this.URLOption_add : this.URLOption_edit
+        let _url = _updata ? _updata : this.URLOption_base
+        this.Loading.addEditApiLoading = true
         if (valid) {
-          console.log(this.handleType,this.formData)
           // 新增
           if(this.handleType == 'add'){
-
+            if(!_updata){_url = _url + '/create'}
+            postCreate(this.formData, _url).then(res => {
+              this.changeActive(1)
+            }).catch(err => {
+              this.changeActive(2)
+            })
           }
           // 编辑
           else{
-
+            if(!_updata){_url = _url + '/update-by-id'}
+            postUpdate(this.formData, this.formData.id, _url).then(res => {
+              this.changeActive(1)
+            }).catch(err => {
+              this.changeActive(2)
+            })
           }
-          this.show = false
         } else {
           return false;
         }
       });
     },
+    // 结果页退出
+    exitHandle(){
+      this.close()
+      if(this.active == '1')this.oldSkipCount = 1;
+      this.show = false
+      this.paging()
+      this.$nextTick(()=>{
+        this.active = 0
+      })
+    },
+    // 更改页面步骤
+    changeActive(sta){
+      this.active = sta
+      this.Loading.addEditApiLoading = false
+    },
     // 值更改函数
     changeValue(prop,item,val) {
       this.$emit("changeValue", prop, item, val)
@@ -185,7 +274,7 @@ export default {
     // 值清除函数
     clearValue(prop,item,val) {
       this.$emit("clearValue", prop, item, val)
-    }
+    },
   }
 }
 </script>
@@ -194,6 +283,13 @@ export default {
   ::v-deep .el-dialog__header{
     padding:  0 !important;
   }
+  ::v-deep .el-row{
+    width: 100%;
+  }
+  ::v-deep .addEditFrom{
+    height: calc(100% - 120px);
+    overflow: auto;
+  }
   ::v-deep .el-form-item__label{
     float: unset;
   }
@@ -201,4 +297,9 @@ export default {
   ::v-deep .el-input,.el-select,.el-input-number{
     width: 100% !important;
   }
+
+  .dialog-footer{
+    padding-top: 15px;
+    text-align: right;
+  }
 </style>

PC/InterFace.Dash/src/mixins/LoadingMixins.js

@@ -9,6 +9,8 @@ export const LoadingMixins = {
         newAndEdiLoading: false,
         autoTableLoading: false,
         appMainLoading: false,
+        // fast-new
+        addEditApiLoading:false,//Api 新增编辑
       },
       //Dialog显示状态
       displayDialog: {

PC/InterFace.Dash/src/mixins/TableHeaderMixins.js

@@ -32,6 +32,7 @@ export const TableHeaderMixins = {
     // 关闭主表新增编辑api
     closeAddEditApiPop(){
       this.addEditApiType = null
+      this.editFromApiRowData = null
       this.displayDialog.addEditApiDialog = false
     },
     // 导出功能

PC/InterFace.Dash/src/mixins/TableMixins.js

@@ -91,6 +91,7 @@ export const tableMixins = {
       // 编辑 api
       if (item.name == "editFromApi") {
         this.addEditApiType = 'edit'
+        this.editFromApiRowData = row
         this.displayDialog.addEditApiDialog = true;
       }
       // 删除

PC/InterFace.Dash/src/mixins/mixins.js

@@ -18,8 +18,6 @@ export const mixins = {
       URLOption_add:allUrlOption[this.$route.name].addURL,
       // 编辑
       URLOption_edit:allUrlOption[this.$route.name].editURL,
-      // 新增和编辑
-      URLOption_updata:allUrlOption[this.$route.name].updataURL,
       //明细-查看主表
       URLOption_parent:allUrlOption[this.$route.name].parentURL ? allUrlOption[this.$route.name].parentURL : allUrlOption[this.$route.name].detailURL,
       //明细-查看主表的连接id
@@ -67,6 +65,7 @@ export const mixins = {
       ],
       
       addEditApiType: null,//Api新增编辑方式(add,edit) 
+      editFromApiRowData:null,//Api编辑方式的默认值
     }
   },
   methods: {

PC/InterFace.Dash/src/mixins/newAndEdiDialogMixins.js

@@ -51,10 +51,10 @@ export const newAndEdiDialogMixins = {
       this.ref = val
       this.Loading.newAndEdiLoading = true
       let _updata = this.formReveal ? this.URLOption_add : this.URLOption_edit
-      let _url = this.URLOption_updata ? this.URLOption_updata : (_updata ? _updata : this.URLOption_base)
+      let _url = _updata ? _updata : this.URLOption_base
       switch (this.formReveal) {
         case true:
-          if(!_updata && !this.URLOption_updata){_url = _url + '/create'}
+          if(!_updata){_url = _url + '/create'}
           postCreate(this.CreateFormData, _url).then(res => {
             this.oldSkipCount = 1;
             this.Loading.newAndEdiLoading = false
@@ -65,7 +65,7 @@ export const newAndEdiDialogMixins = {
           })
           break;
         case false:
-          if(!_updata && !this.URLOption_updata){_url = _url + '/update-by-id'}
+          if(!_updata){_url = _url + '/update-by-id'}
           postUpdate(this.editFormData, this.editFormData.id, _url).then(res => {
             this.propsData = res
             this.Loading.newAndEdiLoading = false

PC/InterFace.Dash/src/utils/baseData/urlOption.js

@@ -6,9 +6,8 @@ export const TestSchool = {
     detailListURL:'TestStudentDetail/base',//明细-列表,
     // parentURL:null,//明细-查看主表:特殊接口，如果没有则走detailURL
     // deleteURL:null,//删除特殊URL
-    // updataURL:null,//新增+编辑特殊URL（新增+编辑使用一个）
+    // addURL:null,//新增特殊URL
-    // addURL:null,//新增特殊URL（有此参数，updataURL无效）
+    // editURL:null,//编辑特殊URL
-    // editURL:null,//编辑特殊URL（有此参数，updataURL无效）
     // exportURL:'exportURL',//导出特殊URL
 }
 

PC/InterFace.Dash/src/views/login/index.vue

@@ -178,7 +178,6 @@ export default {
           return
           this.loading = true
           this.loginForm.userNameOrEmailAddress = this.loginForm.username
-          // todo-new:与permission文件的登录统一封装
           let _zh = localStorage.getItem('columnsApiNamesZh')
           login(this.loginForm).then(()=>{
           // this.$store.dispatch('user/login', this.loginForm).then(() => {

PC/InterFace.Dash/src/views/menuList/ExportCustomUserSetting.vue

@@ -285,12 +285,12 @@ export default {
       this.ref = val
       this.Loading.newAndEdiLoading = true
       let _updata = this.formReveal ? this.URLOption_add : this.URLOption_edit
-      let _url = this.URLOption_updata ? this.URLOption_updata : (_updata ? _updata : this.URLOption_base)
+      let _url = _updata ? _updata : this.URLOption_base
       switch (this.formReveal) {
         case true:
           this.CreateFormData.exportColumnName = this.CreateFormData.exportColumnNameArr.join(" ")
           this.CreateFormData.exportTableName = this.CreateFormData.exportTableName_old
-          if(!_updata && !this.URLOption_updata){_url = _url + '/create'}
+          if(!_updata){_url = _url + '/create'}
           postCreate(this.CreateFormData, _url).then(res => {
             this.oldSkipCount = 1;
             this.Loading.newAndEdiLoading = false
@@ -302,7 +302,7 @@ export default {
           })
           break;
         case false:
-          if(!_updata && !this.URLOption_updata){_url = _url + '/update-by-id'}
+          if(!_updata){_url = _url + '/update-by-id'}
           this.editFormData.exportColumnName = this.editFormData.exportColumnNameArr.join(" ")
           this.editFormData.exportTableName = this.editFormData.exportTableName_old
           postUpdate(this.editFormData, this.editFormData.id, _url).then(res => {

PC/InterFace.Dash/src/views/menuList/IncomingData copy.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="page-box" v-loading="Loading.tableLoading">
+    <tablePagination
+      v-if="apiColumns_Table"
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="apiColumns_Table"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    ></tablePagination>
+    <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left" -->
+    <!-- <curren-Drawer
+      ref="currenDrawer_Ref"
+      :title="apiColumns_DesTions"
+      @rowDrop="rowDrop"
+      :tableColumns="apiColumns_DetailsTable"
+      :tabsDesTions="apiColumns_DesTions"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :totalCount="totalCountDetails"
+      :currentPage="oldSkipCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :buttonOperationList_left="operationButtonsDetail"
+    ></curren-Drawer> -->
+    <!-- 导出弹窗 -->
+    <exportDrop 
+      v-if="displayDialog.exportDialog"
+      @closeDialog="closeExportDrop"
+      @exportDropSubmit="exportDropSubmit"
+    ></exportDrop>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins";
+import { filterSelectMixins } from '@/mixins/filter-Select'
+import { getToken } from '@/utils/auth'
+
+
+export default {
+  name: "IncomingData",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  data() {
+    return {
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultExportBtn({
+          isRedundance:true,
+          isDetailExport:true
+        }),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted() {
+    this.paging();
+  },
+}
+</script>
+<style lang="scss" scoped>
+@import "@/styles/basicData.scss";
+</style>

PC/InterFace.Dash/src/views/menuList/IncomingData.vue

@@ -23,10 +23,14 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
+      :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit')}"
+      @buttonOperationClick_right="buttonOperationClick_right"
     ></tablePagination>
     <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
       @buttonOperationClick_left="buttonOperationClick_left" -->
-    <!-- <curren-Drawer
+    <curren-Drawer
       ref="currenDrawer_Ref"
       :title="apiColumns_DesTions"
       @rowDrop="rowDrop"
@@ -46,13 +50,20 @@
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
       :buttonOperationList_left="operationButtonsDetail"
-    ></curren-Drawer> -->
+    ></curren-Drawer>
     <!-- 导出弹窗 -->
     <exportDrop 
       v-if="displayDialog.exportDialog"
       @closeDialog="closeExportDrop"
       @exportDropSubmit="exportDropSubmit"
     ></exportDrop>
+    <!-- Api新增 -->
+    <addEditFromApiPop
+      v-if="displayDialog.addEditApiDialog"
+      :handleType="addEditApiType"
+      :editRowData="editFromApiRowData"
+      @closePop="closeAddEditApiPop"
+    ></addEditFromApiPop>
   </div>
 </template>
 <script>
@@ -60,7 +71,6 @@ import { tableMixins } from "@/mixins/TableMixins";
 import { LoadingMixins } from "@/mixins/LoadingMixins";
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import { getToken } from '@/utils/auth'
@@ -75,12 +85,14 @@ export default {
     TableHeaderMixins,
     mixins,
     filterSelectMixins,
-    newAndEdiDialogMixins
   ],
   data() {
     return {
       //常用按钮数据
       currenButtonData: [
+        this.defaultAddBtn({
+          name:'addFromApi'
+        }),//新增
         this.defaultExportBtn({
           isRedundance:true,
           isDetailExport:true